EgtCAM5 1.9l1 :

- migliorate icone della TopBar e di esecuzione script - aggiunti a opzioni fattori di scala per import Dxf, Stl e immagini - aggiunte a opzioni dimensioni immagini di export.
2018-12-10 07:57:49 +00:00
parent 7038ba42f3
commit d0192bfaa6
19 changed files with 305 additions and 103 deletions
@@ -86,6 +86,9 @@ Module ConstIni
   Public Const K_MAJLNCOLOR As String = "MajLnColor"

   Public Const S_IMPORT As String = "Import"
+   Public Const K_DXFSCALE As String = "DxfScale"
+   Public Const K_STLSCALE As String = "StlScale"
+   Public Const K_IMGSCALE As String = "ImgScale"
   Public Const K_CNCFLAG As String = "CncFlag"
   Public Const K_BTLFLAG As String = "BtlFlag"

@@ -702,6 +702,9 @@
  <ItemGroup>
    <Resource Include="Resources\TreeView\VolZmap.ico" />
  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\MachinePanel\MachineOptions.png" />
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <PropertyGroup>
    <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtCAM5\EgtCAM5R32.exe
@@ -7,8 +7,8 @@
         Style="{StaticResource GridViewPanelButton}" Width="55" Content="{Binding ToolDBMsg}"/>
      <Button Command="{Binding MachDbCommand}" ToolTip="{Binding MachiningDbToolTip}"
         Style="{StaticResource GridViewPanelButton}" Width="55" Content="{Binding MachiningDbMsg}"/>
-      <Button Command="{Binding MachOptionsCommand}" ToolTip="{Binding OptionsToolTip}">
-         <Image Source="/Resources/TopCommandBar/Options.png" Height="22" />
+      <Button Command="{Binding MachOptionsCommand}" ToolTip="{Binding MachOptionsToolTip}">
+         <Image Source="/Resources/MachinePanel/MachineOptions.png" Height="22" />
      </Button>
   </StackPanel>

@@ -37,6 +37,11 @@ Public Class MachinePanelVM
         Return EgtMsg(MSG_MAINWINDOW + 4)
      End Get
   End Property
+   Public ReadOnly Property MachOptionsToolTip As String
+      Get
+         Return EgtMsg(MSG_MAINWINDOW + 8)
+      End Get
+   End Property

 #End Region   ' ToolTip

@@ -339,26 +339,10 @@ Public Class MainWindowVM
      If GetPrivateProfileString(S_GENERAL, K_MESSAGESDIR, "", sMsgDir) = 0 Then
         sMsgDir = m_sConfigDir
      End If
-      ' Leggo elenco lingue disponibili da file ini
-      Dim nIndex As Integer = 1
-      Dim ReadLanguage As Language = GetPrivateProfileLanguage(S_LANGUAGES, K_LANGUAGE & nIndex)
-      While Not IsNothing(ReadLanguage)
-         OptionModule.m_LanguageList.Add(ReadLanguage)
-         nIndex += 1
-         ReadLanguage = GetPrivateProfileLanguage(S_LANGUAGES, K_LANGUAGE & nIndex)
-      End While
      ' Inizializzo OptionModule
      OptionModule.InitOptionModule()
      ' Leggo file messaggi
-      Dim sMsgName As String = String.Empty
-      GetPrivateProfileString(S_GENERAL, K_MESSAGES, "", sMsgName)
-      Dim sMsgFilePath As String = sMsgDir & "\EgalTechIta.txt"
-      For Each Language In OptionModule.m_LanguageList
-         If Language.Name = sMsgName Then
-            OptionModule.m_SelectedLanguage = Language
-            sMsgFilePath = sMsgDir & "\" & Language.FilePath
-         End If
-      Next
+      Dim sMsgFilePath As String = sMsgDir & "\" & OptionModule.m_SelectedLanguage.FilePath
      If Not EgtLoadMessages(sMsgFilePath) Then
         EgtOutLog("Error in EgtLoadMessages")
      End If
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("1.9.11.3")> 
-<Assembly: AssemblyFileVersion("1.9.11.3")> 
+<Assembly: AssemblyVersion("1.9.12.1")> 
+<Assembly: AssemblyFileVersion("1.9.12.1")> 
@@ -6,8 +6,22 @@ Friend Module OptionModule
   ' Parametri che contengono lista delle lingue disponibili e lingua selezionata
   Friend m_LanguageList As New ObservableCollection(Of Language)
   Friend m_SelectedLanguage As Language
