OmagCUT :

- aggiunto flag per forzare fresature su lavorazioni interne
- DXF di copia sagome ora sono salvati nella unità di misura corrente dell'interfaccia.

AlarmsPageUC.xaml

@@ -26,8 +26,8 @@
             <RowDefinition Height="2*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="1.5*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1.5*"/>
+            <RowDefinition Height="0.5*"/>
             <RowDefinition Height="2*"/>
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
@@ -234,7 +234,19 @@
 
          </GroupBox>
 
-         <GroupBox Name="DirectCutsParamGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Column="2" Grid.Row="2">
+         <GroupBox Name="MillingsParamGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Column="2" Grid.Row="2">
+            <Grid Grid.Column="3" Grid.Row="1">
+
+               <TextBlock Name="InternalCutsTxBl"
+                  Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
+               <CheckBox Name="InternalCutsChBx" Height="40" Width="40"
+                  HorizontalAlignment="Right" Margin="0,0,11,0"/>
+
+            </Grid>
+
+         </GroupBox>
+
+         <GroupBox Name="DirectCutsParamGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Column="2" Grid.Row="3">
             <Grid Grid.Column="3" Grid.Row="1">
 
                <TextBlock Name="FinalHomeTxBl"

AlarmsPageUC.xaml.vb

@@ -57,8 +57,10 @@ Public Class AlarmsPageUC
       ExtArcMinRadTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 18)
       MachineParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 19)
       SawGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 25)
-      DirectCutsParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 27)   ' Tagli diretti
-      FinalHomeTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 28)           ' Home finale
+      DirectCutsParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 27)      ' Tagli diretti
+      FinalHomeTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 28)              ' Home finale
+      MillingsParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 29)        ' Parametri fresature
+      InternalCutsTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 30)           ' Sempre sugli interni
    End Sub
 
    Private Sub AlarmsPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -181,6 +183,9 @@ Public Class AlarmsPageUC
       ExtArcMinRadTxBx.Text = LenToString(dVal, 2)
       ' Salvo DB lavorazioni con aggiornamenti parametri generali
       EgtMdbSave()
+      ' Leggo lavorazione interni con fresa
+      InternalCutsChBx.IsChecked =
+             (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 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

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

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"

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

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