Icarus :

- lettura MinMax ora da Ini macchina.

Icarus/Constants/ConstIni.vb

@@ -122,8 +122,6 @@ Public Module ConstIni
    Public Const K_CLR_MACHSTART As String = "MachStart"
    Public Const K_CLR_OTHERS As String = "Others"
 
-   Public Const S_MINMAX As String = "MinMax"
-
    Public Const S_MRUFILES As String = "MruFiles"
    Public Const S_MRUIMPORTFILES As String = "MruImportFiles"
 

Icarus/Constants/ConstMachIni.vb

@@ -1,31 +1,6 @@
 Public Module ConstMachIni
 
    Public Const MACH_INI_FILE_NAME As String = "MachData.ini"
-   Public Const GETWALLDATA_FILE_NAME As String = "GetWallData.lua"
-   Public Const GETTS3DATA_FILE_NAME As String = "GetTs3Data.lua"
-
-   Public Const K_NCTYPE As String = "NCType"
-   Public Const K_CONNECTIONSTRING As String = "ConnectionString"
-
-   Public Const S_CHANNELS As String = "Channels"
-
-   Public Const S_PARTPROGRAM As String = "PartProgram"
-   Public Const S_EXTENSION As String = "Extension"
-
-   ' Variables della macchina corrente
-   Public Const S_MAINVARIABLES As String = "MainVariables"
-   Public Const S_VARIABLES As String = "Variables"
-   Public Const S_INPUTVARIABLES As String = "InputVariables"
-   Public Const S_OUTPUTVARIABLES As String = "OutputVariables"
-   Public Const S_MDI As String = "MDI"
-
-   Public Const K_BEAM As String = "Beam"
-   Public Const K_WALL As String = "Wall"
-   Public Const K_SCRIPT As String = "Scripts"
-   Public Const K_SETUP As String = "Setup"
-   Public Const K_FLOW As String = "Flow"
-
-   Public Const TS3DATA_FILE As String = "Ts3Data.lua"
 
    Public Const S_MACHINING As String = "Machining"
    Public Const K_MACH_INITSCRIPT As String = "InitScript"
@@ -36,4 +11,6 @@
    Public Const K_SPEED_MIN As String = "SpeedMin"
    Public Const K_SPEED_MAX As String = "SpeedMax"
 
+   Public Const S_MINMAX As String = "MinMax"
+
 End Module

Icarus/MachiningDb/Machining.vb

@@ -749,7 +749,7 @@ Public Class NumericMachiningParam
       MyBase.New(Type, Cathegory)
       ' leggo ed imposto eventuali min e max
       Dim sMinMax As String = ""
-      If GetMainPrivateProfileString(S_MINMAX, Type, "", sMinMax) > 0 Then
+      If GetPrivateProfileString(S_MINMAX, Type, "", sMinMax, CurrentMachine.sMachIniFile) > 0 Then
          Dim sMinMaxValues() As String = sMinMax.Split(","c)
          Dim dMin As Double = 0
          Dim dMax As Double = 0