diff --git a/AboutBox/AboutBoxWD.xaml b/AboutBox/AboutBoxWD.xaml
index 87137cf..87c117a 100644
--- a/AboutBox/AboutBoxWD.xaml
+++ b/AboutBox/AboutBoxWD.xaml
@@ -36,7 +36,7 @@
-
+
-
+
@@ -49,7 +49,7 @@
-
+
@@ -62,7 +62,7 @@
-
+
@@ -123,7 +123,10 @@
-
+
+
+
+
@@ -131,18 +134,25 @@
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/CadCuts/NestPageUC.xaml.vb b/CadCuts/NestPageUC.xaml.vb
index b1e63eb..dea01c2 100644
--- a/CadCuts/NestPageUC.xaml.vb
+++ b/CadCuts/NestPageUC.xaml.vb
@@ -220,17 +220,21 @@ Public Class NestPageUC
m_nCountSpot = 0
m_nCountSpotCUT = 0
End If
+ EgtOutLog("Numero di SPOT caricati da OFFICE: " & m_nCountSpot.ToString)
' Se nel progetto non sono inseriti punti SpotReg disabilito i comandi
If m_nCountSpot < 1 Then
UG0_Reg.IsEnabled = False
UG1_Reg.IsEnabled = False
+ EgtOutLog(" Abilito comandi gestione SPOT")
Else
UG0_Reg.IsEnabled = True
UG1_Reg.IsEnabled = True
+ EgtOutLog(" Disabilito comandi gestione SPOT")
End If
' Se nel progetto non sono inseriti punti SpotRegCUT provvedo ad aggiungerli
If m_nCountSpotCUT < 1 Then
InsertSpotRegistration()
+ EgtOutLog(" Creo SPOT_CUT")
End If
' Se necessario riabilito impostazione modificato
diff --git a/CadCuts/SplitAuto.vb b/CadCuts/SplitAuto.vb
index 8363422..c3fdd40 100644
--- a/CadCuts/SplitAuto.vb
+++ b/CadCuts/SplitAuto.vb
@@ -117,7 +117,7 @@ Public Module SplitAuto
End If
' verifico se trasformabile in un taglio di separazione (almeno da un lato)
If (dStartAddLen > -EPS_SMALL Or dEndAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And
- Mach.m_sLay = NAME_OUTLOOP And Mach.m_nInterf = FMI_TYPE.NONE Then
+ Mach.m_sLay = NAME_OUTLOOP And ( Mach.m_nInterf And FMI_TYPE.RM) = 0 Then
Dim nRes As Integer = EgtVerifyCutAsSplitting(nOperId)
Dim bIn As Boolean = False
Dim bOut As Boolean = False
diff --git a/CadCuts/SplitPageUC.xaml.vb b/CadCuts/SplitPageUC.xaml.vb
index d3dd919..e3f2155 100644
--- a/CadCuts/SplitPageUC.xaml.vb
+++ b/CadCuts/SplitPageUC.xaml.vb
@@ -2208,8 +2208,6 @@ Public Class SplitPageUC
VerifyHomogenousMachining(ItemList)
' Abilitazione bottone Next
EnableButtons()
- Else
-
End If
End Sub
diff --git a/MainWindow.xaml b/MainWindow.xaml
index ffe0143..da1c77f 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -27,7 +27,7 @@
-
+
diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb
index df3e70e..99192e6 100644
--- a/MainWindow.xaml.vb
+++ b/MainWindow.xaml.vb
@@ -343,8 +343,8 @@ Class MainWindow
' Verifico abilitazione nesting automatico
m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
' Recupero opzioni della chiave
- Dim bKey As Boolean = EgtGetKeyLevel(9423, 2610, 1, m_nKeyLevel) And
- EgtGetKeyOptions(9423, 2610, 1, m_nKeyOptions)
+ Dim bKey As Boolean = EgtGetKeyLevel(9423, 2611, 1, m_nKeyLevel) And
+ EgtGetKeyOptions(9423, 2611, 1, m_nKeyOptions)
' Verifico abilitazione prodotto
Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
' Impostazione per programma OnlyFrame: solo se CUT_BASE non attivo
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index d9904cc..4a4f9ad 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/OmagCUT.vbproj b/OmagCUT.vbproj
index a8110e8..8713a7a 100644
--- a/OmagCUT.vbproj
+++ b/OmagCUT.vbproj
@@ -1376,6 +1376,13 @@
+
+
+
+
+
+
+
diff --git a/Project/ProjectMgrUC.xaml.vb b/Project/ProjectMgrUC.xaml.vb
index 5777d67..05cdb26 100644
--- a/Project/ProjectMgrUC.xaml.vb
+++ b/Project/ProjectMgrUC.xaml.vb
@@ -375,7 +375,7 @@ Public Class ProjectMgrUC
If Not EgtGetTableRef(1, m_ptTabOri) Then Return
' recupero il punto medio della curva
EgtMidPoint(nIdSelected, GDB_ID.ROOT, ptMid)
- ptMid.z = m_ptTabOri.z + CamAuto.GetRawHeight() + dHeight
+ ptMid.z = m_ptTabOri.z + CamAuto.GetRawHeight() + dHeight + m_MainWindow.m_CurrentMachine.dAdditionalTable
' Offset dovuto allo spessore Utensile
ptMid -= vtOffset * dThick
diff --git a/Resources/NewIcons/Logo-Egalware (2).png b/Resources/NewIcons/Logo-Egalware (2).png
new file mode 100644
index 0000000..bb8ebf4
Binary files /dev/null and b/Resources/NewIcons/Logo-Egalware (2).png differ
diff --git a/Resources/NewIcons/Logo-Egalware (3).png b/Resources/NewIcons/Logo-Egalware (3).png
new file mode 100644
index 0000000..1839527
Binary files /dev/null and b/Resources/NewIcons/Logo-Egalware (3).png differ
diff --git a/Resources/NewIcons/Logo-Egalware.png b/Resources/NewIcons/Logo-Egalware.png
index e085099..3e879f2 100644
Binary files a/Resources/NewIcons/Logo-Egalware.png and b/Resources/NewIcons/Logo-Egalware.png differ