+   ' Colori di sfondo della vista e della griglia
+   Friend m_TopSceneBackground As Color3d
+   Friend m_BotSceneBackground As Color3d
+   Friend m_GridColor As Color3d
+   ' Flag per visualizzazione smussata delle superfici
+   Friend m_bTriMeshSmoothed As Boolean
+
+   ' Colore di default in disegno
+   Friend m_DefMaterialColor As Color3d
+   ' Tolleranza geometrica
+   Friend m_dGeometryTolerance As Double

   ' Parametri per import
+   Friend m_dDxfScaleFactor As Double
+   Friend m_dStlScaleFactor As Double
+   Friend m_dImgScaleFactor As Double

   ' Parametri per export
   Friend m_nImgWidth As Integer
@@ -23,22 +37,52 @@ Friend Module OptionModule
   Friend m_SelGeomSawFinishing As SceneSelModeOpt
   Friend m_SelGeomGenMachining As SceneSelModeOpt
   Friend m_SelGeomChiseling As SceneSelModeOpt
-
-   ' Tolleranza geometrica
-   Friend m_GeometryTolerance As Double
-   ' Variabile che indica se quando viene creata una nuova operazione di lavorazione deve essere aggiunta in fondo
-   ' alla fase o subito dopo la lavorazione selezionata
+   ' Flag per aggiungere una nuova lavorazione alla fine della fase o subito dopo la lavorazione selezionata
   Friend m_bNewMachiningIsLastOne As Boolean
   ' Variabile che indica se usare lo script per calcolare automaticamente la disposizione quando si passa in lavorazione
   Friend m_bUseDispositionScript As Boolean

-   Friend m_TopSceneBackground As Color3d
-   Friend m_BotSceneBackground As Color3d
-   Friend m_GridColor As Color3d
-   Friend m_DefMaterialColor As Color3d
-
   ' inizializzazione lettura variabili ad inizio programma
   Friend Sub InitOptionModule()
+      ' Leggo elenco lingue disponibili da file ini
+      Dim nIndex As Integer = 1
+      Dim ReadLanguage As Language = GetPrivateProfileLanguage(S_LANGUAGES, K_LANGUAGE & nIndex)
+      While Not IsNothing(ReadLanguage)
+         OptionModule.m_LanguageList.Add(ReadLanguage)
+         nIndex += 1
+         ReadLanguage = GetPrivateProfileLanguage(S_LANGUAGES, K_LANGUAGE & nIndex)
+      End While
+      ' Inizializzo la lingua corrente
+      Dim sMsgName As String = String.Empty
+      GetPrivateProfileString(S_GENERAL, K_MESSAGES, "", sMsgName)
+      For Each Language In OptionModule.m_LanguageList
+         If Language.Name = sMsgName Then
+            OptionModule.m_SelectedLanguage = Language
+            Exit For
+         End If
+      Next
+      ' Inizializzo variabili colori di sfondo scena, griglia
+      Dim BackTopColor As New Color3d(192, 192, 192)
+      GetPrivateProfileColor(S_SCENE, K_BACKTOP, BackTopColor)
+      m_TopSceneBackground = BackTopColor
+      Dim BackBotColor As New Color3d(BackTopColor)
+      GetPrivateProfileColor(S_SCENE, K_BACKBOTTOM, BackBotColor)
+      m_BotSceneBackground = BackBotColor
+      Dim GridColor As New Color3d(0, 0, 0)
+      GetPrivateProfileColor(S_GRID, K_MINLNCOLOR, GridColor)
+      m_GridColor = GridColor
+      ' Inizializzo flag visualizzazione smussata delle superfici
+      m_bTriMeshSmoothed = GetPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1) <> 0
+      ' Inizio colore di default in disegno
+      Dim DefColor As New Color3d(0, 0, 0)
+      GetPrivateProfileColor(S_GEOMDB, K_DEFAULTCOLOR, DefColor)
+      m_DefMaterialColor = DefColor
+      ' Inizializzo tolleranza geometrica
+      m_dGeometryTolerance = GetPrivateProfileDouble(S_GEOMDB, K_SURFTMTOLER, 0.05)
+      ' Inizializzo variabili per import
+      m_dDxfScaleFactor = GetPrivateProfileDouble(S_IMPORT, K_DXFSCALE, 1)
+      m_dStlScaleFactor = GetPrivateProfileDouble(S_IMPORT, K_STLSCALE, 1)
+      m_dImgScaleFactor = GetPrivateProfileDouble(S_IMPORT, K_IMGSCALE, 1)
      ' Inizializzo variabili per export
      m_nImgWidth = GetPrivateProfileInt(S_EXPORT, K_IMGWIDTH, 400)
      m_nImgHeight = GetPrivateProfileInt(S_EXPORT, K_IMGHEIGHT, 300)
