From 23e1c9d0795e798943d7706d060f6fa1ec4db778 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Sat, 15 Feb 2020 09:30:15 +0000
Subject: [PATCH] EgtExecutor : - corrette funzioni Lua
 EgtMdbSetCurrMachiningParam e EgtMdbGetCurrMachiningParam.

---
 LUA_MachMgr.cpp | 76 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 56 insertions(+), 20 deletions(-)

diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp
index e1da46d..3babf0a 100644
--- a/LUA_MachMgr.cpp
+++ b/LUA_MachMgr.cpp
@@ -1746,28 +1746,28 @@ LuaMdbSetCurrMachiningParam( lua_State* L)
    int nType ;
    LuaCheckParam( L, 1, nType)
   // leggo opportunamente il valore da assegnare
-   if ( ( nType & TPA_BOOL) != 0) {
+   if ( ( nType & MPA_BOOL) != 0) {
       bool bVal ;
       LuaCheckParam( L, 2, bVal)
       LuaClearStack( L) ;
       bool bOk = ExeMdbSetCurrMachiningParam( nType, bVal) ;
       LuaSetParam( L, bOk) ;
    }
-   else if ( ( nType & TPA_INT) != 0) {
+   else if ( ( nType & MPA_INT) != 0) {
       int nVal ;
       LuaCheckParam( L, 2, nVal)
       LuaClearStack( L) ;
       bool bOk = ExeMdbSetCurrMachiningParam( nType, nVal) ;
       LuaSetParam( L, bOk) ;
    }
-   else if ( ( nType & TPA_DOU) != 0) {
+   else if ( ( nType & MPA_DOU) != 0) {
       double dVal ;
       LuaCheckParam( L, 2, dVal)
       LuaClearStack( L) ;
       bool bOk = ExeMdbSetCurrMachiningParam( nType, dVal) ;
       LuaSetParam( L, bOk) ;
    }
-   else if ( ( nType & TPA_STR) != 0) {
+   else if ( ( nType & MPA_STR) != 0) {
       string sVal ;
       LuaCheckParam( L, 2, sVal)
       LuaClearStack( L) ;
@@ -1783,12 +1783,12 @@ LuaMdbSetCurrMachiningParam( lua_State* L)
 static int
 LuaMdbGetCurrMachiningParam( lua_State* L)
 {
-  // 1 parametr : nType
+  // 1 parametro : nType
    int nType ;
    LuaCheckParam( L, 1, nType)
    LuaClearStack( L) ;
   // recupero il parametro della lavorazione nel DB
-   if ( ( nType & TPA_BOOL) != 0) {
+   if ( ( nType & MPA_BOOL) != 0) {
       bool bVal ;
       bool bOk = ExeMdbGetCurrMachiningParam( nType, bVal) ;
       if ( bOk)
@@ -1796,7 +1796,7 @@ LuaMdbGetCurrMachiningParam( lua_State* L)
       else
          LuaSetParam( L) ;
    }
-   else if ( ( nType & TPA_INT) != 0) {
+   else if ( ( nType & MPA_INT) != 0) {
       int nVal ;
       bool bOk = ExeMdbGetCurrMachiningParam( nType, nVal) ;
       if ( bOk)
@@ -1804,7 +1804,7 @@ LuaMdbGetCurrMachiningParam( lua_State* L)
       else
          LuaSetParam( L) ;
    }
-   else if ( ( nType & TPA_DOU) != 0) {
+   else if ( ( nType & MPA_DOU) != 0) {
       double dVal ;
       bool bOk = ExeMdbGetCurrMachiningParam( nType, dVal) ;
       if ( bOk)
@@ -1812,7 +1812,7 @@ LuaMdbGetCurrMachiningParam( lua_State* L)
       else
          LuaSetParam( L) ;
    }
-   else if ( ( nType & TPA_STR) != 0) {
+   else if ( ( nType & MPA_STR) != 0) {
       string sVal ;
       bool bOk = ExeMdbGetCurrMachiningParam( nType, sVal) ;
       if ( bOk)
@@ -1832,12 +1832,28 @@ LuaMdbSetGeneralParam( lua_State* L)
   // 2 parametri : nType, dVal
    int nType ;
    LuaCheckParam( L, 1, nType)
-   double dVal ;
-   LuaCheckParam( L, 2, dVal)
-   LuaClearStack( L) ;
-  // lancio salvataggio
-   bool bOk = ExeMdbSetGeneralParam( nType, dVal) ;
-   LuaSetParam( L, bOk) ;
+  // leggo opportunamente il valore da assegnare
+   if ( ( nType & MGP_BOOL) != 0) {
+      bool bVal ;
+      LuaCheckParam( L, 2, bVal)
+      LuaClearStack( L) ;
+      bool bOk = ExeMdbSetGeneralParam( nType, bVal) ;
+      LuaSetParam( L, bOk) ;
+   }
+   else if ( ( nType & MGP_INT) != 0) {
+      int nVal ;
+      LuaCheckParam( L, 2, nVal)
+      LuaClearStack( L) ;
+      bool bOk = ExeMdbSetGeneralParam( nType, nVal) ;
+      LuaSetParam( L, bOk) ;
+   }
+   else if ( ( nType & MGP_DOU) != 0) {
+      double dVal ;
+      LuaCheckParam( L, 2, dVal)
+      LuaClearStack( L) ;
+      bool bOk = ExeMdbSetGeneralParam( nType, dVal) ;
+      LuaSetParam( L, bOk) ;
+   }
    return 1 ;
 }
 
@@ -1849,11 +1865,31 @@ LuaMdbGetGeneralParam( lua_State* L)
    int nType ;
    LuaCheckParam( L, 1, nType)
    LuaClearStack( L) ;
-  // lancio salvataggio
-   double dVal ;
-   bool bOk = ExeMdbGetGeneralParam( nType, dVal) ;
-   if ( bOk)
-      LuaSetParam( L, dVal) ;
+  // recupero il parametro della lavorazione nel DB
+   if ( ( nType & MGP_BOOL) != 0) {
+      bool bVal ;
+      bool bOk = ExeMdbGetGeneralParam( nType, bVal) ;
+      if ( bOk)
+         LuaSetParam( L, bVal) ;
+      else
+         LuaSetParam( L) ;
+   }
+   else if ( ( nType & MGP_INT) != 0) {
+      int nVal ;
+      bool bOk = ExeMdbGetGeneralParam( nType, nVal) ;
+      if ( bOk)
+         LuaSetParam( L, nVal) ;
+      else
+         LuaSetParam( L) ;
+   }
+   else if ( ( nType & MGP_DOU) != 0) {
+      double dVal ;
+      bool bOk = ExeMdbGetGeneralParam( nType, dVal) ;
+      if ( bOk)
+         LuaSetParam( L, dVal) ;
+      else
+         LuaSetParam( L) ;
+   }
    else
       LuaSetParam( L) ;
    return 1 ;