diff --git a/AlarmsPageUC.xaml b/AlarmsPageUC.xaml
index 128112e..9b325bf 100644
--- a/AlarmsPageUC.xaml
+++ b/AlarmsPageUC.xaml
@@ -26,8 +26,8 @@
-
-
+
+
@@ -234,7 +234,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
0)
' Flag per movimento in home alla fine dei tagli diretti
FinalHomeChBx.IsChecked = m_MainWindow.m_CurrentMachine.bDirectCutsFinalHome
End Sub
@@ -402,6 +407,14 @@ Public Class AlarmsPageUC
End If
End Sub
+ Private Sub InternalCutsChBx_Click(sender As Object, e As RoutedEventArgs) Handles InternalCutsChBx.Click
+ If InternalCutsChBx.IsChecked() Then
+ WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, "1", m_MainWindow.GetMachIniFile())
+ Else
+ WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, "0", m_MainWindow.GetMachIniFile())
+ End If
+ End Sub
+
Private Sub FinalHomeChBx_Click(sender As Object, e As RoutedEventArgs) Handles FinalHomeChBx.Click
If FinalHomeChBx.IsChecked() Then
m_MainWindow.m_CurrentMachine.bDirectCutsFinalHome = True
diff --git a/CamAuto.vb b/CamAuto.vb
index 6b94f74..e69500c 100644
--- a/CamAuto.vb
+++ b/CamAuto.vb
@@ -408,6 +408,7 @@ Public Module CamAuto
Dim dHolesOverlap As Double = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_HOLES_OVERLAP, 0, m_MainWindow.GetMachIniFile())
Dim dCornerSafety As Double = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, m_MainWindow.GetMachIniFile())
Dim bOneHoleIntCorner As Boolean = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_ONEHOLE_INTCORNER, 0, m_MainWindow.GetMachIniFile()) <> 0)
+ Dim bMillingOnSinks As Boolean = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0)
dCornerSafety = Math.Max(dCornerSafety, 10 * EPS_SMALL)
EgtLuaSetGlobStringVar("CAM.SAWMCH", sSawMch)
EgtLuaSetGlobStringVar("CAM.MILLMCH", sMillMch)
@@ -417,6 +418,7 @@ Public Module CamAuto
EgtLuaSetGlobNumVar("CAM.HOLESOVERLAP", dHolesOverlap)
EgtLuaSetGlobBoolVar("CAM.ONEHOLEINTCORNER", bOneHoleIntCorner)
EgtLuaSetGlobNumVar("CAM.CORNERSAFETY", dCornerSafety)
+ EgtLuaSetGlobBoolVar("CAM.MILLINGONSINKS", bMillingOnSinks)
EgtLuaSetGlobNumVar("CAM.RAWHEIGHT", GetRawHeight())
Return True
End Function
diff --git a/ConstMachIni.vb b/ConstMachIni.vb
index 7263a1c..ea99a57 100644
--- a/ConstMachIni.vb
+++ b/ConstMachIni.vb
@@ -80,6 +80,7 @@
Public Const K_MACH_REDUCEDCUT As String = "ReducedCut"
Public Const K_MACH_REDUCEDDEPTH As String = "ReducedDepth"
Public Const K_MACH_EXTARCMINRAD As String = "ExtArcMinRad"
+ Public Const K_MACH_MILLING_ON_SINKS As String = "MillingOnSinks"
Public Const S_TOOLCHANGER As String = "ToolChanger"
Public Const K_NUMBER As String = "Number"
diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb
index 8d7ad93..1c696d8 100644
--- a/MainWindow.xaml.vb
+++ b/MainWindow.xaml.vb
@@ -211,7 +211,11 @@ Class MainWindow
' Inizializzazione generale di EgtInterface
m_nDebug = GetPrivateProfileInt(S_GENERAL, K_DEBUG, 0, m_sIniFile)
Dim sLogFile As String = m_sTempDir & "\" & GENLOG_FILE_NAME
- Dim sLogMsg As String = My.Application.Info.Description.ToString() & " ver. " & My.Application.Info.Version.ToString()
+ Dim sLogMsg As String = My.Application.Info.Description.ToString() & " ver. " &
+ My.Application.Info.Version.Major.ToString() &
+ "." & My.Application.Info.Version.Minor.ToString() &
+ (ChrW(97 - 1 + My.Application.Info.Version.Build)).ToString() &
+ My.Application.Info.Version.Revision.ToString()
EgtInit(m_nDebug, sLogFile, sLogMsg)
' Leggo direttorio dei messaggi (se manca uso direttorio di configurazione)
Dim sMsgDir As String = String.Empty
diff --git a/SaveNameWD.xaml.vb b/SaveNameWD.xaml.vb
index 2aa094a..dd3f5fe 100644
--- a/SaveNameWD.xaml.vb
+++ b/SaveNameWD.xaml.vb
@@ -51,7 +51,15 @@ Public Class SaveNameWD
ShowAllCurrPhaseMachinings()
End If
Else
- EgtExportDxf(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_COPYTEMPLATE), sPath)
+ ' Recupero nome gruppo da esportare
+ Dim nId = EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_COPYTEMPLATE)
+ ' Se UI in pollici, scalo opportunamente per avere DXF in pollici
+ Dim bScale As Boolean = Not EgtUiUnitsAreMM()
+ If bScale Then EgtScale(nId, Frame3d.GLOB, 1 / ONEINCH, 1 / ONEINCH, 1 / ONEINCH, GDB_RT.GLOB)
+ ' Eseguo esportazione
+ EgtExportDxf(nId, sPath)
+ ' Se necessario, ripristino scala
+ If bScale Then EgtScale(nId, Frame3d.GLOB, ONEINCH, ONEINCH, ONEINCH, GDB_RT.GLOB)
End If
EgtDraw()