From 80b405a1e65b52491d8a4634a5e13ca38900dad3 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 30 Dec 2019 09:27:37 +0000
Subject: [PATCH] EgtExecutor 2.2a1 : - aggiunte funzioni Exe e Lua
 CreateHorizontalDimension, CreateVerticalDimension e CreateAlignedDimension.

---
 EXE_GdbCreate.cpp | 120 ++++++++++++++++++++++++++++++++++++++++++++++
 EgtExecutor.rc    | Bin 16184 -> 16176 bytes
 LUA_GdbCreate.cpp |  87 +++++++++++++++++++++++++++++++++
 3 files changed, 207 insertions(+)

diff --git a/EXE_GdbCreate.cpp b/EXE_GdbCreate.cpp
index 2380cfd..f3f6b90 100644
--- a/EXE_GdbCreate.cpp
+++ b/EXE_GdbCreate.cpp
@@ -22,6 +22,7 @@
 #include "/EgtDev/Include/EGkGeoPoint3d.h"
 #include "/EgtDev/Include/EGkGeoVector3d.h"
 #include "/EgtDev/Include/EGkExtText.h"
+#include "/EgtDev/Include/EGkExtDimension.h"
 #include "/EgtDev/Include/EGkStringUtils3d.h"
 #include "/EgtDev/Include/EgtStringConverter.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"
@@ -310,3 +311,122 @@ ExeCreateTextAdv( int nParentId, const Point3d& ptP, double dAngRotDeg,
   // restituisco l'identificativo del oggetto
    return nId ;
 }
