Merge pull request #23 from lnls-sirius/dev

Improve monitor page performance
lnls-sirius · Aug 30, 2023 · 173f946 · 173f946
2 parents a918d5a + 1f6c75b
commit 173f946
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/back_end/.gitignore b/back_end/.gitignore
@@ -0,0 +1,2 @@
+app
+__pycache__
diff --git a/front_end/package-lock.json b/front_end/package-lock.json
diff --git a/front_end/package.json b/front_end/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rad-detectors",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "homepage": "https://rad-mon.lnls.br",
   "private": true,
   "dependencies": {
@@ -30,7 +30,7 @@
     "react-git-info": "^2.0.1",
     "react-router-dom": "^6.6.2",
     "react-scripts": "^5.0.1",
-    "sirius-epics-react": "^1.2.6",
+    "sirius-epics-react": "^1.2.7",
     "styled-components": "^5.3.6",
     "typescript": "^4.9.4"
   },

diff --git a/front_end/src/components/ArchRadChart/index.tsx b/front_end/src/components/ArchRadChart/index.tsx
@@ -97,7 +97,7 @@ class ArchRadChart extends Component<RadArchChartInterface>{
         data={{}}
         pv_list={this.getPvList()}
         updateInterval={
-          (this.props.pv_mon[0] == "dose_rate") ? 700 : 1000}
+          (this.props.pv_mon[0] == "dose_rate") ? 800 : 1000}
         configOptions={this.props.configOptions}
         auto_update={true}
         limits={this.getLimits()}

diff --git a/front_end/src/components/ArchiverChart/index.tsx b/front_end/src/components/ArchiverChart/index.tsx
@@ -1,5 +1,5 @@
 import { Component, createRef } from "react";
-import { Chart, registerables } from 'chart.js';
+import { Chart } from 'chart.js';
 import 'chartjs-adapter-moment';
 import zoomPlugin from 'chartjs-plugin-zoom';
 import { SiriusInvisible } from "sirius-epics-react";
@@ -87,7 +87,7 @@ class ArchiverChart extends Component<ArchChartInterface, DetListInterface>{
       setTimeout(()=>{
         this.setState({
           det_list: this.detectorsList()
-        })}, 100);
+        })}, 300);
     }
   }
 
@@ -283,6 +283,7 @@ class ArchiverChart extends Component<ArchChartInterface, DetListInterface>{
     const chartOptions: any = {
       animation: false,
       responsive: true,
+      normalized: true,
       maintainAspectRatio: false,
       layout: {
         padding: {
@@ -294,7 +295,7 @@ class ArchiverChart extends Component<ArchChartInterface, DetListInterface>{
           radius: 0
         },
         line: {
-          tension: 0.01
+          tension: 0.1
         }
       },
       hover: {

diff --git a/front_end/src/components/BarChart/index.tsx b/front_end/src/components/BarChart/index.tsx
@@ -185,7 +185,8 @@ class BarChart extends Component<BarChartInterface, BarChartState>{
           modifyValue={this.handleBarState}
           modifyOptions={this.handleOptions}
           color_label={this.state.color_axis}
-          label={this.state.labels}/>
+          label={this.state.labels}
+          update_interval={800}/>
       </S.ChartWrapper>
     )
   }