@@ -62,25 +106,10 @@ Friend Module OptionModule
      m_SelGeomGenMachining = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt))
      Temp = GetPrivateProfileInt(S_MACH, K_SELGEOMCHISELING, -1)
      m_SelGeomChiseling = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt))
-      ' Inizializzo tolleranza geometrica
-      m_GeometryTolerance = GetPrivateProfileDouble(S_GEOMDB, K_SURFTMTOLER, 0.05)
      ' Inizializzo variabile che indica posizione nuova operazione di lavorazione
      m_bNewMachiningIsLastOne = If(GetPrivateProfileInt(S_OPTIONS, K_NEWMACHININGISLASTONE, 0) <> 0, True, False)
      ' Inizializzo variabile che indica se usare script di disposizione
      m_bUseDispositionScript = If(GetPrivateProfileInt(S_OPTIONS, K_USEDISPOSITIONSCRIPT, 0) <> 0, True, False)
-      ' Inizializzo variabili colori di sfondo scena, griglia e materiale default
-      Dim BackTopColor As New Color3d(192, 192, 192)
-      GetPrivateProfileColor(S_SCENE, K_BACKTOP, BackTopColor)
-      Dim BackBotColor As New Color3d(BackTopColor)
-      GetPrivateProfileColor(S_SCENE, K_BACKBOTTOM, BackBotColor)
-      Dim DefColor As New Color3d(0, 0, 0)
-      GetPrivateProfileColor(S_GEOMDB, K_DEFAULTCOLOR, DefColor)
-      Dim GridColor As New Color3d(0, 0, 0)
-      GetPrivateProfileColor(S_GRID, K_MINLNCOLOR, GridColor)
-      m_TopSceneBackground = BackTopColor
-      m_BotSceneBackground = BackBotColor
-      m_GridColor = GridColor
-      m_DefMaterialColor = DefColor
   End Sub

 End Module
@@ -50,6 +50,24 @@
                       Command="{Binding GridColor_Command}"
                       Style="{StaticResource EgtCAM5_InputButton}"/>
            </UniformGrid>
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="2*"/>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+               </Grid.RowDefinitions>
+               <TextBlock Text="{Binding SmoothTriMeshMsg}" VerticalAlignment="Center"
+                          Grid.Row="0" Margin="0,0,0,5"/>
+               <CheckBox IsChecked="{Binding SmoothTriMesh}"
+                         Grid.Column="1" Grid.Row="0" Margin="4,0,0,0" VerticalAlignment="Center"/>
+            </Grid>
+         </StackPanel>
+      </TabItem>
+      <TabItem Header="{Binding CADMsg}">
+         <StackPanel Margin="5,5,5,0">
            <UniformGrid Columns="2"
                         Margin="0,0,0,5">
               <TextBlock Text="{Binding DefMaterialColorMsg}" VerticalAlignment="Center"/>
