Commit 2ebdc43b authored by David Davó's avatar David Davó

Changed comm of control widgets

parent cfc38215
...@@ -50,7 +50,7 @@ mkCheckBox = do ...@@ -50,7 +50,7 @@ mkCheckBox = do
instance IHaskellWidget CheckBox where instance IHaskellWidget CheckBox where
getCommUUID = uuid getCommUUID = uuid
comm widget val _ = comm widget val _ =
case nestedObjectLookup val ["sync_data", "value"] of case nestedObjectLookup val ["state", "value"] of
Just (Bool value) -> do Just (Bool value) -> do
void $ setField' widget BoolValue value void $ setField' widget BoolValue value
triggerChange widget triggerChange widget
......
...@@ -56,7 +56,7 @@ mkToggleButton = do ...@@ -56,7 +56,7 @@ mkToggleButton = do
instance IHaskellWidget ToggleButton where instance IHaskellWidget ToggleButton where
getCommUUID = uuid getCommUUID = uuid
comm widget val _ = comm widget val _ =
case nestedObjectLookup val ["sync_data", "value"] of case nestedObjectLookup val ["state", "value"] of
Just (Bool value) -> do Just (Bool value) -> do
void $ setField' widget BoolValue value void $ setField' widget BoolValue value
triggerChange widget triggerChange widget
......
...@@ -51,7 +51,7 @@ mkBoundedFloatText = do ...@@ -51,7 +51,7 @@ mkBoundedFloatText = do
instance IHaskellWidget BoundedFloatText where instance IHaskellWidget BoundedFloatText where
getCommUUID = uuid getCommUUID = uuid
comm widget val _ = comm widget val _ =
case nestedObjectLookup val ["sync_data", "value"] of case nestedObjectLookup val ["state", "value"] of
Just (Number value) -> do Just (Number value) -> do
void $ setField' widget FloatValue (Sci.toRealFloat value) void $ setField' widget FloatValue (Sci.toRealFloat value)
triggerChange widget triggerChange widget
......
...@@ -58,7 +58,7 @@ mkFloatSlider = do ...@@ -58,7 +58,7 @@ mkFloatSlider = do
instance IHaskellWidget FloatSlider where instance IHaskellWidget FloatSlider where
getCommUUID = uuid getCommUUID = uuid
comm widget val _ = comm widget val _ =
case nestedObjectLookup val ["sync_data", "value"] of case nestedObjectLookup val ["state", "value"] of
Just (Number value) -> do Just (Number value) -> do
void $ setField' widget FloatValue (Sci.toRealFloat value) void $ setField' widget FloatValue (Sci.toRealFloat value)
triggerChange widget triggerChange widget
......
...@@ -59,7 +59,7 @@ mkFloatRangeSlider = do ...@@ -59,7 +59,7 @@ mkFloatRangeSlider = do
instance IHaskellWidget FloatRangeSlider where instance IHaskellWidget FloatRangeSlider where
getCommUUID = uuid getCommUUID = uuid
comm widget val _ = comm widget val _ =
case nestedObjectLookup val ["sync_data", "value"] of case nestedObjectLookup val ["state", "value"] of
Just (Array values) -> Just (Array values) ->
case map (\(Number x) -> Sci.toRealFloat x) $ V.toList values of case map (\(Number x) -> Sci.toRealFloat x) $ V.toList values of
[x, y] -> do [x, y] -> do
......
...@@ -51,7 +51,7 @@ mkFloatText = do ...@@ -51,7 +51,7 @@ mkFloatText = do
instance IHaskellWidget FloatText where instance IHaskellWidget FloatText where
getCommUUID = uuid getCommUUID = uuid
comm widget val _ = comm widget val _ =
case nestedObjectLookup val ["sync_data", "value"] of case nestedObjectLookup val ["state", "value"] of
Just (Number value) -> do Just (Number value) -> do
void $ setField' widget FloatValue (Sci.toRealFloat value) void $ setField' widget FloatValue (Sci.toRealFloat value)
triggerChange widget triggerChange widget
......
...@@ -51,7 +51,7 @@ mkBoundedIntText = do ...@@ -51,7 +51,7 @@ mkBoundedIntText = do
instance IHaskellWidget BoundedIntText where instance IHaskellWidget BoundedIntText where
getCommUUID = uuid getCommUUID = uuid
comm widget val _ = comm widget val _ =
case nestedObjectLookup val ["sync_data", "value"] of case nestedObjectLookup val ["state", "value"] of
Just (Number value) -> do Just (Number value) -> do
void $ setField' widget IntValue (Sci.coefficient value) void $ setField' widget IntValue (Sci.coefficient value)
triggerChange widget triggerChange widget
......
...@@ -35,7 +35,7 @@ mkIntProgress = do ...@@ -35,7 +35,7 @@ mkIntProgress = do
-- Default properties, with a random uuid -- Default properties, with a random uuid
wid <- U.random wid <- U.random
let boundedIntAttrs = defaultBoundedIntWidget "ProgressView" "ProgressModel" let boundedIntAttrs = defaultBoundedIntWidget "ProgressView" "IntProgressModel"
progressAttrs = (Orientation =:: HorizontalOrientation) progressAttrs = (Orientation =:: HorizontalOrientation)
:& (BarStyle =:: DefaultBar) :& (BarStyle =:: DefaultBar)
:& RNil :& RNil
......
...@@ -38,7 +38,7 @@ mkIntRangeSlider = do ...@@ -38,7 +38,7 @@ mkIntRangeSlider = do
-- Default properties, with a random uuid -- Default properties, with a random uuid
wid <- U.random wid <- U.random
let boundedIntAttrs = defaultBoundedIntRangeWidget "IntSliderView" "IntSliderModel" let boundedIntAttrs = defaultBoundedIntRangeWidget "IntRangeSliderView" "IntRangeSliderModel"
sliderAttrs = (Orientation =:: HorizontalOrientation) sliderAttrs = (Orientation =:: HorizontalOrientation)
:& (ShowRange =:: True) :& (ShowRange =:: True)
:& (ReadOut =:: True) :& (ReadOut =:: True)
...@@ -59,7 +59,7 @@ mkIntRangeSlider = do ...@@ -59,7 +59,7 @@ mkIntRangeSlider = do
instance IHaskellWidget IntRangeSlider where instance IHaskellWidget IntRangeSlider where
getCommUUID = uuid getCommUUID = uuid
comm widget val _ = comm widget val _ =
case nestedObjectLookup val ["sync_data", "value"] of case nestedObjectLookup val ["state", "value"] of
Just (Array values) -> Just (Array values) ->
case map (\(Number x) -> Sci.coefficient x) $ V.toList values of case map (\(Number x) -> Sci.coefficient x) $ V.toList values of
[x, y] -> do [x, y] -> do
......
...@@ -51,7 +51,7 @@ mkIntText = do ...@@ -51,7 +51,7 @@ mkIntText = do
instance IHaskellWidget IntText where instance IHaskellWidget IntText where
getCommUUID = uuid getCommUUID = uuid
comm widget val _ = comm widget val _ =
case nestedObjectLookup val ["sync_data", "value"] of case nestedObjectLookup val ["state", "value"] of
Just (Number value) -> do Just (Number value) -> do
void $ setField' widget IntValue (Sci.coefficient value) void $ setField' widget IntValue (Sci.coefficient value)
triggerChange widget triggerChange widget
......
...@@ -53,7 +53,7 @@ instance IHaskellWidget TextWidget where ...@@ -53,7 +53,7 @@ instance IHaskellWidget TextWidget where
getCommUUID = uuid getCommUUID = uuid
-- Two possibilities: 1. content -> event -> "submit" 2. sync_data -> value -> <new_value> -- Two possibilities: 1. content -> event -> "submit" 2. sync_data -> value -> <new_value>
comm tw val _ = do comm tw val _ = do
case nestedObjectLookup val ["sync_data", "value"] of case nestedObjectLookup val ["state", "value"] of
Just (String value) -> setField' tw StringValue value >> triggerChange tw Just (String value) -> setField' tw StringValue value >> triggerChange tw
_ -> pure () _ -> pure ()
case nestedObjectLookup val ["content", "event"] of case nestedObjectLookup val ["content", "event"] of
......
...@@ -51,7 +51,7 @@ mkTextArea = do ...@@ -51,7 +51,7 @@ mkTextArea = do
instance IHaskellWidget TextArea where instance IHaskellWidget TextArea where
getCommUUID = uuid getCommUUID = uuid
comm widget val _ = comm widget val _ =
case nestedObjectLookup val ["sync_data", "value"] of case nestedObjectLookup val ["state", "value"] of
Just (String value) -> do Just (String value) -> do
void $ setField' widget StringValue value void $ setField' widget StringValue value
triggerChange widget triggerChange widget
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment