repositories
/
mTask.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask
[mTask.git]
/
Shares
/
mTaskShare.icl
diff --git
a/Shares/mTaskShare.icl
b/Shares/mTaskShare.icl
index
b0c4424
..
c0087d8
100644
(file)
--- a/
Shares/mTaskShare.icl
+++ b/
Shares/mTaskShare.icl
@@
-1,7
+1,9
@@
implementation module Shares.mTaskShare
import Utils.SDS
implementation module Shares.mTaskShare
import Utils.SDS
+import Utils.Devices
import iTasks
import iTasks
+import mTask
from Data.Func import $
manageShares :: [MTaskShare] -> Task ()
from Data.Func import $
manageShares :: [MTaskShare] -> Task ()
@@
-10,23
+12,25
@@
manageShares shares = forever (enterChoice "Choose share to update" [ChooseFromG
Nothing = viewShares shares @! zero
Just sh = forever (
viewSharedInformation "View value" [] (getSDSStore sh)
Nothing = viewShares shares @! zero
Just sh = forever (
viewSharedInformation "View value" [] (getSDSStore sh)
- >>* [OnAction (Action "Update") (withValue
$ Just $ updateInformation "New value" []
)]
+ >>* [OnAction (Action "Update") (withValue
(Just o updateInformation "New value" [])
)]
>>= updateShare sh
)
) @! ()
>>= updateShare sh
)
) @! ()
-updateShare :: MTaskShare Int -> Task MTaskShare
-updateShare sh=:{withTask} i = return sh
+updateShare :: MTaskShare a -> Task MTaskShare | toByteCode, iTask a
+updateShare sh=:{withTask,identifier} a = getDeviceByName withTask
+ >>= sendMessages [MTUpd identifier $ toString $ toByteCode a]
+ >>| treturn sh
viewShares :: [MTaskShare] -> Task ()
viewShares sh = anyTask (map viewShare sh) <<@ ArrangeHorizontal @! ()
viewShare :: MTaskShare -> Task ()
viewShares :: [MTaskShare] -> Task ()
viewShares sh = anyTask (map viewShare sh) <<@ ArrangeHorizontal @! ()
viewShare :: MTaskShare -> Task ()
-viewShare m = viewSharedInformation "" [] (getSDSStore m)
- <<@ Title ("SDS: " +++ toString m.identifier) @! ()
+viewShare m =
treturn ()//
viewSharedInformation "" [] (getSDSStore m)
+
//
<<@ Title ("SDS: " +++ toString m.identifier) @! ()
instance zero MTaskShare where
instance zero MTaskShare where
- zero = {
initValue=0,
withTask="",identifier=0,realShare=""}
+ zero = {withTask="",identifier=0,realShare=""}