@@ -57,10 +75,6 @@
                       Command="{Binding DefMaterialColor_Command}"
                       Style="{StaticResource EgtCAM5_InputButton}"/>
            </UniformGrid>
-         </StackPanel>
-      </TabItem>
-      <TabItem Header="{Binding CADMsg}">
-         <StackPanel Margin="5,5,5,0">
            <UniformGrid Grid.ColumnSpan="2" Columns="2"
                         Margin="0,0,0,5">
               <TextBlock Text="{Binding GeometryToleranceMsg}" VerticalAlignment="Center"/>
@@ -70,6 +84,42 @@
            </UniformGrid>
         </StackPanel>
      </TabItem>
+      <TabItem Header="{Binding ImportMsg}">
+         <StackPanel Margin="5,5,5,0">
+            <UniformGrid Grid.ColumnSpan="2" Columns="2">
+               <TextBlock Text="{Binding DxfScaleFactorMsg}" VerticalAlignment="Center"/>
+               <TextBox Text="{Binding DxfScaleFactor}" Height="25"
+                     VerticalContentAlignment="Center"
+                     Margin="10,0,0,5"/>
+               <TextBlock Text="{Binding StlScaleFactorMsg}" VerticalAlignment="Center"/>
+               <TextBox Text="{Binding StlScaleFactor}" Height="25"
+                     VerticalContentAlignment="Center"
+                     Margin="10,0,0,5"/>
+               <TextBlock Text="{Binding ImageScaleFactorMsg}" VerticalAlignment="Center"/>
+               <TextBox Text="{Binding ImageScaleFactor}" Height="25"
+                     VerticalContentAlignment="Center"
+                     Margin="10,0,0,5"/>
+            </UniformGrid>
+         </StackPanel>
+      </TabItem>
+      <TabItem Header="{Binding ExportMsg}">
+         <StackPanel>
+            <GroupBox Grid.Column="1" Grid.RowSpan="2"
+                      Header="{Binding ImageMsg}"
+                      Margin="5,5,5,0">
+               <UniformGrid Grid.ColumnSpan="2" Columns="2">
+               <TextBlock Text="{Binding ImageWidthMsg}" VerticalAlignment="Center"/>
+               <TextBox Text="{Binding ImageWidth}" Height="25"
+                        VerticalContentAlignment="Center"
+                        Margin="10,0,0,5"/>
+               <TextBlock Text="{Binding ImageHeightMsg}" VerticalAlignment="Center"/>
+               <TextBox Text="{Binding ImageHeight}" Height="25"
+                        VerticalContentAlignment="Center"
+                        Margin="10,0,0,5"/>
+            </UniformGrid>
+            </GroupBox>
+         </StackPanel>
+      </TabItem>
      <TabItem Header="{Binding CAMMsg}">
         <StackPanel>
            
@@ -92,35 +92,35 @@ Public Class OptionWindowVM

   Public Property GeometryTolerance As String
      Get
-         Return LenToString(m_GeometryTolerance, 5)
+         Return LenToString(OptionModule.m_dGeometryTolerance, 5)
      End Get
      Set(value As String)
         Dim dVal As Double = 0
         If StringToLen(value, dVal) AndAlso dVal > 0 Then
-            m_GeometryTolerance = dVal
-            Map.refProjectVM.GetController.SetSurfTmTolerance(m_GeometryTolerance)
-            WritePrivateProfileString(S_GEOMDB, K_SURFTMTOLER, DoubleToString(m_GeometryTolerance, 5))
+            OptionModule.m_dGeometryTolerance = dVal
+            Map.refProjectVM.GetController.SetSurfTmTolerance(OptionModule.m_dGeometryTolerance)
+            WritePrivateProfileString(S_GEOMDB, K_SURFTMTOLER, DoubleToString(OptionModule.m_dGeometryTolerance, 5))
         End If
      End Set
   End Property

   Public Property NewMachiningIsLastOne As Boolean
      Get
