Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
metexplore
MetExploreViz
Commits
7903c38e
Commit
7903c38e
authored
Jan 02, 2020
by
maxchaza
Browse files
Manage mask of initialisation
parent
96e08e43
Changes
6
Hide whitespace changes
Inline
Side-by-side
app/view/button/buttonImportToNetwork/ButtonImportToNetworkController.js
View file @
7903c38e
...
...
@@ -25,7 +25,10 @@ Ext.define('metExploreViz.view.button.buttonImportToNetwork.ButtonImportToNetwor
}
metExploreD3
.
GraphUtils
.
handleFileSelect
(
view
.
lookupReference
(
'
importNetwork
'
).
fileInputEl
.
dom
,
function
(
json
){
// Allows to reload the same file
metExploreD3
.
GraphPanel
.
refreshPanel
(
json
,
view
.
lookupReference
(
'
importNetwork
'
).
reset
());
metExploreD3
.
GraphPanel
.
refreshPanel
(
json
,
function
(){
view
.
lookupReference
(
'
importNetwork
'
).
reset
();
metExploreD3
.
hideInitialMask
();
});
});
},
scope
:
me
...
...
app/view/menu/viz_LoadMenu/Viz_LoadMenuController.js
View file @
7903c38e
...
...
@@ -39,7 +39,9 @@ Ext.define('metExploreViz.view.menu.viz_LoadMenu.Viz_LoadMenuController', {
view
.
lookupReference
(
'
loadNetworkFromWebsite
'
).
on
({
click
:
function
(){
metExploreD3
.
GraphPanel
.
refreshPanel
(
_metExploreViz
.
getDataFromWebSite
());
metExploreD3
.
GraphPanel
.
refreshPanel
(
_metExploreViz
.
getDataFromWebSite
(),
function
()
{
metExploreD3
.
hideInitialMask
();
});
},
scope
:
me
});
...
...
app/view/panel/comparisonSidePanel/ComparisonSidePanel.js
View file @
7903c38e
...
...
@@ -18,13 +18,13 @@ Ext.define('metExploreViz.view.panel.comparisonSidePanel.ComparisonSidePanel', {
'MetExplore.view.form.V_UpdateStyleForm'
],
*/
collapsible
:
true
,
collapsed
:
true
,
width
:
'
30%
'
,
height
:
'
100%
'
,
margins
:
'
0 0 2 0
'
,
split
:
true
,
collapsible
:
true
,
collapsed
:
false
,
closable
:
false
,
region
:
'
west
'
,
// hidden:true,
...
...
app/view/panel/networkPanel/NetworkPanelController.js
View file @
7903c38e
...
...
@@ -55,7 +55,7 @@ Ext.define('metExploreViz.view.panel.networkPanel.NetworkPanelController', {
id
:
"
maskInit
"
,
msgCls
:
'
msgClsLaunchMask
'
});
//
mask.show();
mask
.
show
();
var
maskMsgDiv
=
mask
.
getEl
().
down
(
'
.x-mask-msg
'
);
var
buttonDiv
=
maskMsgDiv
.
getFirstChild
()
.
appendChild
({
...
...
@@ -80,7 +80,6 @@ Ext.define('metExploreViz.view.panel.networkPanel.NetworkPanelController', {
if
(
component
!=
undefined
){
component
.
fileInputEl
.
dom
.
click
();
}
mask
.
hide
();
},
renderTo
:
buttonDiv
});
...
...
@@ -102,8 +101,9 @@ Ext.define('metExploreViz.view.panel.networkPanel.NetworkPanelController', {
hidden
:
false
,
style
:
'
margin : 10px 10px 10px 10px
'
,
handler
:
function
(){
metExploreD3
.
GraphPanel
.
refreshPanel
(
_metExploreViz
.
getDataFromWebSite
());
mask
.
hide
();
metExploreD3
.
GraphPanel
.
refreshPanel
(
_metExploreViz
.
getDataFromWebSite
(),
function
(){
mask
.
hide
();
});
},
listeners
:
{
hideInitialLoadButtons
:
function
(){
...
...
resources/lib/functions/GraphMapping.js
View file @
7903c38e
...
...
@@ -1024,9 +1024,6 @@ metExploreD3.GraphMapping = {
}
var
colorStore
=
aStyleFormParent
.
getController
().
getValueMappingsSet
(
session
.
getMappingDataType
());
colorStore
.
forEach
(
function
(
color
){
console
.
log
(
color
.
getName
());
console
.
log
(
color
.
getValue
());
metExploreD3
.
GraphStyleEdition
.
setCollectionStyleDiscreteMapping
(
aStyleFormParent
.
target
,
aStyleFormParent
.
attrType
,
aStyleFormParent
.
attrName
,
aStyleFormParent
.
biologicalType
,
conditionName
,
mappingName
,
color
.
getName
(),
color
.
getValue
())
});
}
...
...
resources/lib/functions/GraphPanel.js
View file @
7903c38e
...
...
@@ -250,7 +250,6 @@ metExploreD3.GraphPanel = {
*/
refreshPanel
:
function
(
json
,
func
)
{
var
me
=
this
;
metExploreD3
.
hideInitialMask
();
var
jsonParsed
=
metExploreD3
.
GraphUtils
.
decodeJSON
(
json
);
if
(
jsonParsed
){
...
...
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