Commit 175b0065 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

Merge branch 'dev' into dev-node-corpus-add-text-cells

parents 1576810f cd54ce7b
...@@ -130,7 +130,7 @@ settingsBox Team = ...@@ -130,7 +130,7 @@ settingsBox Team =
, Annuaire , Annuaire
, NodeFrameWrite , NodeFrameWrite
, NodeFrameCalc , NodeFrameCalc
, NodeFrameNotebook -- , NodeFrameNotebook
, Team , Team
, FolderShared , FolderShared
] ]
......
...@@ -249,15 +249,15 @@ sigmaSettings = ...@@ -249,15 +249,15 @@ sigmaSettings =
, edgeHoverPrecision: 2.0 , edgeHoverPrecision: 2.0
, edgeHoverSizeRatio: 2.0 , edgeHoverSizeRatio: 2.0
, enableHovering: true , enableHovering: true
, font: "arial" -- font params , font: "arial"
, fontStyle: "bold" , fontStyle: ""
, hideEdgesOnMove: true , hideEdgesOnMove: true
, labelSize : "proportional" -- alt : proportional, fixed , labelSize : "proportional" -- alt : proportional, fixed
-- , labelSize: "fixed" -- , labelSize: "fixed"
, labelSizeRatio: 3.0 -- label size in ratio of node size , labelSizeRatio: 2.0 -- label size in ratio of node size
, labelThreshold: 6.0 -- min node cam size to start showing label , labelThreshold: 9.0 -- 5.0 for more labels -- min node cam size to start showing label
, maxEdgeSize: 1.0 , maxEdgeSize: 1.0
, maxNodeSize: 8.0 , maxNodeSize: 10.0
, minEdgeSize: 0.5 -- in fact used in tina as edge size , minEdgeSize: 0.5 -- in fact used in tina as edge size
, minNodeSize: 1.0 , minNodeSize: 1.0
, mouseEnabled: true , mouseEnabled: true
...@@ -278,7 +278,7 @@ sigmaSettings = ...@@ -278,7 +278,7 @@ sigmaSettings =
, verbose : true , verbose : true
, zoomMax: 1.7 , zoomMax: 1.7
, zoomMin: 0.0 , zoomMin: 0.0
, zoomingRatio: 1.7 , zoomingRatio: 1.4
} }
type ForceAtlas2Settings = type ForceAtlas2Settings =
...@@ -306,11 +306,11 @@ forceAtlas2Settings = ...@@ -306,11 +306,11 @@ forceAtlas2Settings =
, barnesHutOptimize : true , barnesHutOptimize : true
, edgeWeightInfluence : 1.0 , edgeWeightInfluence : 1.0
-- fixedY : false -- fixedY : false
, gravity : 1.0 , gravity : 0.01
, iterationsPerRender : 10.0 , iterationsPerRender : 50.0 -- 10.0
, linLogMode : false -- false , linLogMode : false -- false
, outboundAttractionDistribution: false , outboundAttractionDistribution: false
, scalingRatio : 10.0 , scalingRatio : 1000.0
, skipHidden: false , skipHidden: false
, slowDown : 1.0 , slowDown : 1.0
, startingIterations : 10.0 , startingIterations : 10.0
......
...@@ -51,7 +51,7 @@ labelSizeButton sigmaRef state = ...@@ -51,7 +51,7 @@ labelSizeButton sigmaRef state =
sizeButton { sizeButton {
state state
, caption: "Label Size" , caption: "Label Size"
, min: 5.0 , min: 1.0
, max: 30.0 , max: 30.0
, onChange: \e -> do , onChange: \e -> do
let sigma = R.readRef sigmaRef let sigma = R.readRef sigmaRef
...@@ -61,7 +61,8 @@ labelSizeButton sigmaRef state = ...@@ -61,7 +61,8 @@ labelSizeButton sigmaRef state =
Sigma.setSettings s { Sigma.setSettings s {
defaultLabelSize: newValue defaultLabelSize: newValue
, drawLabels: true , drawLabels: true
, labelSizeRatio: newValue / 2.5 , maxNodeSize: newValue / 2.5
--, labelSizeRatio: newValue / 2.5
} }
setValue $ const newValue setValue $ const newValue
} }
......
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