-         Return m_bNewMachiningIsLastOne
+         Return OptionModule.m_bNewMachiningIsLastOne
      End Get
      Set(value As Boolean)
-         m_bNewMachiningIsLastOne = value
-         WritePrivateProfileString(S_OPTIONS, K_NEWMACHININGISLASTONE, If(value, 1, 0).ToString)
+         OptionModule.m_bNewMachiningIsLastOne = value
+         WritePrivateProfileString(S_OPTIONS, K_NEWMACHININGISLASTONE, If(value, "1", "0"))
      End Set
   End Property

   Public Property UseDispositionScript As Boolean
      Get
-         Return m_bUseDispositionScript
+         Return OptionModule.m_bUseDispositionScript
      End Get
      Set(value As Boolean)
-         m_bUseDispositionScript = value
-         WritePrivateProfileString(S_OPTIONS, K_USEDISPOSITIONSCRIPT, If(value, 1, 0).ToString)
+         OptionModule.m_bUseDispositionScript = value
+         WritePrivateProfileString(S_OPTIONS, K_USEDISPOSITIONSCRIPT, If(value, "1", "0"))
      End Set
   End Property

@@ -160,6 +160,88 @@ Public Class OptionWindowVM
      End Get
   End Property

+   Public Property SmoothTriMesh As Boolean
+      Get
+         Return OptionModule.m_bTriMeshSmoothed
+      End Get
+      Set(value As Boolean)
+         OptionModule.m_bTriMeshSmoothed = value
+         WritePrivateProfileString(S_SCENE, K_SHOWTRIAADV, If(value, "1", "0"))
+         EgtSetShowTriaAdv(value)
+      End Set
+   End Property
+
+   Public Property DxfScaleFactor As String
+      Get
+         Return LenToString(OptionModule.m_dDxfScaleFactor, 5)
+      End Get
+      Set(value As String)
+         Dim dVal As Double = 0
+         If StringToLen(value, dVal) AndAlso dVal > 0 Then
+            OptionModule.m_dDxfScaleFactor = dVal
+            WritePrivateProfileString(S_IMPORT, K_DXFSCALE, DoubleToString(OptionModule.m_dDxfScaleFactor, 5))
+            Map.refProjectVM.GetController().SetScaleForDxfImport(OptionModule.m_dDxfScaleFactor)
+         End If
+      End Set
+   End Property
+
+   Public Property StlScaleFactor As String
+      Get
+         Return LenToString(OptionModule.m_dStlScaleFactor, 5)
+      End Get
+      Set(value As String)
+         Dim dVal As Double = 0
+         If StringToLen(value, dVal) AndAlso dVal > 0 Then
+            OptionModule.m_dStlScaleFactor = dVal
+            WritePrivateProfileString(S_IMPORT, K_STLSCALE, DoubleToString(OptionModule.m_dStlScaleFactor, 5))
+            Map.refProjectVM.GetController().SetScaleForStlImport(OptionModule.m_dStlScaleFactor)
+         End If
+      End Set
+   End Property
+
+   Public Property ImageScaleFactor As String
+      Get
+         Return LenToString(OptionModule.m_dImgScaleFactor, 5)
+      End Get
+      Set(value As String)
+         Dim dVal As Double = 0
+         If StringToLen(value, dVal) AndAlso dVal > 0 Then
+            OptionModule.m_dImgScaleFactor = dVal
+            WritePrivateProfileString(S_IMPORT, K_IMGSCALE, DoubleToString(OptionModule.m_dImgScaleFactor, 5))
+            Map.refProjectVM.GetController().SetScaleForImageImport(OptionModule.m_dImgScaleFactor)
+         End If
+      End Set
+   End Property
+
+   Public Property ImageWidth As String
+      Get
+         Return OptionModule.m_nImgWidth.ToString()
+      End Get
+      Set(value As String)
+         Dim nVal As Integer = 0
+         If Integer.TryParse(value, nVal) AndAlso nVal > 0 Then
+            OptionModule.m_nImgWidth = nVal
+            WritePrivateProfileString(S_EXPORT, K_IMGWIDTH, OptionModule.m_nImgWidth.ToString())
+            Map.refProjectVM.GetController().SetDefaultForImageExport(OptionModule.m_nImgWidth, OptionModule.m_nImgHeight)
+         End If
+      End Set
+   End Property
+
+   Public Property ImageHeight As String
+      Get
+         Return OptionModule.m_nImgHeight.ToString()
+      End Get
+      Set(value As String)
+         Dim nVal As Integer = 0
+         If Integer.TryParse(value, nVal) AndAlso nVal > 0 Then
+            OptionModule.m_nImgHeight = nVal
+            WritePrivateProfileString(S_EXPORT, K_IMGHEIGHT, OptionModule.m_nImgHeight.ToString())
+            Map.refProjectVM.GetController().SetDefaultForImageExport(OptionModule.m_nImgWidth, OptionModule.m_nImgHeight)
+         End If
+      End Set
+   End Property
+
+
   ' Definizione comandi
   Private m_cmdCloseOptions As ICommand
   Private m_cmdTopSceneBackground As ICommand
