diff --git a/AboutBox/AboutBoxWD.xaml b/AboutBox/AboutBoxWD.xaml index e386de8..2cea86e 100644 --- a/AboutBox/AboutBoxWD.xaml +++ b/AboutBox/AboutBoxWD.xaml @@ -36,7 +36,7 @@ - + - + diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index fcd464b..8c3f707 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -62,5 +62,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/NcComm/CNCommunication.vb b/NcComm/CNCommunication.vb index 2817d18..378a530 100644 --- a/NcComm/CNCommunication.vb +++ b/NcComm/CNCommunication.vb @@ -34,6 +34,7 @@ Public Class CNCommunication End If End Set End Property + Private m_nSpecialAreas As Integer = 4 ' Variabile che indica il Mode corrente Private m_nCurrMode As Integer = -1 @@ -116,6 +117,9 @@ Public Class CNCommunication ' Leggo flag invio speciale programma di lavoro Dim nTemp As Integer = GetPrivateProfileInt(S_NUMERICALCONTROL, K_SPECIALSEND, -1, m_MainWindow.GetMachIniFile()) m_nSpecialSend = Math.Max( Math.Min( nTemp, 1), -1) + ' Leggo numero di aree per invio speciale + Dim nTemp2 As Integer = GetPrivateProfileInt(S_NUMERICALCONTROL, K_SPECIALAREAS, 4, m_MainWindow.GetMachIniFile()) + m_nSpecialAreas = Math.Max( Math.Min( nTemp2, 16), 1) ' Se CN Siemens leggo dati programma intermedio di comunicazione If m_nNCType = 3 Then @@ -1704,8 +1708,8 @@ Public Class CNCommunication If m_nNCType <> 4 Then Return False ' Indice base Dim nBase As Integer = 900 - ' Ho possibilità di trasmettere in 4 aree consecutive (901, 902, 903 e 904) - For I As Integer = 1 To 4 + ' Ho possibilità di trasmettere in più aree consecutive (901, 902, ...) + For I As Integer = 1 To m_nSpecialAreas ' Leggo la variabile semaforo dell'area I-esima Dim nVal As Integer = -1 Dim sVar As String = "#" & (nBase + I).ToString() diff --git a/OmagCUT.vbproj b/OmagCUT.vbproj index 12777a6..ced43ce 100644 --- a/OmagCUT.vbproj +++ b/OmagCUT.vbproj @@ -1157,7 +1157,7 @@ - + @@ -1419,12 +1419,6 @@ - - - - - - @@ -1453,6 +1447,9 @@ + + + IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe diff --git a/OmagCUTDarkDictionary.xaml b/OmagCUTDarkDictionary.xaml index e817db5..6c70a5d 100644 --- a/OmagCUTDarkDictionary.xaml +++ b/OmagCUTDarkDictionary.xaml @@ -84,7 +84,7 @@ - + diff --git a/Resources/NewIcons/Logo-Egalware (2).png b/Resources/NewIcons/Logo-Egalware (2).png deleted file mode 100644 index bb8ebf4..0000000 Binary files a/Resources/NewIcons/Logo-Egalware (2).png and /dev/null differ diff --git a/Resources/NewIcons/Logo-Egalware (3).png b/Resources/NewIcons/Logo-Egalware (3).png deleted file mode 100644 index 1839527..0000000 Binary files a/Resources/NewIcons/Logo-Egalware (3).png and /dev/null differ diff --git a/Resources/NewIcons/Logo-Egalware.png b/Resources/NewIcons/Logo-Egalware.png index 3e879f2..1839527 100644 Binary files a/Resources/NewIcons/Logo-Egalware.png and b/Resources/NewIcons/Logo-Egalware.png differ diff --git a/Resources/NewIcons/Logo-OmCut.new.png b/Resources/NewIcons/Logo-OmCut.new.png new file mode 100644 index 0000000..22d07f6 Binary files /dev/null and b/Resources/NewIcons/Logo-OmCut.new.png differ