EgtExecutor :

- rimosso l'argomento dScaleFactor da Import3dm.

EXE_Exchange.cpp

@@ -363,7 +363,7 @@ ExeImport3MF( const string& sFilePath)
 
 //-----------------------------------------------------------------------------
 bool
-ExeImport3dm( const string& sFilePath, double dScaleFactor)
+ExeImport3dm( const string& sFilePath)
 {
    GseContext* pGseCtx = GetCurrGseContext() ;
    VERIFY_CTX_GEOMDB( pGseCtx, false)
@@ -384,7 +384,7 @@ ExeImport3dm( const string& sFilePath, double dScaleFactor)
    int nDecDig = DimSt.nDecDigit ;
    string  sFont = DimSt.sFont ;
    double dTextHeight = DimSt.dTextHeight ;
-   bOk = bOk && pImp3dm->Import( sFilePath, pGseCtx->m_pGeomDB, nLayerId, dScaleFactor,
+   bOk = bOk && pImp3dm->Import( sFilePath, pGseCtx->m_pGeomDB, nLayerId,
                                  dTextHeight, dExtLine, dArrLen, dTextDist, bLenIsMM, nDecDig, sFont) ;
   // aggiorno stato file corrente
    if ( pGseCtx->m_sFilePath.empty())
@@ -393,8 +393,7 @@ ExeImport3dm( const string& sFilePath, double dScaleFactor)
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
       string sLua = "EgtImport3dm('" + StringToLuaString( sFilePath) + "'," +
-                                       ToString( dScaleFactor) + ")" +
-                    " -- Ok=" + ToString( bOk) ;
+                           " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
   // restituisco il risultato

LUA_Exchange.cpp

@@ -173,14 +173,12 @@ LuaImport3MF( lua_State* L)
 static int
 LuaImport3dm( lua_State* L)
 {
-   // 1 o 2 parametri : path del file da importare [, Fattore di scala]
+   // 1 parametro : path del file da importare
    string sFilePath ;
    LuaCheckParam( L, 1, sFilePath)
-   double dScaleFactor = 1.0 ;
-   LuaGetParam( L, 2, dScaleFactor) ;
    LuaClearStack( L) ;
    // apro il file
-   bool bOk = ExeImport3dm( sFilePath, dScaleFactor) ; 
+   bool bOk = ExeImport3dm( sFilePath) ; 
    // restituisco il risultato
    LuaSetParam( L, bOk) ;
    return 1 ;
@@ -262,25 +260,6 @@ LuaExport3MF( lua_State* L)
    return 1 ;
 }
 
-//-------------------------------------------------------------------------------
-static int
-LuaExport3dm( lua_State* L)
-{
-  // 2 o 3 parametri : GroupId e path del file da esportare [, Filter]
-   int nGroupId ;
-   LuaCheckParam( L, 1, nGroupId)
-      string sFilePath ;
-   LuaCheckParam( L, 2, sFilePath)
-      int nFilter = EEXFLT_DEFAULT ;
-   LuaGetParam( L, 3, nFilter) ;
-   LuaClearStack( L) ;
-  // creo il file
-   bool bOk = ExeExport3dm( nGroupId, sFilePath, nFilter) ; 
-  // restituisco il risultato
-   LuaSetParam( L, bOk) ;
-   return 1 ;
-}
-
 //-------------------------------------------------------------------------------
 static int
 LuaExport3dm( lua_State* L)