Merge remote-tracking branch 'origin/master' into release/1.35.1

[simantics/district.git] / org.simantics.district.network / scl / Simantics / District.scl

diff --git a/org.simantics.district.network/scl/Simantics/District.scl b/org.simantics.district.network/scl/Simantics/District.scl
index 36dee3979b74ea97dbc7fc2e15fa507518332a11..2f46d361ded6b3eb212bec13d941e1dd6288b11a 100644 (file)
--- a/org.simantics.district.network/scl/Simantics/District.scl
+++ b/org.simantics.district.network/scl/Simantics/District.scl
@@ -112,14 +112,14 @@ possibleMappedComponentVariable r = match possibleMappedComponent r with
 
 """
 """
-possibleMappedComponentPropertyValue :: String -> Resource -> <ReadGraph> Maybe Double
+possibleMappedComponentPropertyValue :: Serializable a => Typeable a => String -> Resource -> <ReadGraph> Maybe a
 possibleMappedComponentPropertyValue propName r = match possibleMappedComponentVariable r with
     Nothing -> Nothing
     Just mv -> possiblePropertyValue mv propName
 
 """
 """
-mappedComponentPropertyValue :: Double -> String -> Resource -> <ReadGraph> Double
+mappedComponentPropertyValue :: Serializable a => Typeable a => a -> String -> Resource -> <ReadGraph> a
 mappedComponentPropertyValue def propName r = match possibleMappedComponentVariable r with
     Nothing -> def
     Just mv -> match possiblePropertyValue mv propName with