+
+//-------------------------------------------------------------------------------
+int
+ExeCreateHorizontalDimension( int nParentId, const Point3d& ptP1, const Point3d& ptP2,
+                              const Point3d& ptDim, const string& sText, int nRefType)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   nParentId = AdjustId( nParentId) ;
+   bool bOk = true ;
+  // recupero il riferimento locale
+   Frame3d frLoc ;
+   bOk = bOk && pGeomDB->GetGroupGlobFrame( nParentId, frLoc) ;
+  // porto in locale i punti e assegno i versori
+   Point3d ptP1L = GetPointLocal( pGeomDB, ptP1, nRefType, frLoc) ;
+   Point3d ptP2L = GetPointLocal( pGeomDB, ptP2, nRefType, frLoc) ;
+   Point3d ptDimL = GetPointLocal( pGeomDB, ptDim, nRefType, frLoc) ;
+   Vector3d vtNL = GetVectorLocal( pGeomDB, Z_AX, nRefType, frLoc) ;
+   Vector3d vtDL = GetVectorLocal( pGeomDB, X_AX, nRefType, frLoc) ;
+  // creo la quota
+   PtrOwner<IExtDimension> pDim( CreateExtDimension()) ;
+   bOk = bOk && ! IsNull( pDim) ;
+   bOk = bOk && pDim->SetLinear( ptP1L, ptP2L, ptDimL, vtNL, vtDL, sText) ;
+  // inserisco la quota nel DB
+   int nId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pDim)) : GDB_ID_NULL) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtHorizontalDimension(" + IdToString( nParentId) + ",{" +
+                                                ToString( ptP1) + "},{" +
+                                                ToString( ptP2) + "},{" +
+                                                ToString( ptDim) + "}," +
+                                                StringToLuaString( sText) + "','" +
+                                                RefTypeToString( nRefType) + ")" +
+                    " -- Id=" + ToString( nId) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco l'identificativo del oggetto
+   return nId ;
+}
+
+//-------------------------------------------------------------------------------
+int
+ExeCreateVerticalDimension( int nParentId, const Point3d& ptP1, const Point3d& ptP2,
+                            const Point3d& ptDim, const string& sText, int nRefType)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   nParentId = AdjustId( nParentId) ;
+   bool bOk = true ;
+  // recupero il riferimento locale
+   Frame3d frLoc ;
+   bOk = bOk && pGeomDB->GetGroupGlobFrame( nParentId, frLoc) ;
+  // porto in locale i punti e assegno i versori
+   Point3d ptP1L = GetPointLocal( pGeomDB, ptP1, nRefType, frLoc) ;
+   Point3d ptP2L = GetPointLocal( pGeomDB, ptP2, nRefType, frLoc) ;
+   Point3d ptDimL = GetPointLocal( pGeomDB, ptDim, nRefType, frLoc) ;
+   Vector3d vtNL = GetVectorLocal( pGeomDB, Z_AX, nRefType, frLoc) ;
+   Vector3d vtDL = GetVectorLocal( pGeomDB, Y_AX, nRefType, frLoc) ;
+  // creo la quota
+   PtrOwner<IExtDimension> pDim( CreateExtDimension()) ;
+   bOk = bOk && ! IsNull( pDim) ;
+   bOk = bOk && pDim->SetLinear( ptP1L, ptP2L, ptDimL, vtNL, vtDL, sText) ;
+  // inserisco la quota nel DB
+   int nId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pDim)) : GDB_ID_NULL) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtVerticalDimension(" + IdToString( nParentId) + ",{" +
+                                              ToString( ptP1) + "},{" +
+                                              ToString( ptP2) + "},{" +
+                                              ToString( ptDim) + "}," +
+                                              StringToLuaString( sText) + "','" +
+                                              RefTypeToString( nRefType) + ")" +
+                    " -- Id=" + ToString( nId) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco l'identificativo del oggetto
+   return nId ;
+}
+
+//-------------------------------------------------------------------------------
+int
+ExeCreateAlignedDimension( int nParentId, const Point3d& ptP1, const Point3d& ptP2,
+                           const Point3d& ptDim, const string& sText, int nRefType)
+{
+   IGeomDB* pGeomDB = GetCurrGeomDB() ;
+   VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
+   nParentId = AdjustId( nParentId) ;
+   bool bOk = true ;
+  // recupero il riferimento locale
+   Frame3d frLoc ;
+   bOk = bOk && pGeomDB->GetGroupGlobFrame( nParentId, frLoc) ;
+  // porto in locale i punti e assegno i versori
+   Point3d ptP1L = GetPointLocal( pGeomDB, ptP1, nRefType, frLoc) ;
+   Point3d ptP2L = GetPointLocal( pGeomDB, ptP2, nRefType, frLoc) ;
+   Point3d ptDimL = GetPointLocal( pGeomDB, ptDim, nRefType, frLoc) ;
+   Vector3d vtNL = GetVectorLocal( pGeomDB, Z_AX, nRefType, frLoc) ;
+  // creo la quota
+   PtrOwner<IExtDimension> pDim( CreateExtDimension()) ;
+   bOk = bOk && ! IsNull( pDim) ;
+   bOk = bOk && pDim->SetLinear( ptP1L, ptP2L, ptDimL, vtNL, V_NULL, sText) ;
+  // inserisco la quota nel DB
+   int nId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pDim)) : GDB_ID_NULL) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtAlignedDimension(" + IdToString( nParentId) + ",{" +
+                                             ToString( ptP1) + "},{" +
+                                             ToString( ptP2) + "},{" +
+                                             ToString( ptDim) + "}," +
+                                             StringToLuaString( sText) + "','" +
+                                             RefTypeToString( nRefType) + ")" +
+                    " -- Id=" + ToString( nId) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco l'identificativo del oggetto
+   return nId ;
+}
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index 6e11ee56e9ad8c0f06fd6da02e47c7cc65418561..f367abb250caf56ccdac41cc6f04d24fa4fde82e 100644
GIT binary patch
delta 273
zcmdl{x1nysCpJza1|0@N5T1NdOq0=Q^KY@WOp~v0W-%KvBu-8gk(^w>DK@!)YX^{T
zF!{gK<jMQE4=@@{4&)Y}?5FZ#a~*FABZe8T<yJCHJ|Ku{hJn%skQtl#g@YLp228Hw
z4VwIbm1FZBQ7%k_ev64SV{^#n|59j%L~ULpi^YJ~a>A$vKwUAJUwHE5GG(YwHv6f(
Gk^%r7H&5gM

delta 267
zcmdl`x1(;uCpK<F1|0@N1|uM8I{7!7CZpkIRd#V^RzrpypnxOSQ)WX3%gNlr6DRND
zKE!A^`67q-<PH&`%^e~djGNE#3Nd0eU@p_-4T5EGLy{-=2~~j%+RQB+%!p!&6%!T%
fzKUUWL6<a!3+Bn<c0q$8HW%DhLUBQa$_*(15KKpd

diff --git a/LUA_GdbCreate.cpp b/LUA_GdbCreate.cpp
index 3ed9f06..15385ee 100644
--- a/LUA_GdbCreate.cpp
+++ b/LUA_GdbCreate.cpp
@@ -220,6 +220,90 @@ LuaCreateTextAdv( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaCreateHorizontalDimension( lua_State* L)
+{
+  // 5 o 6 parametri : ParentId, ptP1, ptP2, ptDim, Text [, nRefType]
+   int nParentId ;
+   LuaCheckParam( L, 1, nParentId)
+   Point3d ptP1 ;
+   LuaCheckParam( L, 2, ptP1) ;
+   Point3d ptP2 ;
+   LuaCheckParam( L, 3, ptP2) ;
+   Point3d ptDim ;
+   LuaCheckParam( L, 4, ptDim) ;
+   string sText ;
+   LuaCheckParam( L, 5, sText) ;
+   int nRefType = RTY_DEFAULT ;
+   LuaGetParam( L, 6, nRefType) ;
+   LuaClearStack( L) ;
+  // creo la quota orizzontale
+   int nId = ExeCreateHorizontalDimension( nParentId, ptP1, ptP2, ptDim, sText, nRefType) ;
+  // restituisco il risultato
+   if ( nId != GDB_ID_NULL)
+      LuaSetParam( L, nId) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+LuaCreateVerticalDimension( lua_State* L)
+{
+  // 5 o 6 parametri : ParentId, ptP1, ptP2, ptDim, Text [, nRefType]
+   int nParentId ;
+   LuaCheckParam( L, 1, nParentId)
+   Point3d ptP1 ;
+   LuaCheckParam( L, 2, ptP1) ;
+   Point3d ptP2 ;
+   LuaCheckParam( L, 3, ptP2) ;
+   Point3d ptDim ;
+   LuaCheckParam( L, 4, ptDim) ;
+   string sText ;
+   LuaCheckParam( L, 5, sText) ;
+   int nRefType = RTY_DEFAULT ;
+   LuaGetParam( L, 6, nRefType) ;
+   LuaClearStack( L) ;
+  // creo la quota verticale
+   int nId = ExeCreateVerticalDimension( nParentId, ptP1, ptP2, ptDim, sText, nRefType) ;
+  // restituisco il risultato
+   if ( nId != GDB_ID_NULL)
+      LuaSetParam( L, nId) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+LuaCreateAlignedDimension( lua_State* L)
+{
+  // 5 o 6 parametri : ParentId, ptP1, ptP2, ptDim, Text [, nRefType]
+   int nParentId ;
+   LuaCheckParam( L, 1, nParentId)
+   Point3d ptP1 ;
+   LuaCheckParam( L, 2, ptP1) ;
+   Point3d ptP2 ;
+   LuaCheckParam( L, 3, ptP2) ;
+   Point3d ptDim ;
+   LuaCheckParam( L, 4, ptDim) ;
+   string sText ;
+   LuaCheckParam( L, 5, sText) ;
+   int nRefType = RTY_DEFAULT ;
+   LuaGetParam( L, 6, nRefType) ;
+   LuaClearStack( L) ;
+  // creo la quota allineata
+   int nId = ExeCreateAlignedDimension( nParentId, ptP1, ptP2, ptDim, sText, nRefType) ;
+  // restituisco il risultato
+   if ( nId != GDB_ID_NULL)
+      LuaSetParam( L, nId) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 bool
 LuaInstallGdbCreate( LuaMgr& luaMgr)
@@ -232,5 +316,8 @@ LuaInstallGdbCreate( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtText", LuaCreateText) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtTextEx", LuaCreateTextEx) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtTextAdv", LuaCreateTextAdv) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtHorizontalDimension", LuaCreateHorizontalDimension) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtVerticalDimension", LuaCreateVerticalDimension) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtAlignedDimension", LuaCreateAlignedDimension) ;
    return bOk ;
 }