@@ -180,16 +262,6 @@ Public Class OptionWindowVM
         Return EgtMsg(MSG_OPTIONPAGE + 14)
      End Get
   End Property
-   Public ReadOnly Property CADMsg As String
-      Get
-         Return EgtMsg(MSG_OPTIONPAGE + 15)
-      End Get
-   End Property
-   Public ReadOnly Property CAMMsg As String
-      Get
-         Return EgtMsg(MSG_OPTIONPAGE + 16)
-      End Get
-   End Property

   Public ReadOnly Property CurrentLanguageMsg As String
      Get
@@ -201,6 +273,90 @@ Public Class OptionWindowVM
         Return EgtMsg(MSG_OPTIONPAGE + 2)
      End Get
   End Property
+   Public ReadOnly Property TopSceneBackgroundMsg As String
+      Get
+         Return EgtMsg(MSG_OPTIONPAGE + 10)
+      End Get
+   End Property
+   Public ReadOnly Property BotSceneBackgroundMsg As String
+      Get
+         Return EgtMsg(MSG_OPTIONPAGE + 11)
+      End Get
+   End Property
+   Public ReadOnly Property GridColorMsg As String
+      Get
+         Return EgtMsg(MSG_OPTIONPAGE + 17)
+      End Get
+   End Property
+   Public ReadOnly Property SmoothTriMeshMsg As String
+      Get
+         Return EgtMsg(MSG_OPTIONPAGE + 18)
+      End Get
+   End Property
+
+   Public ReadOnly Property CADMsg As String
+      Get
+         Return EgtMsg(MSG_OPTIONPAGE + 15)
+      End Get
+   End Property
+   Public ReadOnly Property GeometryToleranceMsg As String
+      Get
+         Return EgtMsg(MSG_OPTIONPAGE + 13)
+      End Get
+   End Property
+   Public ReadOnly Property DefMaterialColorMsg As String
+      Get
+         Return EgtMsg(MSG_OPTIONPAGE + 12)
+      End Get
+   End Property
+
+   Public ReadOnly Property ImportMsg As String
+      Get
+         Return EgtMsg(MSG_OPTIONPAGE + 19)
+      End Get
+   End Property
+   Public ReadOnly Property DxfScaleFactorMsg As String
+      Get
+         Return EgtMsg(MSG_OPTIONPAGE + 20)
+      End Get
+   End Property
+   Public ReadOnly Property StlScaleFactorMsg As String
+      Get
+         Return EgtMsg(MSG_OPTIONPAGE + 21)
+      End Get
+   End Property
+   Public ReadOnly Property ImageScaleFactorMsg As String
+      Get
+         Return EgtMsg(MSG_OPTIONPAGE + 22)
+      End Get
+   End Property
+
+   Public ReadOnly Property ExportMsg As String
+      Get
+         Return EgtMsg(MSG_OPTIONPAGE + 23)
+      End Get
+   End Property
+   Public ReadOnly Property ImageMsg As String
+      Get
+         Return EgtMsg(MSG_OPTIONPAGE + 24)
+      End Get
+   End Property
+   Public ReadOnly Property ImageWidthMsg As String
+      Get
+         Return EgtMsg(MSG_OPTIONPAGE + 25)
+      End Get
+   End Property
+   Public ReadOnly Property ImageHeightMsg As String
+      Get
+         Return EgtMsg(MSG_OPTIONPAGE + 26)
+      End Get
+   End Property
+
+   Public ReadOnly Property CAMMsg As String
+      Get
+         Return EgtMsg(MSG_OPTIONPAGE + 16)
+      End Get
+   End Property
   Public ReadOnly Property MachiningSelGeomMsg As String
      Get
         Return EgtMsg(MSG_OPTIONPAGE + 6)
