From e621fb46d0966b9e41dfc00a5a509bd8ef6da2d9 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Sat, 25 Feb 2023 12:24:29 +0100 Subject: [PATCH] - Aggiornato AboutBox - Aggiunti bottoni v e x - Aggiunte dimansioni oggetto - Esteso uso EgtTextBox2 - Modificato RibParamPanel e ShellNumberParamPanel --- Icarus/AboutBoxWindow/AboutBoxV.xaml | 91 +++-- Icarus/AboutBoxWindow/AboutBoxV.xaml.vb | 15 +- .../CurrMachiningPanelV.xaml | 30 +- .../CurrMachiningPanelVM.vb | 1 + .../DispositionPanel/DispositionPanelV.xaml | 29 +- Icarus/Icarus.vbproj | 4 + Icarus/MachiningDb/MachiningDbV.xaml | 2 +- Icarus/ManagePartPanel/ManagePartPanelVM.vb | 1 + Icarus/ManagePartPanel/ManagePartUtility.vb | 11 +- Icarus/ProjManager/ProjManagerV.xaml | 6 +- Icarus/Resources/AboutBox/EgalwareLogo.png | Bin 0 -> 3120 bytes Icarus/Resources/AboutBox/IcarusLogo.png | Bin 0 -> 1224 bytes Icarus/Resources/Common/Cancel.png | Bin 476 -> 266 bytes Icarus/Resources/Common/Ok.png | Bin 558 -> 311 bytes Icarus/Resources/ProjectManager/Export.png | Bin 603 -> 283 bytes Icarus/RibPanel/RibPanelV.xaml | 37 +- Icarus/RibParamPanel/RibParamPanelV.xaml | 228 ++++++------ Icarus/RibParamPanel/RibParamPanelVM.vb | 1 + Icarus/SceneHost/MySceneHostVM.vb | 1 + .../ShellNumberPanel/ShellNumberPanelV.xaml | 37 +- .../ShellNumberParamPanelV.xaml | 223 ++++++------ Icarus/SliceManager/SliceManagerV.xaml | 24 +- Icarus/SliceManager/SliceManagerVM.vb | 12 + Icarus/StartMachPanel/StartMachPanelV.xaml | 30 +- Icarus/TopPanel/TopPanelVM.vb | 17 +- Icarus/Utility/Dictionary.xaml | 339 +++++++++++++++++- 26 files changed, 769 insertions(+), 370 deletions(-) create mode 100644 Icarus/Resources/AboutBox/EgalwareLogo.png create mode 100644 Icarus/Resources/AboutBox/IcarusLogo.png diff --git a/Icarus/AboutBoxWindow/AboutBoxV.xaml b/Icarus/AboutBoxWindow/AboutBoxV.xaml index 1e807e4..ca02375 100644 --- a/Icarus/AboutBoxWindow/AboutBoxV.xaml +++ b/Icarus/AboutBoxWindow/AboutBoxV.xaml @@ -1,52 +1,81 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + Title="AboutBox" + Height="486" + Width="735" + WindowStyle="None" + ResizeMode="NoResize" + AllowsTransparency="True" + Background="Transparent" + ShowInTaskbar="False" + WindowStartupLocation="CenterOwner"> - + - + + + - - + + + - - - - + - + - - + + - - - + + + + + + + - - - - - - - diff --git a/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb b/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb index 42fc809..0d57a6a 100644 --- a/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb +++ b/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb @@ -16,30 +16,29 @@ Public Class AboutBoxV Dim sKlev As String = Map.refMainWindowVM.MainWindowM.nKeyLevel.ToString() Dim sOpts As String = Map.refMainWindowVM.MainWindowM.nKeyOptions.ToString() Dim sLeftDays As String = "" - Dim nLeftDays As Integer - if EgtGetKeyLeftDays( nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays= " (" & nLeftDays.ToString() & ")" - sInfo = If( EgtIsDebug(), "*** Debug Libraries ***" & Environment.NewLine, "") + Dim nLeftDays As Integer + If EgtGetKeyLeftDays(nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays = " (" & nLeftDays.ToString() & ")" + sInfo = If(EgtIsDebug(), "*** Debug Libraries ***" & Environment.NewLine, "") sInfo &= "User " & Environment.MachineName & "\" & Environment.UserName & " Inst" & Map.refMainWindowVM.MainWindowM.nInstance.ToString() & " Ulv" & Map.refMainWindowVM.MainWindowM.nUserLevel.ToString() & - " Dbg" & Map.refMainWindowVM.MainWindowM.DebugLevel().ToString() & Environment.NewLine + " Dbg" & Map.refMainWindowVM.MainWindowM.DebugLevel().ToString() & Environment.NewLine sInfo &= sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine sInfo &= "DataRoot " & Map.refMainWindowVM.MainWindowM.sDataRoot & Environment.NewLine sInfo &= "MachinesRoot " & Map.refMainWindowVM.MainWindowM.sMachinesRoot & Environment.NewLine Dim sOpSys As String = String.Empty - EgtGetOsInfo( sOpSys) + EgtGetOsInfo(sOpSys) sInfo &= sOpSys & Environment.NewLine Dim sCPU As String = String.Empty - EgtGetCpuInfo( sCPU) + EgtGetCpuInfo(sCPU) sInfo &= sCPU & Environment.NewLine Dim sMem As String = String.Empty - EgtGetMemoryInfo( sMem) + EgtGetMemoryInfo(sMem) sInfo &= sMem & Environment.NewLine Dim sScene As String = String.Empty EgtGetSceneInfo(sScene) sInfo &= sScene InfoLbl.Text = sInfo - ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4) 'Ok End Sub End Class diff --git a/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml index 5f054f5..b67e184 100644 --- a/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml +++ b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml @@ -74,13 +74,13 @@ Margin="2.5,0,2.5,0" Style="{StaticResource RightPanel_ComboBox}"/> + diff --git a/Icarus/ManagePartPanel/ManagePartPanelVM.vb b/Icarus/ManagePartPanel/ManagePartPanelVM.vb index d0f0cc2..7f83613 100644 --- a/Icarus/ManagePartPanel/ManagePartPanelVM.vb +++ b/Icarus/ManagePartPanel/ManagePartPanelVM.vb @@ -451,6 +451,7 @@ Public Class ManagePartPanelVM Map.refTopPanelVM.PartList.Add(NewPart) ' aggiorno riferimento Map.refReferencePanelVM.UpdateFramePosition(NewPart) + Map.refSliceManagerVM.UpdateDimensions() Next End If 'EgtAddMachGroup("3dPrint") diff --git a/Icarus/ManagePartPanel/ManagePartUtility.vb b/Icarus/ManagePartPanel/ManagePartUtility.vb index efeb459..267900f 100644 --- a/Icarus/ManagePartPanel/ManagePartUtility.vb +++ b/Icarus/ManagePartPanel/ManagePartUtility.vb @@ -775,7 +775,7 @@ Public Class GeomEntity_MenuItem ' aggiorno riferimenti nel context menu item m_OrigEntity.UpdateContextMenu() Case ManagePartPanelVM.ManagePartType.MODIFY - Dim bIsMovedRib As Boolean = False + Dim bIsMovedPartOrRib As Boolean = False ' recupero layer da pezzo Dim nLayerId As Integer = GDB_ID.NULL Select Case m_Type @@ -806,11 +806,12 @@ Public Class GeomEntity_MenuItem EgtMove(m_OrigEntity.nId, -vtMoved, GDB_RT.GLOB) EgtRemoveInfo(nPartId, KEY_MOVEDPART) End If + bIsMovedPartOrRib = True Case ManagePart_Layer.LayerType.MACH_START Case ManagePart_Layer.LayerType.RIBS EgtRemoveInfo(m_OrigEntity.nId, KEY_RIB_TYPE) EgtRemoveInfo(m_OrigEntity.nId, RIB_ID) - bIsMovedRib = True + bIsMovedPartOrRib = True Case ManagePart_Layer.LayerType.SHELL_NUMBER EgtRemoveInfo(m_OrigEntity.nId, KEY_SHELLNBR_TYPE) Case ManagePart_Layer.LayerType.AUX_SOLIDS @@ -837,6 +838,7 @@ Public Class GeomEntity_MenuItem EgtSetColor(m_OrigEntity.nId, c3Print) ' rimuovo eventuale nota spostamento per 45 gradi EgtRemoveInfo(m_OrigEntity.OrigLayer.OrigPart.nId, KEY_MOVEDPART) + bIsMovedPartOrRib = True Case ManagePart_Layer.LayerType.MACH_START EgtSetName(m_OrigEntity.nId, LAY_MACH_START) EgtSetColor(m_OrigEntity.nId, c3MachStart) @@ -845,7 +847,7 @@ Public Class GeomEntity_MenuItem EgtSetInfo(m_OrigEntity.nId, KEY_RIB_TYPE, RibEntity.RibTypes.FROMIMPORT) EgtSetInfo(m_OrigEntity.nId, RIB_ID, RibPanelVM.GetNextRibIndex()) EgtSetColor(m_OrigEntity.nId, c3Rib) - bIsMovedRib = True + bIsMovedPartOrRib = True Case ManagePart_Layer.LayerType.SHELL_NUMBER EgtSetName(m_OrigEntity.nId, LAY_SHELL_NBR) EgtSetInfo(m_OrigEntity.nId, KEY_SHELLNBR_TYPE, ShellNumberEntity.ShellNumberTypes.FROMIMPORT) @@ -859,9 +861,10 @@ Public Class GeomEntity_MenuItem EgtSetColor(m_OrigEntity.nId, c3Others) End Select ' se spostato un Rib, aggiorno posizione riferimento e pezzo - If bIsMovedRib Then + If bIsMovedPartOrRib Then Map.refReferencePanelVM.UpdateFramePosition(NewPart.PrintPart) Map.refDispositionPanelVM.UpdateZPos() + Map.refSliceManagerVM.UpdateDimensions() End If EgtDraw() ' aggiorno riferimenti nel context menu item diff --git a/Icarus/ProjManager/ProjManagerV.xaml b/Icarus/ProjManager/ProjManagerV.xaml index 8662140..8433dd3 100644 --- a/Icarus/ProjManager/ProjManagerV.xaml +++ b/Icarus/ProjManager/ProjManagerV.xaml @@ -63,8 +63,10 @@ + - + Margin="5,2.5,5,5" + Style="{StaticResource Icarus_ProgressBar}"/> + diff --git a/Icarus/SliceManager/SliceManagerVM.vb b/Icarus/SliceManager/SliceManagerVM.vb index 707e429..c475936 100644 --- a/Icarus/SliceManager/SliceManagerVM.vb +++ b/Icarus/SliceManager/SliceManagerVM.vb @@ -126,6 +126,18 @@ Public Class SliceManagerVM End Get End Property + Public ReadOnly Property ghDimensions As String + Get + If Not IsNothing(Map.refTopPanelVM.SelPart) Then + Dim b3Print As BBox3d = Map.refDispositionPanelVM.GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart) + Return "[ " & DoubleToString(b3Print.DimX, 1) & " x " & DoubleToString(b3Print.DimY, 1) & " x " & DoubleToString(b3Print.DimZ, 1) & " ]" + End If + End Get + End Property + Friend Sub UpdateDimensions() + NotifyPropertyChanged(NameOf(ghDimensions)) + End Sub + Public ReadOnly Property Time_Visibility As Visibility Get Return If(m_dTime > 0, Visibility.Visible, Visibility.Collapsed) diff --git a/Icarus/StartMachPanel/StartMachPanelV.xaml b/Icarus/StartMachPanel/StartMachPanelV.xaml index 874fd42..afdb55c 100644 --- a/Icarus/StartMachPanel/StartMachPanelV.xaml +++ b/Icarus/StartMachPanel/StartMachPanelV.xaml @@ -251,11 +251,11 @@ - + Style="{StaticResource Move_TextBlock}"/> + @@ -264,11 +264,11 @@ - + Style="{StaticResource Move_TextBlock}"/> + @@ -277,11 +277,11 @@ - + Style="{StaticResource Move_TextBlock}"/> + diff --git a/Icarus/TopPanel/TopPanelVM.vb b/Icarus/TopPanel/TopPanelVM.vb index 7626df4..b2f0fde 100644 --- a/Icarus/TopPanel/TopPanelVM.vb +++ b/Icarus/TopPanel/TopPanelVM.vb @@ -182,6 +182,7 @@ Public Class TopPanelVM SetSelMachining(DbMachining) ' notifico posizione pezzo Map.refDispositionPanelVM.RefreshPos() + Map.refSliceManagerVM.UpdateDimensions() End If End Set End Property @@ -558,10 +559,10 @@ Public Class TopPanelVM Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False) Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False) Map.refSliderManagerVM.SetSliderVisibility(False) - ' tolgo mark da pezzo selezionato - If Not IsNothing(SelPart) Then - EgtResetMark(SelPart.nPrintSolidId) - End If + '' tolgo mark da pezzo selezionato + 'If Not IsNothing(SelPart) Then + ' EgtResetMark(SelPart.nPrintSolidId) + 'End If ' imposto pagina Map.refLeftPanelVM.SetSelPanel(LeftPanelVM.Panels.MODIFYPART) End Sub @@ -575,10 +576,10 @@ Public Class TopPanelVM Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True) Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True) Map.refSliderManagerVM.SetSliderVisibility(True) - ' ripristino mark su pezzo selezionato - If Not IsNothing(SelPart) Then - EgtSetMark(SelPart.nPrintSolidId) - End If + '' ripristino mark su pezzo selezionato + 'If Not IsNothing(SelPart) Then + ' EgtSetMark(SelPart.nPrintSolidId) + 'End If Return True End Function diff --git a/Icarus/Utility/Dictionary.xaml b/Icarus/Utility/Dictionary.xaml index 4885569..f86dd7f 100644 --- a/Icarus/Utility/Dictionary.xaml +++ b/Icarus/Utility/Dictionary.xaml @@ -112,11 +112,6 @@ - - - - - @@ -797,6 +792,24 @@ + + + + + + @@ -820,8 +833,9 @@ - + + + + @@ -1327,7 +1351,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +