X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Shares%2FmTaskShare.icl;h=ee6282b775eb5803d4dc803235dd72ccbadb6dc5;hb=a2df77cbda43d5a24eeb8ac7db7452baae9f18aa;hp=1e9294c4c92ada35639c760caabd421ff149c1e8;hpb=5019b4f7dbeda8679421ec482f40b85eec9ebd72;p=mTask.git

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index 1e9294c..ee6282b 100644
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -1,36 +1,63 @@
 implementation module Shares.mTaskShare
 
+import dynamic_string
 import Utils.SDS
 import Utils.Devices
 import iTasks
 import mTask
+import Data.List
 from Data.Func import $
+from StdFunc import flip
 
-manageShares :: [MTaskShare] -> Task ()
-manageShares shares = forever (enterChoice "Choose share to update" [ChooseFromGrid id] shares
-	>&^ \st->whileUnchanged st $ \msh->case msh of
-		Nothing = viewShares shares @! zero
-		Just sh = forever (
-				viewSharedInformation "View value" [] (getSDSStore sh)
-			>>* [OnAction (Action "Update") (withValue (Just o updateInformation "New value" []))]
-			>>= updateShare sh
-			)
-			
-	) @! ()
-
-updateShare :: MTaskShare a -> Task MTaskShare | toByteCode 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 ()
-viewShare m = viewSharedInformation "" [] (getSDSStore m)
-	<<@ Title ("SDS: " +++ toString m.identifier) @! ()
-
-instance zero MTaskShare where
-	zero = {initValue=0,withTask="",identifier=0,realShare=""}
+derive class iTask MTaskShareType, MTaskShare
 
+manageShares :: [MTaskShare] -> Task ()
+manageShares shares = withShared Nothing $ \cs->forever $
+	(viewSharesGrid cs shares -|| updateShares shares <<@ ArrangeVertical) 
+	@! ()
+
+updateShares :: [MTaskShare] -> Task BCValue
+updateShares shares = anyTask (map updateS shares) <<@ ArrangeWithTabs
+
+updateS :: MTaskShare -> Task BCValue
+updateS sh = flip (<<@) (Title $ toString sh.identifier) $ forever $
+		viewSharedInformation "Current value" [] (getSDSShare sh)
+	||- (
+			updateSharedInformation "New value" [] (getSDSShare sh)
+		>>= \nv->allTasks (map (withDevice treturn) sh.withDevice)
+		>>= \devs->allTasks (map (sendMessages [MTUpd sh.identifier nv]) devs)
+		>>| treturn nv
+		)
+	<<@ ArrangeHorizontal
+
+viewSharesGrid :: (Shared (Maybe MTaskShare)) [MTaskShare] -> Task [BCValue]
+viewSharesGrid _ [] = viewInformation "No shares yet" [] []
+viewSharesGrid cs sh = (allTasks [watch (getSDSShare m)\\m<-sh] <<@ NoUserInterface)
+	>&^ \st->flip (<<@) NoUserInterface $ whileUnchanged st $ \mshs->enterChoice "" [ChooseFromGrid id]
+		[{MTaskShare|ss&value=s}\\s<-fromJust mshs & ss<-sh]
+		>>* [OnValue (withValue $ \s->Just (set (Just s) cs))]
+		@! fromJust mshs
+
+viewShare :: MTaskShare -> Task BCValue
+viewShare m = viewSharedInformation "" [] (getSDSShare m)
+	<<@ Title ("SDS: " +++ toString m.identifier)
+
+getSDSShare :: MTaskShare -> Shared BCValue
+getSDSShare s=:{realShare=(MTaskWithShare id),value} = memoryShare id value
+
+makeShare :: String String Int BCValue -> Task MTaskShare
+makeShare withTask withDevice identifier value = treturn 
+		{MTaskShare
+		|withTask=[withTask]
+		,withDevice=[withDevice]
+		,identifier=identifier
+		,value=value
+		,realShare=MTaskWithShare $ "mTaskSDS-" +++ toString identifier
+		} >>= \sh->set value (getSDSShare sh) >>| treturn sh
+
+updateShare :: Int BCValue -> Task ()
+updateShare ident val = get sdsStore
+	>>= \sh->(case find (\s->s.identifier==ident) sh of
+		Nothing = abort "Help, no share found with this ident"
+		Just mts = set val (getSDSShare mts))
+	>>| traceValue "Updated" @! ()