Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
clinicaltrials
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
david Chavalarias
clinicaltrials
Commits
5be215b5
Commit
5be215b5
authored
Jun 29, 2017
by
Romain Loth
Browse files
Options
Browse Files
Download
Plain Diff
Merge commit 'de07de2' (faster sliders) into with_tina_1.2
parents
86562d73
d5ebd7ae
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
62 additions
and
67 deletions
+62
-67
Tinaweb.js
twmain/Tinaweb.js
+1
-3
enviroment.js
twmain/enviroment.js
+53
-59
methods.js
twmain/methods.js
+5
-4
sigmaUtils.js
twmain/sigmaUtils.js
+3
-1
No files found.
twmain/Tinaweb.js
View file @
5be215b5
...
@@ -751,7 +751,6 @@ var TinaWebJS = function ( sigmacanvas ) {
...
@@ -751,7 +751,6 @@ var TinaWebJS = function ( sigmacanvas ) {
this
.
style
.
cursor
=
'wait'
this
.
style
.
cursor
=
'wait'
// and waiting icon
// and waiting icon
this
.
insertBefore
(
createWaitIcon
(
'noverlapwait'
),
this
.
children
[
0
])
this
.
insertBefore
(
createWaitIcon
(
'noverlapwait'
),
this
.
children
[
0
])
var
listener
=
TW
.
partialGraph
.
startNoverlap
();
var
listener
=
TW
.
partialGraph
.
startNoverlap
();
var
noverButton
=
this
var
noverButton
=
this
listener
.
bind
(
'stop'
,
function
(
event
)
{
listener
.
bind
(
'stop'
,
function
(
event
)
{
...
@@ -1080,8 +1079,7 @@ var TinaWebJS = function ( sigmacanvas ) {
...
@@ -1080,8 +1079,7 @@ var TinaWebJS = function ( sigmacanvas ) {
// for context: family/type prop value,
// for context: family/type prop value,
// for values: the property to filter
// for values: the property to filter
NodeWeightFilter
(
`#slidercat
${
activeId
}
nodesweight`
,
NodeWeightFilter
(
`#slidercat
${
activeId
}
nodesweight`
,
TW
.
categories
[
activeId
]
,
TW
.
categories
[
activeId
]
"size"
);
);
// ex: #slidercat1edgesweight
// ex: #slidercat1edgesweight
...
...
twmain/enviroment.js
View file @
5be215b5
This diff is collapsed.
Click to expand it.
twmain/methods.js
View file @
5be215b5
...
@@ -52,7 +52,7 @@ TW.pushState = function( args ) {
...
@@ -52,7 +52,7 @@ TW.pushState = function( args ) {
$
(
".for-nodecategory-0"
).
show
()
$
(
".for-nodecategory-0"
).
show
()
$
(
".for-nodecategory-1"
).
hide
();
$
(
".for-nodecategory-1"
).
hide
();
NodeWeightFilter
(
"#slidercat0nodesweight"
,
TW
.
categories
[
0
]
,
"size"
);
NodeWeightFilter
(
"#slidercat0nodesweight"
,
TW
.
categories
[
0
]);
EdgeWeightFilter
(
"#slidercat0edgesweight"
,
typesKey
,
"weight"
);
EdgeWeightFilter
(
"#slidercat0edgesweight"
,
typesKey
,
"weight"
);
}
}
...
@@ -61,7 +61,7 @@ TW.pushState = function( args ) {
...
@@ -61,7 +61,7 @@ TW.pushState = function( args ) {
$
(
".for-nodecategory-0"
).
hide
()
$
(
".for-nodecategory-0"
).
hide
()
$
(
".for-nodecategory-1"
).
show
();
$
(
".for-nodecategory-1"
).
show
();
NodeWeightFilter
(
"#slidercat1nodesweight"
,
TW
.
categories
[
1
]
,
"size"
);
NodeWeightFilter
(
"#slidercat1nodesweight"
,
TW
.
categories
[
1
]);
EdgeWeightFilter
(
"#slidercat1edgesweight"
,
typesKey
,
"weight"
);
EdgeWeightFilter
(
"#slidercat1edgesweight"
,
typesKey
,
"weight"
);
}
}
...
@@ -69,10 +69,11 @@ TW.pushState = function( args ) {
...
@@ -69,10 +69,11 @@ TW.pushState = function( args ) {
if
(
typesKey
==
"1|1"
)
{
if
(
typesKey
==
"1|1"
)
{
$
(
".for-nodecategory-0"
).
show
()
$
(
".for-nodecategory-0"
).
show
()
$
(
".for-nodecategory-1"
).
show
();
$
(
".for-nodecategory-1"
).
show
();
NodeWeightFilter
(
"#slidercat0nodesweight"
,
TW
.
categories
[
0
]
,
"size"
);
NodeWeightFilter
(
"#slidercat0nodesweight"
,
TW
.
categories
[
0
]);
NodeWeightFilter
(
"#slidercat1nodesweight"
,
TW
.
categories
[
1
]
,
"size"
);
NodeWeightFilter
(
"#slidercat1nodesweight"
,
TW
.
categories
[
1
]);
// only truly bipartite edges => only one GUI slider
// only truly bipartite edges => only one GUI slider
showDisabledSlider
(
"#slidercat0edgesweight"
)
EdgeWeightFilter
(
"#slidercat1edgesweight"
,
"1|1"
,
"weight"
);
EdgeWeightFilter
(
"#slidercat1edgesweight"
,
"1|1"
,
"weight"
);
}
}
}
}
...
...
twmain/sigmaUtils.js
View file @
5be215b5
...
@@ -570,7 +570,9 @@ var SigmaUtils = function () {
...
@@ -570,7 +570,9 @@ var SigmaUtils = function () {
this
.
toggleEdges
(
false
)
this
.
toggleEdges
(
false
)
}
}
TW
.
partialGraph
.
startForceAtlas2
();
try
{
TW
.
partialGraph
.
startForceAtlas2
();
}
catch
(
e
)
{
return
}
var
icon
=
createWaitIcon
(
'layoutwait'
)
var
icon
=
createWaitIcon
(
'layoutwait'
)
var
btn
=
document
.
querySelector
(
'#layoutButton'
)
var
btn
=
document
.
querySelector
(
'#layoutButton'
)
...
...
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