diff --git a/EXE_GdbCreateSurf.cpp b/EXE_GdbCreateSurf.cpp index 2835e77..8f84ba6 100644 --- a/EXE_GdbCreateSurf.cpp +++ b/EXE_GdbCreateSurf.cpp @@ -740,12 +740,8 @@ ExeCreateSurfTmByExtrusion( int nParentId, INTVECTOR& vCrvIds, const Vector3d& v ExeSetModified() ; // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { - string sIds ; - for ( size_t i = 0 ; i < vCrvIds.size() ; ++ i) - sIds += ToString( vCrvIds[i]) + "," ; - sIds.pop_back() ; string sLua = "EgtSurfTmByExtrusion(" + IdToString( nParentId) + ",{" + - sIds + "},{" + + IdListToString( vCrvIds) + "},{" + ToString( vtExtr) + "}," + ToString( dLinTol) + "," + RefTypeToString( nRefType) + ")" + diff --git a/EXE_General.cpp b/EXE_General.cpp index 8bdbe0e..70aed51 100644 --- a/EXE_General.cpp +++ b/EXE_General.cpp @@ -40,6 +40,7 @@ static Logger* s_pGenLog = nullptr ; static bool s_bCmdLog = false ; static Logger* s_pCmdLog = nullptr ; static string s_sKey ; +static int s_nKeyType = KEY_LOCK_TYPE_ANY ; static pfProcEvents s_pFunProcEvents = nullptr ; static pfOutText s_pFunOutText = nullptr ; @@ -75,6 +76,7 @@ ExeInit( int nDebug, const string& sLogFile, const string& sLogMsg) LOG_INFO( s_pGenLog, sVer.c_str()) // imposto la chiave di protezione sulle librerie di base + SetEGkKeyType( s_nKeyType) ; SetEGkKey( s_sKey) ; // carico libreria grafica opzionale @@ -163,6 +165,14 @@ ExeSetKey( const string& sKey) return true ; } +//----------------------------------------------------------------------------- +bool +ExeSetLockType( int nType) +{ + s_nKeyType = nType ; + return SetLockType( nType) ; +} + //----------------------------------------------------------------------------- bool ExeSetFont( const string& sNfeFontDir, const string& sDefaultFont)