OmagCUT 2.7i4 :

- con SpecialSend di Fanuc c'è la possibilità di definire da ini macchina il numero di aree di memoria in cui scrivere (max 16)
- piccole sistemazioni di icone Omag e Egalware.

AboutBox/AboutBoxWD.xaml

@@ -36,7 +36,7 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <Border Name="LogoBrd" Grid.Column="1">
-               <Image Source="../Resources/NewIcons/Logo-Egalware (3).png" Stretch="Uniform"/>
+               <Image Source="../Resources/NewIcons/Logo-Egalware.png" Stretch="Uniform"/>
             </Border>
          </Grid>
          <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"

Constants/ConstMachIni.vb

@@ -3,6 +3,7 @@
    Public Const S_NUMERICALCONTROL As String = "NumericalControl"
    Public Const K_TYPE As String = "Type"
    Public Const K_SPECIALSEND As String = "SpecialSend"
+   Public Const K_SPECIALAREAS As String = "SpecialAreas"
 
    Public Const S_PARTPROGRAM As String = "PartProgram"
    Public Const K_EXTENSION As String = "Extension"

MainWindow.xaml

@@ -27,7 +27,7 @@
          </Grid.ColumnDefinitions>
 
          <Border Name="LogoBrd" Background="Transparent">
-                <Image Source="../Resources/NewIcons/logo-OmCut.png" Stretch="Uniform" Margin="1"/>
+                <Image Source="../Resources/NewIcons/Logo-OmCut.png" Stretch="Uniform" Margin="1"/>
          </Border>
 
          <!-- ** Definizione della Grid delle tab ** -->

My Project/AssemblyInfo.vb

@@ -62,5 +62,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.7.9.3")>
-<Assembly: AssemblyFileVersion("2.7.9.3")>
+<Assembly: AssemblyVersion("2.7.9.4")>
+<Assembly: AssemblyFileVersion("2.7.9.4")>

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()

OmagCUT.vbproj

@@ -1157,7 +1157,7 @@
     <Resource Include="Resources\NewIcons\MHT.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\NewIcons\logo-OmCut.png" />
+    <Resource Include="Resources\NewIcons\Logo-OmCut.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\PartRotOff.png" />
@@ -1419,12 +1419,6 @@
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\NewIcons\Logo-Egalware.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\NewIcons\Logo-Egalware %282%29.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\NewIcons\Logo-Egalware %283%29.png" />
     <Resource Include="Resources\NewIcons\RawHeight.png" />
   </ItemGroup>
   <ItemGroup>
@@ -1453,6 +1447,9 @@
   <ItemGroup>
     <Resource Include="Resources\NewIcons\DatiMacchina2.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Logo-OmCut.new.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe

OmagCUTDarkDictionary.xaml

@@ -84,7 +84,7 @@
    <BitmapImage x:Key="ZoomInImg" UriSource="Resources/NewIcons/Zoom+.png"></BitmapImage>
    <BitmapImage x:Key="ZoomOutImg" UriSource="Resources/NewIcons/Zoom-.png"></BitmapImage>
    <BitmapImage x:Key="ZoomWinImg" UriSource="Resources/NewIcons/ZoomWIn.png"></BitmapImage>
-   <BitmapImage x:Key="LogoOmagImg" UriSource="Resources/NewIcons/logo-OmCut.png"></BitmapImage>
+   <BitmapImage x:Key="LogoOmagImg" UriSource="Resources/NewIcons/Logo-OmCut.png"></BitmapImage>
 
    <!--Nuove icone da sistemare-->
    <BitmapImage x:Key="AvantiVeloceImg" UriSource="Resources/NewIcons/AvantiVeloce.png"></BitmapImage>