Поправил работу формул

kuvbur · Aug 20, 2024 · 9b632b5 · 9b632b5
1 parent ab9e54c
commit 9b632b5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 48 deletions.
diff --git a/Sources/AddOn/Helpers.cpp b/Sources/AddOn/Helpers.cpp
@@ -3423,15 +3423,26 @@ bool ParamHelpers::ReadFormula (ParamDictValue& paramByType, ParamDictValue& par
     for (GS::HashTable<GS::UniString, ParamValue>::PairIterator cIt = paramByType.EnumeratePairs (); cIt != NULL; ++cIt) {
 #if defined(AC_28)
         ParamValue& param = cIt->value;
+        GS::UniString key = cIt->key;
 #else
         ParamValue& param = *cIt->value;
+        GS::UniString key = *cIt->key;
 #endif
         GS::UniString expression = param.val.uniStringValue;
         if (!param.val.formatstring.isEmpty) expression = expression + '.' + param.val.formatstring.stringformat;
         if (ParamHelpers::ReplaceParamInExpression (params, expression)) {
             if (EvalExpression (expression)) {
                 flag_find = true;
-                param.val.uniStringValue = expression;
+                ParamValue pvalue;
+                ParamHelpers::ConvertStringToParamValue (pvalue, key, expression);
+                paramByType.Get (key).val = pvalue.val;
+                GS::UniString expression_ = "<" + expression + ">";
+                if (EvalExpression (expression_)) {
+                    ParamHelpers::ConvertStringToParamValue (pvalue, key, expression_);
+                    paramByType.Get (key).val = pvalue.val;
+                    paramByType.Get (key).val.uniStringValue = expression;
+                }
+                paramByType.Get (key).isValid = true;
             }
         }
     }

diff --git a/Sources/AddOn/SomeStuff_Main.cpp b/Sources/AddOn/SomeStuff_Main.cpp
@@ -26,42 +26,6 @@
 #include	"Summ.hpp"
 #include	"Dimensions.hpp"
 
-bool debugtestfunc ()
-{
-#if defined(DEBUG)
-    // Тест функции вычисления
-    //GS::UniString unistring_expression = ""; bool res = false;
-    //unistring_expression = "<3+1+1>";
-    //res = EvalExpression (unistring_expression);
-    //if (unistring_expression != "5") DBPrintf ("== SMSTF == ERR debugtestfunc\n");
-
-    //unistring_expression = "<3+1+1>.3mm";
-    //res = EvalExpression (unistring_expression);
-    //if (unistring_expression != "5000") DBPrintf ("== SMSTF == ERR debugtestfunc\n");
-
-    //unistring_expression = "<3+1+1>.3m";
-    //res = EvalExpression (unistring_expression);
-    //if (unistring_expression != "5") DBPrintf ("== SMSTF == ERR debugtestfunc\n");
-
-    //unistring_expression = "<3+1>.3mm+<3+1>.3mm";
-    //res = EvalExpression (unistring_expression);
-    //if (unistring_expression != "4000+4000") DBPrintf ("== SMSTF == ERR debugtestfunc\n");
-
-    //unistring_expression = "<3+1>.3m+<3+1>.3mm";
-    //res = EvalExpression (unistring_expression);
-
-    //unistring_expression = "<3+1>+<3+1>.3mm";
-    //res = EvalExpression (unistring_expression);
-
-    //unistring_expression = "<3+1>.3mm +<3+1>.3mm";
-    //res = EvalExpression (unistring_expression);
-    return true;
-#else
-    return true;
-#endif
-}
-
-
 //-----------------------------------------------------------------------------
 // Срабатывает при событиях в тимворк
 //-----------------------------------------------------------------------------
@@ -404,9 +368,6 @@ API_AddonType __ACDLL_CALL CheckEnvironment (API_EnvirParams * envir)
     RSGetIndString (&envir->addOnInfo.name, ID_ADDON_INFO + isEng (), AddOnNameID, ACAPI_GetOwnResModule ());
     RSGetIndString (&envir->addOnInfo.description, ID_ADDON_INFO + isEng (), AddOnDescriptionID, ACAPI_GetOwnResModule ());
     ACAPI_KeepInMemory (true);
-    if (!debugtestfunc ()) {
-        msg_rep ("debugtestfunc", "Error in test", APIERR_GENERAL, APINULLGuid);
-    }
     return APIAddon_Preload;
 }
 #if defined(AC_28)

diff --git a/Sources/AddOn/SomeStuff_Main.hpp b/Sources/AddOn/SomeStuff_Main.hpp
@@ -33,14 +33,6 @@ static const Int32 AutoList_CommandID = 11;
 static const Int32 Auto3D_CommandID = 12;
 static const Int32 AutoLay_CommandID = 13;
 
-// -----------------------------------------------------------------------------
-// Функция для тестирования поведения некоторых функций
-// Срабатывает при загрузке аддона
-// При обычном режиме всегда возвращает истину
-// При дебаге возвращает истину если все тесты сработали
-// -----------------------------------------------------------------------------
-bool debugtestfunc ();
-
 #if defined(AC_28)
 GSErrCode ElementEventHandlerProc (const API_NotifyElementType* elemType);