diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb index 58e38a6..a0c4599 100644 --- a/Constants/ConstIni.vb +++ b/Constants/ConstIni.vb @@ -206,6 +206,7 @@ Module ConstIni Public Const K_OFFSZ As String = "OffsZ" Public Const K_OFFSXY As String = "OffsXY" Public Const K_OFFSYY As String = "OffsYY" + Public Const K_OFFSXINTERY As String = "OffsYInterY" Public Const K_STARTTRIM As String = "StartTrim" Public Const K_ENDTRIM As String = "EndTrim" Public Const K_OTHERSIDE As String = "OtherSide" diff --git a/DrawImport/DrawPageUC.xaml.vb b/DrawImport/DrawPageUC.xaml.vb index ea50b56..177dae8 100644 --- a/DrawImport/DrawPageUC.xaml.vb +++ b/DrawImport/DrawPageUC.xaml.vb @@ -1138,7 +1138,7 @@ Public Class DrawPageUC Return True End Function - Private Function MakeSectionFrameInsert() As Boolean + Private Function MakeSectionFrameInsert(ByVal nNbr As Integer) As Boolean ' m_MainWindow.m_ImportPageUC.LoadFrame() ' recupero il primo layer del primo pezzo Dim nLayerId As Integer = EgtGetFirstLayer(EgtGetFirstPart()) @@ -1150,13 +1150,16 @@ Public Class DrawPageUC EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx()) ' Inserisco il pezzo If Not My.Computer.FileSystem.FileExists(sTmpFile) Then Return False - EgtInsertFile(sTmpFile) - ' Ne recupero l'Id - Dim nPartId As Integer = EgtGetLastPart() - ' Creo la cornice - m_MainWindow.m_FrameCutPageUC.CreateFrame(nPartId) - ' Ricalcolo lavorazioni - AddFrameMachinings(m_MainWindow.m_FrameCutPageUC.m_FrameMachiningUC.m_dStartTrim, m_MainWindow.m_FrameCutPageUC.m_FrameMachiningUC.m_dEndTrim) + ' eseguo inserimento + For i As Integer = 1 To nNbr + EgtInsertFile(sTmpFile) + ' Ne recupero l'Id + Dim nPartId As Integer = EgtGetLastPart() + ' Creo la cornice + m_MainWindow.m_FrameCutPageUC.CreateFrame(nPartId) + ' Ricalcolo lavorazioni + AddFrameMachinings(m_MainWindow.m_FrameCutPageUC.m_FrameMachiningUC.m_dStartTrim, m_MainWindow.m_FrameCutPageUC.m_FrameMachiningUC.m_dEndTrim) + Next ' Cancello il file My.Computer.FileSystem.DeleteFile(sTmpFile) Return True @@ -1178,7 +1181,7 @@ Public Class DrawPageUC ' Passo al contesto principale 'MakeInsert(InsNbr, sPartName) If m_MainWindow.FrameCutBtn.IsChecked Then - MakeSectionFrameInsert() + MakeSectionFrameInsert(InsNbr) Else MakeMultipleInsert(InsNbr, sPartName) End If diff --git a/Frames/FrameCutPageUC.xaml b/Frames/FrameCutPageUC.xaml index 1679db8..8d5ca49 100644 --- a/Frames/FrameCutPageUC.xaml +++ b/Frames/FrameCutPageUC.xaml @@ -72,6 +72,7 @@ + @@ -118,11 +119,16 @@ Style="{DynamicResource OmagCut_CalculatorTextBox}"/> + Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/> + Style="{DynamicResource OmagCut_CalculatorTextBox}"/> - + + + +