@@ -236,48 +392,17 @@ Public Class OptionWindowVM
         Return EgtMsg(MSG_MACHININGSDBPAGE + 9)
      End Get
   End Property
-
-   Public ReadOnly Property GeometryToleranceMsg As String
-      Get
-         Return EgtMsg(MSG_OPTIONPAGE + 13)
-      End Get
-   End Property
   Public ReadOnly Property NewMachiningPosMsg As String
      Get
         Return EgtMsg(MSG_OPTIONPAGE + 7)
      End Get
   End Property
-
   Public ReadOnly Property UseDispositionScriptMsg As String
      Get
         Return EgtMsg(MSG_OPTIONPAGE + 8)
      End Get
   End Property

-   Public ReadOnly Property TopSceneBackgroundMsg As String
-      Get
-         Return EgtMsg(MSG_OPTIONPAGE + 10)
-      End Get
-   End Property
-
-   Public ReadOnly Property BotSceneBackgroundMsg As String
-      Get
-         Return EgtMsg(MSG_OPTIONPAGE + 11)
-      End Get
-   End Property
-
-   Public ReadOnly Property GridColorMsg As String
-      Get
-         Return EgtMsg(MSG_OPTIONPAGE + 17)
-      End Get
-   End Property
-
-   Public ReadOnly Property DefMaterialColorMsg As String
-      Get
-         Return EgtMsg(MSG_OPTIONPAGE + 12)
-      End Get
-   End Property
-
 #End Region

 #Region "COMMANDS"
@@ -258,8 +258,7 @@ Public Class ProjectVM
                            MessageBoxButton.OK, MessageBoxImage.Warning)
         End If
      End If
-      Dim dSurfTmToler As Double = GetPrivateProfileDouble(S_GEOMDB, K_SURFTMTOLER, 0.05)
-      m_Controller.SetSurfTmTolerance(dSurfTmToler)
+      m_Controller.SetSurfTmTolerance(OptionModule.m_dGeometryTolerance)
      m_Controller.SetUseCustomColors(True, S_SCENE, K_CUSTOMCOLORS)
      ' imposto unità di misura per interfaccia utente
      IniFile.m_bMmUnits = (GetPrivateProfileInt(S_SCENE, K_MMUNITS, 1) <> 0)
@@ -305,6 +304,10 @@ Public Class ProjectVM
      ' Imposto stato filtro selezione
      m_ProjectScene.GetObjFilterForSel(m_bSelZeroDim, m_bSelCurve, m_bSelSurf, m_bSelVolume, m_bSelExtra)
      m_Controller.MouseSetObjFilterForSelect(m_bSelZeroDim, m_bSelCurve, m_bSelSurf, m_bSelVolume, m_bSelExtra)
+      ' Imposto default per import
+      m_Controller.SetScaleForDxfImport(OptionModule.m_dDxfScaleFactor)
+      m_Controller.SetScaleForStlImport(OptionModule.m_dStlScaleFactor)
+      m_Controller.SetScaleForImageImport(OptionModule.m_dImgScaleFactor)
      ' Imposto default per export
      m_Controller.SetDefaultForImageExport(OptionModule.m_nImgWidth, OptionModule.m_nImgHeight)
   End Sub