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
9bf87773
Commit
9bf87773
authored
Apr 11, 2017
by
Romain Loth
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
allow *not* rendering in cancelSelection
parent
0a553c8d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
6 deletions
+16
-6
Tinaweb.js
tinawebJS/Tinaweb.js
+7
-3
methods.js
tinawebJS/methods.js
+9
-3
No files found.
tinawebJS/Tinaweb.js
View file @
9bf87773
...
...
@@ -71,7 +71,7 @@ function SelectionEngine() {
this
.
search_n_select
=
function
(
string
)
{
// alert("search is happening !")
cancelSelection
(
false
);
cancelSelection
(
false
,
{
norender
:
true
}
);
if
(
typeof
string
!=
"string"
)
{
return
-
1
;
...
...
@@ -150,7 +150,8 @@ function SelectionEngine() {
*/
// ====================
this
.
MultipleSelection2
=
(
function
(
nodes
,
nodesDict
,
edgesDict
)
{
// =====
var
tMS2_deb
=
performance
.
now
()
console
.
log
(
"IN SelectionEngine.MultipleSelection2:"
)
console
.
log
(
"nodes"
,
nodes
)
...
...
@@ -315,6 +316,9 @@ function SelectionEngine() {
updateRelatedNodesPanel
(
selections
,
same
,
oppos
);
var
tMS2_fin
=
performance
.
now
()
console
.
log
(
"end MultipleSelection2, own time:"
,
tMS2_fin
-
tMS2_deb
)
}).
index
()
};
...
...
@@ -681,7 +685,7 @@ TinaWebJS = function ( sigmacanvas ) {
// we keep the global selections and then clear it and all its effects
var
previousSelection
=
selections
cancelSelection
(
false
);
cancelSelection
(
false
,
{
norender
:
true
});
// no need to render before MS2
if
(
cursor_size
==
0
)
{
var
targeted
=
SelInst
.
SelectorEngine
(
{
...
...
tinawebJS/methods.js
View file @
9bf87773
'use strict'
;
function
cancelSelection
(
fromTagCloud
)
{
// settings: {norender: Bool}
function
cancelSelection
(
fromTagCloud
,
settings
)
{
console
.
log
(
"
\
t***in cancelSelection"
);
if
(
!
settings
)
settings
=
{}
highlightSelectedNodes
(
false
);
//Unselect the selected ones :D
opossites
=
[];
selections
=
[];
...
...
@@ -72,8 +76,10 @@ function cancelSelection (fromTagCloud) {
// global flag
TW
.
selectionActive
=
false
// finally redraw
TW
.
partialGraph
.
render
();
if
(
!
settings
.
norender
)
{
// finally redraw
TW
.
partialGraph
.
render
();
}
}
function
highlightSelectedNodes
(
flag
){
...
...
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