From 5f886baa2c5b5502a75d2ec1ff82aa28c2724e3c Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Wed, 4 Jan 2023 11:15:36 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D1=87=D0=B8=D1=82=D1=8B=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=B5=D0=BC=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D0=BF=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B9=20=D1=81=D0=BE=20=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=BE=D0=BA=D0=B0=D0=BC=D0=B8=20=D0=B2=20=D1=81=D1=86=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=80=D0=B8=D0=B8=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D1=83=20=D1=81=20=D1=87=D0=B8=D1=81=D0=BB=D0=B0=D0=BC=D0=B8=20?=
 =?UTF-8?q?=D0=B8=D0=B7=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5=D0=B9=20?=
 =?UTF-8?q?=D0=BD=D0=B5=20=D1=83=D1=87=D0=B8=D1=82=D1=8B=D0=B2=D0=B0=D1=8E?=
 =?UTF-8?q?=D1=89=D0=B8=D1=85=20=D0=BE=D0=BA=D1=80=D1=83=D0=B3=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5.=20=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D1=88=D0=BE=D0=B9=20=D0=BA=D0=BE=D1=81=D1=82=D1=8B=D0=BB=D1=8C?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D0=BA=D0=B0=20=D0=BD=D0=B5=20=D0=BF=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BB=D0=B0=D0=B5=D0=BC=20=D1=80=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=82=D1=83=20=D1=81=D0=BE=20=D0=B7=D0=BD=D0=B0=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=D0=BC=D0=B8,=20=D0=BF=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=80=D1=83=D0=B5=D1=82=D1=81=D1=8F=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20long,=20=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B1=D0=BE=D1=82=D1=83=20=D1=81=D0=BE=20=D0=B2=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BC,=20=D0=BF=D0=B5=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B5=D1=81=D1=82=D0=B8=20=D0=BE=D0=BA=D1=80=D1=83=D0=B3?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=20=D0=BC=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B8=D1=84=D0=B8=D0=BA=D0=B0=D1=82=D0=BE=D1=80=D1=8B=20=D0=B2?=
 =?UTF-8?q?=20IoTValue=20=D0=BF=D0=BE=D0=BA=D0=B0=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=BE=D0=BA=D1=80=D1=83=D0=B3=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=B2=20IoTItem=20=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D0=BD=D1=8F?=
 =?UTF-8?q?=D0=B5=D1=82=D1=81=D1=8F=20=D1=85=D0=B8=D1=82=D1=80=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D1=8C=20=D1=81=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D0=B2=D0=BD=D0=B5=D1=88=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=B3=D0=BE=20=D0=B2=D0=B8=D0=B4=D0=B0=20=D1=87=D0=B8?=
 =?UTF-8?q?=D1=81=D0=BB=D0=B0=20=D0=B2=20=D1=81=D1=82=D1=80=D0=BE=D0=BA?=
 =?UTF-8?q?=D1=83=20valS,=20=D0=BD=D0=BE=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D1=8B=D0=B5=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B8?=
 =?UTF-8?q?=20=D0=B8=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0=BD=D1=8B?=
 =?UTF-8?q?=D0=B5=20=D0=BD=D0=B5=20=D0=B4=D0=B5=D0=BB=D0=B0=D1=8E=D1=82=20?=
 =?UTF-8?q?=D1=8D=D1=82=D0=BE=D0=B3=D0=BE,=20=D0=BF=D0=BE=D1=8D=D1=82?=
 =?UTF-8?q?=D0=BE=D0=BC=D1=83=20=D0=BE=D1=82=D0=BB=D0=B0=D0=B2=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=B5=D0=BC=20=D1=8D=D1=82=D1=83=20=D1=81=D0=B8?=
 =?UTF-8?q?=D1=82=D1=83=D0=B0=D1=86=D0=B8=D1=8E=20=D1=82=D1=83=D1=82=20?=
 =?UTF-8?q?=D0=B8=20=D1=83=D1=87=D0=B8=D1=82=D1=8B=D0=B2=D0=B0=D0=B5=D0=BC?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/classes/IoTScenario.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/classes/IoTScenario.cpp b/src/classes/IoTScenario.cpp
index bd6eaf26..9980fce0 100644
--- a/src/classes/IoTScenario.cpp
+++ b/src/classes/IoTScenario.cpp
@@ -200,6 +200,9 @@ class BinaryExprAST : public ExprAST {
                     break;
             }
         } else {    // иначе имеем дело с операциями + или - или ==, которые могут работать с разными типами данных
+            if (lhs->isDecimal && lhs->valS == "") lhs->valS = (String)lhs->valD;   // небольшой костыль пока не переделаем работу со значениями, планируется добавить long, работу со временем, перенести округление и модификаторы в IoTValue
+            if (rhs->isDecimal && rhs->valS == "") rhs->valS = (String)rhs->valD;   // пока для сохранения округления в IoTItem применяется хитрость с сохранением внешнего вида числа в строку valS,
+                                                                                    // но некоторые модули и системные не делают этого, поэтому отлавливаем эту ситуацию тут и учитываем.
             switch (Op) {
                 case tok_equal:
                     if (lhs->isDecimal && rhs->isDecimal)