OmagCUT 1.6.14.12 :
- in gestione separazione aggiunta possibilità di iniziare i tagli Out.
This commit is contained in:
+1
-1
@@ -129,7 +129,7 @@ Public Module CamAuto
|
||||
EgtGetInfo(nOperId, "Lay", sLay)
|
||||
' verifica interferenza
|
||||
nFlag = FMI_TYPE.NONE
|
||||
If sLay = "OutLoop" Then
|
||||
If sLay = NAME_OUTLOOP Then
|
||||
Dim nRes As Integer = FMI_TYPE.LI Or FMI_TYPE.RM Or FMI_TYPE.LO
|
||||
If Not EgtVerifyMachining(nOperId, nRes) Then Return False
|
||||
nFlag = nFlag Or nRes
|
||||
|
||||
+21
-13
@@ -27,7 +27,27 @@
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<!--Griglia per oscurare i bottoni della pagina sottostante-->
|
||||
<Grid Background="{StaticResource OmagCut_Gray}" />
|
||||
<Grid Background="{StaticResource OmagCut_Gray}" >
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="2*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Button Name="PrevBtn" Grid.Column="0" Style="{StaticResource OmagCut_YellowIconButton}">
|
||||
<Image Source="Resources/NumericKeyboardArrow.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
|
||||
</Button>
|
||||
<Button Name="NextBtn" Grid.Column="1" Style="{StaticResource OmagCut_YellowIconButton}">
|
||||
<Image Source="Resources/NumericKeyboardArrow.png" Style="{StaticResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
|
||||
<Image.RenderTransform>
|
||||
<TransformGroup>
|
||||
<RotateTransform Angle="180"/>
|
||||
</TransformGroup>
|
||||
</Image.RenderTransform>
|
||||
</Image>
|
||||
</Button>
|
||||
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
<!--Left Button Grid-->
|
||||
@@ -114,18 +134,6 @@
|
||||
<ColumnDefinition Width="10*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Button Name="PrevBtn" Grid.Column="0" Style="{StaticResource OmagCut_YellowIconButton}">
|
||||
<Image Source="Resources/NumericKeyboardArrow.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
|
||||
</Button>
|
||||
<Button Name="NextBtn" Grid.Column="1" Style="{StaticResource OmagCut_YellowIconButton}">
|
||||
<Image Source="Resources/NumericKeyboardArrow.png" Style="{StaticResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
|
||||
<Image.RenderTransform>
|
||||
<TransformGroup>
|
||||
<RotateTransform Angle="180"/>
|
||||
</TransformGroup>
|
||||
</Image.RenderTransform>
|
||||
</Image>
|
||||
</Button>
|
||||
|
||||
</Grid>
|
||||
|
||||
|
||||
@@ -60,5 +60,5 @@ Imports System.Windows
|
||||
' by using the '*' as shown below:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.6.14.11")>
|
||||
<Assembly: AssemblyFileVersion("1.6.14.11")>
|
||||
<Assembly: AssemblyVersion("1.6.14.12")>
|
||||
<Assembly: AssemblyFileVersion("1.6.14.12")>
|
||||
|
||||
+29
-14
@@ -31,7 +31,27 @@
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<!--Griglia per oscurare i bottoni della pagina sottostante-->
|
||||
<Grid Background="{StaticResource OmagCut_Gray}" />
|
||||
<Grid Background="{StaticResource OmagCut_Gray}">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="2*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Button Name="PrevBtn" Grid.Column="0" Style="{StaticResource OmagCut_YellowIconButton}">
|
||||
<Image Source="Resources/NumericKeyboardArrow.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
|
||||
</Button>
|
||||
<Button Name="NextBtn" Grid.Column="1" Style="{StaticResource OmagCut_YellowIconButton}">
|
||||
<Image Source="Resources/NumericKeyboardArrow.png" Style="{StaticResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
|
||||
<Image.RenderTransform>
|
||||
<TransformGroup>
|
||||
<RotateTransform Angle="180"/>
|
||||
</TransformGroup>
|
||||
</Image.RenderTransform>
|
||||
</Image>
|
||||
</Button>
|
||||
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
<!--Left Button Grid-->
|
||||
@@ -108,21 +128,16 @@
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="10*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="7*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Button Name="PrevBtn" Grid.Column="0" Style="{StaticResource OmagCut_YellowIconButton}">
|
||||
<Image Source="Resources/NumericKeyboardArrow.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
|
||||
</Button>
|
||||
<Button Name="NextBtn" Grid.Column="1" Style="{StaticResource OmagCut_YellowIconButton}">
|
||||
<Image Source="Resources/NumericKeyboardArrow.png" Style="{StaticResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
|
||||
<Image.RenderTransform>
|
||||
<TransformGroup>
|
||||
<RotateTransform Angle="180"/>
|
||||
</TransformGroup>
|
||||
</Image.RenderTransform>
|
||||
</Image>
|
||||
</Button>
|
||||
|
||||
<Button Name="OutCenStartBtn" Grid.Column="0" Style="{StaticResource OmagCut_YellowTextButton}" FontSize="16"/>
|
||||
<Button Name="AllOutStartBtn" Grid.Column="1" Style="{StaticResource OmagCut_YellowTextButton}" FontSize="16"/>
|
||||
<Button Name="AllCenStartBtn" Grid.Column="2" Style="{StaticResource OmagCut_YellowTextButton}" FontSize="16"/>
|
||||
|
||||
</Grid>
|
||||
|
||||
|
||||
+90
-4
@@ -28,6 +28,9 @@ Public Class SplitPageUC
|
||||
CutBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 4) ' Allunga/Accorcia
|
||||
CutStartBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 5) ' Inizio Allunga/Accorcia
|
||||
CutEndBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 6) ' Fine Allunga/Accorcia
|
||||
OutCenStartBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 7) ' Inizio Centro/Fuori
|
||||
AllOutStartBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 8) ' Inizi Tutti Fuori
|
||||
AllCenStartBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 9) ' Inizi Tutti Centro
|
||||
End Sub
|
||||
|
||||
Private Sub SplitPageUC_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded
|
||||
@@ -71,7 +74,7 @@ Public Class SplitPageUC
|
||||
' layer di origine
|
||||
EgtGetInfo(nOperId, "Lay", Mach.m_sLay)
|
||||
' verifica interferenza
|
||||
If Mach.m_sLay = "OutLoop" Then
|
||||
If Mach.m_sLay = NAME_OUTLOOP Then
|
||||
EgtVerifyMachining(nOperId, Mach.m_nInterf)
|
||||
For Each nId As Integer In Mach.m_vOthId
|
||||
Dim nRes As Integer = FMI_TYPE.LI Or FMI_TYPE.RM Or FMI_TYPE.LO
|
||||
@@ -82,7 +85,7 @@ Public Class SplitPageUC
|
||||
Mach.m_nInterf = FMI_TYPE.NONE
|
||||
End If
|
||||
' verifica se trasformabile in un taglio di separazione
|
||||
If Mach.m_sLay = "OutLoop" And Mach.m_nInterf = FMI_TYPE.NONE Then
|
||||
If Mach.m_sLay = NAME_OUTLOOP And Mach.m_nInterf = FMI_TYPE.NONE Then
|
||||
Dim nRes As Integer = EgtVerifyCutAsSplitting(nOperId)
|
||||
Mach.m_bCanAllStart = (nRes And CAR_RES.LI_OK) <> 0
|
||||
Mach.m_bCanAllEnd = (nRes And CAR_RES.LO_OK) <> 0
|
||||
@@ -335,14 +338,13 @@ Public Class SplitPageUC
|
||||
If m_MachiningList(nI).m_bAllEnd Then
|
||||
' accorcio
|
||||
EgtSetMachiningParam(MCH_MP.LEADOUTTYPE, MCH_SAW_LO.CENT)
|
||||
UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
|
||||
m_MachiningList(nI).m_bAllEnd = False
|
||||
Else
|
||||
' allungo
|
||||
EgtSetMachiningParam(MCH_MP.LEADOUTTYPE, MCH_SAW_LO.EXT)
|
||||
UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
|
||||
m_MachiningList(nI).m_bAllEnd = True
|
||||
End If
|
||||
UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
|
||||
ColorMachining(nI)
|
||||
EgtDraw()
|
||||
End If
|
||||
@@ -350,6 +352,90 @@ Public Class SplitPageUC
|
||||
EnableNextButton()
|
||||
End Sub
|
||||
|
||||
Private Sub OutCenStartBtn_Click(sender As Object, e As RoutedEventArgs) Handles OutCenStartBtn.Click
|
||||
Dim SelItem As NameIdLsBxItem = MachiningLsBx.SelectedItem
|
||||
If IsNothing(SelItem) Then
|
||||
Return
|
||||
End If
|
||||
Dim nI As Integer = SelItem.Ind
|
||||
If m_MachiningList(nI).m_sLay = NAME_OUTLOOP Then
|
||||
EgtSetCurrMachining(m_MachiningList(nI).m_nId)
|
||||
Dim nLiPrev As Integer
|
||||
EgtGetMachiningParam(MCH_MP.LEADINTYPE, nLiPrev)
|
||||
If nLiPrev = MCH_SAW_LI.OUT Then
|
||||
' accorcio
|
||||
EgtSetMachiningParam(MCH_MP.LEADINTYPE, MCH_SAW_LI.CENT)
|
||||
UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
|
||||
' ri-verifico interferenza
|
||||
EgtVerifyMachining(m_MachiningList(nI).m_nId, m_MachiningList(nI).m_nInterf)
|
||||
ElseIf nLiPrev = MCH_SAW_LI.EXT_OUT Then
|
||||
' accorcio
|
||||
UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
|
||||
EgtSetMachiningParam(MCH_MP.LEADINTYPE, MCH_SAW_LI.EXT_CENT)
|
||||
ElseIf nLiPrev = MCH_SAW_LI.CENT Then
|
||||
' allungo
|
||||
EgtSetMachiningParam(MCH_MP.LEADINTYPE, MCH_SAW_LI.OUT)
|
||||
UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
|
||||
' ri-verifico interferenza
|
||||
EgtVerifyMachining(m_MachiningList(nI).m_nId, m_MachiningList(nI).m_nInterf)
|
||||
ElseIf nLiPrev = MCH_SAW_LI.EXT_CENT Then
|
||||
' allungo
|
||||
EgtSetMachiningParam(MCH_MP.LEADINTYPE, MCH_SAW_LI.EXT_OUT)
|
||||
UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
|
||||
End If
|
||||
ColorMachining(nI)
|
||||
EgtDraw()
|
||||
' Imposto flag di modifica
|
||||
m_bModified = True
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub AllOutStartBtn_Click(sender As Object, e As RoutedEventArgs) Handles AllOutStartBtn.Click
|
||||
For nI As Integer = 0 To m_MachiningList.Count() - 1
|
||||
EgtSetCurrMachining(m_MachiningList(nI).m_nId)
|
||||
Dim nLiPrev As Integer
|
||||
EgtGetMachiningParam(MCH_MP.LEADINTYPE, nLiPrev)
|
||||
If nLiPrev = MCH_SAW_LI.CENT Then
|
||||
' allungo
|
||||
EgtSetMachiningParam(MCH_MP.LEADINTYPE, MCH_SAW_LI.OUT)
|
||||
UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
|
||||
' ri-verifico interferenza
|
||||
EgtVerifyMachining(m_MachiningList(nI).m_nId, m_MachiningList(nI).m_nInterf)
|
||||
ElseIf nLiPrev = MCH_SAW_LI.EXT_CENT Then
|
||||
' allungo
|
||||
EgtSetMachiningParam(MCH_MP.LEADINTYPE, MCH_SAW_LI.EXT_OUT)
|
||||
UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
|
||||
End If
|
||||
ColorMachining(nI)
|
||||
Next
|
||||
EgtDraw()
|
||||
' Imposto flag di modifica
|
||||
m_bModified = True
|
||||
End Sub
|
||||
|
||||
Private Sub AllCenStartBtn_Click(sender As Object, e As RoutedEventArgs) Handles AllCenStartBtn.Click
|
||||
For nI As Integer = 0 To m_MachiningList.Count() - 1
|
||||
EgtSetCurrMachining(m_MachiningList(nI).m_nId)
|
||||
Dim nLiPrev As Integer
|
||||
EgtGetMachiningParam(MCH_MP.LEADINTYPE, nLiPrev)
|
||||
If nLiPrev = MCH_SAW_LI.OUT Then
|
||||
' accorcio
|
||||
EgtSetMachiningParam(MCH_MP.LEADINTYPE, MCH_SAW_LI.CENT)
|
||||
UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
|
||||
' ri-verifico interferenza
|
||||
EgtVerifyMachining(m_MachiningList(nI).m_nId, m_MachiningList(nI).m_nInterf)
|
||||
ElseIf nLiPrev = MCH_SAW_LI.EXT_OUT Then
|
||||
' accorcio
|
||||
EgtSetMachiningParam(MCH_MP.LEADINTYPE, MCH_SAW_LI.EXT_CENT)
|
||||
UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
|
||||
End If
|
||||
ColorMachining(nI)
|
||||
Next
|
||||
EgtDraw()
|
||||
' Imposto flag di modifica
|
||||
m_bModified = True
|
||||
End Sub
|
||||
|
||||
Private Sub NextBtn_Click(sender As Object, e As RoutedEventArgs) Handles NextBtn.Click
|
||||
m_bToNext = True
|
||||
m_MainWindow.m_CadCutPageUC.CadCutPageGrid.Children.Remove(m_MainWindow.m_CadCutPageUC.m_SplitPage)
|
||||
|
||||
Reference in New Issue
Block a user