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.dcl
diff --git
a/Shares/mTaskShare.dcl
b/Shares/mTaskShare.dcl
index
a3155fd
..
6cd08a9
100644
(file)
--- a/
Shares/mTaskShare.dcl
+++ b/
Shares/mTaskShare.dcl
@@
-6,17
+6,19
@@
import mTask
import Devices.mTaskDevice
derive class iTask MTaskShare
import Devices.mTaskDevice
derive class iTask MTaskShare
+derive gPrint BCState
:: MTaskShare =
:: MTaskShare =
- {withTask :: [String]
- ,identifier :: Int
- ,value :: BCValue
+ {withTask :: [String]
+ ,identifier:: Int
+ ,value :: BCValue
+ ,humanName :: String
}
instance == MTaskShare
//Constructor
}
instance == MTaskShare
//Constructor
-makeShare :: String Int BCValue -> MTaskShare
+makeShare :: String
String
Int BCValue -> MTaskShare
//General viewing task
manageShares :: Task [MTaskDevice]
//General viewing task
manageShares :: Task [MTaskDevice]
@@
-29,7
+31,7
@@
cleanSharesTask :: Int MTaskDevice -> Task [MTaskShare]
//cleanSharesTask :: Int MTaskDevice -> Task [MTaskShare]
//Clean out shares when a device has been removed
//cleanSharesTask :: Int MTaskDevice -> Task [MTaskShare]
//Clean out shares when a device has been removed
-updateShareFromPublish :: MTaskDevice Int BCValue -> Task
[MTaskShare]
+updateShareFromPublish :: MTaskDevice Int BCValue -> Task
BCValue
//updateShare :: Int BCValue -> Task [MTaskShare]
getRealShare :: MTaskDevice MTaskShare -> Shared BCValue
//updateShare :: Int BCValue -> Task [MTaskShare]
getRealShare :: MTaskDevice MTaskShare -> Shared BCValue