Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fd8af7be3e |
@@ -122,6 +122,8 @@ Public Module ConstIni
|
||||
Public Const K_CLR_MACHSTART As String = "MachStart"
|
||||
Public Const K_CLR_OTHERS As String = "Others"
|
||||
|
||||
Public Const S_MINMAX As String = "MinMax"
|
||||
|
||||
Public Const S_MRUFILES As String = "MruFiles"
|
||||
Public Const S_MRUIMPORTFILES As String = "MruImportFiles"
|
||||
|
||||
|
||||
@@ -1,6 +1,31 @@
|
||||
Public Module ConstMachIni
|
||||
|
||||
Public Const MACH_INI_FILE_NAME As String = "MachData.ini"
|
||||
Public Const GETWALLDATA_FILE_NAME As String = "GetWallData.lua"
|
||||
Public Const GETTS3DATA_FILE_NAME As String = "GetTs3Data.lua"
|
||||
|
||||
Public Const K_NCTYPE As String = "NCType"
|
||||
Public Const K_CONNECTIONSTRING As String = "ConnectionString"
|
||||
|
||||
Public Const S_CHANNELS As String = "Channels"
|
||||
|
||||
Public Const S_PARTPROGRAM As String = "PartProgram"
|
||||
Public Const S_EXTENSION As String = "Extension"
|
||||
|
||||
' Variables della macchina corrente
|
||||
Public Const S_MAINVARIABLES As String = "MainVariables"
|
||||
Public Const S_VARIABLES As String = "Variables"
|
||||
Public Const S_INPUTVARIABLES As String = "InputVariables"
|
||||
Public Const S_OUTPUTVARIABLES As String = "OutputVariables"
|
||||
Public Const S_MDI As String = "MDI"
|
||||
|
||||
Public Const K_BEAM As String = "Beam"
|
||||
Public Const K_WALL As String = "Wall"
|
||||
Public Const K_SCRIPT As String = "Scripts"
|
||||
Public Const K_SETUP As String = "Setup"
|
||||
Public Const K_FLOW As String = "Flow"
|
||||
|
||||
Public Const TS3DATA_FILE As String = "Ts3Data.lua"
|
||||
|
||||
Public Const S_MACHINING As String = "Machining"
|
||||
Public Const K_MACH_INITSCRIPT As String = "InitScript"
|
||||
@@ -11,6 +36,4 @@
|
||||
Public Const K_SPEED_MIN As String = "SpeedMin"
|
||||
Public Const K_SPEED_MAX As String = "SpeedMax"
|
||||
|
||||
Public Const S_MINMAX As String = "MinMax"
|
||||
|
||||
End Module
|
||||
|
||||
@@ -274,7 +274,7 @@ Public Class CurrMachiningCathegory
|
||||
' verifico dipendenze tra parametri
|
||||
Select Case m_Type
|
||||
Case Cathegories.LINK
|
||||
For Each Param In {MachiningParam.Params.LINKTYPE, MachiningParam.Params.LEADIN, MachiningParam.Params.LEADOUT}
|
||||
For Each Param In {MachiningParam.Params.LINKTYPE, MachiningParam.Params.LEADIN}
|
||||
Dim MachiningParam As ComboMachiningParam = MachiningParamList.FirstOrDefault(Function(z) z.Type = Param)
|
||||
MachiningParam.ManageDependencyParam()
|
||||
Next
|
||||
|
||||
@@ -35,10 +35,6 @@ Public Class FilledSolidPanelVM
|
||||
Return m_SelFilledSolid
|
||||
End Get
|
||||
Set(value As FilledSolidEntity)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse Map.refFilledSolidPanelVM.bCPlaneObj_IsActive Then
|
||||
NotifyPropertyChanged(NameOf(SelFilledSolid))
|
||||
Return
|
||||
End If
|
||||
m_SelFilledSolid = value
|
||||
EgtDeselectAll()
|
||||
If Not IsNothing(value) Then
|
||||
@@ -353,8 +349,6 @@ Public Class FilledSolidPanelVM
|
||||
NotifyPropertyChanged(NameOf(bRotate_IsChecked))
|
||||
Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.AUXSOLIDPARAM)
|
||||
NotifyPropertyChanged(NameOf(FilledSolidList_IsEnabled))
|
||||
' disattivo interfaccia
|
||||
ManageInterface(False)
|
||||
Else
|
||||
NotifyPropertyChanged(NameOf(m_bMachParam_IsChecked))
|
||||
End If
|
||||
@@ -364,8 +358,6 @@ Public Class FilledSolidPanelVM
|
||||
m_bMachParam_IsChecked = False
|
||||
NotifyPropertyChanged(NameOf(bMachParam_IsChecked))
|
||||
NotifyPropertyChanged(NameOf(FilledSolidList_IsEnabled))
|
||||
' riattivo interfaccia
|
||||
ManageInterface(True)
|
||||
End Sub
|
||||
|
||||
Public ReadOnly Property Compo_Visibility As Visibility
|
||||
@@ -374,17 +366,11 @@ Public Class FilledSolidPanelVM
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private m_FilledSolidList_IsEnabled As Boolean = False
|
||||
Public ReadOnly Property FilledSolidList_IsEnabled As Boolean
|
||||
Get
|
||||
Return If(m_FilledSolidList.Count > 0, m_FilledSolidList_IsEnabled, False)
|
||||
Return Not m_bMachParam_IsChecked
|
||||
End Get
|
||||
End Property
|
||||
Friend Sub SetFilledSolidListIsEnabled(bValue As Boolean)
|
||||
m_FilledSolidList_IsEnabled = bValue
|
||||
NotifyPropertyChanged(NameOf(FilledSolidList_IsEnabled))
|
||||
End Sub
|
||||
|
||||
' riferimento griglia all'ingresso in questa pagina
|
||||
Private m_OriginalGridFrame As New Frame3d
|
||||
|
||||
@@ -402,8 +388,6 @@ Public Class FilledSolidPanelVM
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private m_bEscOnLine2P As Boolean = False
|
||||
|
||||
#Region "Tooltip"
|
||||
|
||||
Public ReadOnly Property Import_ToolTip As String
|
||||
@@ -587,8 +571,6 @@ Public Class FilledSolidPanelVM
|
||||
SelFilledSolid = m_FilledSolidList(0)
|
||||
NotifyPropertyChanged(NameOf(SelFilledSolid))
|
||||
End If
|
||||
' attivo lista filled solid
|
||||
SetFilledSolidListIsEnabled(True)
|
||||
Map.refSceneHostVM.MainScene.SetStatusNull()
|
||||
End Sub
|
||||
|
||||
@@ -624,13 +606,8 @@ Public Class FilledSolidPanelVM
|
||||
EgtSelectObj(m_SelFilledSolid.nCurveId)
|
||||
Case FilledSolidSelectionTypes.EXTRUSION
|
||||
' creo layer per estrusione
|
||||
Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION)
|
||||
If nNewExtrusionLayerId = GDB_ID.NULL Then
|
||||
nNewExtrusionLayerId = EgtCreateGroup(m_nPartId)
|
||||
EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
|
||||
Else
|
||||
EgtEmptyGroup(nNewExtrusionLayerId)
|
||||
End If
|
||||
Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
|
||||
EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
|
||||
EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
|
||||
EgtSelectObj(m_SelFilledSolid.nCurveId)
|
||||
Case FilledSolidSelectionTypes.BOTH
|
||||
@@ -638,8 +615,6 @@ Public Class FilledSolidPanelVM
|
||||
EgtSelectObj(m_SelFilledSolid.nExtrusionId)
|
||||
End Select
|
||||
EgtDraw()
|
||||
' disattivo il resto dell'interfaccia
|
||||
ManageInterface(False)
|
||||
Return True
|
||||
End Function
|
||||
|
||||
@@ -649,7 +624,6 @@ Public Class FilledSolidPanelVM
|
||||
End Sub
|
||||
|
||||
Friend Sub OnExecCmdEnd(command As Controller.CMD)
|
||||
m_bEscOnLine2P = False
|
||||
Select Case command
|
||||
Case Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE
|
||||
' leggo altezza estrusione
|
||||
@@ -689,10 +663,6 @@ Public Class FilledSolidPanelVM
|
||||
' Imposto flag di ricalcolo slice
|
||||
EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
|
||||
End Select
|
||||
' se non ho creato percorso riabilito interfaccia
|
||||
If Not m_bIsCreatingPath Then
|
||||
ManageInterface(True)
|
||||
End If
|
||||
If command <> Controller.CMD.LINE2P AndAlso command <> Controller.CMD.EXTRUDE Then Return
|
||||
' se finita creazione estrusione
|
||||
If m_bIsCreatingExtrusion Then
|
||||
@@ -763,9 +733,6 @@ Public Class FilledSolidPanelVM
|
||||
If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
|
||||
m_bIsCreatingExtrusion = True
|
||||
Map.refControllerInputPanelVM.IsChecked = True
|
||||
If Not EgtCurveIsClosed(nNewEntityId) Then
|
||||
m_bEscOnLine2P = True
|
||||
End If
|
||||
Else
|
||||
' cancello layer
|
||||
EgtErase(nNewExtrusionLayerId)
|
||||
@@ -790,13 +757,6 @@ Public Class FilledSolidPanelVM
|
||||
' rimetto la selezione scena a null
|
||||
Map.refSceneHostVM.MainScene.SetStatusNull()
|
||||
End If
|
||||
' se esc su creazione percorso, lo annullo, altrimenti riabilito interfaccia
|
||||
If m_bEscOnLine2P Then
|
||||
m_bEscOnLine2P = False
|
||||
Else
|
||||
If m_bIsCreatingExtrusion Then m_bIsCreatingExtrusion = False
|
||||
ManageInterface(True)
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -832,18 +792,6 @@ Public Class FilledSolidPanelVM
|
||||
Return nFilledSolidIndex + 1
|
||||
End Function
|
||||
|
||||
Friend Sub ManageInterface(bValue As Boolean)
|
||||
' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
|
||||
Map.refProjManagerVM.SetProjCmdIsEnabled(bValue)
|
||||
Map.refTopPanelVM.SetTopPanelIsEnabled(bValue)
|
||||
Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(bValue)
|
||||
Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue)
|
||||
Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue)
|
||||
Map.refSliceManagerVM.SetButtonsIsEnabled(bValue)
|
||||
Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bValue)
|
||||
SetFilledSolidListIsEnabled(bValue)
|
||||
End Sub
|
||||
|
||||
#End Region ' METHODS
|
||||
|
||||
#Region "COMMANDS"
|
||||
@@ -867,9 +815,7 @@ Public Class FilledSolidPanelVM
|
||||
''' </summary>
|
||||
Public Sub Import(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
Map.refSceneHostVM.InsertFilledSolid()
|
||||
ManageInterface(True)
|
||||
End Sub
|
||||
|
||||
#End Region ' Import
|
||||
@@ -893,7 +839,6 @@ Public Class FilledSolidPanelVM
|
||||
''' </summary>
|
||||
Public Sub Line2P(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
Dim nNewShellNumberLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB)
|
||||
If nNewShellNumberLayerId = GDB_ID.NULL Then nNewShellNumberLayerId = EgtCreateGroup(m_nPartId)
|
||||
EgtSetName(nNewShellNumberLayerId, LAY_NEWRIB)
|
||||
@@ -942,7 +887,6 @@ Public Class FilledSolidPanelVM
|
||||
End If
|
||||
NotifyPropertyChanged(NameOf(SelFilledSolid))
|
||||
End If
|
||||
SetFilledSolidListIsEnabled(True)
|
||||
End Sub
|
||||
|
||||
#End Region ' Delete
|
||||
@@ -1227,7 +1171,6 @@ Public Class FilledSolidPanelVM
|
||||
''' </summary>
|
||||
Public Sub CPlaneElevation(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
|
||||
End Sub
|
||||
|
||||
@@ -1252,7 +1195,6 @@ Public Class FilledSolidPanelVM
|
||||
''' </summary>
|
||||
Public Sub CPlaneOrigin(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
|
||||
End Sub
|
||||
|
||||
@@ -1369,7 +1311,6 @@ Public Class FilledSolidPanelVM
|
||||
''' </summary>
|
||||
Public Sub CPlaneObj(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
' salvo selezione precedente e deseleziono altri oggetti
|
||||
m_PrevSelObjs.Clear()
|
||||
Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
|
||||
|
||||
@@ -0,0 +1,118 @@
|
||||
<Grid x:Class="HelpPanelV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:PrintApp="clr-namespace:Icarus"
|
||||
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:Icarus"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="450" d:DesignWidth="800">
|
||||
<Grid.Resources>
|
||||
<SolidColorBrush x:Key="HighlightBorder_Color" Color="Red"/>
|
||||
<Thickness x:Key="HighlightBorder_Thickness">5</Thickness>
|
||||
<CornerRadius x:Key="HighlightBorder_CornerRadius">2</CornerRadius>
|
||||
<Thickness x:Key="HighlightBorder_Margin">-2</Thickness>
|
||||
<Style x:Key="Highlight_HelpBorder" TargetType="{x:Type Border}">
|
||||
<Setter Property="BorderBrush" Value="{StaticResource HighlightBorder_Color}"/>
|
||||
<Setter Property="BorderThickness" Value="{StaticResource HighlightBorder_Thickness}"/>
|
||||
<Setter Property="CornerRadius" Value="{StaticResource HighlightBorder_CornerRadius}"/>
|
||||
<Setter Property="Margin" Value="{StaticResource HighlightBorder_Margin}"/>
|
||||
</Style>
|
||||
<Style x:Key="Popup_HelpBorder" TargetType="{x:Type Border}">
|
||||
<Setter Property="BorderBrush" Value="{StaticResource Icarus_Gray}"/>
|
||||
<Setter Property="BorderThickness" Value="1"/>
|
||||
<Setter Property="CornerRadius" Value="5"/>
|
||||
<Setter Property="Background" Value="White"/>
|
||||
</Style>
|
||||
<Style TargetType="{x:Type Popup}">
|
||||
<Setter Property="AllowsTransparency" Value="True"/>
|
||||
<Setter Property="StaysOpen" Value="True"/>
|
||||
<Setter Property="Placement" Value="Bottom"/>
|
||||
</Style>
|
||||
</Grid.Resources>
|
||||
<Border BorderThickness="{StaticResource WindowBorder_Thickness}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="{StaticResource TitleBarHeight}"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid Style="{StaticResource TopBar_HelpButton}">
|
||||
<Border Visibility="{Binding Icon_Visibility}"
|
||||
Style="{StaticResource Highlight_HelpBorder}">
|
||||
</Border>
|
||||
</Grid>
|
||||
<Grid Grid.Column="1">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Grid.Column="1"
|
||||
Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Grid.Column="2"
|
||||
Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Grid.Column="3"
|
||||
Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Grid.Column="4"
|
||||
Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Grid.Column="5"
|
||||
Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Grid.Column="6"
|
||||
Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Grid.Column="7"
|
||||
Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Grid.Column="8"
|
||||
Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Border Grid.ColumnSpan="9"
|
||||
Visibility="{Binding ProjectManager_Visibility}"
|
||||
Style="{StaticResource Highlight_HelpBorder}">
|
||||
</Border>
|
||||
</Grid>
|
||||
<Grid Grid.Column="2" Width="70"/>
|
||||
<Grid Grid.Column="3"/>
|
||||
<Grid Grid.Column="4">
|
||||
<UniformGrid Rows="1">
|
||||
<Grid Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Style="{StaticResource TopBar_HelpButton}"/>
|
||||
</UniformGrid>
|
||||
</Grid>
|
||||
<Border Grid.Row="1"
|
||||
Grid.ColumnSpan="5"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
Margin="-2,7,0,0"
|
||||
Visibility="{Binding Icon_Visibility}"
|
||||
Style="{StaticResource Popup_HelpBorder}">
|
||||
<PrintApp:Icon_Tooltip/>
|
||||
</Border>
|
||||
<Border Grid.Row="1"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="5"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
Margin="-2,7,0,0"
|
||||
Visibility="{Binding ProjectManager_Visibility}"
|
||||
Style="{StaticResource Popup_HelpBorder}">
|
||||
<PrintApp:ProjectManager_Tooltip/>
|
||||
</Border>
|
||||
|
||||
</Grid>
|
||||
</Border>
|
||||
</Grid>
|
||||
@@ -0,0 +1,3 @@
|
||||
Public Class HelpPanelV
|
||||
|
||||
End Class
|
||||
@@ -0,0 +1,81 @@
|
||||
Imports EgtWPFLib5
|
||||
|
||||
Public Class HelpPanelVM
|
||||
Inherits VMBase
|
||||
|
||||
Public Enum HelpPages As Integer
|
||||
NULL = 0
|
||||
ICON = 1
|
||||
PROJECTMANAGER = 2
|
||||
End Enum
|
||||
|
||||
Private m_CurrHelpPage As HelpPages
|
||||
Public ReadOnly Property CurrHelpPage As HelpPages
|
||||
Get
|
||||
Return m_CurrHelpPage
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private m_Icon_Visibility As Boolean = False
|
||||
Public ReadOnly Property Icon_Visibility As Visibility
|
||||
Get
|
||||
Return If(m_Icon_Visibility, Visibility.Visible, Visibility.Collapsed)
|
||||
End Get
|
||||
End Property
|
||||
Public Property Icon_IsOpen As Boolean
|
||||
Get
|
||||
Return m_Icon_Visibility
|
||||
End Get
|
||||
Set(value As Boolean)
|
||||
m_Icon_Visibility = value
|
||||
End Set
|
||||
End Property
|
||||
Friend Sub SetIconVisibility(bValue As Boolean)
|
||||
m_Icon_Visibility = bValue
|
||||
NotifyPropertyChanged(NameOf(Icon_Visibility))
|
||||
NotifyPropertyChanged(NameOf(Icon_IsOpen))
|
||||
End Sub
|
||||
|
||||
Private m_ProjectManager_Visibility As Boolean = False
|
||||
Public ReadOnly Property ProjectManager_Visibility As Visibility
|
||||
Get
|
||||
Return If(m_ProjectManager_Visibility, Visibility.Visible, Visibility.Collapsed)
|
||||
End Get
|
||||
End Property
|
||||
Public Property ProjectManager_IsOpen As Boolean
|
||||
Get
|
||||
Return m_ProjectManager_Visibility
|
||||
End Get
|
||||
Set(value As Boolean)
|
||||
m_ProjectManager_Visibility = value
|
||||
End Set
|
||||
End Property
|
||||
Friend Sub SetProjectManagerVisibility(bValue As Boolean)
|
||||
m_ProjectManager_Visibility = bValue
|
||||
NotifyPropertyChanged(NameOf(ProjectManager_Visibility))
|
||||
NotifyPropertyChanged(NameOf(ProjectManager_IsOpen))
|
||||
End Sub
|
||||
|
||||
Sub New()
|
||||
Map.SetRefHelpPanelVM(Me)
|
||||
End Sub
|
||||
|
||||
Friend Sub SelHelpPage(SelHelpPage As HelpPages)
|
||||
Select Case m_CurrHelpPage
|
||||
Case HelpPages.ICON
|
||||
SetIconVisibility(False)
|
||||
Case HelpPages.PROJECTMANAGER
|
||||
SetProjectManagerVisibility(False)
|
||||
End Select
|
||||
m_CurrHelpPage = SelHelpPage
|
||||
Select Case m_CurrHelpPage
|
||||
Case HelpPages.NULL
|
||||
SetProjectManagerVisibility(False)
|
||||
Case HelpPages.ICON
|
||||
SetIconVisibility(True)
|
||||
Case HelpPages.PROJECTMANAGER
|
||||
SetProjectManagerVisibility(True)
|
||||
End Select
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
@@ -0,0 +1,12 @@
|
||||
<RichTextBox x:Class="Icon_Tooltip"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
BorderThickness="0"
|
||||
Width="200"
|
||||
Margin="5">
|
||||
<FlowDocument>
|
||||
<Paragraph FontSize="20">Icon</Paragraph>
|
||||
<Paragraph FontSize="14">The software logo icon.
|
||||
If clicked opens the AboutBox.</Paragraph>
|
||||
</FlowDocument>
|
||||
</RichTextBox>
|
||||
@@ -0,0 +1,3 @@
|
||||
Public Class Icon_Tooltip
|
||||
|
||||
End Class
|
||||
@@ -0,0 +1,29 @@
|
||||
<RichTextBox x:Class="ProjectManager_Tooltip"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
BorderThickness="0"
|
||||
Width="300"
|
||||
Margin="10">
|
||||
<FlowDocument>
|
||||
<Paragraph FontSize="20">Project Manager</Paragraph>
|
||||
<Paragraph FontSize="14">This space permit to manage the project.
|
||||
The commands available are :</Paragraph>
|
||||
<List>
|
||||
<ListItem>
|
||||
<Paragraph>New</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>Open</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>Save</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>Save As</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>Import</Paragraph>
|
||||
</ListItem>
|
||||
</List>
|
||||
</FlowDocument>
|
||||
</RichTextBox>
|
||||
@@ -0,0 +1,3 @@
|
||||
Public Class ProjectManager_Tooltip
|
||||
|
||||
End Class
|
||||
@@ -0,0 +1,71 @@
|
||||
<EgtWPFLib5:EgtMainWindow x:Class="HelpWndV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
|
||||
Title="{Binding Title_Msg}"
|
||||
Icon="/Resources/Icarus.ico"
|
||||
Height="600"
|
||||
Width="800"
|
||||
CloseCommand="{Binding Close_Command, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
|
||||
Style="{StaticResource Help_Window}">
|
||||
<RichTextBox IsReadOnly="True"
|
||||
IsDocumentEnabled="True">
|
||||
|
||||
<!--<FlowDocumentReader ViewingMode="Page"
|
||||
IsTwoPageViewEnabled="False"
|
||||
IsScrollViewEnabled="False">-->
|
||||
<FlowDocument>
|
||||
<Paragraph FontSize="50"
|
||||
FontWeight="Bold"
|
||||
TextAlignment="Center">
|
||||
Icarus Manual
|
||||
</Paragraph>
|
||||
<List FontSize="14">
|
||||
<ListItem>
|
||||
<Paragraph>
|
||||
<Hyperlink Command="{Binding SoftwareStructure_Command}">
|
||||
Software Structure
|
||||
</Hyperlink>
|
||||
</Paragraph>
|
||||
<List FontSize="14">
|
||||
<ListItem>
|
||||
<Paragraph>
|
||||
<Hyperlink Command="{Binding Icon_Command}">
|
||||
Icon
|
||||
</Hyperlink>
|
||||
</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>
|
||||
<Hyperlink Command="{Binding ProjectManagerBar_Command}">
|
||||
Project Manager Bar
|
||||
</Hyperlink>
|
||||
</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>View Bar</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>Status Bar</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>Top Panel</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>Slice Manager</Paragraph>
|
||||
</ListItem>
|
||||
</List>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>ListItem 2</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>ListItem 3</Paragraph>
|
||||
</ListItem>
|
||||
</List>
|
||||
|
||||
</FlowDocument>
|
||||
</RichTextBox>
|
||||
<!--</FlowDocumentReader>-->
|
||||
|
||||
</EgtWPFLib5:EgtMainWindow>
|
||||
@@ -0,0 +1,18 @@
|
||||
Public Class HelpWndV
|
||||
|
||||
Private WithEvents m_HelpWndVM As HelpWndVM
|
||||
|
||||
Sub New(Owner As Window, HelpWndVM As HelpWndVM)
|
||||
MyBase.New(Owner)
|
||||
' This call is required by the designer.
|
||||
InitializeComponent()
|
||||
Me.DataContext = HelpWndVM
|
||||
' Assegno al riferimento locale al VM il VM preso dal DataContext
|
||||
m_HelpWndVM = HelpWndVM
|
||||
End Sub
|
||||
|
||||
Private Sub CloseWindow(bDialogResult As Boolean) Handles m_HelpWndVM.m_CloseWindow
|
||||
Me.Close()
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
@@ -0,0 +1,108 @@
|
||||
Imports System.Collections.ObjectModel
|
||||
Imports System.Drawing
|
||||
Imports System.Windows.Forms.VisualStyles.VisualStyleElement.ToolTip
|
||||
Imports EgtWPFLib5
|
||||
|
||||
Public Class HelpWndVM
|
||||
|
||||
#Region "FIELDS & PROPERTIES"
|
||||
|
||||
Friend Event m_CloseWindow(bDialogResult As Boolean)
|
||||
|
||||
#Region "Messages"
|
||||
|
||||
Public ReadOnly Property Title_Msg As String
|
||||
Get
|
||||
Return "Help"
|
||||
End Get
|
||||
End Property
|
||||
|
||||
#End Region ' Messages
|
||||
|
||||
' Definizione comandi
|
||||
Private m_cmdSoftwareStructure As ICommand
|
||||
Private m_cmdIcon As ICommand
|
||||
Private m_cmdProjectManagerBar As ICommand
|
||||
Private m_cmdClose As ICommand
|
||||
|
||||
#End Region ' FIELDS & PROPERTIES
|
||||
|
||||
Sub New()
|
||||
Map.SetRefHelpWndVM(Me)
|
||||
End Sub
|
||||
|
||||
#Region "COMMANDS"
|
||||
|
||||
#Region "SoftwareStructure"
|
||||
|
||||
Public ReadOnly Property SoftwareStructure_Command As ICommand
|
||||
Get
|
||||
If m_cmdSoftwareStructure Is Nothing Then
|
||||
m_cmdSoftwareStructure = New Command(AddressOf SoftwareStructure)
|
||||
End If
|
||||
Return m_cmdSoftwareStructure
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub SoftwareStructure()
|
||||
|
||||
End Sub
|
||||
|
||||
#End Region ' SoftwareStructure
|
||||
|
||||
#Region "Icon"
|
||||
|
||||
Public ReadOnly Property Icon_Command As ICommand
|
||||
Get
|
||||
If m_cmdIcon Is Nothing Then
|
||||
m_cmdIcon = New Command(AddressOf Icon)
|
||||
End If
|
||||
Return m_cmdIcon
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub Icon()
|
||||
Map.refHelpPanelVM.SelHelpPage(HelpPanelVM.HelpPages.ICON)
|
||||
End Sub
|
||||
|
||||
#End Region ' Icon
|
||||
|
||||
#Region "ProjectManagerBar"
|
||||
|
||||
Public ReadOnly Property ProjectManagerBar_Command As ICommand
|
||||
Get
|
||||
If m_cmdProjectManagerBar Is Nothing Then
|
||||
m_cmdProjectManagerBar = New Command(AddressOf ProjectManagerBar)
|
||||
End If
|
||||
Return m_cmdProjectManagerBar
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub ProjectManagerBar()
|
||||
Map.refHelpPanelVM.SelHelpPage(HelpPanelVM.HelpPages.PROJECTMANAGER)
|
||||
End Sub
|
||||
|
||||
#End Region ' ProjectManagerBar
|
||||
|
||||
#Region "Close"
|
||||
|
||||
Public ReadOnly Property Close_Command As ICommand
|
||||
Get
|
||||
If m_cmdClose Is Nothing Then
|
||||
m_cmdClose = New Command(AddressOf Close)
|
||||
End If
|
||||
Return m_cmdClose
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub Close()
|
||||
Map.refHelpPanelVM.SelHelpPage(HelpPanelVM.HelpPages.NULL)
|
||||
Map.SetRefHelpWndVM(Nothing)
|
||||
RaiseEvent m_CloseWindow(True)
|
||||
End Sub
|
||||
|
||||
#End Region ' Close
|
||||
|
||||
#End Region ' COMMANDS
|
||||
|
||||
End Class
|
||||
@@ -158,6 +158,20 @@
|
||||
<DependentUpon>FilledSolidParamPanelV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FilledSolidParamPanel\FilledSolidParamPanelVM.vb" />
|
||||
<Compile Include="HelpPanel\HelpPanelV.xaml.vb">
|
||||
<DependentUpon>HelpPanelV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HelpPanel\HelpPanelVM.vb" />
|
||||
<Compile Include="HelpPanel\Icon_Tooltip.xaml.vb">
|
||||
<DependentUpon>Icon_Tooltip.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HelpPanel\ProjectManager_Tooltip.xaml.vb">
|
||||
<DependentUpon>ProjectManager_Tooltip.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HelpWnd\HelpWndV.xaml.vb">
|
||||
<DependentUpon>HelpWndV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HelpWnd\HelpWndVM.vb" />
|
||||
<Compile Include="ImportExportMachiningPanel\ImportExportMachiningPanelV.xaml.vb">
|
||||
<DependentUpon>ImportExportMachiningPanelV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
@@ -370,6 +384,22 @@
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="HelpPanel\HelpPanelV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="HelpPanel\Icon_Tooltip.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="HelpPanel\ProjectManager_Tooltip.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="HelpWnd\HelpWndV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="ImportExportMachiningPanel\ImportExportMachiningPanelV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>XamlIntelliSenseFileGenerator</Generator>
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
||||
xmlns:local="clr-namespace:Icarus"
|
||||
IsEnabled="{Binding InstrumentPanel_IsEnabled}"
|
||||
Orientation="Horizontal">
|
||||
|
||||
<local:CheckedImageToggleButton ToolTip="{Binding GetDist_ToolTip}"
|
||||
|
||||
@@ -749,7 +749,7 @@ Public Class NumericMachiningParam
|
||||
MyBase.New(Type, Cathegory)
|
||||
' leggo ed imposto eventuali min e max
|
||||
Dim sMinMax As String = ""
|
||||
If GetPrivateProfileString(S_MINMAX, Type, "", sMinMax, CurrentMachine.sMachIniFile) > 0 Then
|
||||
If GetMainPrivateProfileString(S_MINMAX, Type, "", sMinMax) > 0 Then
|
||||
Dim sMinMaxValues() As String = sMinMax.Split(","c)
|
||||
Dim dMin As Double = 0
|
||||
Dim dMax As Double = 0
|
||||
@@ -838,7 +838,7 @@ Public Class NumericMachiningParam
|
||||
m_dValue = ReadMachiningParamDouble(nIndex, MAC_POSTFLOWDELAY, 0)
|
||||
m_bIsLen = False
|
||||
Case Params.SCREWBACK
|
||||
m_dValue = ReadMachiningParamDouble(nIndex, MAC_SCREWBACK, 45)
|
||||
m_dValue = ReadMachiningParamDouble(nIndex, MAC_SCREWBACK, 0)
|
||||
m_bIsLen = False
|
||||
Case Params.RIBSOVERLAP
|
||||
m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSOVERLAP, 0)
|
||||
|
||||
@@ -195,8 +195,8 @@ Public Class MainWindowM
|
||||
' Verifico abilitazione nesting automatico
|
||||
m_bAutoNestOption = Not String.IsNullOrWhiteSpace(sNestKey)
|
||||
' Recupero livello e opzioni della chiave
|
||||
Dim bKey As Boolean = EgtGetKeyLevel(5583, 2505, 1, m_nKeyLevel) And
|
||||
EgtGetKeyOptions(5583, 2505, 1, m_nKeyOptions)
|
||||
Dim bKey As Boolean = EgtGetKeyLevel(5583, 2504, 1, m_nKeyLevel) And
|
||||
EgtGetKeyOptions(5583, 2504, 1, m_nKeyOptions)
|
||||
' Inizializzazione generale di EgtInterface
|
||||
m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
|
||||
m_sLogFile = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())
|
||||
|
||||
@@ -148,7 +148,7 @@ Public Class MainWindowVM
|
||||
End Sub
|
||||
|
||||
Private Function ProcessEvents(ByVal nProg As Integer, ByVal nPause As Integer) As Integer
|
||||
If Map.refSliceManagerVM.bCalculating OrElse Map.refSliceManagerVM.bCalcSolid Then
|
||||
If Map.refSliceManagerVM.bCalculating Then
|
||||
Map.refSliceManagerVM.ProcessEvents(nProg, nPause)
|
||||
End If
|
||||
If Not IsNothing(Map.refImportLoadingWndVM) Then
|
||||
|
||||
@@ -70,5 +70,5 @@ Imports System.Windows
|
||||
' by using the '*' as shown below:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.5.5.1")>
|
||||
<Assembly: AssemblyFileVersion("2.5.5.1")>
|
||||
<Assembly: AssemblyVersion("2.5.4.1")>
|
||||
<Assembly: AssemblyFileVersion("2.5.4.1")>
|
||||
|
||||
@@ -86,5 +86,12 @@
|
||||
<Image Source="/Resources/ProjectManager/Send.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
<Button Command="{Binding Help_Command}"
|
||||
ToolTip="{Binding Help_ToolTip}"
|
||||
Margin="2.5,0,0,0"
|
||||
Style="{StaticResource ProjManager_Button}">
|
||||
<Image Source="/Resources/ProjectManager/Send.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
|
||||
</StackPanel>
|
||||
|
||||
@@ -63,6 +63,7 @@ Public Class ProjManagerVM
|
||||
Private m_cmdExport As ICommand
|
||||
Private m_cmdOptions As ICommand
|
||||
Private m_cmdSendFeedback As ICommand
|
||||
Private m_cmdHelp As ICommand
|
||||
|
||||
|
||||
#Region "ToolTip"
|
||||
@@ -197,7 +198,7 @@ Public Class ProjManagerVM
|
||||
End Sub
|
||||
|
||||
Friend Function OpenProject(sFilePath As String) As Boolean
|
||||
Return Map.refSceneHostVM.OpenProject(sFilePath)
|
||||
Map.refSceneHostVM.OpenProject(sFilePath)
|
||||
End Function
|
||||
|
||||
#End Region ' OpenCommand
|
||||
@@ -385,7 +386,7 @@ Public Class ProjManagerVM
|
||||
Map.refSceneHostVM.SaveProject()
|
||||
End If
|
||||
EgtGetCurrFilePath(sCurrProject)
|
||||
' se modificato, chiedo se si vuole salvare
|
||||
' se modificato, chiedo se si vuole salvare
|
||||
Else
|
||||
If EgtGetModified() Then
|
||||
If MessageBox.Show(EgtMsg(MSG_TOPCOMMANDBAR + 11), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
|
||||
@@ -483,6 +484,30 @@ Public Class ProjManagerVM
|
||||
|
||||
#End Region ' SendFeedback
|
||||
|
||||
#Region "Help"
|
||||
|
||||
''' <summary>
|
||||
''' Returns a command that do SendFeedback.
|
||||
''' </summary>
|
||||
Public ReadOnly Property Help_Command As ICommand
|
||||
Get
|
||||
If m_cmdHelp Is Nothing Then
|
||||
m_cmdHelp = New Command(AddressOf Help)
|
||||
End If
|
||||
Return m_cmdHelp
|
||||
End Get
|
||||
End Property
|
||||
|
||||
''' <summary>
|
||||
''' Execute the SendFeedback. This method is invoked by the SendFeedbackCommand.
|
||||
''' </summary>
|
||||
Public Sub Help(ByVal param As Object)
|
||||
Dim HelpWnd As New HelpWndV(Application.Current.MainWindow, New HelpWndVM())
|
||||
HelpWnd.Show()
|
||||
End Sub
|
||||
|
||||
#End Region ' Help
|
||||
|
||||
#End Region ' Commands
|
||||
|
||||
End Class
|
||||
|
||||
@@ -2,9 +2,7 @@
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:PrintApp="clr-namespace:Icarus">
|
||||
<DockPanel.Resources>
|
||||
<PrintApp:VisibilityToRowConverter x:Key="VisibilityToRowConverter"/>
|
||||
</DockPanel.Resources>
|
||||
|
||||
<Grid DockPanel.Dock="Top">
|
||||
<PrintApp:TopPanelV Grid.Column="1"
|
||||
DataContext="{StaticResource TopPanelVM }"/>
|
||||
@@ -29,27 +27,12 @@
|
||||
DataContext="{StaticResource SliderManagerVM}"
|
||||
HorizontalAlignment="Stretch"/>
|
||||
<!--StatusBar -->
|
||||
<Grid Grid.RowSpan="2"
|
||||
Grid.ColumnSpan="2">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="67"/>
|
||||
</Grid.RowDefinitions>
|
||||
<PrintApp:MessagePanelV Grid.Row="{Binding DataContext.Message_Visibility, ElementName=ControllerInputPanelV, Converter={StaticResource VisibilityToRowConverter}}"
|
||||
Grid.ColumnSpan="2"
|
||||
DataContext="{StaticResource StatusBarVM}"/>
|
||||
<PrintApp:ControllerInputPanelV x:Name="ControllerInputPanelV" Grid.Row="2"
|
||||
Grid.ColumnSpan="2"
|
||||
DataContext="{StaticResource ControllerInputPanelVM}"/>
|
||||
</Grid>
|
||||
|
||||
<!--<PrintApp:ControllerInputPanelV Grid.Row="1"
|
||||
<PrintApp:ControllerInputPanelV Grid.Row="1"
|
||||
Grid.ColumnSpan="2"
|
||||
DataContext="{StaticResource ControllerInputPanelVM}"/>
|
||||
<PrintApp:MessagePanelV Grid.Row="1"
|
||||
Grid.ColumnSpan="2"
|
||||
DataContext="{StaticResource StatusBarVM}"/>-->
|
||||
DataContext="{StaticResource StatusBarVM}"/>
|
||||
<PrintApp:ShowPanelV Grid.Column="2"
|
||||
Grid.Row="1"
|
||||
DataContext="{StaticResource ShowPanelVM}"/>
|
||||
|
||||
@@ -3,7 +3,6 @@ Imports EgtWPFLib5
|
||||
Imports EgtUILib
|
||||
Imports System.Collections.ObjectModel
|
||||
Imports System.IO
|
||||
Imports System.Globalization
|
||||
|
||||
Public Class ProjectVM
|
||||
Inherits VMBase
|
||||
@@ -29,15 +28,3 @@ Public Class ProjectVM
|
||||
|
||||
End Class
|
||||
|
||||
Public Class VisibilityToRowConverter
|
||||
Implements IValueConverter
|
||||
|
||||
Public Function Convert(ByVal value As Object, ByVal targetType As Type, ByVal parameter As Object, ByVal culture As CultureInfo) As Object Implements IValueConverter.Convert
|
||||
If IsNothing(value) Then Return 2
|
||||
Return If(value = Visibility.Visible, 1, 2)
|
||||
End Function
|
||||
|
||||
Public Function ConvertBack(ByVal value As Object, ByVal targetType As Type, ByVal parameter As Object, ByVal culture As CultureInfo) As Object Implements IValueConverter.ConvertBack
|
||||
Throw New System.NotImplementedException()
|
||||
End Function
|
||||
End Class
|
||||
|
||||
@@ -42,10 +42,6 @@ Public Class RibPanelVM
|
||||
Return m_SelRib
|
||||
End Get
|
||||
Set(value As RibEntity)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse Map.refRibPanelVM.bCPlaneObj_IsActive Then
|
||||
NotifyPropertyChanged(NameOf(SelRib))
|
||||
Return
|
||||
End If
|
||||
m_SelRib = value
|
||||
EgtDeselectAll()
|
||||
If Not IsNothing(value) Then
|
||||
@@ -378,8 +374,6 @@ Public Class RibPanelVM
|
||||
NotifyPropertyChanged(NameOf(bRotate_IsChecked))
|
||||
Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.RIBPARAM)
|
||||
NotifyPropertyChanged(NameOf(RibList_IsEnabled))
|
||||
' disattivo interfaccia
|
||||
ManageInterface(False)
|
||||
Else
|
||||
NotifyPropertyChanged(NameOf(m_bMachParam_IsChecked))
|
||||
End If
|
||||
@@ -389,8 +383,6 @@ Public Class RibPanelVM
|
||||
m_bMachParam_IsChecked = False
|
||||
NotifyPropertyChanged(NameOf(bMachParam_IsChecked))
|
||||
NotifyPropertyChanged(NameOf(RibList_IsEnabled))
|
||||
' riattivo interfaccia
|
||||
ManageInterface(True)
|
||||
End Sub
|
||||
|
||||
Public ReadOnly Property Compo_Visibility As Visibility
|
||||
@@ -399,17 +391,11 @@ Public Class RibPanelVM
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private m_RibList_IsEnabled As Boolean = False
|
||||
Public ReadOnly Property RibList_IsEnabled As Boolean
|
||||
Get
|
||||
Return If(m_RibList.Count > 0, m_RibList_IsEnabled, False)
|
||||
Return Not m_bMachParam_IsChecked
|
||||
End Get
|
||||
End Property
|
||||
Friend Sub SetRibListIsEnabled(bValue As Boolean)
|
||||
m_RibList_IsEnabled = bValue
|
||||
NotifyPropertyChanged(NameOf(RibList_IsEnabled))
|
||||
End Sub
|
||||
|
||||
' riferimento griglia all'ingresso in questa pagina
|
||||
Private m_OriginalGridFrame As New Frame3d
|
||||
|
||||
@@ -427,8 +413,6 @@ Public Class RibPanelVM
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private m_bEscOnLine2P As Boolean = False
|
||||
|
||||
#Region "Tooltip"
|
||||
|
||||
Public ReadOnly Property Import_ToolTip As String
|
||||
@@ -612,8 +596,6 @@ Public Class RibPanelVM
|
||||
SelRib = m_RibList(0)
|
||||
NotifyPropertyChanged(NameOf(SelRib))
|
||||
End If
|
||||
' abilito lista ribs
|
||||
SetRibListIsEnabled(True)
|
||||
Map.refSceneHostVM.MainScene.SetStatusNull()
|
||||
End Sub
|
||||
|
||||
@@ -649,13 +631,8 @@ Public Class RibPanelVM
|
||||
EgtSelectObj(m_SelRib.nCurveId)
|
||||
Case RibSelectionTypes.EXTRUSION
|
||||
' creo layer per estrusione
|
||||
Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION)
|
||||
If nNewExtrusionLayerId = GDB_ID.NULL Then
|
||||
nNewExtrusionLayerId = EgtCreateGroup(m_nPartId)
|
||||
EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
|
||||
Else
|
||||
EgtEmptyGroup(nNewExtrusionLayerId)
|
||||
End If
|
||||
Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
|
||||
EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
|
||||
EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
|
||||
EgtSelectObj(m_SelRib.nCurveId)
|
||||
Case RibSelectionTypes.BOTH
|
||||
@@ -663,8 +640,6 @@ Public Class RibPanelVM
|
||||
EgtSelectObj(m_SelRib.nExtrusionId)
|
||||
End Select
|
||||
EgtDraw()
|
||||
' disattivo il resto dell'interfaccia
|
||||
ManageInterface(False)
|
||||
Return True
|
||||
End Function
|
||||
|
||||
@@ -674,7 +649,6 @@ Public Class RibPanelVM
|
||||
End Sub
|
||||
|
||||
Friend Sub OnExecCmdEnd(command As Controller.CMD)
|
||||
m_bEscOnLine2P = False
|
||||
Select Case command
|
||||
Case Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE
|
||||
' leggo altezza estrusione
|
||||
@@ -714,10 +688,6 @@ Public Class RibPanelVM
|
||||
' Imposto flag di ricalcolo slice
|
||||
EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
|
||||
End Select
|
||||
' se non ho creato percorso riabilito interfaccia
|
||||
If Not m_bIsCreatingPath Then
|
||||
ManageInterface(True)
|
||||
End If
|
||||
If command <> Controller.CMD.LINE2P AndAlso command <> Controller.CMD.EXTRUDE Then Return
|
||||
' se finita creazione estrusione
|
||||
If m_bIsCreatingExtrusion Then
|
||||
@@ -784,10 +754,9 @@ Public Class RibPanelVM
|
||||
EgtSelectObj(nNewEntityId)
|
||||
If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
|
||||
m_bIsCreatingExtrusion = True
|
||||
If Not EgtCurveIsClosed(nNewEntityId) Then
|
||||
m_bEscOnLine2P = True
|
||||
End If
|
||||
Else
|
||||
' cancello layer
|
||||
'EgtErase(nNewRibLayerId)
|
||||
EgtErase(nNewExtrusionLayerId)
|
||||
End If
|
||||
End If
|
||||
@@ -810,13 +779,6 @@ Public Class RibPanelVM
|
||||
' rimetto la selezione scena a null
|
||||
Map.refSceneHostVM.MainScene.SetStatusNull()
|
||||
End If
|
||||
' se esc su creazione percorso, lo annullo, altrimenti riabilito interfaccia
|
||||
If m_bEscOnLine2P Then
|
||||
m_bEscOnLine2P = False
|
||||
Else
|
||||
If m_bIsCreatingExtrusion Then m_bIsCreatingExtrusion = False
|
||||
ManageInterface(True)
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -852,18 +814,6 @@ Public Class RibPanelVM
|
||||
Return nRibIndex + 1
|
||||
End Function
|
||||
|
||||
Friend Sub ManageInterface(bValue As Boolean)
|
||||
' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
|
||||
Map.refProjManagerVM.SetProjCmdIsEnabled(bValue)
|
||||
Map.refTopPanelVM.SetTopPanelIsEnabled(bValue)
|
||||
Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(bValue)
|
||||
Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue)
|
||||
Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue)
|
||||
Map.refSliceManagerVM.SetButtonsIsEnabled(bValue)
|
||||
Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bValue)
|
||||
SetRibListIsEnabled(bValue)
|
||||
End Sub
|
||||
|
||||
#End Region ' METHODS
|
||||
|
||||
#Region "COMMANDS"
|
||||
@@ -887,9 +837,7 @@ Public Class RibPanelVM
|
||||
''' </summary>
|
||||
Public Sub Import(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
Map.refSceneHostVM.InsertRib()
|
||||
ManageInterface(True)
|
||||
End Sub
|
||||
|
||||
#End Region ' Import
|
||||
@@ -913,7 +861,6 @@ Public Class RibPanelVM
|
||||
''' </summary>
|
||||
Public Sub Line2P(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
Dim nNewRibLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB)
|
||||
If nNewRibLayerId = GDB_ID.NULL Then nNewRibLayerId = EgtCreateGroup(m_nPartId)
|
||||
EgtSetName(nNewRibLayerId, LAY_NEWRIB)
|
||||
@@ -958,11 +905,10 @@ Public Class RibPanelVM
|
||||
Else
|
||||
SelRib = Nothing
|
||||
m_bEdit_IsChecked = False
|
||||
NotifyPropertyChanged(NameOf(bEdit_IsChecked))
|
||||
NotifyPropertyChanged(NameOf( bEdit_IsChecked))
|
||||
End If
|
||||
NotifyPropertyChanged(NameOf(SelRib))
|
||||
End If
|
||||
SetRibListIsEnabled(True)
|
||||
End Sub
|
||||
|
||||
#End Region ' Delete
|
||||
@@ -1246,7 +1192,6 @@ Public Class RibPanelVM
|
||||
''' </summary>
|
||||
Public Sub CPlaneElevation(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
|
||||
End Sub
|
||||
|
||||
@@ -1271,7 +1216,6 @@ Public Class RibPanelVM
|
||||
''' </summary>
|
||||
Public Sub CPlaneOrigin(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
|
||||
End Sub
|
||||
|
||||
@@ -1388,7 +1332,6 @@ Public Class RibPanelVM
|
||||
''' </summary>
|
||||
Public Sub CPlaneObj(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
' salvo selezione precedente e deseleziono altri oggetti
|
||||
m_PrevSelObjs.Clear()
|
||||
Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
|
||||
|
||||
@@ -135,8 +135,6 @@ Public Class RibParamPanelVM
|
||||
Map.refSliceManagerVM.UpdateDimensions()
|
||||
End If
|
||||
End If
|
||||
' riattivo lista ribs
|
||||
Map.refRibPanelVM.SetRibListIsEnabled(False)
|
||||
' ripristino modalita' standard
|
||||
Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
|
||||
Map.refRibPanelVM.ResetMachParamIsChecked()
|
||||
|
||||
@@ -274,6 +274,8 @@ Public Class MySceneHostVM
|
||||
bOk = MainController.OpenProject(sFilePath, False)
|
||||
' Imposto stato gestione mouse diretto della scena a nessuno
|
||||
MainScene.SetStatusNull()
|
||||
' imposto modalita' import
|
||||
Map.refTopPanelVM.SelPage = Pages.NULL
|
||||
Return bOk
|
||||
End Function
|
||||
|
||||
|
||||
@@ -15,6 +15,9 @@
|
||||
<EgtWPFLib5:EgtMainWindow.TitlePanel>
|
||||
<PrintApp:ProjManagerV DataContext="{StaticResource ProjManagerVM}"/>
|
||||
</EgtWPFLib5:EgtMainWindow.TitlePanel>
|
||||
<EgtWPFLib5:EgtMainWindow.HelpPanel>
|
||||
<PrintApp:HelpPanelV DataContext="{StaticResource HelpPanelVM}"/>
|
||||
</EgtWPFLib5:EgtMainWindow.HelpPanel>
|
||||
<EgtWPFLib5:EgtMainWindow.OpacityMask>
|
||||
<SolidColorBrush Color="White" Opacity="{Binding Window_Opacity}"/>
|
||||
</EgtWPFLib5:EgtMainWindow.OpacityMask>
|
||||
@@ -26,5 +29,4 @@
|
||||
<PrintApp:ProjectV DataContext="{StaticResource ProjectVM}"/>
|
||||
|
||||
</DockPanel>
|
||||
|
||||
</EgtWPFLib5:EgtMainWindow>
|
||||
|
||||
@@ -130,10 +130,7 @@ Public Class SecondaryWindowVM
|
||||
Dim sFile As String = Environment.GetCommandLineArgs(1)
|
||||
Dim sExt As String = IO.Path.GetExtension(sFile).ToLower()
|
||||
If String.IsNullOrWhiteSpace(sFile) OrElse String.IsNullOrWhiteSpace(sExt) Then Return False
|
||||
Dim bOk As Boolean = OpenStdFile(sFile)
|
||||
m_Window_Opacity = 1
|
||||
NotifyPropertyChanged(NameOf(Window_Opacity))
|
||||
Return bOk
|
||||
Return OpenStdFile(sFile)
|
||||
End Function
|
||||
|
||||
Friend Function OpenStdFile(sFile As String) As Boolean
|
||||
|
||||
@@ -40,10 +40,6 @@ Public Class ShellNumberPanelVM
|
||||
Return m_SelShellNumber
|
||||
End Get
|
||||
Set(value As ShellNumberEntity)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse Map.refShellNumberPanelVM.bCPlaneObj_IsActive Then
|
||||
NotifyPropertyChanged(NameOf(SelShellNumber))
|
||||
Return
|
||||
End If
|
||||
m_SelShellNumber = value
|
||||
EgtDeselectAll()
|
||||
If Not IsNothing(value) Then
|
||||
@@ -358,8 +354,6 @@ Public Class ShellNumberPanelVM
|
||||
NotifyPropertyChanged(NameOf(bRotate_IsChecked))
|
||||
Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.SHELLNUMBERPARAM)
|
||||
NotifyPropertyChanged(NameOf(ShellNumberList_IsEnabled))
|
||||
' disattivo interfaccia
|
||||
ManageInterface(False)
|
||||
Else
|
||||
NotifyPropertyChanged(NameOf(m_bMachParam_IsChecked))
|
||||
End If
|
||||
@@ -369,8 +363,6 @@ Public Class ShellNumberPanelVM
|
||||
m_bMachParam_IsChecked = False
|
||||
NotifyPropertyChanged(NameOf(bMachParam_IsChecked))
|
||||
NotifyPropertyChanged(NameOf(ShellNumberList_IsEnabled))
|
||||
' riattivo interfaccia
|
||||
ManageInterface(True)
|
||||
End Sub
|
||||
|
||||
Public ReadOnly Property Compo_Visibility As Visibility
|
||||
@@ -379,17 +371,11 @@ Public Class ShellNumberPanelVM
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private m_ShellNumberList_IsEnabled As Boolean = False
|
||||
Public ReadOnly Property ShellNumberList_IsEnabled As Boolean
|
||||
Get
|
||||
Return If(m_ShellNumberList.Count > 0, m_ShellNumberList_IsEnabled, False)
|
||||
Return Not m_bMachParam_IsChecked
|
||||
End Get
|
||||
End Property
|
||||
Friend Sub SetShellNumberListIsEnabled(bValue As Boolean)
|
||||
m_ShellNumberList_IsEnabled = bValue
|
||||
NotifyPropertyChanged(NameOf(ShellNumberList_IsEnabled))
|
||||
End Sub
|
||||
|
||||
' riferimento griglia all'ingresso in questa pagina
|
||||
Private m_OriginalGridFrame As New Frame3d
|
||||
|
||||
@@ -407,8 +393,6 @@ Public Class ShellNumberPanelVM
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private m_bEscOnLine2P As Boolean = False
|
||||
|
||||
#Region "Tooltip"
|
||||
|
||||
Public ReadOnly Property Import_ToolTip As String
|
||||
@@ -592,8 +576,6 @@ Public Class ShellNumberPanelVM
|
||||
SelShellNumber = m_ShellNumberList(0)
|
||||
NotifyPropertyChanged(NameOf(SelShellNumber))
|
||||
End If
|
||||
' abilito lista shell number
|
||||
SetShellNumberListIsEnabled(True)
|
||||
Map.refSceneHostVM.MainScene.SetStatusNull()
|
||||
End Sub
|
||||
|
||||
@@ -629,13 +611,8 @@ Public Class ShellNumberPanelVM
|
||||
EgtSelectObj(m_SelShellNumber.nCurveId)
|
||||
Case ShellNumberSelectionTypes.EXTRUSION
|
||||
' creo layer per estrusione
|
||||
Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION)
|
||||
If nNewExtrusionLayerId = GDB_ID.NULL Then
|
||||
nNewExtrusionLayerId = EgtCreateGroup(m_nPartId)
|
||||
EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
|
||||
Else
|
||||
EgtEmptyGroup(nNewExtrusionLayerId)
|
||||
End If
|
||||
Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
|
||||
EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
|
||||
EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
|
||||
EgtSelectObj(m_SelShellNumber.nCurveId)
|
||||
Case ShellNumberSelectionTypes.BOTH
|
||||
@@ -643,8 +620,6 @@ Public Class ShellNumberPanelVM
|
||||
EgtSelectObj(m_SelShellNumber.nExtrusionId)
|
||||
End Select
|
||||
EgtDraw()
|
||||
' disattivo il resto dell'interfaccia
|
||||
ManageInterface(False)
|
||||
Return True
|
||||
End Function
|
||||
|
||||
@@ -654,7 +629,6 @@ Public Class ShellNumberPanelVM
|
||||
End Sub
|
||||
|
||||
Friend Sub OnExecCmdEnd(command As Controller.CMD)
|
||||
m_bEscOnLine2P = False
|
||||
Select Case command
|
||||
Case Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE
|
||||
' leggo altezza estrusione
|
||||
@@ -694,10 +668,6 @@ Public Class ShellNumberPanelVM
|
||||
' Imposto flag di ricalcolo slice
|
||||
EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
|
||||
End Select
|
||||
' se non ho creato percorso riabilito interfaccia
|
||||
If Not m_bIsCreatingPath Then
|
||||
ManageInterface(True)
|
||||
End If
|
||||
If command <> Controller.CMD.LINE2P AndAlso command <> Controller.CMD.EXTRUDE Then Return
|
||||
' se finita creazione estrusione
|
||||
If m_bIsCreatingExtrusion Then
|
||||
@@ -768,9 +738,6 @@ Public Class ShellNumberPanelVM
|
||||
If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
|
||||
m_bIsCreatingExtrusion = True
|
||||
Map.refControllerInputPanelVM.IsChecked = True
|
||||
If Not EgtCurveIsClosed(nNewEntityId) Then
|
||||
m_bEscOnLine2P = True
|
||||
End If
|
||||
Else
|
||||
' cancello layer
|
||||
EgtErase(nNewExtrusionLayerId)
|
||||
@@ -795,13 +762,6 @@ Public Class ShellNumberPanelVM
|
||||
' rimetto la selezione scena a null
|
||||
Map.refSceneHostVM.MainScene.SetStatusNull()
|
||||
End If
|
||||
' se esc su creazione percorso, lo annullo, altrimenti riabilito interfaccia
|
||||
If m_bEscOnLine2P Then
|
||||
m_bEscOnLine2P = False
|
||||
Else
|
||||
If m_bIsCreatingExtrusion Then m_bIsCreatingExtrusion = False
|
||||
ManageInterface(True)
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -837,19 +797,6 @@ Public Class ShellNumberPanelVM
|
||||
Return nShellNumberIndex + 1
|
||||
End Function
|
||||
|
||||
Friend Sub ManageInterface(bValue As Boolean)
|
||||
' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
|
||||
Map.refProjManagerVM.SetProjCmdIsEnabled(bValue)
|
||||
Map.refTopPanelVM.SetTopPanelIsEnabled(bValue)
|
||||
Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(bValue)
|
||||
Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue)
|
||||
Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue)
|
||||
Map.refSliceManagerVM.SetButtonsIsEnabled(bValue)
|
||||
Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bValue)
|
||||
SetShellNumberListIsEnabled(bValue)
|
||||
End Sub
|
||||
|
||||
|
||||
#End Region ' METHODS
|
||||
|
||||
#Region "COMMANDS"
|
||||
@@ -873,9 +820,7 @@ Public Class ShellNumberPanelVM
|
||||
''' </summary>
|
||||
Public Sub Import(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
Map.refSceneHostVM.InsertShellNumber()
|
||||
ManageInterface(True)
|
||||
End Sub
|
||||
|
||||
#End Region ' Import
|
||||
@@ -899,7 +844,6 @@ Public Class ShellNumberPanelVM
|
||||
''' </summary>
|
||||
Public Sub Line2P(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
Dim nNewShellNumberLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB)
|
||||
If nNewShellNumberLayerId = GDB_ID.NULL Then nNewShellNumberLayerId = EgtCreateGroup(m_nPartId)
|
||||
EgtSetName(nNewShellNumberLayerId, LAY_NEWRIB)
|
||||
@@ -948,7 +892,6 @@ Public Class ShellNumberPanelVM
|
||||
End If
|
||||
NotifyPropertyChanged(NameOf(SelShellNumber))
|
||||
End If
|
||||
SetShellNumberListIsEnabled(True)
|
||||
End Sub
|
||||
|
||||
#End Region ' Delete
|
||||
@@ -1233,7 +1176,6 @@ Public Class ShellNumberPanelVM
|
||||
''' </summary>
|
||||
Public Sub CPlaneElevation(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
|
||||
End Sub
|
||||
|
||||
@@ -1258,7 +1200,6 @@ Public Class ShellNumberPanelVM
|
||||
''' </summary>
|
||||
Public Sub CPlaneOrigin(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
|
||||
End Sub
|
||||
|
||||
@@ -1375,7 +1316,6 @@ Public Class ShellNumberPanelVM
|
||||
''' </summary>
|
||||
Public Sub CPlaneObj(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
' salvo selezione precedente e deseleziono altri oggetti
|
||||
m_PrevSelObjs.Clear()
|
||||
Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
|
||||
|
||||
@@ -44,11 +44,6 @@ Public Class SliceManagerVM
|
||||
Private m_bCalcTFS As Boolean = False
|
||||
Private m_bGenerate As Boolean = False
|
||||
Private m_bCalcSolid As Boolean = False
|
||||
Friend ReadOnly Property bCalcSolid As Boolean
|
||||
Get
|
||||
Return m_bCalcSolid
|
||||
End Get
|
||||
End Property
|
||||
Friend Sub SetCalcSolid(value As Boolean)
|
||||
m_bCalcSolid = value
|
||||
End Sub
|
||||
@@ -531,8 +526,6 @@ Public Class SliceManagerVM
|
||||
''' Execute the CPlaneTop. This method is invoked by the CPlaneTopCommand.
|
||||
''' </summary>
|
||||
Public Sub Slice()
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse Map.refStartMachPanelVM.bCPlaneObj_IsActive OrElse Map.refRibPanelVM.bCPlaneObj_IsActive OrElse
|
||||
Map.refShellNumberPanelVM.bCPlaneObj_IsActive OrElse Map.refFilledSolidPanelVM.bCPlaneObj_IsActive Then Return
|
||||
If m_bCalculating Then Return
|
||||
m_bCalculating = True
|
||||
If IsNothing(Map.refTopPanelVM.SelPart) Then
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
ItemsSource="{Binding StartList}"
|
||||
SelectedItem="{Binding SelStart}"
|
||||
DisplayMemberPath="ghName"
|
||||
IsEnabled="{Binding StartList_IsEnabled}"
|
||||
Style="{StaticResource LeftPanel_ComboBox}"/>
|
||||
<!-- Add Button -->
|
||||
<ToggleButton x:Name="AddBtn"
|
||||
|
||||
@@ -35,10 +35,6 @@ Public Class StartMachPanelVM
|
||||
Return m_SelStart
|
||||
End Get
|
||||
Set(value As StartEntity)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse Map.refStartMachPanelVM.bCPlaneObj_IsActive Then
|
||||
NotifyPropertyChanged(NameOf(SelStart))
|
||||
Return
|
||||
End If
|
||||
m_SelStart = value
|
||||
EgtDeselectAll()
|
||||
If Not IsNothing(value) Then
|
||||
@@ -297,18 +293,6 @@ Public Class StartMachPanelVM
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private m_StartList_IsEnabled As Boolean = False
|
||||
Public ReadOnly Property StartList_IsEnabled As Boolean
|
||||
Get
|
||||
Return If(m_StartList.Count > 0, m_StartList_IsEnabled, False)
|
||||
End Get
|
||||
End Property
|
||||
Friend Sub SetStartListIsEnabled(bValue As Boolean)
|
||||
m_StartList_IsEnabled = bValue
|
||||
NotifyPropertyChanged(NameOf(StartList_IsEnabled))
|
||||
End Sub
|
||||
|
||||
|
||||
' riferimento griglia all'ingresso in questa pagina
|
||||
Private m_OriginalGridFrame As New Frame3d
|
||||
|
||||
@@ -320,8 +304,6 @@ Public Class StartMachPanelVM
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private m_bEscOnLine2P As Boolean = False
|
||||
|
||||
#Region "Tooltip"
|
||||
|
||||
Public ReadOnly Property Point_ToolTip As String
|
||||
@@ -476,8 +458,6 @@ Public Class StartMachPanelVM
|
||||
SelStart = m_StartList(0)
|
||||
NotifyPropertyChanged(NameOf(SelStart))
|
||||
End If
|
||||
' abilito lista start mach
|
||||
SetStartListIsEnabled(True)
|
||||
Map.refSceneHostVM.MainScene.SetStatusNull()
|
||||
End Sub
|
||||
|
||||
@@ -501,33 +481,16 @@ Public Class StartMachPanelVM
|
||||
' seleziono percorso corrente
|
||||
EgtDeselectAll()
|
||||
EgtSelectObj(m_SelStart.nId)
|
||||
EgtDraw()
|
||||
' disattivo il resto dell'interfaccia
|
||||
ManageInterface(False)
|
||||
Return True
|
||||
End Function
|
||||
|
||||
Friend Sub UpdateUI()
|
||||
' se attiva operazione in piu' passaggi, esco
|
||||
If Map.refSceneHostVM.MainController.GetContinue() Then Return
|
||||
End Sub
|
||||
|
||||
Friend Sub OnExecCmdEnd(command As Controller.CMD)
|
||||
m_bEscOnLine2P = False
|
||||
Select Case command
|
||||
Case Controller.CMD.LINE2P, Controller.CMD.DELETE, Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE,
|
||||
Controller.CMD.MOVE, Controller.CMD.ROTATE
|
||||
' Imposto flag di ricalcolo slice
|
||||
EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
|
||||
' rimetto la selezione scena a null
|
||||
Map.refSceneHostVM.MainScene.SetStatusNull()
|
||||
End Select
|
||||
' riabilito interfaccia
|
||||
ManageInterface(True)
|
||||
' se finita creazione curva
|
||||
Dim NewEntity As StartEntity = Nothing
|
||||
' se finita creazione curva (è stata chiusa)
|
||||
If bIsCreatingPath Then
|
||||
m_bIsCreatingPath = False
|
||||
Dim NewEntity As StartEntity = Nothing
|
||||
Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWSTART)
|
||||
Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewStartLayerId)
|
||||
Dim NewGeomType As GDB_TY = EgtGetType(nNewEntityId)
|
||||
@@ -540,22 +503,37 @@ Public Class StartMachPanelVM
|
||||
NewEntityType = StartMachTypes.COMPO
|
||||
End Select
|
||||
EgtSetName(nNewEntityId, START_GEOM)
|
||||
' resetto colore entita'
|
||||
EgtResetColor(nNewEntityId)
|
||||
' coloro l'entita' di rosso
|
||||
Dim c3Red As Color3d
|
||||
c3Red.FromColor(System.Drawing.Color.Red)
|
||||
EgtSetColor(nNewEntityId, c3Red)
|
||||
' lo sposto nel layer degli start
|
||||
EgtRelocateGlob(nNewEntityId, m_nStartMachLayerId, GDB_POS.LAST_SON)
|
||||
' lo aggiungo alla lista
|
||||
NewEntity = New StartEntity(nNewEntityId, NewEntityType)
|
||||
m_StartList.Add(NewEntity)
|
||||
' lo seleziono
|
||||
SelStart = NewEntity
|
||||
NotifyPropertyChanged(NameOf(SelStart))
|
||||
' cancello layer di disegno
|
||||
EgtErase(nNewStartLayerId)
|
||||
End If
|
||||
' cancello layer di disegno
|
||||
EgtErase(nNewStartLayerId)
|
||||
End If
|
||||
' aggiorno posizione
|
||||
RefreshPos()
|
||||
' se aggiunta entita'
|
||||
If Not IsNothing(NewEntity) Then
|
||||
SelStart = NewEntity
|
||||
NotifyPropertyChanged(NameOf(SelStart))
|
||||
End If
|
||||
' rimetto la selezione scena a null
|
||||
Map.refSceneHostVM.MainScene.SetStatusNull()
|
||||
End Sub
|
||||
|
||||
Friend Sub OnExecCmdEnd(command As Controller.CMD)
|
||||
Select Case command
|
||||
Case Controller.CMD.LINE2P, Controller.CMD.DELETE, Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE,
|
||||
Controller.CMD.MOVE, Controller.CMD.ROTATE
|
||||
' Imposto flag di ricalcolo slice
|
||||
EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
|
||||
End Select
|
||||
End Sub
|
||||
|
||||
Friend Sub OnKeyDown(Key As Forms.Keys)
|
||||
@@ -572,12 +550,6 @@ Public Class StartMachPanelVM
|
||||
' rimetto la selezione scena a null
|
||||
Map.refSceneHostVM.MainScene.SetStatusNull()
|
||||
End If
|
||||
' se esc su creazione percorso, lo annullo, altrimenti riabilito interfaccia
|
||||
If m_bEscOnLine2P Then
|
||||
m_bEscOnLine2P = False
|
||||
Else
|
||||
ManageInterface(True)
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -593,18 +565,6 @@ Public Class StartMachPanelVM
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Friend Sub ManageInterface(bValue As Boolean)
|
||||
' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
|
||||
Map.refProjManagerVM.SetProjCmdIsEnabled(bValue)
|
||||
Map.refTopPanelVM.SetTopPanelIsEnabled(bValue)
|
||||
Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(bValue)
|
||||
Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue)
|
||||
Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue)
|
||||
Map.refSliceManagerVM.SetButtonsIsEnabled(bValue)
|
||||
Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bValue)
|
||||
SetStartListIsEnabled(bValue)
|
||||
End Sub
|
||||
|
||||
#End Region ' METHODS
|
||||
|
||||
#Region "COMMANDS"
|
||||
@@ -628,13 +588,13 @@ Public Class StartMachPanelVM
|
||||
''' </summary>
|
||||
Public Sub Point(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWSTART)
|
||||
Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup( m_nPartId, LAY_NEWSTART)
|
||||
If nNewStartLayerId = GDB_ID.NULL Then
|
||||
nNewStartLayerId = EgtCreateGroup(m_nPartId)
|
||||
EgtSetName(nNewStartLayerId, LAY_NEWSTART)
|
||||
End If
|
||||
EgtSetCurrPartLayer(m_nPartId, nNewStartLayerId)
|
||||
'InitCommand(True)
|
||||
If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.POINT) Then
|
||||
m_bIsCreatingPath = True
|
||||
End If
|
||||
@@ -661,8 +621,7 @@ Public Class StartMachPanelVM
|
||||
''' </summary>
|
||||
Public Sub Line2P(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWSTART)
|
||||
Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup( m_nPartId, LAY_NEWSTART)
|
||||
If nNewStartLayerId = GDB_ID.NULL Then
|
||||
nNewStartLayerId = EgtCreateGroup(m_nPartId)
|
||||
EgtSetName(nNewStartLayerId, LAY_NEWSTART)
|
||||
@@ -929,7 +888,6 @@ Public Class StartMachPanelVM
|
||||
''' </summary>
|
||||
Public Sub CPlaneElevation(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
|
||||
End Sub
|
||||
|
||||
@@ -954,7 +912,6 @@ Public Class StartMachPanelVM
|
||||
''' </summary>
|
||||
Public Sub CPlaneOrigin(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
|
||||
End Sub
|
||||
|
||||
@@ -995,7 +952,6 @@ Public Class StartMachPanelVM
|
||||
''' </summary>
|
||||
Public Sub CPlaneObj(ByVal param As Object)
|
||||
If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
|
||||
ManageInterface(False)
|
||||
' salvo selezione precedente e deseleziono altri oggetti
|
||||
m_PrevSelObjs.Clear()
|
||||
Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
|
||||
@@ -1056,7 +1012,6 @@ Public Class StartMachPanelVM
|
||||
End If
|
||||
NotifyPropertyChanged(NameOf(SelStart))
|
||||
End If
|
||||
SetStartListIsEnabled(True)
|
||||
End Sub
|
||||
|
||||
#End Region ' Delete
|
||||
|
||||
@@ -337,7 +337,7 @@ Public Class TFSEditorVM
|
||||
|
||||
Public ReadOnly Property Seconds_Msg As String
|
||||
Get
|
||||
Return "min:s"
|
||||
Return "s"
|
||||
End Get
|
||||
End Property
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
<ToggleButton x:Name="ModifyBtn"
|
||||
Grid.Column="2"
|
||||
Grid.Row="1"
|
||||
Content="{Binding SelModifyModeName}"
|
||||
Content="{Binding SelectedItem.sName, ElementName=ModifyModeListBox}"
|
||||
IsChecked="{Binding bModify_IsChecked}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource TopPanel_Modify_ToggleButton}">
|
||||
|
||||
@@ -121,7 +121,6 @@ Public Class TopPanelVM
|
||||
Map.refLeftPanelVM.SetSelPanel(LeftPanelVM.Panels.NULL)
|
||||
NotifyPropertyChanged(NameOf(SelModifyMode))
|
||||
End If
|
||||
NotifyPropertyChanged(NameOf(SelModifyModeName))
|
||||
' chiudo il popup
|
||||
SetModifyIsChecked(False)
|
||||
End Set
|
||||
@@ -129,15 +128,8 @@ Public Class TopPanelVM
|
||||
Friend Sub SetSelModifyMode(ModifyMode As ModifyModes)
|
||||
SelModifyMode = m_ModifyModeList.FirstOrDefault(Function(x) x.ModifyMode = ModifyMode)
|
||||
NotifyPropertyChanged(NameOf(SelModifyMode))
|
||||
NotifyPropertyChanged(NameOf(SelModifyModeName))
|
||||
End Sub
|
||||
|
||||
Public ReadOnly Property SelModifyModeName As String
|
||||
Get
|
||||
Return If(Not IsNothing(m_SelModifyMode) AndAlso m_SelModifyMode.ModifyMode <> ModifyModes.NULL, m_SelModifyMode.sName, "Modify")
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private m_bModify_IsChecked As Boolean
|
||||
Public Property bModify_IsChecked As Boolean
|
||||
Get
|
||||
|
||||
@@ -160,7 +160,7 @@ Public Module CurrentMachine
|
||||
' se non esiste file dati macchina, esco
|
||||
If String.IsNullOrWhiteSpace(m_sMachDataIniFile) Then Return
|
||||
' recupero tipo di slice
|
||||
Dim sExtrusionType As String = S_VERTICAL
|
||||
Dim sExtrusionType As String
|
||||
Dim GeneralCathegory As MachiningCathegory = Map.refTopPanelVM.CurrMachining.CathegoryList.FirstOrDefault(Function(x) x.Type = MachiningCathegory.Cathegories.GENERAL)
|
||||
Dim SlicingTypeParam As ComboMachiningParam = GeneralCathegory.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.SLICINGTYPE)
|
||||
Dim SlicingTypeValue As Machining.MPAR_SLICINGTYPE = SlicingTypeParam.SelValue.Id
|
||||
|
||||
+215
-67
@@ -52,6 +52,7 @@
|
||||
<PrintApp:MachineViewPanelVM x:Key="MachineViewPanelVM"/>
|
||||
<!--<PrintApp:ModifyPartPanelVM x:Key="ModifyPartPanelVM"/>-->
|
||||
<PrintApp:ManagePartPanelVM x:Key="ManagePartPanelVM"/>
|
||||
<PrintApp:HelpPanelVM x:Key="HelpPanelVM"/>
|
||||
<!--<EgtBEAMWALL:CALCPanelVM x:Key="CALCPanelVM"/>
|
||||
<EgtBEAMWALL:PartParametersVM x:Key="PartParametersVM"/>
|
||||
<EgtBEAMWALL:LeftPanelVM x:Key="LeftPanelVM"/>
|
||||
@@ -4190,81 +4191,70 @@
|
||||
Background="White">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Button Command="{Binding AboutBoxCommand}"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Style="{StaticResource AboutBox_Button}">
|
||||
<Image Source="{TemplateBinding Icon}"/>
|
||||
<Image Source="{TemplateBinding Icon}"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
<Grid Grid.Column="1">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<ContentPresenter Content="{TemplateBinding TitlePanel}"
|
||||
VerticalAlignment="Center"/>
|
||||
<TextBlock Text="{TemplateBinding ProjectName}"
|
||||
ToolTip="{TemplateBinding ProjectPath}"
|
||||
Grid.Column="1"
|
||||
TextTrimming="CharacterEllipsis"
|
||||
FontSize="14"
|
||||
VerticalAlignment="Center"
|
||||
Background="{StaticResource Icarus_Gray}"
|
||||
Padding="5,2,5,3"
|
||||
Margin="10,0,0,0"
|
||||
Foreground="White"/>
|
||||
<TextBlock x:Name="PART_MoveRectangle"
|
||||
Text="{TemplateBinding Title}"
|
||||
Grid.Column="2"
|
||||
TextTrimming="CharacterEllipsis"
|
||||
HorizontalAlignment="Stretch"
|
||||
FontSize="14"
|
||||
TextAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Width="Auto"
|
||||
Foreground="{StaticResource Icarus_Gray}"
|
||||
Panel.ZIndex="0"/>
|
||||
</Grid>
|
||||
|
||||
<Grid x:Name="WindowControlsGrid"
|
||||
Grid.Column="2"
|
||||
Background="White">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Button x:Name="MinimizeButton"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Style="{StaticResource TitleBar_Button}">
|
||||
<Image Source="\Resources\Common\Minimize.png"/>
|
||||
</Button>
|
||||
<Button x:Name="MaximizeButton"
|
||||
Grid.Column="1"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Style="{StaticResource TitleBar_Button}">
|
||||
<Image Source="\Resources\Common\Maximize.png"/>
|
||||
</Button>
|
||||
<Button x:Name="RestoreButton"
|
||||
Grid.Column="1"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Style="{StaticResource TitleBar_Button}"
|
||||
Visibility="Collapsed">
|
||||
<Image Source="\Resources\Common\Restore.png"/>
|
||||
</Button>
|
||||
<Button x:Name="CloseButton"
|
||||
<ContentPresenter Grid.Column="1"
|
||||
Content="{TemplateBinding TitlePanel}"
|
||||
VerticalAlignment="Center"/>
|
||||
<TextBlock Text="{TemplateBinding ProjectName}"
|
||||
ToolTip="{TemplateBinding ProjectPath}"
|
||||
Grid.Column="2"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Command="{TemplateBinding CloseCommand}"
|
||||
Style="{StaticResource TitleBar_Button}">
|
||||
<Image Source="\Resources\Common\Close.png"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
TextTrimming="CharacterEllipsis"
|
||||
FontSize="14"
|
||||
VerticalAlignment="Center"
|
||||
Background="{StaticResource Icarus_Gray}"
|
||||
Padding="5,2,5,3"
|
||||
Margin="10,0,0,0"
|
||||
Foreground="White"/>
|
||||
<TextBlock x:Name="PART_MoveRectangle"
|
||||
Text="{TemplateBinding Title}"
|
||||
Grid.Column="3"
|
||||
TextTrimming="CharacterEllipsis"
|
||||
HorizontalAlignment="Stretch"
|
||||
FontSize="14"
|
||||
TextAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Width="Auto"
|
||||
Foreground="{StaticResource Icarus_Gray}"
|
||||
Panel.ZIndex="0"/>
|
||||
<Button x:Name="MinimizeButton"
|
||||
Grid.Column="4"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Style="{StaticResource TitleBar_Button}">
|
||||
<Image Source="\Resources\Common\Minimize.png"/>
|
||||
</Button>
|
||||
<Button x:Name="MaximizeButton"
|
||||
Grid.Column="5"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Style="{StaticResource TitleBar_Button}">
|
||||
<Image Source="\Resources\Common\Maximize.png"/>
|
||||
</Button>
|
||||
<Button x:Name="RestoreButton"
|
||||
Grid.Column="5"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Style="{StaticResource TitleBar_Button}"
|
||||
Visibility="Collapsed">
|
||||
<Image Source="\Resources\Common\Restore.png"/>
|
||||
</Button>
|
||||
<Button x:Name="CloseButton"
|
||||
Grid.Column="6"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Command="{TemplateBinding CloseCommand}"
|
||||
Style="{StaticResource TitleBar_Button}">
|
||||
<Image Source="\Resources\Common\Close.png"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
<Grid x:Name="PART_MainContentGrid"
|
||||
Grid.Row="1"
|
||||
@@ -4329,6 +4319,9 @@
|
||||
Height="{StaticResource WindowBorder_Height}"
|
||||
x:Name="topLeft" />
|
||||
</Grid>
|
||||
<Grid Panel.ZIndex="20">
|
||||
<ContentPresenter Content="{TemplateBinding HelpPanel}"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="WindowState" Value="Maximized">
|
||||
@@ -4441,6 +4434,150 @@
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="Help_Window" TargetType="{x:Type EgtWPFLib5:EgtMainWindow}">
|
||||
<Setter Property="Background" Value="White"/>
|
||||
<Setter Property="BorderBrush" Value="Black"/>
|
||||
<Setter Property="MinHeight" Value="320"/>
|
||||
<Setter Property="MinWidth" Value="480"/>
|
||||
<Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality"/>
|
||||
<Setter Property="Title" Value="{Binding Title}"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type EgtWPFLib5:EgtMainWindow}">
|
||||
<Grid Background="Transparent" x:Name="WindowRoot">
|
||||
<Border x:Name="ResizeBorder"
|
||||
BorderBrush="{StaticResource Icarus_Gray}"
|
||||
BorderThickness="{StaticResource WindowBorder_Thickness}">
|
||||
<Grid x:Name="LayoutRoot"
|
||||
Background="{TemplateBinding Background}">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="{StaticResource TitleBarHeight}"/>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<!--TitleBar-->
|
||||
<Grid x:Name="PART_HeaderBar"
|
||||
Background="White">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Button Command="{Binding AboutBoxCommand}"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Style="{StaticResource AboutBox_Button}">
|
||||
<Image Source="{TemplateBinding Icon}"/>
|
||||
</Button>
|
||||
<Grid Grid.Column="1">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock x:Name="PART_MoveRectangle"
|
||||
Text="{TemplateBinding Title}"
|
||||
Grid.Column="2"
|
||||
TextTrimming="CharacterEllipsis"
|
||||
HorizontalAlignment="Stretch"
|
||||
FontSize="14"
|
||||
TextAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Width="Auto"
|
||||
Foreground="{StaticResource Icarus_Gray}"
|
||||
Panel.ZIndex="0"/>
|
||||
</Grid>
|
||||
|
||||
<Grid x:Name="WindowControlsGrid"
|
||||
Grid.Column="2"
|
||||
Background="White">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Button x:Name="CloseButton"
|
||||
Grid.Column="2"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Command="{TemplateBinding CloseCommand}"
|
||||
Style="{StaticResource TitleBar_Button}">
|
||||
<Image Source="\Resources\Common\Close.png"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
</Grid>
|
||||
<Grid x:Name="PART_MainContentGrid"
|
||||
Grid.Row="1"
|
||||
Panel.ZIndex="10">
|
||||
<ContentPresenter x:Name="PART_MainContentPresenter"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Border>
|
||||
<!-- Resize grid to be inserted here -->
|
||||
<Grid x:Name="PART_ResizeGrid">
|
||||
<Rectangle x:Name="top"
|
||||
Height="{StaticResource WindowBorder_Height}"
|
||||
VerticalAlignment="Top"
|
||||
Fill="Transparent"
|
||||
Stroke="{x:Null}"
|
||||
Margin="5,0,5,0" />
|
||||
<Rectangle x:Name="bottom"
|
||||
Height="{StaticResource WindowBorder_Height}"
|
||||
VerticalAlignment="Bottom"
|
||||
Fill="Transparent"
|
||||
Stroke="{x:Null}"
|
||||
Margin="5,0,5,0" />
|
||||
<Rectangle x:Name="left"
|
||||
Width="{StaticResource WindowBorder_Height}"
|
||||
HorizontalAlignment="Left"
|
||||
Fill="Transparent"
|
||||
Stroke="{x:Null}"
|
||||
Margin="0,5,0,5"/>
|
||||
<Rectangle x:Name="right"
|
||||
Width="{StaticResource WindowBorder_Height}"
|
||||
HorizontalAlignment="Right"
|
||||
Fill="Transparent"
|
||||
Stroke="{x:Null}"
|
||||
Margin="0,5,0,5"/>
|
||||
<Rectangle x:Name="bottomLeft"
|
||||
Height="{StaticResource WindowBorder_Height}"
|
||||
Width="{StaticResource WindowBorder_Height}"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Bottom"
|
||||
Fill="Transparent"
|
||||
Stroke="{x:Null}"/>
|
||||
<Rectangle x:Name="bottomRight"
|
||||
Height="{StaticResource WindowBorder_Height}"
|
||||
Width="{StaticResource WindowBorder_Height}"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Bottom"
|
||||
Fill="Transparent"
|
||||
Stroke="{x:Null}"/>
|
||||
<Rectangle x:Name="topRight"
|
||||
Height="{StaticResource WindowBorder_Height}"
|
||||
Width="{StaticResource WindowBorder_Height}"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top"
|
||||
Fill="Transparent"
|
||||
Stroke="{x:Null}"/>
|
||||
<Rectangle
|
||||
Stroke="{x:Null}"
|
||||
Fill="Transparent"
|
||||
HorizontalAlignment="Left"
|
||||
Width="{StaticResource WindowBorder_Height}"
|
||||
VerticalAlignment="Top"
|
||||
Height="{StaticResource WindowBorder_Height}"
|
||||
x:Name="topLeft" />
|
||||
</Grid>
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="WindowState" Value="Maximized">
|
||||
<Setter TargetName="ResizeBorder" Property="BorderThickness" Value="0"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
||||
|
||||
<!--EgtMainWindow-->
|
||||
@@ -4701,6 +4838,17 @@
|
||||
</Style>
|
||||
|
||||
-->
|
||||
|
||||
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
||||
|
||||
<!-- Help -->
|
||||
|
||||
<Style x:Key="TopBar_HelpButton" TargetType="{x:Type Grid}">
|
||||
<Setter Property="Height" Value="30"/>
|
||||
<Setter Property="Width" Value="30"/>
|
||||
</Style>
|
||||
|
||||
|
||||
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
||||
|
||||
</ResourceDictionary>
|
||||
|
||||
@@ -35,6 +35,8 @@ Module Map
|
||||
Private m_refManagePartPanelVM As ManagePartPanelVM
|
||||
Private m_refMachineViewPanelVM As MachineViewPanelVM
|
||||
Private m_refImportLoadingWndVM As ImportLoadingWndVM
|
||||
Private m_refHelpPanelVM As HelpPanelVM
|
||||
Private m_refHelpWndVM As HelpWndVM
|
||||
|
||||
#Region "Get"
|
||||
|
||||
@@ -247,6 +249,18 @@ Module Map
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public ReadOnly Property refHelpPanelVM As HelpPanelVM
|
||||
Get
|
||||
Return m_refHelpPanelVM
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public ReadOnly Property refHelpWndVM As HelpWndVM
|
||||
Get
|
||||
Return m_refHelpWndVM
|
||||
End Get
|
||||
End Property
|
||||
|
||||
#End Region ' Get
|
||||
|
||||
#Region "Set"
|
||||
@@ -415,6 +429,16 @@ Module Map
|
||||
Return Not IsNothing(m_refImportLoadingWndVM)
|
||||
End Function
|
||||
|
||||
Friend Function SetRefHelpPanelVM(HelpPanelVM As HelpPanelVM) As Boolean
|
||||
m_refHelpPanelVM = HelpPanelVM
|
||||
Return Not IsNothing(m_refHelpPanelVM)
|
||||
End Function
|
||||
|
||||
Friend Function SetRefHelpWndVM(HelpWndVM As HelpWndVM) As Boolean
|
||||
m_refHelpWndVM = HelpWndVM
|
||||
Return Not IsNothing(m_refHelpWndVM)
|
||||
End Function
|
||||
|
||||
#End Region ' Set
|
||||
|
||||
#Region "Init"
|
||||
|
||||
Reference in New Issue
Block a user