From d002f12ce0184e2301622716ea6125223e12152f Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Thu, 9 May 2019 06:26:07 +0000
Subject: [PATCH] EgtExecutor 2.1e2 : - aggiunta funzione Exe e Lua
 RemoveCurveCompoCurve.

---
 EXE_GdbModifyCurve.cpp |  23 +++++++++++++++++++++++
 EgtExecutor.rc         | Bin 16176 -> 16176 bytes
 LUA_GdbModifyCurve.cpp |  17 +++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/EXE_GdbModifyCurve.cpp b/EXE_GdbModifyCurve.cpp
index cc4fee9..3638b92 100644
--- a/EXE_GdbModifyCurve.cpp
+++ b/EXE_GdbModifyCurve.cpp
@@ -1466,6 +1466,29 @@ ExeAddCurveCompoArc2P( int nId, const Point3d& ptMid, const Point3d& ptP, int nR
    return bOk ;
 }
 
+//-------------------------------------------------------------------------------
+bool
+ExeRemoveCurveCompoCurve( int nId, bool bLast)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, false)
+   bool bOk = true ;
+  // recupero la curva composita
+   ICurveComposite* pCompo = GetCurveComposite( pGeomDB->GetGeoObj( nId)) ;
+   bOk = bOk && ( pCompo != nullptr) ;
+  // eseguo la modifica
+   bOk = bOk && pCompo->RemoveFirstOrLastCurve( bLast) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtRemoveCurveCompoCurve(" + ToString( nId) + ")" +
+                    " -- Ok=" + ToString( bOk) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco il risultato
+   return bOk ;
+}
+
 //-------------------------------------------------------------------------------
 bool
 ExeAddCurveCompoJoint( int nId, double dU)
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index 9c048a4a5e0374777530ba8b0e0acfa51cc8a8c8..88e8c2a81908b95f9d3ff5345ba6b4811c0b63bf 100644
GIT binary patch
delta 79
zcmdl`x1nysFE&P_&A-`PnSqoe*K!sx?>N)s4T4pSMw1=6k~jAW*?>e(i-FY$N+HxV
MD8kglDP58Q0C_7LTL1t6

delta 79
zcmdl`x1nysFE&QQ&A-`PnSqoe*K!sx?>N)s4T4pShLat+k~jAW*?>e(i-FY$N+HxV
MD8kglDP58Q0C(RTQvd(}

diff --git a/LUA_GdbModifyCurve.cpp b/LUA_GdbModifyCurve.cpp
index 3a9488d..7d31c64 100644
--- a/LUA_GdbModifyCurve.cpp
+++ b/LUA_GdbModifyCurve.cpp
@@ -636,6 +636,22 @@ LuaAddCurveCompoArc2P( lua_State* L)
    return 1 ;
 }
 
+//----------------------------------------------------------------------------
+static int
+LuaRemoveCurveCompoCurve( lua_State* L)
+{
+  // 1 o 2 parametri : Id, [, bLast]
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   bool bLast ;
+   LuaGetParam( L, 2, bLast) ;
+   LuaClearStack( L) ;
+  // rimuovo prima o ultima curva della composita
+   bool bOk = ExeRemoveCurveCompoCurve( nId, bLast) ;
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
 //----------------------------------------------------------------------------
 static int
 LuaAddCurveCompoJoint( lua_State* L)
@@ -818,6 +834,7 @@ LuaInstallGdbModifyCurve( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtAddCurveCompoLine", LuaAddCurveCompoLine) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtAddCurveCompoArcTg", LuaAddCurveCompoArcTg) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtAddCurveCompoArc2P", LuaAddCurveCompoArc2P) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtRemoveCurveCompoCurve", LuaRemoveCurveCompoCurve) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtAddCurveCompoJoint", LuaAddCurveCompoJoint) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtModifyCurveCompoJoint", LuaModifyCurveCompoJoint) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtRemoveCurveCompoJoint", LuaRemoveCurveCompoJoint) ;