From de4cbfd047e0e32f08e7eed9f5d7df71e3f03953 Mon Sep 17 00:00:00 2001
From: Hammouda Elbez <hammouda.elbez@univ-lille.fr>
Date: Mon, 17 Jul 2023 15:46:51 +0200
Subject: [PATCH] Layout updated

---
 src/Global_Var.py                | 2 +-
 src/Modules/General/callbacks.py | 7 +++----
 src/Modules/General/layout.py    | 3 +--
 src/Modules/General/spark.py     | 6 ------
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/Global_Var.py b/src/Global_Var.py
index 67fc12f..288f934 100755
--- a/src/Global_Var.py
+++ b/src/Global_Var.py
@@ -27,7 +27,7 @@ class Global_Var():
     data_loaded = None
     db = None
     updateInterval = 1.0  # 1 second
-    InputPerEpoch = 1
+    InputPerEpoch = 100
     stepMax = 0
     Max = 0
     nbrClasses = 0
diff --git a/src/Modules/General/callbacks.py b/src/Modules/General/callbacks.py
index ff68593..5f486d2 100755
--- a/src/Modules/General/callbacks.py
+++ b/src/Modules/General/callbacks.py
@@ -87,7 +87,7 @@ class callbacks(callbacksOp):
                                             fill='tozeroy' if len(
                                                 generalGraphFilter) == 1 else 'none',
                                             line=dict(color="rgb(31, 119, 180)"),
-                                            name='Spikes'+ ('['+layer+']' if len(generalLayerFilter) > 1 else ''),
+                                            name='Spikes '+ ('['+layer+']' if len(generalLayerFilter) > 1 else ''),
                                             mode='lines+markers',
                                             text=list(super.xAxisLabel),
                                             customdata=list(super.SpikeGraphY[layer]),
@@ -112,7 +112,7 @@ class callbacks(callbacksOp):
                                             fill='tozeroy' if len(
                                                 generalGraphFilter) == 1 else 'none',
                                             line=dict(color="rgb(255, 127, 14)"),
-                                            name='Synapses activity'+ ('['+layer+']' if len(generalLayerFilter) > 1 else ''),
+                                            name='Synapses activity '+ ('['+layer+']' if len(generalLayerFilter) > 1 else ''),
                                             mode='lines+markers',
                                             text=list(super.xAxisLabel),
                                             customdata=list(super.SynapseGraphY[layer]),
@@ -136,7 +136,7 @@ class callbacks(callbacksOp):
                                             fill='tozeroy' if len(
                                                 generalGraphFilter) == 1 else 'none',
                                             line=dict(color="rgb(44, 160, 44)"),
-                                            name='Neuron\'s potential'+ ('['+layer+']' if len(generalLayerFilter) > 1 else ''),
+                                            name='Neuron\'s potential '+ ('['+layer+']' if len(generalLayerFilter) > 1 else ''),
                                             mode='lines+markers',
                                             text=list(super.xAxisLabel),
                                             customdata=list(super.PotentialGraphY[layer]),
@@ -753,7 +753,6 @@ class callbacks(callbacksOp):
 
                 L = dict({i["_id"]: i["C"] for i in labels})
 
-                print(timestamp, interval, Max)
                 return [L, Max]
 
             def getSpike(timestamp, interval, layer, perNeuron):
diff --git a/src/Modules/General/layout.py b/src/Modules/General/layout.py
index dedc4e1..e08e117 100755
--- a/src/Modules/General/layout.py
+++ b/src/Modules/General/layout.py
@@ -189,8 +189,7 @@ class layout(layoutOp):
                                         id='2DViewLayerFilter',
                                         options=[{'label': str(i), 'value': str(i)} for i in (
                                             i["layer"] for i in self.g.LayersNeuronsInfo)],
-                                        value=[str(i) for i in (
-                                            i["layer"] for i in self.g.LayersNeuronsInfo)],
+                                        value=[],
                                         multi=True,
                                         style={"minWidth": "80%", "textAlign": "start"}),
                                     ], style={"textAlign": "start", },className="d-flex col-lg-12 col-sm-12 col-xs-12"),
diff --git a/src/Modules/General/spark.py b/src/Modules/General/spark.py
index 273237a..eb175ab 100755
--- a/src/Modules/General/spark.py
+++ b/src/Modules/General/spark.py
@@ -36,12 +36,6 @@ class spark(sparkOp):
             LN = data["L:N"]
             LN = loads(dumps(LN))
             self.g.Layer_Neuron = LN
-
-            try:
-                self.g.InputPerEpoch = data["E"]
-            except Exception:
-                self.g.InputPerEpoch = pymongo.collection.Collection(self.g.db, 'labels').count_documents({})
-                pass
             for l in LN:
                 if(l == "Input"):
                     self.g.Input = LN[l]
-- 
GitLab