Egalware/icarus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- correzione eliminazione superficie pezzo

Browse Source 
- correzione contextMenu in ManagePart
- Tooltip su tutte le icone
- gestione disattivazione interfaccia durante import
This commit is contained in:
Emmanuele Sassi
2023-03-13 18:32:58 +01:00
parent 0c2a5343ee
commit 54c5d41c67
19 changed files with 542 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml
+2 -2
View File
@@ -210,8 +210,8 @@
<Image Source="\Resources\Common\Cancel.png"
Style="{StaticResource Button_Image}"/>
</Button>
<Button ToolTip="Save in Db"
Command="{Binding SaveInDb_Command}"
<Button Command="{Binding SaveInDb_Command}"
ToolTip="{Binding SaveInDb_ToolTip}"
Margin="0,0,2.5,0"
Style="{StaticResource RightPanel_HalfRound_Button}">
<Image Source="\Resources\CurrMachining\SaveInDb.png"
Icarus/CurrMachiningPanel/CurrMachiningPanelVM.vb
+10
View File
@@ -18,6 +18,16 @@ Public Class CurrMachiningPanelVM
Map.refTopPanelVM.UpdateCurrMachining()
End Sub
#Region "Tooltip"
Public ReadOnly Property SaveInDb_ToolTip As String
Get
Return "Save in Db"
End Get
End Property
#End Region ' Tooltip
' Definizione comandi
Private m_cmdOk As ICommand
Private m_cmdCancel As ICommand
Icarus/FilledSolidPanel/FilledSolidPanelV.xaml
+9 -9
View File
@@ -167,7 +167,7 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Button Command="{Binding CPlaneTop_Command}"
ToolTip="{Binding CPlaneTopToolTip}"
ToolTip="{Binding CPlaneTop_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneTOP.png"
@@ -175,7 +175,7 @@
</Button>
<Button Grid.Column="1"
Command="{Binding CPlaneFront_Command}"
ToolTip="{Binding CPlaneFrontToolTip}"
ToolTip="{Binding CPlaneFront_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneFRONT.png"
@@ -183,7 +183,7 @@
</Button>
<Button Grid.Column="2"
Command="{Binding CPlaneRight_Command}"
ToolTip="{Binding CPlaneRightToolTip}"
ToolTip="{Binding CPlaneRight_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneRIGHT.png"
@@ -191,7 +191,7 @@
</Button>
<Button Grid.Column="3"
Command="{Binding CPlaneBack_Command}"
ToolTip="{Binding CPlaneBackToolTip}"
ToolTip="{Binding CPlaneBack_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneBACK.png"
@@ -199,7 +199,7 @@
</Button>
<Button Grid.Column="4"
Command="{Binding CPlaneLeft_Command}"
ToolTip="{Binding CPlaneLeftToolTip}"
ToolTip="{Binding CPlaneLeft_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneLEFT.png"
@@ -207,7 +207,7 @@
</Button>
<Button Grid.Column="5"
Command="{Binding CPlaneBottom_Command}"
ToolTip="{Binding CPlaneBottomToolTip}"
ToolTip="{Binding CPlaneBottom_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png"
@@ -215,7 +215,7 @@
</Button>
<Button Grid.Column="6"
Command="{Binding CPlaneElevation_Command}"
ToolTip="{Binding CPlaneElevationToolTip}"
ToolTip="{Binding CPlaneElevation_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneELEVATION.png"
@@ -223,7 +223,7 @@
</Button>
<Button Grid.Column="7"
Command="{Binding CPlaneOrigin_Command}"
ToolTip="{Binding CPlaneOriginToolTip}"
ToolTip="{Binding CPlaneOrigin_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CPlaneORIGIN.png"
@@ -231,7 +231,7 @@
</Button>
<Button Grid.Column="8"
Command="{Binding CPlaneObj_Command}"
ToolTip="{Binding CPlaneObjToolTip}"
ToolTip="{Binding CPlaneObj_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneOBJECT.png"
Icarus/FilledSolidPanel/FilledSolidPanelVM.vb
+105
View File
@@ -388,6 +388,111 @@ Public Class FilledSolidPanelVM
End Get
End Property
#Region "Tooltip"
Public ReadOnly Property Import_ToolTip As String
Get
Return "Import"
End Get
End Property
Public ReadOnly Property Point_ToolTip As String
Get
Return "Point"
End Get
End Property
Public ReadOnly Property Line2P_ToolTip As String
Get
Return "Multiline"
End Get
End Property
Public ReadOnly Property Delete_ToolTip As String
Get
Return "Delete"
End Get
End Property
Public ReadOnly Property ModifyCurve_ToolTip As String
Get
Return "Modify Curve"
End Get
End Property
Public ReadOnly Property AddPointCurve_ToolTip As String
Get
Return "Add Point to Curve"
End Get
End Property
Public ReadOnly Property RemovePointCurve_ToolTip As String
Get
Return "Remove Point From Curve"
End Get
End Property
Public ReadOnly Property Extrude_ToolTip As String
Get
Return "Modify Extrusion"
End Get
End Property
Public ReadOnly Property CPlaneTop_ToolTip As String
Get
Return "Grid From Top"
End Get
End Property
Public ReadOnly Property CPlaneFront_ToolTip As String
Get
Return "Grid From Front"
End Get
End Property
Public ReadOnly Property CPlaneRight_ToolTip As String
Get
Return "Grid From Right"
End Get
End Property
Public ReadOnly Property CPlaneBack_ToolTip As String
Get
Return "Grid From Back"
End Get
End Property
Public ReadOnly Property CPlaneLeft_ToolTip As String
Get
Return "Grid From Left"
End Get
End Property
Public ReadOnly Property CPlaneBottom_ToolTip As String
Get
Return "Grid From Bottom"
End Get
End Property
Public ReadOnly Property CPlaneElevation_ToolTip As String
Get
Return "Grid Elevation"
End Get
End Property
Public ReadOnly Property CPlaneOrigin_ToolTip As String
Get
Return "Grid Origin"
End Get
End Property
Public ReadOnly Property CPlaneObj_ToolTip As String
Get
Return "Grid On Object"
End Get
End Property
#End Region ' Tooltip
' Definizione comandi
Private m_cmdImport As ICommand
Icarus/InstrumentPanel/InstrumentPanelV.xaml
+2 -2
View File
@@ -5,7 +5,7 @@
xmlns:local="clr-namespace:Icarus"
Orientation="Horizontal">
<local:CheckedImageToggleButton ToolTip="{Binding GetDistToolTip}"
<local:CheckedImageToggleButton ToolTip="{Binding GetDist_ToolTip}"
IsChecked="{Binding GetDistIsChecked}"
ImageSource="/Resources/InstrumentPanel/GetDist.png"
CheckedImageSource="/Resources/InstrumentPanel/GetDist_White.png"
@@ -17,7 +17,7 @@
<sys:Double x:Key="ToggleButton.Image.Width">25</sys:Double>
</local:CheckedImageToggleButton.Resources>
</local:CheckedImageToggleButton>
<local:CheckedImageToggleButton ToolTip="{Binding EdgeAnalysisToolTip}"
<local:CheckedImageToggleButton ToolTip="{Binding EdgeAnalysis_ToolTip}"
IsChecked="{Binding bEdgeAnalysis_IsChecked}"
IsEnabled="{Binding bEdgeAnalysis_IsEnabled}"
ImageSource="/Resources/InstrumentPanel/EdgeAnalysis.png"
Icarus/InstrumentPanel/MyInstrumentPanelVM.vb
+16
View File
@@ -139,6 +139,22 @@ Public Class MyInstrumentPanelVM
NotifyPropertyChanged(NameOf(bEdgeAnalysis_IsEnabled))
End Sub
#Region "Tooltip"
Public ReadOnly Property GetDist_ToolTip As String
Get
Return "Distance"
End Get
End Property
Public ReadOnly Property EdgeAnalysis_ToolTip As String
Get
Return "Edge Analysis"
End Get
End Property
#End Region ' Tooltip
#Region "CONSTRUCTORS"
Sub New()
Icarus/MachiningDb/MachiningDbV.xaml
+3 -2
View File
@@ -53,7 +53,7 @@
Style="{StaticResource RightPanel_Button}"/>
<Button Grid.Column="3"
Command="{Binding Import_Command}"
ToolTip="{Binding ImportToolTip}"
ToolTip="{Binding Import_ToolTip}"
IsEnabled="{Binding ImpExp_IsEnabled}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
@@ -62,7 +62,7 @@
</Button>
<Button Grid.Column="4"
Command="{Binding Export_Command}"
ToolTip="{Binding ImportToolTip}"
ToolTip="{Binding Export_ToolTip}"
IsEnabled="{Binding ImpExp_IsEnabled}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
@@ -92,6 +92,7 @@
Style="{StaticResource OptionTextBox2}"/>
<Button Grid.Column="1"
Command="{Binding EditName_Command}"
ToolTip="{Binding EditName_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/MachiningDB/Edit.png"
Icarus/MachiningDb/MachiningDbVM.vb
+22
View File
@@ -112,6 +112,28 @@ Public Class MachiningDbVM
End Get
End Property
#Region "Tooltip"
Public ReadOnly Property Import_ToolTip As String
Get
Return "Import"
End Get
End Property
Public ReadOnly Property Export_ToolTip As String
Get
Return "Export"
End Get
End Property
Public ReadOnly Property EditName_ToolTip As String
Get
Return "Edit Name"
End Get
End Property
#End Region ' Tooltip
' Definizione comandi
Private m_cmdOk As ICommand
Private m_cmdNew As ICommand
Icarus/ManagePartPanel/ManagePartUtility.vb
+4 -2
View File
@@ -646,7 +646,9 @@ Public Class GeomEntity_MenuItem
' aggiorno riferimenti nel context menu item
Map.refManagePartPanelVM.UpdateAllEntityContextMenu()
' Imposto flag di ricalcolo slice
EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
If Map.refManagePartPanelVM.Type = ManagePartPanelVM.ManagePartType.MODIFY Then
EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
End If
End If
Return
ElseIf m_Type = ManagePart_Layer.LayerType.NEWPART Then
@@ -775,7 +777,7 @@ Public Class GeomEntity_MenuItem
End If
End If
' aggiorno riferimenti nel context menu item
m_OrigEntity.UpdateContextMenu()
Map.refManagePartPanelVM.UpdateAllEntityContextMenu()
Case ManagePartPanelVM.ManagePartType.MODIFY
Dim bIsMovedPartOrRib As Boolean = False
' recupero layer da pezzo
Icarus/MaterialDb/MaterialDbV.xaml
+3 -2
View File
@@ -52,7 +52,7 @@
Style="{StaticResource RightPanel_Button}"/>
<Button Grid.Column="3"
Command="{Binding Import_Command}"
ToolTip="{Binding ImportToolTip}"
ToolTip="{Binding Import_ToolTip}"
IsEnabled="{Binding ImpExp_IsEnabled}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
@@ -61,7 +61,7 @@
</Button>
<Button Grid.Column="4"
Command="{Binding Export_Command}"
ToolTip="{Binding ImportToolTip}"
ToolTip="{Binding Export_ToolTip}"
IsEnabled="{Binding ImpExp_IsEnabled}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
@@ -91,6 +91,7 @@
Style="{StaticResource OptionTextBox2}"/>
<Button Grid.Column="1"
Command="{Binding EditName_Command}"
ToolTip="{Binding EditName_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/MaterialDB/Edit.png"/>
Icarus/MaterialDb/MaterialDbVM.vb
+22
View File
@@ -128,6 +128,28 @@ Public Class MaterialDbVM
End Get
End Property
#Region "Tooltip"
Public ReadOnly Property Import_ToolTip As String
Get
Return "Import"
End Get
End Property
Public ReadOnly Property Export_ToolTip As String
Get
Return "Export"
End Get
End Property
Public ReadOnly Property EditName_ToolTip As String
Get
Return "Edit Name"
End Get
End Property
#End Region ' Tooltip
' Definizione comandi
Private m_cmdOk As ICommand
Private m_cmdCopy As ICommand
Icarus/RibPanel/RibPanelV.xaml
+9 -9
View File
@@ -167,7 +167,7 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Button Command="{Binding CPlaneTop_Command}"
ToolTip="{Binding CPlaneTopToolTip}"
ToolTip="{Binding CPlaneTop_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneTOP.png"
@@ -175,7 +175,7 @@
</Button>
<Button Grid.Column="1"
Command="{Binding CPlaneFront_Command}"
ToolTip="{Binding CPlaneFrontToolTip}"
ToolTip="{Binding CPlaneFront_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneFRONT.png"
@@ -183,7 +183,7 @@
</Button>
<Button Grid.Column="2"
Command="{Binding CPlaneRight_Command}"
ToolTip="{Binding CPlaneRightToolTip}"
ToolTip="{Binding CPlaneRight_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneRIGHT.png"
@@ -191,7 +191,7 @@
</Button>
<Button Grid.Column="3"
Command="{Binding CPlaneBack_Command}"
ToolTip="{Binding CPlaneBackToolTip}"
ToolTip="{Binding CPlaneBack_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneBACK.png"
@@ -199,7 +199,7 @@
</Button>
<Button Grid.Column="4"
Command="{Binding CPlaneLeft_Command}"
ToolTip="{Binding CPlaneLeftToolTip}"
ToolTip="{Binding CPlaneLeft_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneLEFT.png"
@@ -207,7 +207,7 @@
</Button>
<Button Grid.Column="5"
Command="{Binding CPlaneBottom_Command}"
ToolTip="{Binding CPlaneBottomToolTip}"
ToolTip="{Binding CPlaneBottom_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png"
@@ -215,7 +215,7 @@
</Button>
<Button Grid.Column="6"
Command="{Binding CPlaneElevation_Command}"
ToolTip="{Binding CPlaneElevationToolTip}"
ToolTip="{Binding CPlaneElevation_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneELEVATION.png"
@@ -223,7 +223,7 @@
</Button>
<Button Grid.Column="7"
Command="{Binding CPlaneOrigin_Command}"
ToolTip="{Binding CPlaneOriginToolTip}"
ToolTip="{Binding CPlaneOrigin_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneORIGIN.png"
@@ -231,7 +231,7 @@
</Button>
<Button Grid.Column="8"
Command="{Binding CPlaneObj_Command}"
ToolTip="{Binding CPlaneObjToolTip}"
ToolTip="{Binding CPlaneObj_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneOBJECT.png"
Icarus/RibPanel/RibPanelVM.vb
+105
View File
@@ -413,6 +413,111 @@ Public Class RibPanelVM
End Get
End Property
#Region "Tooltip"
Public ReadOnly Property Import_ToolTip As String
Get
Return "Import"
End Get
End Property
Public ReadOnly Property Point_ToolTip As String
Get
Return "Point"
End Get
End Property
Public ReadOnly Property Line2P_ToolTip As String
Get
Return "Multiline"
End Get
End Property
Public ReadOnly Property Delete_ToolTip As String
Get
Return "Delete"
End Get
End Property
Public ReadOnly Property ModifyCurve_ToolTip As String
Get
Return "Modify Curve"
End Get
End Property
Public ReadOnly Property AddPointCurve_ToolTip As String
Get
Return "Add Point to Curve"
End Get
End Property
Public ReadOnly Property RemovePointCurve_ToolTip As String
Get
Return "Remove Point From Curve"
End Get
End Property
Public ReadOnly Property Extrude_ToolTip As String
Get
Return "Modify Extrusion"
End Get
End Property
Public ReadOnly Property CPlaneTop_ToolTip As String
Get
Return "Grid From Top"
End Get
End Property
Public ReadOnly Property CPlaneFront_ToolTip As String
Get
Return "Grid From Front"
End Get
End Property
Public ReadOnly Property CPlaneRight_ToolTip As String
Get
Return "Grid From Right"
End Get
End Property
Public ReadOnly Property CPlaneBack_ToolTip As String
Get
Return "Grid From Back"
End Get
End Property
Public ReadOnly Property CPlaneLeft_ToolTip As String
Get
Return "Grid From Left"
End Get
End Property
Public ReadOnly Property CPlaneBottom_ToolTip As String
Get
Return "Grid From Bottom"
End Get
End Property
Public ReadOnly Property CPlaneElevation_ToolTip As String
Get
Return "Grid Elevation"
End Get
End Property
Public ReadOnly Property CPlaneOrigin_ToolTip As String
Get
Return "Grid Origin"
End Get
End Property
Public ReadOnly Property CPlaneObj_ToolTip As String
Get
Return "Grid On Object"
End Get
End Property
#End Region ' Tooltip
' Definizione comandi
Private m_cmdImport As ICommand
Icarus/SceneHost/MySceneHostVM.vb
+11 -11
View File
@@ -333,13 +333,14 @@ Public Class MySceneHostVM
Map.refProjManagerVM.SetProjCmdIsEnabled(False)
Map.refTopPanelVM.SetTopPanelIsEnabled(False)
Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(False)
Map.refTFSEditorVM.SetTFSEditorIsEnabled(False)
Map.refSliceManagerVM.SetButtonsIsEnabled(False)
Map.refSliderManagerVM.SetLayerIndexIsEnabled(False)
Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False)
Map.refSliceManagerVM.SetButtonsIsEnabled(False)
Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False)
Map.refSliderManagerVM.SetSliderVisibility(False)
' importo la nuova geometria
If MainController.InsertProject(sFile, False) Then
Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(True)
' la sposto in centro tavola
Dim nNewPartId As Integer = EgtGetLastPart()
Dim b3NewPart As New BBox3d
@@ -347,17 +348,16 @@ Public Class MySceneHostVM
EgtMove(nNewPartId, New Point3d((CurrentMachine.b3Tab.DimX / 2) - (b3NewPart.DimX / 2), (CurrentMachine.b3Tab.DimY / 2) - (b3NewPart.DimY / 2), 0) - b3NewPart.Min(), GDB_RT.GLOB)
' imposto modalita' import
Map.refTopPanelVM.SelPage = Pages.IMPORT
Else
Map.refProjManagerVM.SetProjCmdIsEnabled(True)
Map.refTopPanelVM.SetTopPanelIsEnabled(True)
Map.refSliceManagerVM.SetButtonsIsEnabled(True)
Map.refSliderManagerVM.SetLayerIndexIsEnabled(True)
Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True)
Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True)
Map.refSliderManagerVM.SetSliderVisibility(True)
End If
EgtDraw()
' riabilito ProjManager, TopPanel e uscita dal programma
Map.refProjManagerVM.SetProjCmdIsEnabled(True)
Map.refTopPanelVM.SetTopPanelIsEnabled(True)
Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(True)
Map.refTFSEditorVM.SetTFSEditorIsEnabled(True)
Map.refSliderManagerVM.SetLayerIndexIsEnabled(True)
Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True)
Map.refSliceManagerVM.SetButtonsIsEnabled(True)
Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True)
End Sub
Public Sub InsertRib()
Icarus/ShellNumberPanel/ShellNumberPanelV.xaml
+9 -9
View File
@@ -167,7 +167,7 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Button Command="{Binding CPlaneTop_Command}"
ToolTip="{Binding CPlaneTopToolTip}"
ToolTip="{Binding CPlaneTop_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneTOP.png"
@@ -175,7 +175,7 @@
</Button>
<Button Grid.Column="1"
Command="{Binding CPlaneFront_Command}"
ToolTip="{Binding CPlaneFrontToolTip}"
ToolTip="{Binding CPlaneFront_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneFRONT.png"
@@ -183,7 +183,7 @@
</Button>
<Button Grid.Column="2"
Command="{Binding CPlaneRight_Command}"
ToolTip="{Binding CPlaneRightToolTip}"
ToolTip="{Binding CPlaneRight_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneRIGHT.png"
@@ -191,7 +191,7 @@
</Button>
<Button Grid.Column="3"
Command="{Binding CPlaneBack_Command}"
ToolTip="{Binding CPlaneBackToolTip}"
ToolTip="{Binding CPlaneBack_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneBACK.png"
@@ -199,7 +199,7 @@
</Button>
<Button Grid.Column="4"
Command="{Binding CPlaneLeft_Command}"
ToolTip="{Binding CPlaneLeftToolTip}"
ToolTip="{Binding CPlaneLeft_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneLEFT.png"
@@ -207,7 +207,7 @@
</Button>
<Button Grid.Column="5"
Command="{Binding CPlaneBottom_Command}"
ToolTip="{Binding CPlaneBottomToolTip}"
ToolTip="{Binding CPlaneBottom_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png"
@@ -215,7 +215,7 @@
</Button>
<Button Grid.Column="6"
Command="{Binding CPlaneElevation_Command}"
ToolTip="{Binding CPlaneElevationToolTip}"
ToolTip="{Binding CPlaneElevation_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneELEVATION.png"
@@ -223,7 +223,7 @@
</Button>
<Button Grid.Column="7"
Command="{Binding CPlaneOrigin_Command}"
ToolTip="{Binding CPlaneOriginToolTip}"
ToolTip="{Binding CPlaneOrigin_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CPlaneORIGIN.png"
@@ -231,7 +231,7 @@
</Button>
<Button Grid.Column="8"
Command="{Binding CPlaneObj_Command}"
ToolTip="{Binding CPlaneObjToolTip}"
ToolTip="{Binding CPlaneObj_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneOBJECT.png"
Icarus/ShellNumberPanel/ShellNumberPanelVM.vb
+105
View File
@@ -393,6 +393,111 @@ Public Class ShellNumberPanelVM
End Get
End Property
#Region "Tooltip"
Public ReadOnly Property Import_ToolTip As String
Get
Return "Import"
End Get
End Property
Public ReadOnly Property Point_ToolTip As String
Get
Return "Point"
End Get
End Property
Public ReadOnly Property Line2P_ToolTip As String
Get
Return "Multiline"
End Get
End Property
Public ReadOnly Property Delete_ToolTip As String
Get
Return "Delete"
End Get
End Property
Public ReadOnly Property ModifyCurve_ToolTip As String
Get
Return "Modify Curve"
End Get
End Property
Public ReadOnly Property AddPointCurve_ToolTip As String
Get
Return "Add Point to Curve"
End Get
End Property
Public ReadOnly Property RemovePointCurve_ToolTip As String
Get
Return "Remove Point From Curve"
End Get
End Property
Public ReadOnly Property Extrude_ToolTip As String
Get
Return "Modify Extrusion"
End Get
End Property
Public ReadOnly Property CPlaneTop_ToolTip As String
Get
Return "Grid From Top"
End Get
End Property
Public ReadOnly Property CPlaneFront_ToolTip As String
Get
Return "Grid From Front"
End Get
End Property
Public ReadOnly Property CPlaneRight_ToolTip As String
Get
Return "Grid From Right"
End Get
End Property
Public ReadOnly Property CPlaneBack_ToolTip As String
Get
Return "Grid From Back"
End Get
End Property
Public ReadOnly Property CPlaneLeft_ToolTip As String
Get
Return "Grid From Left"
End Get
End Property
Public ReadOnly Property CPlaneBottom_ToolTip As String
Get
Return "Grid From Bottom"
End Get
End Property
Public ReadOnly Property CPlaneElevation_ToolTip As String
Get
Return "Grid Elevation"
End Get
End Property
Public ReadOnly Property CPlaneOrigin_ToolTip As String
Get
Return "Grid Origin"
End Get
End Property
Public ReadOnly Property CPlaneObj_ToolTip As String
Get
Return "Grid On Object"
End Get
End Property
#End Region ' Tooltip
' Definizione comandi
Private m_cmdImport As ICommand
Icarus/StartMachPanel/StartMachPanelV.xaml
+9 -9
View File
@@ -153,7 +153,7 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Button Command="{Binding CPlaneTop_Command}"
ToolTip="{Binding CPlaneTopToolTip}"
ToolTip="{Binding CPlaneTop_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneTOP.png"
@@ -161,7 +161,7 @@
</Button>
<Button Grid.Column="1"
Command="{Binding CPlaneFront_Command}"
ToolTip="{Binding CPlaneFrontToolTip}"
ToolTip="{Binding CPlaneFront_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneFRONT.png"
@@ -169,7 +169,7 @@
</Button>
<Button Grid.Column="2"
Command="{Binding CPlaneRight_Command}"
ToolTip="{Binding CPlaneRightToolTip}"
ToolTip="{Binding CPlaneRight_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneRIGHT.png"
@@ -177,7 +177,7 @@
</Button>
<Button Grid.Column="3"
Command="{Binding CPlaneBack_Command}"
ToolTip="{Binding CPlaneBackToolTip}"
ToolTip="{Binding CPlaneBack_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneBACK.png"
@@ -185,7 +185,7 @@
</Button>
<Button Grid.Column="4"
Command="{Binding CPlaneLeft_Command}"
ToolTip="{Binding CPlaneLeftToolTip}"
ToolTip="{Binding CPlaneLeft_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneLEFT.png"
@@ -193,7 +193,7 @@
</Button>
<Button Grid.Column="5"
Command="{Binding CPlaneBottom_Command}"
ToolTip="{Binding CPlaneBottomToolTip}"
ToolTip="{Binding CPlaneBottom_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png"
@@ -201,7 +201,7 @@
</Button>
<Button Grid.Column="6"
Command="{Binding CPlaneElevation_Command}"
ToolTip="{Binding CPlaneElevationToolTip}"
ToolTip="{Binding CPlaneElevation_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneELEVATION.png"
@@ -209,7 +209,7 @@
</Button>
<Button Grid.Column="7"
Command="{Binding CPlaneOrigin_Command}"
ToolTip="{Binding CPlaneOriginToolTip}"
ToolTip="{Binding CPlaneOrigin_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneORIGIN.png"
@@ -217,7 +217,7 @@
</Button>
<Button Grid.Column="8"
Command="{Binding CPlaneObj_Command}"
ToolTip="{Binding CPlaneObjToolTip}"
ToolTip="{Binding CPlaneObj_ToolTip}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/GridViewPanel/CplaneOBJECT.png"
Icarus/StartMachPanel/StartMachPanelVM.vb
+94
View File
@@ -304,6 +304,100 @@ Public Class StartMachPanelVM
End Get
End Property
#Region "Tooltip"
Public ReadOnly Property Point_ToolTip As String
Get
Return "Point"
End Get
End Property
Public ReadOnly Property Line2P_ToolTip As String
Get
Return "Multiline"
End Get
End Property
Public ReadOnly Property Delete_ToolTip As String
Get
Return "Delete"
End Get
End Property
Public ReadOnly Property ModifyCurve_ToolTip As String
Get
Return "Modify Curve"
End Get
End Property
Public ReadOnly Property AddPointCurve_ToolTip As String
Get
Return "Add Point to Curve"
End Get
End Property
Public ReadOnly Property RemovePointCurve_ToolTip As String
Get
Return "Remove Point From Curve"
End Get
End Property
Public ReadOnly Property CPlaneTop_ToolTip As String
Get
Return "Grid From Top"
End Get
End Property
Public ReadOnly Property CPlaneFront_ToolTip As String
Get
Return "Grid From Front"
End Get
End Property
Public ReadOnly Property CPlaneRight_ToolTip As String
Get
Return "Grid From Right"
End Get
End Property
Public ReadOnly Property CPlaneBack_ToolTip As String
Get
Return "Grid From Back"
End Get
End Property
Public ReadOnly Property CPlaneLeft_ToolTip As String
Get
Return "Grid From Left"
End Get
End Property
Public ReadOnly Property CPlaneBottom_ToolTip As String
Get
Return "Grid From Bottom"
End Get
End Property
Public ReadOnly Property CPlaneElevation_ToolTip As String
Get
Return "Grid Elevation"
End Get
End Property
Public ReadOnly Property CPlaneOrigin_ToolTip As String
Get
Return "Grid Origin"
End Get
End Property
Public ReadOnly Property CPlaneObj_ToolTip As String
Get
Return "Grid On Object"
End Get
End Property
#End Region ' Tooltip
' Definizione comandi
Private m_cmdPoint As ICommand
Private m_cmdLine2P As ICommand
Icarus/TopPanel/TopPanelVM.vb
+2
View File
@@ -414,6 +414,7 @@ Public Class TopPanelVM
Map.refSliderManagerVM.SetLayerIndexIsEnabled(False)
Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False)
Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False)
Map.refSliderManagerVM.SetSliderVisibility(False)
' imposto pagina
Map.refLeftPanelVM.SetSelPanel(LeftPanelVM.Panels.IMPORT)
''Map.refImportPanelVM.Init()
@@ -428,6 +429,7 @@ Public Class TopPanelVM
Map.refSliderManagerVM.SetLayerIndexIsEnabled(True)
Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True)
Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True)
Map.refSliderManagerVM.SetSliderVisibility(True)
Return True
End Function