Icarus 2.5c1 :

- eliminati alcuni crash
- in geometrie si chiude Edit dopo aver cancellato l'ultima
- piccoli aggiustamenti ai tooltip.
This commit is contained in:
DarioS
2023-03-03 19:59:19 +01:00
parent da22e9217c
commit becbf3c682
12 changed files with 49 additions and 38 deletions
+1 -1
View File
@@ -249,7 +249,7 @@ Public Class CurrMachiningCathegory
New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nPartId, nIndex, bForceFromDb),
New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nPartId, nIndex, bForceFromDb),
New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nPartId, nIndex, bForceFromDb),
New CurrNumericMachiningParam(MachiningParam.Params.RIBSLIMITUNBOUNDEDWITHSOLID, nPartId, nIndex, bForceFromDb)})
New CurrCheckMachiningParam(MachiningParam.Params.RIBSLIMITUNBOUNDEDWITHSOLID, nPartId, nIndex, bForceFromDb)})
Case Cathegories.SHELL_NUMBER
m_sName = "Reduce Shell Number"
m_MachiningParamList = New List(Of MachiningParam)({New CurrNumericMachiningParam(MachiningParam.Params.SHELLNBRDIFFERENCE, nPartId, nIndex, bForceFromDb),
@@ -772,6 +772,8 @@ Public Class FilledSolidPanelVM
SelFilledSolid = m_FilledSolidList(m_FilledSolidList.Count - 1)
Else
SelFilledSolid = Nothing
m_bEdit_IsChecked = False
NotifyPropertyChanged(NameOf( bEdit_IsChecked))
End If
NotifyPropertyChanged(NameOf(SelFilledSolid))
End If
@@ -264,7 +264,7 @@ Public Class ImportExportMachiningPanelVM
Select Case m_WindowType
Case WindowTypeEnum.MATERIAL
Return Map.refMaterialDbVM.MaterialList.Any(Function(x) x.sName = MachiningName)
Case WindowTypeEnum.MACHINING
Case Else ' WindowTypeEnum.MACHINING
Return Map.refMachiningDbVM.MachiningList.Any(Function(x) x.sName = MachiningName)
End Select
End Function
+2 -2
View File
@@ -70,5 +70,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.5.2.3")>
<Assembly: AssemblyFileVersion("2.5.2.3")>
<Assembly: AssemblyVersion("2.5.3.1")>
<Assembly: AssemblyFileVersion("2.5.3.1")>
+1 -1
View File
@@ -1133,7 +1133,7 @@ Public Class OptionWindowVM
' aggiungo i file della Macchina
Dim sMachineDir As String = Map.refMainWindowVM.MainWindowM.sMachinesRoot & "\" & sCurrMachineName
If Directory.Exists(sMachineDir) Then
zip.AddItem(sMachineDir, sCurrMachineName)
zip.AddSelectedFiles( "name != *\.git\*.* and name != *.git*", sMachineDir, sCurrMachineName, True)
End If
' salvo lo zip
zip.Save()
+8 -18
View File
@@ -88,34 +88,24 @@ Public Class ProjManagerVM
Return EgtMsg(MSG_TOPCOMMANDBAR + 4)
End Get
End Property
Public ReadOnly Property InsertToolTip As String
Public ReadOnly Property ImportToolTip As String
Get
Return EgtMsg(MSG_TOPCOMMANDBAR + 5)
Return "Import"
End Get
End Property
Public ReadOnly Property ImportBTL_ToolTip As String
Public ReadOnly Property ExportToolTip As String
Get
Return EgtMsg(61840)
Return "Export"
End Get
End Property
Public ReadOnly Property UpdateBTL_ToolTip As String
Public ReadOnly Property OptionsToolTip As String
Get
Return EgtMsg(61834)
Return "Options"
End Get
End Property
Public ReadOnly Property ExportProject_ToolTip As String
Public ReadOnly Property SendFeedbackToolTip As String
Get
Return EgtMsg(61838)
End Get
End Property
Public ReadOnly Property ImportProject_ToolTip As String
Get
Return EgtMsg(61839)
End Get
End Property
Public ReadOnly Property GoToProd_ToolTip As String
Get
Return EgtMsg(61835)
Return "Send Feedback"
End Get
End Property
+2
View File
@@ -794,6 +794,8 @@ Public Class RibPanelVM
SelRib = m_RibList(m_RibList.Count - 1)
Else
SelRib = Nothing
m_bEdit_IsChecked = False
NotifyPropertyChanged(NameOf( bEdit_IsChecked))
End If
NotifyPropertyChanged(NameOf(SelRib))
End If
@@ -777,6 +777,8 @@ Public Class ShellNumberPanelVM
SelShellNumber = m_ShellNumberList(m_ShellNumberList.Count - 1)
Else
SelShellNumber = Nothing
m_bEdit_IsChecked = False
NotifyPropertyChanged(NameOf( bEdit_IsChecked))
End If
NotifyPropertyChanged(NameOf(SelShellNumber))
End If
+1
View File
@@ -132,6 +132,7 @@ Public Class SliceManagerVM
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
Return ""
End Get
End Property
Friend Sub UpdateDimensions()
@@ -912,6 +912,8 @@ Public Class StartMachPanelVM
SelStart = m_StartList(m_StartList.Count - 1)
Else
SelStart = Nothing
m_bEdit_IsChecked = False
NotifyPropertyChanged(NameOf( bEdit_IsChecked))
End If
NotifyPropertyChanged(NameOf(SelStart))
End If
+2 -2
View File
@@ -59,8 +59,8 @@
<Image Source="/Resources/ViewPanel/LookFromISO_SE.png"
Style="{StaticResource Button_Image}"/>
</Button>
<Button ToolTip="{Binding ViewToCPlaneToolTip}"
Command="{Binding ViewToCPlaneCommand}"
<Button ToolTip="{Binding ViewFromCPlaneToolTip}"
Command="{Binding ViewFromCPlaneCommand}"
Margin="2.5,0,2.5,0"
Style="{StaticResource BottomPanel_Button}">
<Image Source="/Resources/ViewPanel/CplaneView.png"
+25 -13
View File
@@ -15,7 +15,7 @@ Public Class ViewPanelVM
Private m_cmdRightView As ICommand
Private m_cmdIsoViewSW As ICommand
Private m_cmdIsoViewSE As ICommand
Private m_cmdViewToCPlane As ICommand
Private m_cmdViewFromCPlane As ICommand
#Region "ToolTip"
@@ -55,12 +55,24 @@ Public Class ViewPanelVM
End Get
End Property
Public ReadOnly Property LookFromIso_SWToolTip As String
Public ReadOnly Property LookFromIsoSWToolTip As String
Get
Return EgtMsg(MSG_GRIDVIEWPANEL + 12)
End Get
End Property
Public ReadOnly Property LookFromIsoSEToolTip As String
Get
Return "SE Isometric View"
End Get
End Property
Public ReadOnly Property ViewFromCPlaneToolTip As String
Get
Return "View From CPlane"
End Get
End Property
#End Region ' ToolTip
#End Region ' FIELDS & PROPERTIES
@@ -231,7 +243,7 @@ Public Class ViewPanelVM
#Region "IsoViewSECommand"
''' <summary>
''' Returns a command that do IsoViewSW.
''' Returns a command that do IsoViewSE.
''' </summary>
Public ReadOnly Property IsoViewSECommand As ICommand
Get
@@ -243,7 +255,7 @@ Public Class ViewPanelVM
End Property
''' <summary>
''' Execute the IsoViewSW. This method is invoked by the IsoViewSWCommand.
''' Execute the IsoViewSW. This method is invoked by the IsoViewSECommand.
''' </summary>
Public Sub IsoViewSE(ByVal param As Object)
Map.refSceneHostVM.MainScene.IsoViewSE()
@@ -251,28 +263,28 @@ Public Class ViewPanelVM
#End Region ' IsoViewSECommand
#Region "ViewToCPlaneCommand"
#Region "ViewFromCPlaneCommand"
''' <summary>
''' Returns a command that do GetDist.
''' Returns a command that do ViewFromCPlane.
''' </summary>
Public ReadOnly Property ViewToCPlaneCommand As ICommand
Public ReadOnly Property ViewFromCPlaneCommand As ICommand
Get
If m_cmdViewToCPlane Is Nothing Then
m_cmdViewToCPlane = New Command(AddressOf ViewToCPlane)
If m_cmdViewFromCPlane Is Nothing Then
m_cmdViewFromCPlane = New Command(AddressOf ViewFromCPlane)
End If
Return m_cmdViewToCPlane
Return m_cmdViewFromCPlane
End Get
End Property
''' <summary>
''' Execute the GetDist. This method is invoked by the GetDistCommand.
''' Execute the ViewFromCPlane. This method is invoked by the ViewFromCPlaneCommand.
''' </summary>
Public Sub ViewToCPlane(ByVal param As Object)
Public Sub ViewFromCPlane(ByVal param As Object)
Map.refSceneHostVM.MainScene.CPlaneView()
End Sub
#End Region ' ViewToCPlaneCommand
#End Region ' ViewFromCPlaneCommand
#End Region ' COMMANDS