OmagCUT 1.8d1 :

- corretta gestione undo/redo in tagli e spostamenti pezzi
- corretta gestione uscita da eseguibile mentre in spostamento pezzi.
This commit is contained in:
Dario Sassi
2017-04-06 18:43:44 +00:00
parent 3b235ad7c1
commit dffdab67ca
5 changed files with 33 additions and 20 deletions
-17
View File
@@ -96,20 +96,6 @@
VerticalAlignment="Center" />
</Button>
<Button Name="RotateCounterClockwiseBtn" Grid.Column="0" Grid.Row="4"
Style="{StaticResource OmagCut_RightGrayGradientYellowButton}" Visibility="Hidden"/>
<ToggleButton Name="MagneticPiecesBtn" Grid.Column="1" Grid.Row="4"
Style="{StaticResource OmagCut_RightGrayYellowIconToggleButton}" Visibility="Hidden"/>
<Button Name="RotateClockwiseBtn" Grid.Column="2" Grid.Row="4"
Style="{StaticResource OmagCut_RightGrayGradientYellowButton}" Visibility="Hidden"/>
<UniformGrid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" >
<Button Name="InsertPartBtn" Style="{StaticResource OmagCut_YellowTextButton}" Visibility="Hidden"/>
<Button Name="StorePartBtn" Style="{StaticResource OmagCut_YellowTextButton}" Padding="1" Visibility="Hidden"/>
</UniformGrid>
<Button Name="RemovePartBtn" Grid.ColumnSpan="3" Grid.Row="6"
Style="{StaticResource OmagCut_YellowTextButton}"/>
@@ -121,9 +107,6 @@
<ColumnDefinition Width="0.5*"/>
</Grid.ColumnDefinitions>
<Button Name="BeforeBtn" Grid.Column="1" Style="{StaticResource OmagCut_YellowIconButton}" Visibility="Hidden"/>
<Button Name="AfterBtn" Grid.Column="2" Style="{StaticResource OmagCut_YellowIconButton}" Visibility="Hidden"/>
</Grid>
</Grid>
+13
View File
@@ -123,6 +123,8 @@ Public Class MoveRawPartPage
RemovePartBtn.Visibility = Windows.Visibility.Visible
' Abilitazione bottone modifica
ModifyBtn.IsEnabled = m_SplitPage.m_bShow
' gestione abilitazione altri bottoni
EnableButtons()
End Sub
Private Sub OnMyMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseDownScene
@@ -362,6 +364,17 @@ Public Class MoveRawPartPage
End While
' disabilito bottone
ModifyBtn.IsEnabled = False
' gestione abilitazione altri bottoni
EnableButtons()
End Sub
Private Sub EnableButtons()
UpBtn.IsEnabled = Not m_SplitPage.m_bShow
LeftBtn.IsEnabled = Not m_SplitPage.m_bShow
RightBtn.IsEnabled = Not m_SplitPage.m_bShow
DownBtn.IsEnabled = Not m_SplitPage.m_bShow
StepMoveTxBx.IsEnabled = Not m_SplitPage.m_bShow
RemovePartBtn.IsEnabled = Not m_SplitPage.m_bShow
End Sub
Private Sub MoveRawPartPage_Unloaded(sender As Object, e As EventArgs) Handles Me.Unloaded
+2 -2
View File
@@ -60,5 +60,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.8.3.5")>
<Assembly: AssemblyFileVersion("1.8.3.5")>
<Assembly: AssemblyVersion("1.8.4.1")>
<Assembly: AssemblyFileVersion("1.8.4.1")>
+17
View File
@@ -812,6 +812,23 @@ Public Class SplitPageUC
ModifyBtn.IsEnabled = m_bShow
' Per bottone AUTO
AutoBtn.IsEnabled = Not m_bShow And ((GetDisabledCutsCount() > 0 Or m_nCurrPhase = 1) And Not m_bByHand)
' Altri bottoni
MoveUpBtn.IsEnabled = Not m_bShow
MoveDownBtn.IsEnabled = Not m_bShow
OnOffBtn.IsEnabled = Not m_bShow
AllOnBtn.IsEnabled = Not m_bShow
AllOffBtn.IsEnabled = Not m_bShow
CutBtn.IsEnabled = Not m_bShow
CutStartBtn.IsEnabled = Not m_bShow
CutEndBtn.IsEnabled = Not m_bShow
OutCenStartBtn.IsEnabled = Not m_bShow
AllOutStartBtn.IsEnabled = Not m_bShow
AllCenStartBtn.IsEnabled = Not m_bShow
OutCenEndBtn.IsEnabled = Not m_bShow
AllOutEndBtn.IsEnabled = Not m_bShow
AllCenEndBtn.IsEnabled = Not m_bShow
AllExtendBtn.IsEnabled = Not m_bShow
AllReduceBtn.IsEnabled = Not m_bShow
End Sub
Private Function ModifyOtherLeadIn(nI As Integer, nLiOthType As Integer) As Boolean
+1 -1
View File
@@ -60,7 +60,7 @@ Module VacuumCups
m_nTempId = EgtCreateGroup(GDB_ID.ROOT)
If m_nTempId = GDB_ID.NULL Then Return False
EgtSetName(m_nTempId, "VacTmp")
EgtSetLevel(m_nTempId, GDB_LV.SYSTEM)
EgtSetLevel(m_nTempId, GDB_LV.TEMP)
' Eseguo copia in globale
m_nVacId = EgtCopyGlob(nLayId, m_nTempId)
If m_nVacId = GDB_ID.NULL Then Return False