Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
haskell-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Przemyslaw Kaminski
haskell-gargantext
Commits
985b9c83
Commit
985b9c83
authored
Apr 12, 2019
by
Quentin Lobbé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some warnings
parent
89d26230
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
24 deletions
+14
-24
package.yaml
package.yaml
+2
-0
Export.hs
src/Gargantext/Viz/Phylo/View/Export.hs
+12
-23
ViewMaker.hs
src/Gargantext/Viz/Phylo/View/ViewMaker.hs
+0
-1
No files found.
package.yaml
View file @
985b9c83
...
...
@@ -88,6 +88,8 @@ library:
-
base >=4.7 && <5
-
base16-bytestring
-
blaze-html
-
blaze-markup
-
blaze-svg
-
bytestring
-
case-insensitive
-
cassava
...
...
src/Gargantext/Viz/Phylo/View/Export.hs
View file @
985b9c83
...
...
@@ -20,16 +20,13 @@ module Gargantext.Viz.Phylo.View.Export
import
Control.Lens
hiding
(
Level
)
import
Control.Monad
import
Data.GraphViz
hiding
(
DotGraph
)
import
Data.GraphViz.Attributes.Complete
hiding
(
EdgeType
)
import
Data.GraphViz.Types
import
Data.GraphViz.Attributes.Complete
hiding
(
EdgeType
)
import
Data.GraphViz.Types.Generalised
(
DotGraph
)
import
Data.GraphViz.Types.Monadic
import
Data.List
((
++
),
unwords
,
concat
,
sortOn
,
nub
,
nubBy
)
import
Data.Map
(
Map
,
mapWithKey
,
elems
,
toList
)
import
Data.Maybe
(
isJust
,
isNothing
,
fromJust
)
import
Data.Text
(
Text
)
import
Data.Text.Lazy
(
Text
,
fromStrict
,
pack
)
import
GHC.TypeLits
(
KnownNat
)
import
Data.List
((
++
),
unwords
,
concat
,
sortOn
,
nub
)
import
Data.Map
(
Map
,
toList
)
import
Data.Maybe
(
isNothing
,
fromJust
)
import
Data.Text.Lazy
(
fromStrict
,
pack
)
import
qualified
Data.Text
as
T
import
qualified
Data.Text.Lazy
as
T
'
...
...
@@ -41,14 +38,6 @@ import Gargantext.Viz.Phylo.Tools
type
DotId
=
T'
.
Text
--------------------------
-- | PhyloView to SVG | --
--------------------------
viewToSvg
v
=
undefined
--------------------------
-- | PhyloView to DOT | --
--------------------------
...
...
@@ -63,9 +52,9 @@ setAttr k v = customAttribute k v
-- | To create customs Graphviz's Attributes out of some Metrics
setAttrFromMetrics
::
Map
T
.
Text
[
Double
]
->
[
CustomAttribute
]
setAttrFromMetrics
a
ttrs
=
map
(
\
(
k
,
v
)
->
setAttr
(
fromStrict
k
)
$
(
pack
.
unwords
)
$
map
show
v
)
$
toList
attrs
setAttrFromMetrics
a
=
map
(
\
(
k
,
v
)
->
setAttr
(
fromStrict
k
)
$
(
pack
.
unwords
)
$
map
show
v
)
$
toList
a
-- | To transform a PhyloBranchId into a DotId
...
...
@@ -172,7 +161,7 @@ viewToDot pv = digraph ((Str . fromStrict) $ pv ^. pv_title)
<>
[
setAttr
"description"
$
fromStrict
$
pv
^.
pv_description
]
<>
[
setAttr
"filiation"
$
(
pack
.
show
)
$
pv
^.
pv_filiation
]
<>
(
setAttrFromMetrics
$
pv
^.
pv_metrics
)
<>
[
FontSize
(
fromIntegral
30
)
,
LabelLoc
VTop
,
Splines
SplineEdges
,
Overlap
ScaleOverlaps
,
<>
[
FontSize
30
,
LabelLoc
VTop
,
Splines
SplineEdges
,
Overlap
ScaleOverlaps
,
Ratio
AutoRatio
,
Style
[
SItem
Filled
[]
],
Color
[
toWColor
White
]])
-- set the peaks
...
...
@@ -185,7 +174,7 @@ viewToDot pv = digraph ((Str . fromStrict) $ pv ^. pv_title)
-- set the nodes, period by period
mapM
(
\
prd
->
_
<-
mapM
(
\
prd
->
subgraph
(
Str
$
fromStrict
$
T
.
pack
$
"subGraph "
++
(
show
$
(
fst
prd
))
++
(
show
$
(
snd
prd
)))
$
do
...
...
@@ -202,9 +191,9 @@ viewToDot pv = digraph ((Str . fromStrict) $ pv ^. pv_title)
-- set the edges : from peaks to nodes, from nodes to nodes, from periods to periods
mapM
(
\
(
bId
,
nId
)
->
setPeakDotEdge
(
toBranchDotId
bId
)
(
toNodeDotId
nId
))
$
getFirstNodes
(
pv
^.
pv_level
)
pv
_
<-
mapM
(
\
(
bId
,
nId
)
->
setPeakDotEdge
(
toBranchDotId
bId
)
(
toNodeDotId
nId
))
$
getFirstNodes
(
pv
^.
pv_level
)
pv
mapM
setDotEdge
$
filterEdgesByLevel
(
pv
^.
pv_level
)
$
filterEdgesByType
PeriodEdge
(
pv
^.
pv_edges
)
_
<-
mapM
setDotEdge
$
filterEdgesByLevel
(
pv
^.
pv_level
)
$
filterEdgesByType
PeriodEdge
(
pv
^.
pv_edges
)
mapM
setDotPeriodEdge
$
listToSequentialCombi
$
getViewPeriods
pv
...
...
src/Gargantext/Viz/Phylo/View/ViewMaker.hs
View file @
985b9c83
...
...
@@ -27,7 +27,6 @@ import Gargantext.Prelude
import
Gargantext.Viz.Phylo
import
Gargantext.Viz.Phylo.Tools
import
Gargantext.Viz.Phylo.View.Display
import
Gargantext.Viz.Phylo.View.Export
import
Gargantext.Viz.Phylo.View.Filters
import
Gargantext.Viz.Phylo.View.Metrics
import
Gargantext.Viz.Phylo.View.Sort
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment