From d4cac866545eef0c65418ab6273725aa83a7bd87 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Thu, 11 Apr 2024 00:25:58 +0200
Subject: [PATCH] EgtUILib : - aggiornata interfaccia di EgtAdvancedImport per
 gestire parametro Flag - aggiornata ImportProject di Controller per gestire
 Flag su formati avanzati.

---
 Controller.vb   |  2 +-
 EgtInterface.vb | 61 ++++++++++++++++++++++++++-----------------------
 EgtUILib.vbproj |  4 +++-
 3 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/Controller.vb b/Controller.vb
index b30f8b0..259b831 100644
--- a/Controller.vb
+++ b/Controller.vb
@@ -574,7 +574,7 @@ Public Class Controller
          Case FT._3DM
             bOk = bOk AndAlso EgtImport3dm(sFile)
          Case FT.OBJ, FT.IGES, FT.STEP_, FT.ACIS, FT.PARASOLID, FT.JT, FT.VRML, FT.C3D
-            bOk = bOk AndAlso EgtAdvancedImport(sFile, m_dEpsStm)
+            bOk = bOk AndAlso EgtAdvancedImport(sFile, m_dEpsStm, nFlag)
       End Select
       EgtResetCurrPartLayer()
       DisableCommandLog()
diff --git a/EgtInterface.vb b/EgtInterface.vb
index 73c740f..2242ad7 100644
--- a/EgtInterface.vb
+++ b/EgtInterface.vb
@@ -2262,16 +2262,16 @@ Public Function EgtAdvancedImportIsEnabled() As Boolean
 End Function
 
 <DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtAdvancedImport"), SuppressUnmanagedCodeSecurity()>
-Private Function EgtAdvancedImport_32(sFilePath As String, dLinTol As Double) As Boolean
+Private Function EgtAdvancedImport_32(sFilePath As String, dLinTol As Double, nFlag As Integer) As Boolean
 End Function
 <DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtAdvancedImport"), SuppressUnmanagedCodeSecurity()>
-Private Function EgtAdvancedImport_64(sFilePath As String, dLinTol As Double) As Boolean
+Private Function EgtAdvancedImport_64(sFilePath As String, dLinTol As Double, nFlag As Integer) As Boolean
 End Function
-Public Function EgtAdvancedImport(sFilePath As String, Optional dLinTol As Double = EPS_STM) As Boolean
+Public Function EgtAdvancedImport(sFilePath As String, Optional dLinTol As Double = EPS_STM, Optional nFlag As Integer = 0) As Boolean
    If IntPtr.Size = 4 Then
-      Return EgtAdvancedImport_32(sFilePath, dLinTol)
+      Return EgtAdvancedImport_32(sFilePath, dLinTol, nFlag)
    Else
-      Return EgtAdvancedImport_64(sFilePath, dLinTol)
+      Return EgtAdvancedImport_64(sFilePath, dLinTol, nFlag)
    End If
 End Function
 
@@ -15216,29 +15216,34 @@ Public Enum EIB_FL As Integer
    SORT = 16
    USEUATTR = 32
 End Enum
-   'Costanti : flag per export (sommabili tra loro)
-   Public Enum EEX_FL As Integer
-      NONE = 0
-      COMP_LAYER = 1
-      COL_BY_LAYER = 2
-      ADV_NAMES = 4
-   End Enum
-   'Costanti : filtri per export (sommabili tra loro)
-   Public Enum EEX_FLT As Integer
-      NONE = 0
-      [DEFAULT] = 1 + 8 + 128 + 256
-      LEV_USER = 1
-      LEV_SYSTEM = 2
-      LEV_TEMP = 4
-      MODE_STD = 8
-      MODE_LOCKED = 16
-      MODE_HIDDEN = 32
-      STAT_OFF = 64
-      STAT_ON = 128
-      STAT_SEL = 256
-   End Enum
-   'Costanti : interruzione di riga
-   Public Const LINE_BREAK As String = "<br/>"
+'Costanti : flag per import Advanced (Iges, Step,...) (sommabili tra loro)
+Public Enum EIA_FL As Integer
+   NONE = 0
+   NEW_TESSELLATOR = 1
+End Enum
+'Costanti : flag per export (sommabili tra loro)
+Public Enum EEX_FL As Integer
+   NONE = 0
+   COMP_LAYER = 1
+   COL_BY_LAYER = 2
+   ADV_NAMES = 4
+End Enum
+'Costanti : filtri per export (sommabili tra loro)
+Public Enum EEX_FLT As Integer
+   NONE = 0
+   [DEFAULT] = 1 + 8 + 128 + 256
+   LEV_USER = 1
+   LEV_SYSTEM = 2
+   LEV_TEMP = 4
+   MODE_STD = 8
+   MODE_LOCKED = 16
+   MODE_HIDDEN = 32
+   STAT_OFF = 64
+   STAT_ON = 128
+   STAT_SEL = 256
+End Enum
+'Costanti : interruzione di riga
+Public Const LINE_BREAK As String = "<br/>"
 'Costanti : flag separazione loop in adiacenze di facet
 Public Const STM_FACETADJ_ENDLOOP As Integer = -2
 'Costanti : tipo creazione pezzo piatto
diff --git a/EgtUILib.vbproj b/EgtUILib.vbproj
index a08026a..34fbbfe 100644
--- a/EgtUILib.vbproj
+++ b/EgtUILib.vbproj
@@ -141,7 +141,9 @@
     <Compile Include="btnExec.Designer.vb">
       <DependentUpon>btnExec.vb</DependentUpon>
     </Compile>
-    <Compile Include="btnExec.vb" />
+    <Compile Include="btnExec.vb">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="btnExport.Designer.vb">
       <DependentUpon>btnExport.vb</DependentUpon>
     </Compile>