diff --git a/src/Modules/General/layout.py b/src/Modules/General/layout.py index e95290947490c7f210944b0e836c9e5e8e085da0..f26bcca1b9323653eadcc34de7bb68a4d46c9e1d 100755 --- a/src/Modules/General/layout.py +++ b/src/Modules/General/layout.py @@ -147,9 +147,9 @@ class layout(layoutOp): value=[str(i) for i in ( i for i in self.g.Layer_Neuron if i != "Input")], multi=True, - style={"minWidth": "20%", "marginLeft": "15px", "textAlign": "start"})], className="row", style={"paddingLeft": "20px", 'width': '100%'}) + style={"minWidth": "20%", "marginLeft": "15px", "textAlign": "start"})], className="d-flex", style={"paddingLeft": "20px", 'width': '100%'}) ], className="col-12") - ], className="row"), + ], className="d-flex"), html.Div([dcc.Graph(id='general-graph', animate=False, config={"displaylogo": False})])], className="col-lg-9 col-sm-12 col-xs-12" if(self.g.labelsExistance) else "col-lg-12 col-sm-12 col-xs-12"), html.Div([ html.Div([ @@ -161,7 +161,7 @@ class layout(layoutOp): size=30, color="#28a745", style={"marginLeft": "10px"} - )], className="row"), + )], className="d-flex"), dcc.Graph(id='label-graph', animate=False, config={"displaylogo": False})], className="col-lg-3 col-sm-12 col-xs-12") if(self.g.labelsExistance) else []], className="row") ], style={"padding": "5px"})), label="General information", value="General information"), dcc.Tab(dbc.Card( @@ -255,6 +255,7 @@ class layout(layoutOp): id='vis-slider', min=0, max=self.g.stepMax, + marks=None, step=1, value=0, )], style={"textAlign": "start", "padding": "5px"})], diff --git a/src/Modules/Neuron/callbacks.py b/src/Modules/Neuron/callbacks.py index 4e409c79f6f26b62a3f71f19239d9912ffe82b49..c25926faabfeec5cab56d6fc510e55a84a0aa837 100755 --- a/src/Modules/Neuron/callbacks.py +++ b/src/Modules/Neuron/callbacks.py @@ -9,8 +9,7 @@ import statistics import dash_daq as daq from collections import deque import plotly.graph_objects as go -import dash_core_components as dcc -import dash_html_components as html +from dash import dcc, html from bson.json_util import dumps, loads from dash.exceptions import PreventUpdate from dash.dependencies import ALL, MATCH, Input, Output, State diff --git a/src/Modules/Neuron/layout.py b/src/Modules/Neuron/layout.py index 518969e656ddf1897f9091e79f73cf54436e7274..ad14181e5676037043f40462e40fb7c06f57e042 100755 --- a/src/Modules/Neuron/layout.py +++ b/src/Modules/Neuron/layout.py @@ -8,8 +8,7 @@ from .callbacks import callbacks from bson.json_util import dumps from bson.json_util import loads import plotly.graph_objects as go -import dash_core_components as dcc -import dash_html_components as html +from dash import dcc, html import dash_bootstrap_components as dbc from src.templates.layoutOp import layoutOp diff --git a/src/Modules/Neuron/spark.py b/src/Modules/Neuron/spark.py index 69705a6be5d4dd891b42ca64c88add867f0de785..2585b138a71298e9d006e2282751f613cd8bd8de 100755 --- a/src/Modules/Neuron/spark.py +++ b/src/Modules/Neuron/spark.py @@ -33,7 +33,7 @@ class spark(sparkOp): # -------------------------------------------------------- # Spike per neuron df = self.g.sparkSession.read.format("com.mongodb.spark.sql") \ - .option("spark.mongodb.input.uri", self.MONGODB_URL + self.g.name + "."+self.DOCUMENT_NAME+"?authSource=admin&readPreference=primaryPreferred") \ + .option("spark.mongodb.input.uri", self.MONGODBURL + self.g.name + "."+self.DOCUMENT_NAME+"?authSource=admin&readPreference=primaryPreferred") \ .option("pipeline", "[{ $sort : { T : 1} }]") df = df.load() @@ -48,7 +48,7 @@ class spark(sparkOp): df.write.format("com.mongodb.spark.sql.DefaultSource") \ .option("spark.mongodb.output.uri", - self.MONGODB_URL + self.g.name + "."+self.OUTPUT_DOCUMENT_NAME+"?authSource=admin&readPreference=primaryPreferred").mode("overwrite").save() + self.MONGODBURL + self.g.name + "."+self.OUTPUT_DOCUMENT_NAME+"?authSource=admin&readPreference=primaryPreferred").mode("overwrite").save() # -------------------------------------------------------- else: