From 9e5c1e74bd8bcf7eeb1c19d93e80af10288df89d Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Sat, 1 Oct 2022 03:07:09 +0200
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D0=B5=D1=80=D1=8C=D0=B5=D0=B7?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B1=D0=B0=D0=B3=D0=B0=20=D0=B3?=
 =?UTF-8?q?=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.svelte | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index 661b8d7..81ab0a8 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -145,6 +145,8 @@
   //***********************************************************navigation********************************************************/
   let currentPageName = undefined;
 
+  var chartJsonBlobArray = [];
+  let chartTopic;
   var chartJsonBlob = new MyBlobBuilder();
   var layoutJsonBlobArray = [];
 
@@ -448,13 +450,17 @@
           }
           //сборщик chartJson пакетов
           if (data.includes("/st/chart.json|")) {
-            chartJsonFlag[ws] = true;
+            let json = JSON.parse(deleteBeforeDelimiter(data, "|"));
+            chartTopic = json.topic;
+            chartJsonFlag[chartTopic] = true;
           }
           if (data.includes("/end/chart.json|")) {
             let json = JSON.parse(deleteBeforeDelimiter(data, "|"));
+            chartTopic = json.topic;
+            chartJsonFlag[chartTopic] = false;
+
             console.log("[i] chart blob", json.topic, json.maxCount);
-            chartJsonFlag[ws] = false;
-            var bb = chartJsonBlob.getBlob();
+            var bb = chartJsonBlobArray[chartTopic].getBlob();
             let chartJsonReader = new FileReader();
             chartJsonReader.readAsText(bb);
             chartJsonReader.onload = () => {
@@ -504,7 +510,10 @@
             if (scenarioJsonPacket) scenarioJsonPacket.append(event.data);
           }
           //принимаем данные от всех устройств
-          if (chartJsonFlag[ws]) chartJsonBlob.append(event.data);
+          //if (chartJsonFlag[ws]) chartJsonBlob.append(event.data);
+
+          if (!chartJsonBlobArray[chartTopic]) chartJsonBlobArray[chartTopic] = new MyBlobBuilder();
+          if (chartJsonFlag[chartTopic]) chartJsonBlobArray[chartTopic].append(event.data);
 
           if (!layoutJsonBlobArray[ws]) layoutJsonBlobArray[ws] = new MyBlobBuilder();
           if (layoutJsonFlag[ws]) layoutJsonBlobArray[ws].append(event.data);
@@ -805,6 +814,7 @@
     itemsJson = [];
     layoutJson = [];
     layoutJsonBlobArray = [];
+    chartJsonBlobArray = [];
 
     scenarioTxt = "";