- Aggiunti FilledSolid
- Aggiunto ShellNumberId fisso - Gestiti messaggi in StatusBar per misure - Aggiornate icone TopPanel
This commit is contained in:
Emmanuele Sassi
@@ -15,6 +15,8 @@
|
||||
Public Const RIB_EXTRUSION = "RibExtrusion"
|
||||
Public Const RIB_CURVE = "RibCurve"
|
||||
Public Const RIB_ID = "RibId"
|
||||
Public Const SHELLNUMBER_ID = "ShellNumberId"
|
||||
Public Const FILLEDSOLID_ID = "FilledSolidId"
|
||||
Public Const VIEWPARAMS = "ViewParams"
|
||||
Public Const IMPORTED_SOLID = "ImportedSolid"
|
||||
Public Const RESULT_READ_PROG = "ResultReadProg"
|
||||
|
||||
@@ -198,10 +198,13 @@
|
||||
<Image Source="\Resources\Common\Cancel.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
<Button Content="Save in Db"
|
||||
<Button ToolTip="Save in Db"
|
||||
Command="{Binding SaveInDb_Command}"
|
||||
Margin="0,0,2.5,0"
|
||||
Style="{StaticResource RightPanel_HalfRound_Button}"/>
|
||||
Style="{StaticResource RightPanel_HalfRound_Button}">
|
||||
<Image Source="\Resources\CurrMachining\SaveInDb.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
</UniformGrid>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
@@ -0,0 +1,361 @@
|
||||
<Grid x:Class="FilledSolidPanelV"
|
||||
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"
|
||||
xmlns:PrintApp="clr-namespace:Icarus"
|
||||
Margin="5">
|
||||
<Grid.Resources>
|
||||
<PrintApp:FromBooleanToVisibility x:Key="FromBooleanToVisibility"/>
|
||||
</Grid.Resources>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
|
||||
<RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
|
||||
<RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
|
||||
<RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<ComboBox Grid.Row="3"
|
||||
ItemsSource="{Binding FilledSolidList}"
|
||||
SelectedItem="{Binding SelFilledSolid}"
|
||||
IsEnabled="{Binding FilledSolidList_IsEnabled}"
|
||||
DisplayMemberPath="ghName"
|
||||
Style="{StaticResource LeftPanel_ComboBox}"/>
|
||||
<!--Add Button-->
|
||||
<ToggleButton x:Name="AddBtn"
|
||||
Grid.Row="4"
|
||||
Content="Add"
|
||||
IsChecked="{Binding bAdd_IsChecked}"
|
||||
Margin="0,2.5,0,2.5"
|
||||
Style="{StaticResource LeftPanel_ToggleButton}"/>
|
||||
<Border Grid.Column="1"
|
||||
Grid.Row="3"
|
||||
Grid.RowSpan="3"
|
||||
VerticalAlignment="Center"
|
||||
Visibility="{Binding IsChecked, ElementName=AddBtn, Converter={StaticResource FromBooleanToVisibility}}"
|
||||
Style="{StaticResource LeftPanel_PopupButton_Border}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Button Grid.Column="0"
|
||||
Command="{Binding Import_Command}"
|
||||
ToolTip="{Binding Import_ToolTip}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ToolBar_Button}">
|
||||
<Image Source="/Resources/ProjectManager/Import.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
<Button Grid.Column="1"
|
||||
Command="{Binding Line2P_Command}"
|
||||
ToolTip="{Binding Line2P_ToolTip}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ToolBar_Button}">
|
||||
<Image Source="/Resources/DrawPanel/Line2P.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
</Border>
|
||||
<!--Edit Button-->
|
||||
<ToggleButton x:Name="EditBtn"
|
||||
Grid.Row="5"
|
||||
Content="Edit"
|
||||
IsChecked="{Binding bEdit_IsChecked}"
|
||||
Margin="0,2.5,0,2.5"
|
||||
Style="{StaticResource LeftPanel_ToggleButton}"/>
|
||||
<Border Grid.Column="1"
|
||||
Grid.Row="4"
|
||||
Grid.RowSpan="3"
|
||||
VerticalAlignment="Center"
|
||||
Visibility="{Binding IsChecked, ElementName=EditBtn, Converter={StaticResource FromBooleanToVisibility}}"
|
||||
Style="{StaticResource LeftPanel_PopupButton_Border}">
|
||||
<Grid>
|
||||
<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"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Button Grid.Column="0"
|
||||
Command="{Binding Delete_Command}"
|
||||
ToolTip="{Binding Delete_ToolTip}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ToolBar_Button}">
|
||||
<Image Source="/Resources/DrawPanel/Delete.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
<Button Grid.Column="1"
|
||||
Command="{Binding ModifyCurve_Command}"
|
||||
ToolTip="{Binding ModifyCurve_ToolTip}"
|
||||
Visibility="{Binding Compo_Visibility}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ToolBar_Button}">
|
||||
<Image Source="/Resources/DrawPanel/ModifyCurve.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
<Button Grid.Column="2"
|
||||
Command="{Binding AddPointCurve_Command}"
|
||||
ToolTip="{Binding AddPointCurve_ToolTip}"
|
||||
Visibility="{Binding Compo_Visibility}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ToolBar_Button}">
|
||||
<Image Source="/Resources/DrawPanel/AddPointCurve.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
<Button Grid.Column="3"
|
||||
Command="{Binding RemovePointCurve_Command}"
|
||||
ToolTip="{Binding RemovePointCurve_ToolTip}"
|
||||
Visibility="{Binding Compo_Visibility}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ToolBar_Button}">
|
||||
<Image Source="/Resources/DrawPanel/RemovePointCurve.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
<Button Grid.Column="4"
|
||||
Command="{Binding Extrude_Command}"
|
||||
ToolTip="{Binding Extrude_ToolTip}"
|
||||
Visibility="{Binding Compo_Visibility}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ToolBar_Button}">
|
||||
<Image Source="/Resources/DrawPanel/Extrude.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
</Border>
|
||||
<!--Grid Button-->
|
||||
<ToggleButton x:Name="GridBtn"
|
||||
Grid.Row="6"
|
||||
Content="Grid"
|
||||
IsChecked="{Binding bGrid_IsChecked}"
|
||||
IsEnabled="{Binding bGrid_IsEnabled}"
|
||||
Margin="0,2.5,0,2.5"
|
||||
Style="{StaticResource LeftPanel_ToggleButton}"/>
|
||||
<Border Grid.Column="1"
|
||||
Grid.Row="5"
|
||||
Grid.RowSpan="3"
|
||||
VerticalAlignment="Center"
|
||||
Visibility="{Binding IsChecked, ElementName=GridBtn, Converter={StaticResource FromBooleanToVisibility}}"
|
||||
Style="{StaticResource LeftPanel_PopupButton_Border}">
|
||||
<Grid>
|
||||
<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"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Button Command="{Binding CPlaneTop_Command}"
|
||||
ToolTip="{Binding CPlaneTopToolTip}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ToolBar_Button}">
|
||||
<Image Source="/Resources/GridViewPanel/CplaneTOP.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
<Button Grid.Column="1"
|
||||
Command="{Binding CPlaneFront_Command}"
|
||||
ToolTip="{Binding CPlaneFrontToolTip}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ToolBar_Button}">
|
||||
<Image Source="/Resources/GridViewPanel/CplaneFRONT.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
<Button Grid.Column="2"
|
||||
Command="{Binding CPlaneRight_Command}"
|
||||
ToolTip="{Binding CPlaneRightToolTip}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ToolBar_Button}">
|
||||
<Image Source="/Resources/GridViewPanel/CplaneRIGHT.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
<Button Grid.Column="3"
|
||||
Command="{Binding CPlaneBack_Command}"
|
||||
ToolTip="{Binding CPlaneBackToolTip}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ToolBar_Button}">
|
||||
<Image Source="/Resources/GridViewPanel/CplaneBACK.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
<Button Grid.Column="4"
|
||||
Command="{Binding CPlaneLeft_Command}"
|
||||
ToolTip="{Binding CPlaneLeftToolTip}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ToolBar_Button}">
|
||||
<Image Source="/Resources/GridViewPanel/CplaneLEFT.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
<Button Grid.Column="5"
|
||||
Command="{Binding CPlaneBottom_Command}"
|
||||
ToolTip="{Binding CPlaneBottomToolTip}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ToolBar_Button}">
|
||||
<Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
<Button Grid.Column="6"
|
||||
Command="{Binding CPlaneElevation_Command}"
|
||||
ToolTip="{Binding CPlaneElevationToolTip}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ToolBar_Button}">
|
||||
<Image Source="/Resources/GridViewPanel/CplaneELEVATION.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
<Button Grid.Column="7"
|
||||
Command="{Binding CPlaneOrigin_Command}"
|
||||
ToolTip="{Binding CPlaneOriginToolTip}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ToolBar_Button}">
|
||||
<Image Source="/Resources/GridViewPanel/CPlaneORIGIN.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
<Button Grid.Column="8"
|
||||
Command="{Binding CPlaneObj_Command}"
|
||||
ToolTip="{Binding CPlaneObjToolTip}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ToolBar_Button}">
|
||||
<Image Source="/Resources/GridViewPanel/CplaneOBJECT.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
</Border>
|
||||
<!--Move Button-->
|
||||
<ToggleButton x:Name="MoveBtn"
|
||||
Grid.Row="7"
|
||||
Content="Move"
|
||||
IsChecked="{Binding bMove_IsChecked}"
|
||||
Margin="0,2.5,0,2.5"
|
||||
Style="{StaticResource LeftPanel_ToggleButton}"/>
|
||||
<Border Grid.Column="1"
|
||||
Grid.Row="5"
|
||||
Grid.RowSpan="5"
|
||||
VerticalAlignment="Center"
|
||||
Visibility="{Binding IsChecked, ElementName=MoveBtn, Converter={StaticResource FromBooleanToVisibility}}"
|
||||
Style="{StaticResource LeftPanel_Popup_Border}">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid Margin="0,0,0,2.5">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="X"
|
||||
Style="{StaticResource Move_TextBlock}"/>
|
||||
<EgtWPFLib5:EgtTextBox2 Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
|
||||
Grid.Column="1"
|
||||
Margin="5,0,0,0"
|
||||
Style="{StaticResource LeftPanel_TextBox2}"/>
|
||||
</Grid>
|
||||
<Grid Grid.Row="1"
|
||||
Margin="0,2.5,0,2.5">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="Y"
|
||||
Style="{StaticResource Move_TextBlock}"/>
|
||||
<EgtWPFLib5:EgtTextBox2 Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
|
||||
Grid.Column="1"
|
||||
Margin="5,0,0,0"
|
||||
Style="{StaticResource LeftPanel_TextBox2}"/>
|
||||
</Grid>
|
||||
<Grid Grid.Row="2"
|
||||
Margin="0,2.5,0,2.5">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="Z"
|
||||
Style="{StaticResource Move_TextBlock}"/>
|
||||
<EgtWPFLib5:EgtTextBox2 Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
|
||||
Grid.Column="1"
|
||||
Margin="5,0,0,0"
|
||||
Style="{StaticResource LeftPanel_TextBox2}"/>
|
||||
</Grid>
|
||||
<Grid Grid.Row="3"
|
||||
Margin="0,2.5,0,0">
|
||||
<Button Content="Drag"
|
||||
Command="{Binding DragMove_Command}"
|
||||
Style="{StaticResource LeftPanel_TextButton}"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Border>
|
||||
<!--Rotate Button-->
|
||||
<ToggleButton x:Name="RotateBtn"
|
||||
Grid.Row="8"
|
||||
Content="Rotate"
|
||||
IsChecked="{Binding bRotate_IsChecked}"
|
||||
Margin="0,2.5,0,2.5"
|
||||
Style="{StaticResource LeftPanel_ToggleButton}"/>
|
||||
<Border Grid.Column="1"
|
||||
Grid.Row="6"
|
||||
Grid.RowSpan="5"
|
||||
VerticalAlignment="Center"
|
||||
Visibility="{Binding IsChecked, ElementName=RotateBtn, Converter={StaticResource FromBooleanToVisibility}}"
|
||||
Style="{StaticResource LeftPanel_Popup_Border}">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
<UniformGrid Columns="3">
|
||||
<RadioButton Content="X"
|
||||
GroupName="Axes"
|
||||
IsChecked="{Binding RotX}"
|
||||
Style="{StaticResource ToolBar_ToggleButton}"/>
|
||||
<RadioButton Content="Y"
|
||||
GroupName="Axes"
|
||||
IsChecked="{Binding RotY}"
|
||||
Style="{StaticResource ToolBar_ToggleButton}"/>
|
||||
<RadioButton Content="Z"
|
||||
GroupName="Axes"
|
||||
IsChecked="{Binding RotZ}"
|
||||
Style="{StaticResource ToolBar_ToggleButton}"/>
|
||||
</UniformGrid>
|
||||
<EgtWPFLib5:EgtTextBox2 Grid.Row="1"
|
||||
Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
|
||||
ResetValueOnLostFocus="False"
|
||||
Margin="0,5,0,2.5"/>
|
||||
<Grid Grid.Row="2"
|
||||
Margin="0,2.5,0,0">
|
||||
<Button Content="Drag"
|
||||
Command="{Binding DragRotate_Command}"
|
||||
Style="{StaticResource LeftPanel_TextButton}"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Border>
|
||||
<!--Parameters Button-->
|
||||
<ToggleButton Content="Parameters"
|
||||
Grid.Row="9"
|
||||
IsChecked="{Binding bMachParam_IsChecked}"
|
||||
Margin="0,2.5,0,2.5"
|
||||
Style="{StaticResource LeftPanel_Parameters_ToggleButton}"/>
|
||||
|
||||
</Grid>
|
||||
@@ -0,0 +1,3 @@
|
||||
Public Class FilledSolidPanelV
|
||||
|
||||
End Class
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,100 @@
|
||||
<Grid x:Class="FilledSolidParamPanelV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:PrintApp="clr-namespace:Icarus"
|
||||
Width="310"
|
||||
VerticalAlignment="Center">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Border Margin="0,0,0,2.5"
|
||||
Style="{StaticResource Title_Border}">
|
||||
<TextBlock Text="REDUCE SHELL NUMBER PARAMETERS"
|
||||
Style="{StaticResource Title_TextBlock}"/>
|
||||
</Border>
|
||||
<Border Grid.Row="1"
|
||||
Padding="0,2.5,0,0"
|
||||
Margin="0,2.5,0,0"
|
||||
Style="{StaticResource BottomGrayRow_Border}">
|
||||
<Grid Margin="2.5,2.5,2.5,0">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
<ScrollViewer VerticalScrollBarVisibility="Auto"
|
||||
HorizontalScrollBarVisibility="Disabled">
|
||||
<ItemsControl ItemsSource="{Binding MachiningParamList}">
|
||||
<ItemsControl.ItemsPanel>
|
||||
<ItemsPanelTemplate>
|
||||
<UniformGrid Columns="1"
|
||||
HorizontalAlignment="Stretch"/>
|
||||
</ItemsPanelTemplate>
|
||||
</ItemsControl.ItemsPanel>
|
||||
<ItemsControl.Resources>
|
||||
<DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
|
||||
<Grid Margin="0,1,2.5,1">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="2*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="{Binding sName}"
|
||||
Margin="0,0,2.5,0"
|
||||
Style="{StaticResource ParameterList_TextBlock}"/>
|
||||
<TextBox Grid.Column="1"
|
||||
Text="{Binding sValue}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ParameterList_TextBox}"/>
|
||||
<Button Grid.Column="2"
|
||||
Content="R"
|
||||
Command="{Binding ResetParam_Command}"
|
||||
IsEnabled="{Binding bIsModifiedFromPart}"
|
||||
VerticalContentAlignment="Center"
|
||||
HorizontalContentAlignment="Center"
|
||||
Margin="2.5,0,0,0"
|
||||
Style="{StaticResource ToolBar_SmallButton}"/>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
<DataTemplate DataType="{x:Type PrintApp:ComboMachiningParam}">
|
||||
<Grid Margin="0,1,2.5,1">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="2*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="{Binding sName}"
|
||||
Margin="0,0,2.5,0"
|
||||
Style="{StaticResource ParameterList_TextBlock}"/>
|
||||
<ComboBox Grid.Column="1"
|
||||
ItemsSource="{Binding ValueList}"
|
||||
SelectedItem="{Binding SelValue}"
|
||||
HorizontalAlignment="Stretch"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource RightPanel_ComboBox}"/>
|
||||
<Button Grid.Column="2"
|
||||
Content="R"
|
||||
Command="{Binding ResetParam_Command}"
|
||||
IsEnabled="{Binding bIsModifiedFromPart}"
|
||||
VerticalContentAlignment="Center"
|
||||
HorizontalContentAlignment="Center"
|
||||
Margin="2.5,0,0,0"
|
||||
Style="{StaticResource ToolBar_SmallButton}"/>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</ItemsControl.Resources>
|
||||
</ItemsControl>
|
||||
</ScrollViewer>
|
||||
<UniformGrid Grid.Row="1"
|
||||
Rows="1"
|
||||
Margin="0,2.5,0,0">
|
||||
<Button Content="Ok"
|
||||
Command="{Binding Ok_Command}"
|
||||
Style="{StaticResource RightPanel_HalfRound_Button}"/>
|
||||
<Button Content="Cancel"
|
||||
Command="{Binding Cancel_Command}"
|
||||
Style="{StaticResource RightPanel_HalfRound_Button}"/>
|
||||
</UniformGrid>
|
||||
</Grid>
|
||||
</Border>
|
||||
</Grid>
|
||||
@@ -0,0 +1,3 @@
|
||||
Public Class FilledSolidParamPanelV
|
||||
|
||||
End Class
|
||||
@@ -0,0 +1,441 @@
|
||||
Imports System.Collections.ObjectModel
|
||||
Imports System.Reflection
|
||||
Imports EgtUILib
|
||||
Imports EgtWPFLib5
|
||||
|
||||
Public Class FilledSolidParamPanelVM
|
||||
Inherits MachiningCathegory
|
||||
|
||||
#Region "FIELDS & PROPERTIES"
|
||||
|
||||
' Definizione comandi
|
||||
Private m_cmdOk As ICommand
|
||||
Private m_cmdCancel As ICommand
|
||||
|
||||
#End Region ' FIELDS & PROPERTIES
|
||||
|
||||
#Region "CONSTRUCTORS"
|
||||
|
||||
Sub New()
|
||||
' Creo riferimento a questa classe in EgtCAM5Map
|
||||
Map.SetRefFilledSolidParamPanelVM(Me)
|
||||
End Sub
|
||||
|
||||
#End Region ' CONSTRUCTORS
|
||||
|
||||
#Region "METHODS"
|
||||
|
||||
Friend Sub Init()
|
||||
If IsNothing(Map.refFilledSolidPanelVM.SelFilledSolid) Then
|
||||
' ripristino modalita' standard
|
||||
Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
|
||||
Return
|
||||
End If
|
||||
Dim nPartId As Integer = Map.refTopPanelVM.SelPart.nPartId
|
||||
Dim nFilledSolidId As Integer = GDB_ID.NULL
|
||||
Select Case Map.refFilledSolidPanelVM.SelFilledSolid.Type
|
||||
Case RibEntity.RibTypes.FROMDRAW
|
||||
nFilledSolidId = Map.refFilledSolidPanelVM.SelFilledSolid.nCurveId
|
||||
Case RibEntity.RibTypes.FROMIMPORT
|
||||
nFilledSolidId = Map.refFilledSolidPanelVM.SelFilledSolid.nExtrusionId
|
||||
End Select
|
||||
|
||||
m_Type = Cathegories.AUX_SOLID
|
||||
m_sName = "Filled Solid"
|
||||
m_MachiningParamList = New List(Of MachiningParam)({New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSOVERLAP, nFilledSolidId, nPartId),
|
||||
New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nFilledSolidId, nPartId),
|
||||
New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDORDER, nFilledSolidId, nPartId),
|
||||
New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSLINKTYPE, nFilledSolidId, nPartId),
|
||||
New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSLINKPARAM, nFilledSolidId, nPartId),
|
||||
New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE, nFilledSolidId, nPartId),
|
||||
New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSCOASTINGLEN, nFilledSolidId, nPartId),
|
||||
New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPELEN, nFilledSolidId, nPartId),
|
||||
New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPEDIR, nFilledSolidId, nPartId)})
|
||||
NotifyPropertyChanged(NameOf(MachiningParamList))
|
||||
NotifyPropertyChanged(NameOf(sName))
|
||||
End Sub
|
||||
|
||||
Friend Sub SaveCurrParams()
|
||||
For Each Param In m_MachiningParamList
|
||||
Param.SaveParam()
|
||||
Next
|
||||
End Sub
|
||||
|
||||
Friend Sub ResetCurrParams()
|
||||
For Each Param In m_MachiningParamList
|
||||
Param.ResetParam()
|
||||
Next
|
||||
End Sub
|
||||
|
||||
Friend Sub WriteParamsInFilledSolid(nRibId As Integer)
|
||||
' se parametri modificati
|
||||
Dim bModified As Boolean = False
|
||||
For Each Param In m_MachiningParamList
|
||||
Select Case Param.GetType()
|
||||
Case GetType(FilledSolidNumericMachiningParam)
|
||||
Dim NumericParam As FilledSolidNumericMachiningParam = TryCast(Param, FilledSolidNumericMachiningParam)
|
||||
If NumericParam.bIsModified AndAlso Not bModified Then bModified = True
|
||||
NumericParam.WriteParamInFilledSolid(nRibId)
|
||||
Case GetType(FilledSolidComboMachiningParam)
|
||||
Dim NumericParam As FilledSolidComboMachiningParam = TryCast(Param, FilledSolidComboMachiningParam)
|
||||
If NumericParam.bIsModified AndAlso Not bModified Then bModified = True
|
||||
NumericParam.WriteParamInFilledSolid(nRibId)
|
||||
End Select
|
||||
Next
|
||||
If bModified Then
|
||||
' Imposto flag di ricalcolo slice
|
||||
EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
#End Region ' METHODS
|
||||
|
||||
#Region "COMMANDS"
|
||||
|
||||
#Region "Ok"
|
||||
|
||||
Public ReadOnly Property Ok_Command As ICommand
|
||||
Get
|
||||
If m_cmdOk Is Nothing Then
|
||||
m_cmdOk = New Command(AddressOf Ok)
|
||||
End If
|
||||
Return m_cmdOk
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub Ok()
|
||||
If Not IsNothing(Map.refFilledSolidPanelVM.SelFilledSolid) Then
|
||||
' scrivo i parametri modificati
|
||||
Select Case Map.refFilledSolidPanelVM.SelFilledSolid.Type
|
||||
Case FilledSolidEntity.FilledSolidTypes.FROMDRAW
|
||||
WriteParamsInFilledSolid(Map.refFilledSolidPanelVM.SelFilledSolid.nCurveId)
|
||||
WriteParamsInFilledSolid(Map.refFilledSolidPanelVM.SelFilledSolid.nExtrusionId)
|
||||
Case FilledSolidEntity.FilledSolidTypes.FROMIMPORT
|
||||
WriteParamsInFilledSolid(Map.refFilledSolidPanelVM.SelFilledSolid.nExtrusionId)
|
||||
End Select
|
||||
End If
|
||||
' ripristino modalita' standard
|
||||
Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
|
||||
Map.refFilledSolidPanelVM.ResetMachParamIsChecked()
|
||||
End Sub
|
||||
|
||||
#End Region ' Ok
|
||||
|
||||
#Region "Cancel"
|
||||
|
||||
Public ReadOnly Property Cancel_Command As ICommand
|
||||
Get
|
||||
If m_cmdCancel Is Nothing Then
|
||||
m_cmdCancel = New Command(AddressOf Cancel)
|
||||
End If
|
||||
Return m_cmdCancel
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub Cancel()
|
||||
' ripristino modalita' standard
|
||||
Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
|
||||
Map.refFilledSolidPanelVM.ResetMachParamIsChecked()
|
||||
End Sub
|
||||
|
||||
#End Region ' Cancel
|
||||
|
||||
#End Region ' COMMANDS
|
||||
|
||||
End Class
|
||||
|
||||
Public Class FilledSolidNumericMachiningParam
|
||||
Inherits NumericMachiningParam
|
||||
|
||||
Public Overrides Property sValue As String
|
||||
Get
|
||||
Return If(m_bIsLen, LenToString(m_dValue, 1), m_dValue)
|
||||
End Get
|
||||
Set(value As String)
|
||||
If m_bIsLen Then
|
||||
StringToLen(value, m_dValue)
|
||||
Else
|
||||
m_dValue = value
|
||||
End If
|
||||
NotifyPropertyChanged(NameOf(sValue))
|
||||
NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_dPartValue As Double
|
||||
Public ReadOnly Property dPartValue As Double
|
||||
Get
|
||||
Return m_dPartValue
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public ReadOnly Property bIsModifiedFromPart As Boolean
|
||||
Get
|
||||
Return m_dValue <> m_dPartValue
|
||||
End Get
|
||||
End Property
|
||||
|
||||
' Definizione comandi
|
||||
Private m_cmdResetParam As ICommand
|
||||
|
||||
Sub New(Type As Params, nFilledSolidId As Integer, nPartId As Integer)
|
||||
MyBase.New(Type)
|
||||
Dim bReadFromPart As Boolean = False
|
||||
Select Case Type
|
||||
Case Params.AUXSOLIDSOVERLAP
|
||||
bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSOVERLAP, m_dValue)
|
||||
EgtGetInfo(nPartId, MAC_AUXSOLIDSOVERLAP, m_dPartValue)
|
||||
m_bIsLen = True
|
||||
Case Params.AUXSOLIDSLINKPARAM
|
||||
bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSLINKPARAM, m_dValue)
|
||||
EgtGetInfo(nPartId, MAC_AUXSOLIDSLINKPARAM, m_dPartValue)
|
||||
m_bIsLen = True
|
||||
Case Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE
|
||||
bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE, m_dValue)
|
||||
EgtGetInfo(nPartId, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE, m_dPartValue)
|
||||
m_bIsLen = True
|
||||
Case Params.AUXSOLIDSCOASTINGLEN
|
||||
bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSCOASTINGLEN, m_dValue)
|
||||
EgtGetInfo(nPartId, MAC_AUXSOLIDSCOASTINGLEN, m_dPartValue)
|
||||
m_bIsLen = True
|
||||
Case Params.AUXSOLIDSWIPELEN
|
||||
bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSWIPELEN, m_dValue)
|
||||
EgtGetInfo(nPartId, MAC_AUXSOLIDSWIPELEN, m_dPartValue)
|
||||
m_bIsLen = True
|
||||
Case Params.AUXSOLIDSWIPEDIR
|
||||
bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSWIPEDIR, m_dValue)
|
||||
EgtGetInfo(nPartId, MAC_AUXSOLIDSWIPEDIR, m_dPartValue)
|
||||
m_bIsLen = True
|
||||
End Select
|
||||
m_dOrigValue = m_dValue
|
||||
If Not bReadFromPart Then
|
||||
m_dValue = m_dPartValue
|
||||
m_dOrigValue = m_dPartValue
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Friend Sub WriteParamInFilledSolid(nFilledSolidId As Integer)
|
||||
Dim sWriteValue As String = ""
|
||||
If m_bIsLen Then
|
||||
sWriteValue = LenToString(m_dValue, 2)
|
||||
Else
|
||||
sWriteValue = DoubleToString(m_dValue, 2)
|
||||
End If
|
||||
Select Case Type
|
||||
Case Params.AUXSOLIDSOVERLAP
|
||||
If bIsModifiedFromPart Then
|
||||
EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSOVERLAP, sWriteValue)
|
||||
Else
|
||||
EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSOVERLAP)
|
||||
End If
|
||||
Case Params.AUXSOLIDSLINKPARAM
|
||||
If bIsModifiedFromPart Then
|
||||
EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSLINKPARAM, sWriteValue)
|
||||
Else
|
||||
EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSLINKPARAM)
|
||||
End If
|
||||
Case Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE
|
||||
If bIsModifiedFromPart Then
|
||||
EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE, sWriteValue)
|
||||
Else
|
||||
EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE)
|
||||
End If
|
||||
Case Params.AUXSOLIDSCOASTINGLEN
|
||||
If bIsModifiedFromPart Then
|
||||
EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSCOASTINGLEN, sWriteValue)
|
||||
Else
|
||||
EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSCOASTINGLEN)
|
||||
End If
|
||||
Case Params.AUXSOLIDSWIPELEN
|
||||
If bIsModifiedFromPart Then
|
||||
EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSWIPELEN, sWriteValue)
|
||||
Else
|
||||
EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSWIPELEN)
|
||||
End If
|
||||
Case Params.AUXSOLIDSWIPEDIR
|
||||
If bIsModifiedFromPart Then
|
||||
EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSWIPEDIR, sWriteValue)
|
||||
Else
|
||||
EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSWIPEDIR)
|
||||
End If
|
||||
End Select
|
||||
End Sub
|
||||
|
||||
Friend Overrides Sub SaveParam()
|
||||
m_dOrigValue = m_dValue
|
||||
End Sub
|
||||
|
||||
Friend Overrides Sub ResetParam()
|
||||
m_dValue = m_dOrigValue
|
||||
End Sub
|
||||
|
||||
#Region "COMMANDS"
|
||||
|
||||
#Region "ResetParam"
|
||||
|
||||
Public ReadOnly Property ResetParam_Command As ICommand
|
||||
Get
|
||||
If m_cmdResetParam Is Nothing Then
|
||||
m_cmdResetParam = New Command(AddressOf ResetParamCmd)
|
||||
End If
|
||||
Return m_cmdResetParam
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub ResetParamCmd()
|
||||
m_dValue = m_dPartValue
|
||||
NotifyPropertyChanged(NameOf(sValue))
|
||||
NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
|
||||
End Sub
|
||||
|
||||
#End Region ' ResetParam
|
||||
|
||||
#End Region ' COMMANDS
|
||||
|
||||
End Class
|
||||
|
||||
Public Class FilledSolidComboMachiningParam
|
||||
Inherits ComboMachiningParam
|
||||
|
||||
Public Overrides Property SelValue As IdNameStruct
|
||||
Get
|
||||
Return m_SelValue
|
||||
End Get
|
||||
Set(value As IdNameStruct)
|
||||
m_SelValue = value
|
||||
NotifyPropertyChanged(NameOf(SelValue))
|
||||
NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Protected m_PartSelValue As IdNameStruct
|
||||
Public ReadOnly Property PartSelValue As IdNameStruct
|
||||
Get
|
||||
Return m_PartSelValue
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public ReadOnly Property bIsModifiedFromPart As Boolean
|
||||
Get
|
||||
Return m_SelValue.Id <> m_PartSelValue.Id
|
||||
End Get
|
||||
End Property
|
||||
|
||||
' Definizione comandi
|
||||
Private m_cmdResetParam As ICommand
|
||||
|
||||
Sub New(Type As Params, nRibId As Integer, nPartId As Integer)
|
||||
MyBase.New(Type)
|
||||
Dim bReadFromRib As Boolean = False
|
||||
Dim bReadFromPart As Boolean = False
|
||||
Select Case Type
|
||||
Case Params.AUXSOLIDSINFILL
|
||||
m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_INFILL.NONE, "None"),
|
||||
New IdNameStruct(Machining.MPAR_INFILL.OFFSET, "Offset"),
|
||||
New IdNameStruct(Machining.MPAR_INFILL.ZIGZAG, "ZigZag")})
|
||||
Dim nSelValue As Integer = 1
|
||||
bReadFromRib = EgtGetInfo(nRibId, MAC_AUXSOLIDSINFILL, nSelValue)
|
||||
If bReadFromRib Then
|
||||
m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
|
||||
End If
|
||||
bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSINFILL, nSelValue)
|
||||
m_PartSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
|
||||
Case Params.AUXSOLIDSSTRANDORDER
|
||||
m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_STRANDORDERS.OUTTOIN, "From Outside To Inside"),
|
||||
New IdNameStruct(Machining.MPAR_STRANDORDERS.INTOOUT, "From Inside To Outside")})
|
||||
Dim nSelValue As Integer = 1
|
||||
bReadFromRib = EgtGetInfo(nRibId, MAC_AUXSOLIDSSTRANDORDER, nSelValue)
|
||||
If bReadFromRib Then
|
||||
m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
|
||||
End If
|
||||
bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSSTRANDORDER, nSelValue)
|
||||
m_PartSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
|
||||
Case Params.AUXSOLIDSLINKTYPE
|
||||
m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_LINKTYPES.NONE, "None"),
|
||||
New IdNameStruct(Machining.MPAR_LINKTYPES.LINEAR, "Linear"),
|
||||
New IdNameStruct(Machining.MPAR_LINKTYPES.BIARC, "Biarc")})
|
||||
Dim nSelValue As Integer = 1
|
||||
bReadFromRib = EgtGetInfo(nRibId, MAC_AUXSOLIDSLINKTYPE, nSelValue)
|
||||
If bReadFromRib Then
|
||||
m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
|
||||
End If
|
||||
bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSLINKTYPE, nSelValue)
|
||||
m_PartSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
|
||||
End Select
|
||||
m_OrigSelValue = m_SelValue
|
||||
If Not bReadFromRib Then
|
||||
If bReadFromPart Then
|
||||
m_SelValue = m_PartSelValue
|
||||
m_OrigSelValue = m_PartSelValue
|
||||
Else
|
||||
Select Case Type
|
||||
Case Params.AUXSOLIDSINFILL
|
||||
m_OrigSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = Machining.MPAR_INFILL.NONE)
|
||||
m_SelValue = m_OrigSelValue
|
||||
Case Params.AUXSOLIDSSTRANDORDER
|
||||
m_OrigSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = Machining.MPAR_STRANDORDERS.OUTTOIN)
|
||||
m_SelValue = m_OrigSelValue
|
||||
Case Params.AUXSOLIDSLINKTYPE
|
||||
m_OrigSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = Machining.MPAR_LINKTYPES.NONE)
|
||||
m_SelValue = m_OrigSelValue
|
||||
End Select
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Friend Sub WriteParamInFilledSolid(nRibId As Integer)
|
||||
Select Case Type
|
||||
Case Params.AUXSOLIDSINFILL
|
||||
If bIsModifiedFromPart Then
|
||||
EgtSetInfo(nRibId, MAC_AUXSOLIDSINFILL, m_SelValue.Id)
|
||||
Else
|
||||
EgtRemoveInfo(nRibId, MAC_AUXSOLIDSINFILL)
|
||||
End If
|
||||
Case Params.AUXSOLIDSSTRANDORDER
|
||||
If bIsModifiedFromPart Then
|
||||
EgtSetInfo(nRibId, MAC_AUXSOLIDSSTRANDORDER, m_SelValue.Id)
|
||||
Else
|
||||
EgtRemoveInfo(nRibId, MAC_AUXSOLIDSSTRANDORDER)
|
||||
End If
|
||||
Case Params.AUXSOLIDSLINKTYPE
|
||||
If bIsModifiedFromPart Then
|
||||
EgtSetInfo(nRibId, MAC_AUXSOLIDSLINKTYPE, m_SelValue.Id)
|
||||
Else
|
||||
EgtRemoveInfo(nRibId, MAC_AUXSOLIDSLINKTYPE)
|
||||
End If
|
||||
End Select
|
||||
End Sub
|
||||
|
||||
Friend Overrides Sub SaveParam()
|
||||
m_OrigSelValue = m_SelValue
|
||||
End Sub
|
||||
|
||||
Friend Overrides Sub ResetParam()
|
||||
m_SelValue = m_OrigSelValue
|
||||
End Sub
|
||||
|
||||
#Region "COMMANDS"
|
||||
|
||||
#Region "ResetParam"
|
||||
|
||||
Public ReadOnly Property ResetParam_Command As ICommand
|
||||
Get
|
||||
If m_cmdResetParam Is Nothing Then
|
||||
m_cmdResetParam = New Command(AddressOf ResetParamCmd)
|
||||
End If
|
||||
Return m_cmdResetParam
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub ResetParamCmd()
|
||||
m_SelValue = m_PartSelValue
|
||||
NotifyPropertyChanged(NameOf(SelValue))
|
||||
NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
|
||||
End Sub
|
||||
|
||||
#End Region ' ResetParam
|
||||
|
||||
#End Region ' COMMANDS
|
||||
|
||||
|
||||
End Class
|
||||
@@ -149,6 +149,14 @@
|
||||
<DependentUpon>DispositionPanelV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DispositionPanel\DispositionPanelVM.vb" />
|
||||
<Compile Include="FilledSolidPanel\FilledSolidPanelV.xaml.vb">
|
||||
<DependentUpon>FilledSolidPanelV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FilledSolidPanel\FilledSolidPanelVM.vb" />
|
||||
<Compile Include="FilledSolidParamPanel\FilledSolidParamPanelV.xaml.vb">
|
||||
<DependentUpon>FilledSolidParamPanelV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FilledSolidParamPanel\FilledSolidParamPanelVM.vb" />
|
||||
<Compile Include="ImportExportMachiningPanel\ImportExportMachiningPanelV.xaml.vb">
|
||||
<DependentUpon>ImportExportMachiningPanelV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
@@ -281,6 +289,9 @@
|
||||
<DependentUpon>StartMachPanelV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="StartMachPanel\StartMachPanelVM.vb" />
|
||||
<Compile Include="StatusBar\MessagePanelV.xaml.vb">
|
||||
<DependentUpon>MessagePanelV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="StatusBar\MyStatusBarVM.vb" />
|
||||
<Compile Include="StatusBar\StatusBarV.xaml.vb">
|
||||
<DependentUpon>StatusBarV.xaml</DependentUpon>
|
||||
@@ -342,6 +353,14 @@
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="FilledSolidPanel\FilledSolidPanelV.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="FilledSolidParamPanel\FilledSolidParamPanelV.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="ImportExportMachiningPanel\ImportExportMachiningPanelV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>XamlIntelliSenseFileGenerator</Generator>
|
||||
@@ -486,6 +505,10 @@
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="StatusBar\MessagePanelV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="StatusBar\StatusBarV.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
@@ -753,6 +776,9 @@
|
||||
<Resource Include="Resources\AboutBox\EgalwareLogo.png" />
|
||||
<Resource Include="Resources\AboutBox\IcarusLogo.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\CurrMachining\SaveInDb.png" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR32.exe
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
<PrintApp:ShellNumberPanelV DataContext="{StaticResource ShellNumberPanelVM}"/>
|
||||
</TabItem>
|
||||
<TabItem Header="AUXSOLIDS">
|
||||
<Button Height="100"/>
|
||||
<PrintApp:FilledSolidPanelV DataContext="{StaticResource FilledSolidPanelVM}"/>
|
||||
</TabItem>
|
||||
<TabItem Header="MODIFYPART">
|
||||
<!--<PrintApp:ModifyPartPanelV DataContext="{StaticResource ModifyPartPanelVM}"/>-->
|
||||
|
||||
@@ -39,6 +39,8 @@ Public Class LeftPanelVM
|
||||
Map.refRibPanelVM.Dispose()
|
||||
Case Panels.SHELLNUMBER
|
||||
Map.refShellNumberPanelVM.Dispose()
|
||||
Case Panels.AUXSOLIDS
|
||||
Map.refFilledSolidPanelVM.Dispose()
|
||||
End Select
|
||||
m_SelPanel = Panel
|
||||
Select Case Panel
|
||||
@@ -54,8 +56,9 @@ Public Class LeftPanelVM
|
||||
Map.refRibPanelVM.Init()
|
||||
Case Panels.SHELLNUMBER
|
||||
Map.refShellNumberPanelVM.Init()
|
||||
Case Panels.AUXSOLIDS
|
||||
Map.refFilledSolidPanelVM.Init()
|
||||
Case Panels.MODIFYPART
|
||||
''Map.refModifyPartPanelVM.Init()
|
||||
Map.refManagePartPanelVM.Init(ManagePartPanelVM.ManagePartType.MODIFY)
|
||||
End Select
|
||||
If Not IsNothing(Map.refViewLayerManagerVM) Then Map.refViewLayerManagerVM.UpdateForced()
|
||||
|
||||
@@ -375,27 +375,33 @@ Public Class ManagePartPanelVM
|
||||
nShellNumberLayerId = EgtCreateGroup(nPartId)
|
||||
EgtSetName(nShellNumberLayerId, LAY_SHELL_NBR)
|
||||
EgtSetColor(nShellNumberLayerId, GeomEntityColors.c3ShellNumber)
|
||||
Dim nShellNumberIndex As Integer = 1
|
||||
For Each PartManager_GeomEntity In ManagePart_Layer.EntityList
|
||||
EgtSetInfo(PartManager_GeomEntity.nId, KEY_SHELLNBR_TYPE, ShellNumberEntity.ShellNumberTypes.FROMIMPORT)
|
||||
EgtSetInfo(PartManager_GeomEntity.nId, SHELLNUMBER_ID, nShellNumberIndex)
|
||||
EgtRelocateGlob(PartManager_GeomEntity.nId, nShellNumberLayerId, GDB_POS.LAST_SON)
|
||||
' elimino colore entita'
|
||||
EgtResetColor(PartManager_GeomEntity.nId)
|
||||
If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
|
||||
EgtSetInfo(PartManager_GeomEntity.nId, ENTITY_NAME, PartManager_GeomEntity.sName)
|
||||
End If
|
||||
nShellNumberIndex += 1
|
||||
Next
|
||||
Case ManagePart_Layer.LayerType.AUX_SOLIDS
|
||||
nAuxSolidsLayerId = EgtCreateGroup(nPartId)
|
||||
EgtSetName(nAuxSolidsLayerId, LAY_AUX_SOLIDS)
|
||||
EgtSetColor(nAuxSolidsLayerId, GeomEntityColors.c3AuxSolids)
|
||||
Dim nFilledSolidIndex As Integer = 1
|
||||
For Each PartManager_GeomEntity In ManagePart_Layer.EntityList
|
||||
EgtSetInfo(PartManager_GeomEntity.nId, KEY_AUXSOLID_TYPE, RibEntity.RibTypes.FROMIMPORT)
|
||||
EgtSetInfo(PartManager_GeomEntity.nId, FILLEDSOLID_ID, nFilledSolidIndex)
|
||||
EgtRelocateGlob(PartManager_GeomEntity.nId, nAuxSolidsLayerId, GDB_POS.LAST_SON)
|
||||
' elimino colore entita'
|
||||
EgtResetColor(PartManager_GeomEntity.nId)
|
||||
If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
|
||||
EgtSetInfo(PartManager_GeomEntity.nId, ENTITY_NAME, PartManager_GeomEntity.sName)
|
||||
End If
|
||||
nFilledSolidIndex += 1
|
||||
Next
|
||||
Case ManagePart_Layer.LayerType.OTHERS
|
||||
nOthersLayerId = EgtCreateGroup(nPartId)
|
||||
|
||||
@@ -512,11 +512,11 @@ Public Class ManagePart_Layer
|
||||
m_nLayerId = PrintPart.nAuxSolidsLayerId
|
||||
Dim nEntityId As Integer = EgtGetFirstInGroup(m_nLayerId)
|
||||
While nEntityId <> GDB_ID.NULL
|
||||
'Dim ShellType As Integer = ShellNumberEntity.ShellNumberTypes.FROMDRAW
|
||||
'EgtGetInfo(nEntityId, KEY_SHELLNBR_TYPE, ShellType)
|
||||
'If ShellType = ShellNumberEntity.ShellNumberTypes.FROMIMPORT Then
|
||||
m_EntityList.Add(New PartManager_GeomEntity(Me, nEntityId))
|
||||
'End If
|
||||
Dim FIlledSolidType As Integer = FilledSolidEntity.FilledSolidTypes.FROMDRAW
|
||||
EgtGetInfo(nEntityId, KEY_AUXSOLID_TYPE, FIlledSolidType)
|
||||
If FIlledSolidType = FilledSolidEntity.FilledSolidTypes.FROMIMPORT Then
|
||||
m_EntityList.Add(New PartManager_GeomEntity(Me, nEntityId))
|
||||
End If
|
||||
nEntityId = EgtGetNext(nEntityId)
|
||||
End While
|
||||
Case LayerType.OTHERS
|
||||
@@ -835,31 +835,27 @@ Public Class GeomEntity_MenuItem
|
||||
Select Case m_Type
|
||||
Case ManagePart_Layer.LayerType.PRINT_SOLID
|
||||
EgtSetName(m_OrigEntity.nId, PRINT_SOLID)
|
||||
EgtSetColor(m_OrigEntity.nId, c3Print)
|
||||
' rimuovo eventuale nota spostamento per 45 gradi
|
||||
EgtRemoveInfo(m_OrigEntity.OrigLayer.OrigPart.nId, KEY_MOVEDPART)
|
||||
bIsMovedPartOrRib = True
|
||||
Case ManagePart_Layer.LayerType.MACH_START
|
||||
EgtSetName(m_OrigEntity.nId, LAY_MACH_START)
|
||||
EgtSetColor(m_OrigEntity.nId, c3MachStart)
|
||||
Case ManagePart_Layer.LayerType.RIBS
|
||||
EgtSetName(m_OrigEntity.nId, LAY_RIBS)
|
||||
EgtSetInfo(m_OrigEntity.nId, KEY_RIB_TYPE, RibEntity.RibTypes.FROMIMPORT)
|
||||
EgtSetInfo(m_OrigEntity.nId, RIB_ID, RibPanelVM.GetNextRibIndex())
|
||||
EgtSetColor(m_OrigEntity.nId, c3Rib)
|
||||
bIsMovedPartOrRib = True
|
||||
Case ManagePart_Layer.LayerType.SHELL_NUMBER
|
||||
EgtSetName(m_OrigEntity.nId, LAY_SHELL_NBR)
|
||||
EgtSetInfo(m_OrigEntity.nId, KEY_SHELLNBR_TYPE, ShellNumberEntity.ShellNumberTypes.FROMIMPORT)
|
||||
EgtSetColor(m_OrigEntity.nId, c3ShellNumber)
|
||||
Case ManagePart_Layer.LayerType.AUX_SOLIDS
|
||||
EgtSetName(m_OrigEntity.nId, LAY_AUX_SOLIDS)
|
||||
EgtSetInfo(m_OrigEntity.nId, KEY_AUXSOLID_TYPE, RibEntity.RibTypes.FROMIMPORT)
|
||||
EgtSetColor(m_OrigEntity.nId, c3AuxSolids)
|
||||
Case ManagePart_Layer.LayerType.OTHERS
|
||||
EgtSetName(m_OrigEntity.nId, LAY_OTHERS)
|
||||
EgtSetColor(m_OrigEntity.nId, c3Others)
|
||||
End Select
|
||||
' resetto colore entita'
|
||||
EgtResetColor(m_OrigEntity.nId)
|
||||
' se spostato un Rib, aggiorno posizione riferimento e pezzo
|
||||
If bIsMovedPartOrRib Then
|
||||
Map.refReferencePanelVM.UpdateFramePosition(NewPart.PrintPart)
|
||||
|
||||
@@ -30,6 +30,9 @@
|
||||
<PrintApp:ControllerInputPanelV Grid.Row="1"
|
||||
Grid.ColumnSpan="2"
|
||||
DataContext="{StaticResource ControllerInputPanelVM}"/>
|
||||
<PrintApp:MessagePanelV Grid.Row="1"
|
||||
Grid.ColumnSpan="2"
|
||||
DataContext="{StaticResource StatusBarVM}"/>
|
||||
<PrintApp:ShowPanelV Grid.Column="2"
|
||||
Grid.Row="1"
|
||||
DataContext="{StaticResource ShowPanelVM}"/>
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 580 B |
Binary file not shown.
|
Before Width: | Height: | Size: 396 B After Width: | Height: | Size: 285 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 912 B |
Binary file not shown.
|
Before Width: | Height: | Size: 924 B After Width: | Height: | Size: 455 B |
Binary file not shown.
|
Before Width: | Height: | Size: 432 B After Width: | Height: | Size: 344 B |
Binary file not shown.
|
Before Width: | Height: | Size: 422 B After Width: | Height: | Size: 329 B |
@@ -555,10 +555,8 @@ Public Class RibPanelVM
|
||||
Dim nNewEntityId As Integer = EgtCreateSurfTmByRegionExtrusion(m_nRibLayerId, 1, {m_SelRib.nCurveId}, Vector3d.Z_AX * dExtrusionLength, EPS_STM)
|
||||
EgtSetName(nNewEntityId, RIB_EXTRUSION)
|
||||
EgtSetInfo(nNewEntityId, KEY_EXTRUSION_LENGTH, dExtrusionLength)
|
||||
' coloro l'entita' di viola
|
||||
Dim c3LightBlue As Color3d
|
||||
c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid)
|
||||
EgtSetColor(nNewEntityId, c3LightBlue)
|
||||
' resetto colore entita'
|
||||
EgtResetColor(nNewEntityId)
|
||||
' aggiorno riferimento nella curva
|
||||
m_SelRib.SetExtrusionId(nNewEntityId)
|
||||
' seleziono nuova estrusione
|
||||
@@ -580,6 +578,12 @@ Public Class RibPanelVM
|
||||
' rimetto la selezione scena a null
|
||||
Map.refSceneHostVM.MainScene.SetStatusNull()
|
||||
End Select
|
||||
Select Case command
|
||||
Case Controller.CMD.LINE2P, Controller.CMD.DELETE, Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE, Controller.CMD.EXTRUDE,
|
||||
Controller.CMD.MOVE, Controller.CMD.ROTATE
|
||||
' Imposto flag di ricalcolo slice
|
||||
EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
|
||||
End Select
|
||||
If command <> Controller.CMD.LINE2P AndAlso command <> Controller.CMD.EXTRUDE Then Return
|
||||
' se finita creazione estrusione
|
||||
If m_bIsCreatingExtrusion Then
|
||||
@@ -597,10 +601,8 @@ Public Class RibPanelVM
|
||||
Dim dExtrusionLength As Double = 0
|
||||
StringToLen(Map.refControllerInputPanelVM.Text, dExtrusionLength)
|
||||
EgtSetInfo(nNewEntityId, KEY_EXTRUSION_LENGTH, dExtrusionLength)
|
||||
' coloro l'entita' di blu
|
||||
Dim c3LightBlue As Color3d
|
||||
c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid)
|
||||
EgtSetColor(nNewEntityId, c3LightBlue)
|
||||
' resetto colore entita'
|
||||
EgtResetColor(nNewEntityId)
|
||||
'' lo sposto nel layer dei rib
|
||||
EgtRelocateGlob(nNewEntityId, m_nRibLayerId, GDB_POS.LAST_SON)
|
||||
' aggiungo riferimento a curva
|
||||
@@ -623,10 +625,8 @@ Public Class RibPanelVM
|
||||
Dim NewGeomType As GDB_TY = EgtGetType(nNewEntityId)
|
||||
If NewGeomType = GDB_TY.CRV_COMPO Then
|
||||
EgtSetName(nNewEntityId, RIB_CURVE)
|
||||
' coloro l'entita' di blu
|
||||
Dim c3LightBlue As Color3d
|
||||
c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid)
|
||||
EgtSetColor(nNewEntityId, c3LightBlue)
|
||||
' resetto colore entita'
|
||||
EgtResetColor(nNewEntityId)
|
||||
' lo sposto nel layer dei rib
|
||||
EgtRelocateGlob(nNewEntityId, m_nRibLayerId, GDB_POS.LAST_SON)
|
||||
' lo aggiungo alla lista
|
||||
@@ -653,12 +653,6 @@ Public Class RibPanelVM
|
||||
' cancello layer di disegno
|
||||
EgtErase(nNewRibLayerId)
|
||||
End If
|
||||
Select Case command
|
||||
Case Controller.CMD.LINE2P, Controller.CMD.DELETE, Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE, Controller.CMD.EXTRUDE,
|
||||
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)
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
<PrintApp:ShellNumberParamPanelV DataContext="{StaticResource ShellNumberParamPanelVM}"/>
|
||||
</TabItem>
|
||||
<TabItem Header="AUXSOLIDPARAM">
|
||||
<Button/>
|
||||
<PrintApp:FilledSolidParamPanelV DataContext="{StaticResource FilledSolidParamPanelVM}"/>
|
||||
</TabItem>
|
||||
<TabItem Header="TFSEDITOR">
|
||||
<PrintApp:TFSEditorV DataContext="{StaticResource TFSEditorVM}"/>
|
||||
|
||||
@@ -54,6 +54,8 @@ Public Class RightPanelVM
|
||||
Map.refRibParamPanelVM.Init()
|
||||
Case Panels.SHELLNUMBERPARAM
|
||||
Map.refShellNumberParamPanelVM.Init()
|
||||
Case Panels.AUXSOLIDPARAM
|
||||
Map.refFilledSolidParamPanelVM.Init()
|
||||
Case Panels.TFSEDITOR
|
||||
'Map.refTFSEditorVM.Refresh()
|
||||
Case Panels.SIMULATION
|
||||
|
||||
@@ -536,6 +536,75 @@ Public Class MySceneHostVM
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Public Sub InsertFilledSolid()
|
||||
' Recupero cartella dell'ultimo progetto aperto
|
||||
Dim sDir As String = MainController.GetCurrFile()
|
||||
If String.IsNullOrWhiteSpace(sDir) Then
|
||||
GetMainPrivateProfileString(S_MRUIMPORTFILES, K_FILE & 1, "", sDir)
|
||||
End If
|
||||
If Not String.IsNullOrWhiteSpace(sDir) Then
|
||||
sDir = Path.GetDirectoryName(sDir)
|
||||
End If
|
||||
If Not Directory.Exists(sDir) Then sDir = ""
|
||||
Dim OpenFileDialog As New OpenFileDialog With {.Title = "Insert",
|
||||
.Filter = "Stereolithography (*.stl)|*.stl" &
|
||||
"|Iges files (*.igs;*.iges)|*.igs;*.iges" &
|
||||
"|Step files (*.stp;*.step)|*.stp;*.step" &
|
||||
"|3D Manufacturing format (*.3mf)|*.3mf" &
|
||||
"|New geometry EgalTech(*.nge)|*.nge" &
|
||||
"|All Files (*.*)|*.*",
|
||||
.FilterIndex = 1,
|
||||
.InitialDirectory = sDir}
|
||||
If Not OpenFileDialog.ShowDialog Then
|
||||
Return
|
||||
End If
|
||||
Dim sFile As String = String.Empty
|
||||
sFile = OpenFileDialog.FileName
|
||||
' importo la nuova geometria
|
||||
If MainController.InsertProject(sFile, False) Then
|
||||
' sposto le nuove geometrie nel layer ShellNumber del pezzo
|
||||
Dim nNewPartId As Integer = EgtGetLastPart()
|
||||
Dim nNewLayerId As Integer = EgtGetFirstGroupInGroup(nNewPartId)
|
||||
Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewLayerId)
|
||||
While nNewEntityId <> GDB_ID.NULL
|
||||
Dim EntityType As GDB_TY = EgtGetType(nNewEntityId)
|
||||
Select Case EntityType
|
||||
Case GDB_TY.CRV_COMPO, GDB_TY.CRV_LINE, GDB_TY.CRV_ARC
|
||||
Dim nNewFilledSolidId As Integer = nNewEntityId
|
||||
If EntityType = GDB_TY.CRV_LINE OrElse EntityType = GDB_TY.CRV_ARC Then
|
||||
nNewFilledSolidId = EgtCreateCurveCompo(Map.refTopPanelVM.SelPart.nPartId, nNewEntityId, False)
|
||||
Else
|
||||
' lo copio nel layer dei shellnumber
|
||||
nNewFilledSolidId = EgtCopy(nNewEntityId, Map.refFilledSolidPanelVM.nFilledSolidLayerId, GDB_POS.LAST_SON)
|
||||
End If
|
||||
EgtSetName(nNewFilledSolidId, RIB_CURVE)
|
||||
' elimino colore entita'
|
||||
EgtResetColor(nNewEntityId)
|
||||
' lo aggiungo alla lista
|
||||
Dim NewEntity As FilledSolidEntity = New FilledSolidEntity(FilledSolidEntity.FilledSolidTypes.FROMIMPORT, nNewFilledSolidId)
|
||||
Map.refFilledSolidPanelVM.FilledSolidList.Add(NewEntity)
|
||||
Case GDB_TY.SRF_MESH, GDB_TY.SRF_FRGN, GDB_TY.SRF_BEZ
|
||||
Dim nNewFilledSolidId = nNewEntityId
|
||||
' lo copio nel layer dei rib
|
||||
nNewFilledSolidId = EgtCopy(nNewEntityId, Map.refFilledSolidPanelVM.nFilledSolidLayerId, GDB_POS.LAST_SON)
|
||||
EgtSetName(nNewFilledSolidId, RIB_EXTRUSION)
|
||||
' elimino colore entita'
|
||||
EgtResetColor(nNewEntityId)
|
||||
' lo aggiungo alla lista
|
||||
Dim NewEntity As FilledSolidEntity = New FilledSolidEntity(FilledSolidEntity.FilledSolidTypes.FROMIMPORT, nNewFilledSolidId)
|
||||
Map.refFilledSolidPanelVM.FilledSolidList.Add(NewEntity)
|
||||
End Select
|
||||
nNewEntityId = EgtGetNext(nNewEntityId)
|
||||
End While
|
||||
EgtErase(nNewPartId)
|
||||
' seleziono ultima rib
|
||||
Map.refFilledSolidPanelVM.SelLastFilledSolid()
|
||||
EgtDraw()
|
||||
' Imposto flag di ricalcolo slice
|
||||
EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub ImportProject()
|
||||
Dim sDir As String = String.Empty
|
||||
GetMainPrivateProfileString(S_MRUIMPORT, K_FILE & "1", "", sDir)
|
||||
@@ -632,6 +701,8 @@ Public Class MySceneHostVM
|
||||
Rib_OnMouseDownScene(sender, e)
|
||||
Case ModifyModes.SHELLNUMBER
|
||||
ShellNumber_OnMouseDownScene(sender, e)
|
||||
Case ModifyModes.AUXSOLIDS
|
||||
FilledSolid_OnMouseDownScene(sender, e)
|
||||
End Select
|
||||
ElseIf Map.refTopPanelVM.SelPage = Pages.IMPORT Then
|
||||
Import_OnMouseDownScene(sender, e)
|
||||
@@ -678,6 +749,8 @@ Public Class MySceneHostVM
|
||||
Rib_OnMouseMoveScene(sender, e)
|
||||
Case ModifyModes.SHELLNUMBER
|
||||
ShellNumber_OnMouseMoveScene(sender, e)
|
||||
Case ModifyModes.AUXSOLIDS
|
||||
FilledSolid_OnMouseMoveScene(sender, e)
|
||||
End Select
|
||||
ElseIf Map.refTopPanelVM.SelPage = Pages.IMPORT Then
|
||||
Import_OnMouseMoveScene(sender, e)
|
||||
@@ -723,6 +796,8 @@ Public Class MySceneHostVM
|
||||
Rib_OnMouseUpScene(sender, e)
|
||||
Case ModifyModes.SHELLNUMBER
|
||||
ShellNumber_OnMouseUpScene(sender, e)
|
||||
Case ModifyModes.AUXSOLIDS
|
||||
FilledSolid_OnMouseUpScene(sender, e)
|
||||
End Select
|
||||
ElseIf Map.refTopPanelVM.SelPage = Pages.IMPORT Then
|
||||
Import_OnMouseUpScene(sender, e)
|
||||
@@ -767,6 +842,7 @@ Public Class MySceneHostVM
|
||||
Case ModifyModes.SHELLNUMBER
|
||||
bOk = Map.refShellNumberPanelVM.OnMouseSelectingObj(nId)
|
||||
Case ModifyModes.AUXSOLIDS
|
||||
bOk = Map.refFilledSolidPanelVM.OnMouseSelectingObj(nId)
|
||||
End Select
|
||||
End If
|
||||
End Sub
|
||||
@@ -871,6 +947,7 @@ Public Class MySceneHostVM
|
||||
Case ModifyModes.SHELLNUMBER
|
||||
Map.refShellNumberPanelVM.OnKeyDown(e.KeyData)
|
||||
Case ModifyModes.AUXSOLIDS
|
||||
Map.refFilledSolidPanelVM.OnKeyDown(e.KeyData)
|
||||
End Select
|
||||
End If
|
||||
'' Se in modalità edit L250
|
||||
@@ -1140,6 +1217,7 @@ Public Class MySceneHostVM
|
||||
Case ModifyModes.SHELLNUMBER
|
||||
Map.refShellNumberPanelVM.UpdateUI()
|
||||
Case ModifyModes.AUXSOLIDS
|
||||
Map.refFilledSolidPanelVM.UpdateUI()
|
||||
End Select
|
||||
End If
|
||||
' aggiorno titolo
|
||||
@@ -1159,6 +1237,7 @@ Public Class MySceneHostVM
|
||||
Case ModifyModes.SHELLNUMBER
|
||||
Map.refShellNumberPanelVM.OnExecCmdEnd(command)
|
||||
Case ModifyModes.AUXSOLIDS
|
||||
Map.refFilledSolidPanelVM.OnExecCmdEnd(command)
|
||||
End Select
|
||||
End If
|
||||
End Sub
|
||||
@@ -1551,6 +1630,88 @@ Public Class MySceneHostVM
|
||||
|
||||
#End Region ' ShellNumber
|
||||
|
||||
#Region "FilledSolid"
|
||||
|
||||
Friend Sub FilledSolid_OnMouseDownScene(sender As Object, e As Forms.MouseEventArgs)
|
||||
m_nIdToSel = GDB_ID.NULL
|
||||
' Verifico se selezionato indicativo di pezzo
|
||||
EgtSetObjFilterForSelWin(True, True, True, True, True)
|
||||
Dim nSel As Integer
|
||||
EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
|
||||
Dim nId As Integer = EgtGetFirstObjInSelWin()
|
||||
While nId <> GDB_ID.NULL
|
||||
' Se per Griglia da faccia di oggetto
|
||||
If Map.refFilledSolidPanelVM.bCPlaneObj_IsActive Then
|
||||
If EgtGetType(nId) = GDB_TY.SRF_MESH Then
|
||||
m_nIdToSel = nId
|
||||
Exit While
|
||||
End If
|
||||
Else
|
||||
Dim nFilledSolidLayerId As Integer = EgtGetParent(nId)
|
||||
If nFilledSolidLayerId = Map.refFilledSolidPanelVM.nFilledSolidLayerId Then
|
||||
m_nIdToSel = nId
|
||||
Exit While
|
||||
End If
|
||||
End If
|
||||
nId = EgtGetNextObjInSelWin()
|
||||
End While
|
||||
If Map.refFilledSolidPanelVM.bCPlaneObj_IsActive And m_nIdToSel <> GDB_ID.NULL Then
|
||||
' recupero dati punto di selezione
|
||||
Dim PtTemp As Point3d
|
||||
Dim nAux As Integer
|
||||
If EgtGetPointFromSelect(m_nIdToSel, e.Location, PtTemp, nAux) Then
|
||||
' eseguo la selezione
|
||||
EgtSelectObj(m_nIdToSel)
|
||||
' dati ausiliari
|
||||
EgtSetSelInfo(m_nIdToSel, nAux, PtTemp)
|
||||
End If
|
||||
End If
|
||||
' Dati per drag
|
||||
m_bDragToStart = True
|
||||
End Sub
|
||||
|
||||
Friend Sub FilledSolid_OnMouseMoveScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
|
||||
' Se drag non abilitato o già in esecuzione, esco
|
||||
If Not m_bDragToStart Then Return
|
||||
' Se primo movimento di drag, verifico di aver superato la soglia di movimento in pixel
|
||||
If m_bDragToStart Then
|
||||
If Math.Abs(e.Location.X - m_locPrev.X) < m_nRestRadius And
|
||||
Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
|
||||
Return
|
||||
End If
|
||||
m_bDragToStart = False
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Friend Sub FilledSolid_OnMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
|
||||
' Se eseguito drag
|
||||
If Not m_bDragToStart Then
|
||||
|
||||
' Se selezione da eseguire
|
||||
ElseIf m_nIdToSel <> GDB_ID.NULL Then
|
||||
If Map.refFilledSolidPanelVM.bCPlaneObj_IsActive Then
|
||||
' eseguo comando
|
||||
Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_OBJ)
|
||||
Map.refFilledSolidPanelVM.ResetCPlaneObjIsActive()
|
||||
' ripristino selezioni precedenti
|
||||
For Each Id In Map.refFilledSolidPanelVM.PrevSelObjs
|
||||
EgtSelectObj(Id)
|
||||
Next
|
||||
Map.refControllerInputPanelVM.ResetInputBox()
|
||||
Else
|
||||
' eseguo la selezione
|
||||
Map.refFilledSolidPanelVM.SelStartFromId(m_nIdToSel)
|
||||
End If
|
||||
End If
|
||||
' Reset
|
||||
m_bDrag = False
|
||||
m_nIdToSel = GDB_ID.NULL
|
||||
m_nIdToDesel = GDB_ID.NULL
|
||||
EgtDraw()
|
||||
End Sub
|
||||
|
||||
#End Region ' FilledSolid
|
||||
|
||||
#End Region ' VIEW EVENTS
|
||||
|
||||
End Class
|
||||
|
||||
@@ -535,10 +535,8 @@ Public Class ShellNumberPanelVM
|
||||
Dim nNewEntityId As Integer = EgtCreateSurfTmByRegionExtrusion(m_nShellNumberLayerId, 1, {m_SelShellNumber.nCurveId}, Vector3d.Z_AX * dExtrusionLength, EPS_STM)
|
||||
EgtSetName(nNewEntityId, RIB_EXTRUSION)
|
||||
EgtSetInfo(nNewEntityId, KEY_EXTRUSION_LENGTH, dExtrusionLength)
|
||||
' coloro l'entita' di verde
|
||||
Dim c3LightBlue As Color3d
|
||||
c3LightBlue.FromColor(System.Drawing.Color.Lime)
|
||||
EgtSetColor(nNewEntityId, c3LightBlue)
|
||||
' resetto colore entita'
|
||||
EgtResetColor(nNewEntityId)
|
||||
' aggiorno riferimento nella curva
|
||||
m_SelShellNumber.SetExtrusionId(nNewEntityId)
|
||||
' seleziono nuova estrusione
|
||||
@@ -560,6 +558,12 @@ Public Class ShellNumberPanelVM
|
||||
' rimetto la selezione scena a null
|
||||
Map.refSceneHostVM.MainScene.SetStatusNull()
|
||||
End Select
|
||||
Select Case command
|
||||
Case Controller.CMD.LINE2P, Controller.CMD.DELETE, Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE, Controller.CMD.EXTRUDE,
|
||||
Controller.CMD.MOVE, Controller.CMD.ROTATE
|
||||
' Imposto flag di ricalcolo slice
|
||||
EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
|
||||
End Select
|
||||
If command <> Controller.CMD.LINE2P AndAlso command <> Controller.CMD.EXTRUDE Then Return
|
||||
' se finita creazione estrusione
|
||||
If m_bIsCreatingExtrusion Then
|
||||
@@ -577,10 +581,8 @@ Public Class ShellNumberPanelVM
|
||||
Dim dExtrusionLength As Double = 0
|
||||
StringToLen(Map.refControllerInputPanelVM.Text, dExtrusionLength)
|
||||
EgtSetInfo(nNewEntityId, KEY_EXTRUSION_LENGTH, dExtrusionLength)
|
||||
' coloro l'entita' di verde
|
||||
Dim c3LightBlue As Color3d
|
||||
c3LightBlue.FromColor(System.Drawing.Color.Lime)
|
||||
EgtSetColor(nNewEntityId, c3LightBlue)
|
||||
' resetto colore entita'
|
||||
EgtResetColor(nNewEntityId)
|
||||
'' lo sposto nel layer dei rib
|
||||
EgtRelocateGlob(nNewEntityId, m_nShellNumberLayerId, GDB_POS.LAST_SON)
|
||||
' aggiungo riferimento a curva
|
||||
@@ -606,10 +608,8 @@ Public Class ShellNumberPanelVM
|
||||
EgtCloseCurveCompo(nNewEntityId)
|
||||
End If
|
||||
EgtSetName(nNewEntityId, RIB_CURVE)
|
||||
' coloro l'entita' di verde
|
||||
Dim c3LightBlue As Color3d
|
||||
c3LightBlue.FromColor(System.Drawing.Color.Lime)
|
||||
EgtSetColor(nNewEntityId, c3LightBlue)
|
||||
' resetto colore entita'
|
||||
EgtResetColor(nNewEntityId)
|
||||
' lo sposto nel layer dei rib
|
||||
EgtRelocateGlob(nNewEntityId, m_nShellNumberLayerId, GDB_POS.LAST_SON)
|
||||
' lo aggiungo alla lista
|
||||
@@ -636,12 +636,6 @@ Public Class ShellNumberPanelVM
|
||||
' cancello layer di disegno
|
||||
EgtErase(nNewRibLayerId)
|
||||
End If
|
||||
Select Case command
|
||||
Case Controller.CMD.LINE2P, Controller.CMD.DELETE, Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE, Controller.CMD.EXTRUDE,
|
||||
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)
|
||||
@@ -679,6 +673,20 @@ Public Class ShellNumberPanelVM
|
||||
NotifyPropertyChanged(NameOf(SelShellNumber))
|
||||
End Sub
|
||||
|
||||
Friend Shared Function GetNextShellNumberIndex()
|
||||
Dim nShellNumberIndex As Integer = 0
|
||||
Dim nShellNumberId As Integer = EgtGetFirstInGroup(Map.refTopPanelVM.SelPart.nShellNumberLayerId)
|
||||
While nShellNumberId <> GDB_ID.NULL
|
||||
Dim nCurrIndex As Integer = GDB_ID.NULL
|
||||
EgtGetInfo(nShellNumberId, SHELLNUMBER_ID, nCurrIndex)
|
||||
If nCurrIndex > nShellNumberIndex Then
|
||||
nShellNumberIndex = nCurrIndex
|
||||
End If
|
||||
nShellNumberId = EgtGetNext(nShellNumberId)
|
||||
End While
|
||||
Return nShellNumberIndex + 1
|
||||
End Function
|
||||
|
||||
#End Region ' METHODS
|
||||
|
||||
#Region "COMMANDS"
|
||||
@@ -1338,7 +1346,10 @@ Public Class ShellNumberEntity
|
||||
End Property
|
||||
|
||||
Sub New(Type As ShellNumberTypes, nId As Integer)
|
||||
m_nIndex = nSharedIndex
|
||||
If Not EgtGetInfo(nId, SHELLNUMBER_ID, m_nIndex) Then
|
||||
m_nIndex = ShellNumberPanelVM.GetNextShellNumberIndex()
|
||||
EgtSetInfo(nId, SHELLNUMBER_ID, m_nIndex)
|
||||
End If
|
||||
m_Type = Type
|
||||
EgtSetInfo(nId, KEY_SHELLNBR_TYPE, Type)
|
||||
Select Case Type
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
<Border x:Class="MessagePanelV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="clr-namespace:Icarus"
|
||||
Height="18"
|
||||
HorizontalAlignment="Left"
|
||||
Margin="45,0,0,0"
|
||||
Padding="0"
|
||||
Visibility="{Binding OutputMessage, Converter={StaticResource StringToVisibilityConverter}}"
|
||||
Style="{StaticResource ViewLayerManager_Border}">
|
||||
<Border.InputBindings>
|
||||
<MouseBinding MouseAction="LeftClick"
|
||||
Command="{Binding ClearOutputMessage_Command}"/>
|
||||
</Border.InputBindings>
|
||||
<!--Stringa di output messaggi-->
|
||||
<TextBlock Text="{Binding OutputMessage}"
|
||||
Margin="5,0,5,0"
|
||||
Style="{StaticResource ControllerInput_TextBlock}"/>
|
||||
</Border>
|
||||
@@ -0,0 +1,3 @@
|
||||
Public Class MessagePanelV
|
||||
|
||||
End Class
|
||||
@@ -1,4 +1,5 @@
|
||||
Imports System.Runtime.InteropServices
|
||||
Imports System.Globalization
|
||||
Imports System.Runtime.InteropServices
|
||||
Imports System.Threading
|
||||
Imports EgtUILib
|
||||
Imports EgtWPFLib5
|
||||
@@ -224,3 +225,20 @@ Public Class MyStatusBarVM
|
||||
#End Region ' COMMANDS
|
||||
|
||||
End Class
|
||||
|
||||
Public Class StringToVisibilityConverter
|
||||
Implements IValueConverter
|
||||
|
||||
Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.Convert
|
||||
If TypeOf value Is String Then
|
||||
Dim sValue As String = CStr(value)
|
||||
Return If(String.IsNullOrWhiteSpace(sValue), Visibility.Collapsed, Visibility.Visible)
|
||||
End If
|
||||
Return Visibility.Collapsed
|
||||
End Function
|
||||
|
||||
Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.ConvertBack
|
||||
Throw New NotImplementedException()
|
||||
End Function
|
||||
|
||||
End Class
|
||||
@@ -126,10 +126,8 @@
|
||||
Style="{StaticResource TopPanel_ComboBox}" Grid.RowSpan="2"/>
|
||||
<Button Grid.Column="1"
|
||||
Command="{Binding MaterialDb_Command}"
|
||||
Width="35"
|
||||
Height="35"
|
||||
Margin="-2"
|
||||
Style="{StaticResource TopPanel_Button}" Grid.ColumnSpan="2" Grid.RowSpan="2">
|
||||
Style="{StaticResource TopPanel_Button}">
|
||||
<Image Source="/Resources/TopPanel/MaterialDb.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
@@ -176,76 +174,52 @@
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1.5*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="1.5*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1.5*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Image Source="/Resources/TopPanel/SlicingDirection.png"
|
||||
ToolTip="Slicing direction"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
<!--<TextBlock Text="Slicing direction:"
|
||||
VerticalAlignment="Bottom"
|
||||
Style="{StaticResource TopPanelFixed_TextBlock}"/>-->
|
||||
<TextBlock Grid.Column="1"
|
||||
Text="{Binding CurrMachining.sCurrSlicingType}"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Bottom"
|
||||
Margin="5,0,5,0"
|
||||
Style="{StaticResource TopPanelData_TextBlock}"/>
|
||||
<Image Grid.Column="2"
|
||||
Source="/Resources/TopPanel/StrandH.png"
|
||||
ToolTip="Strand Height"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
<!--<TextBlock Grid.Column="2"
|
||||
Text="StrandH:"
|
||||
VerticalAlignment="Bottom"
|
||||
Style="{StaticResource TopPanelFixed_TextBlock}"/>-->
|
||||
<TextBlock Grid.Column="3"
|
||||
Text="{Binding CurrMachining.sCurrStrandH}"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Bottom"
|
||||
Margin="5,0,5,0"
|
||||
Style="{StaticResource TopPanelData_TextBlock}"/>
|
||||
<Image Grid.Column="4"
|
||||
Source="/Resources/TopPanel/StrandW.png"
|
||||
ToolTip="Strand Width"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
<!--<TextBlock Grid.Column="4"
|
||||
Text="StrandW:"
|
||||
VerticalAlignment="Bottom"
|
||||
Style="{StaticResource TopPanelFixed_TextBlock}"/>-->
|
||||
<TextBlock Grid.Column="5"
|
||||
Text="{Binding CurrMachining.sCurrStrandW}"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Bottom"
|
||||
Margin="5,0,5,0"
|
||||
Style="{StaticResource TopPanelData_TextBlock}"/>
|
||||
<Image Grid.Column="6"
|
||||
Source="/Resources/TopPanel/StrandCount.png"
|
||||
ToolTip="Strand Count"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
<!--<TextBlock Grid.Column="6"
|
||||
Text="StrandCount:"
|
||||
VerticalAlignment="Bottom"
|
||||
Style="{StaticResource TopPanelFixed_TextBlock}"/>-->
|
||||
<TextBlock Grid.Column="7"
|
||||
Text="{Binding CurrMachining.sCurrStrandCount}"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Bottom"
|
||||
Margin="5,0,5,0"
|
||||
Style="{StaticResource TopPanelData_TextBlock}"/>
|
||||
<Image Grid.Column="8"
|
||||
Source="/Resources/TopPanel/Offset.png"
|
||||
ToolTip="Offset"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
<!--<TextBlock Grid.Column="8"
|
||||
Text="Offset:"
|
||||
VerticalAlignment="Bottom"
|
||||
Style="{StaticResource TopPanelFixed_TextBlock}"/>-->
|
||||
<TextBlock Grid.Column="9"
|
||||
Text="{Binding CurrMachining.sCurrOffset}"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Bottom"
|
||||
Margin="5,0,5,0"
|
||||
Style="{StaticResource TopPanelData_TextBlock}"/>
|
||||
</Grid>
|
||||
|
||||
@@ -43,6 +43,8 @@
|
||||
<PrintApp:RibParamPanelVM x:Key="RibParamPanelVM"/>
|
||||
<PrintApp:ShellNumberPanelVM x:Key="ShellNumberPanelVM"/>
|
||||
<PrintApp:ShellNumberParamPanelVM x:Key="ShellNumberParamPanelVM"/>
|
||||
<PrintApp:FilledSolidPanelVM x:Key="FilledSolidPanelVM"/>
|
||||
<PrintApp:FilledSolidParamPanelVM x:Key="FilledSolidParamPanelVM"/>
|
||||
<PrintApp:SimulationPanelVM x:Key="SimulationPanelVM"/>
|
||||
<PrintApp:ReferencePanelVM x:Key="ReferencePanelVM"/>
|
||||
<PrintApp:ViewLayerManagerVM x:Key="ViewLayerManagerVM"/>
|
||||
@@ -117,6 +119,9 @@
|
||||
<!--o viene eseguito un lua che non aggiorna l'interfaccia-->
|
||||
<PopupAnimation x:Key="{x:Static SystemParameters.MenuPopupAnimationKey}">None</PopupAnimation>
|
||||
|
||||
<!--convertert per visibilita' stringa di testo con misure in StatusBar-->
|
||||
<PrintApp:StringToVisibilityConverter x:Key="StringToVisibilityConverter"/>
|
||||
|
||||
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
||||
|
||||
<!-- FocusVisual standard-->
|
||||
|
||||
+24
-394
@@ -5,49 +5,18 @@ Module Map
|
||||
Private m_refMainWindowVM As MainWindowVM
|
||||
Private m_refMyStatusBarVM As MyStatusBarVM
|
||||
Private m_refProjManagerVM As ProjManagerVM
|
||||
'Private m_refProdManagerVM As ProdManagerVM
|
||||
Private m_refProjectVM As ProjectVM
|
||||
Private m_refSecondaryWindowVM As SecondaryWindowVM
|
||||
Private m_refSecondaryWindowV As SecondaryWindowV
|
||||
'Private m_refMainMenuVM As MainMenuVM
|
||||
Private m_refMachinePanelVM As MachinePanelVM
|
||||
''Private m_refMyMachGroupPanelVM As MyMachGroupPanelVM
|
||||
Private m_refLeftPanelVM As LeftPanelVM
|
||||
Private m_refRightPanelVM As RightPanelVM
|
||||
Private m_refDispositionPanelVM As DispositionPanelVM
|
||||
Private m_refStartMachPanelVM As StartMachPanelVM
|
||||
Private m_refRibPanelVM As RibPanelVM
|
||||
Private m_refControllerInputPanelVM As ControllerInputPanelVM
|
||||
'Private m_refBottomPanelVM As BottomPanelVM
|
||||
'Private m_refShowBeamPanelVM As ShowBeamPanelVM
|
||||
'Private m_refConfigurationPageVM As ConfigurationPageVM
|
||||
'Private m_refRawPartListVM As RawPartListVM
|
||||
'Private m_refPartInRawPartListVM As PartInRawPartListVM
|
||||
'Private m_refWarehouseWndVM As WarehouseWndVM
|
||||
'Private m_refFeatureListVM As FeatureListVM
|
||||
'Private m_refFreeContourManagerVM As FreeContourManagerVM
|
||||
'Private m_refFreeContourInputVM As FreeContourInputVM
|
||||
'Private m_refPartManagerVM As PartManagerVM
|
||||
Private m_refInstrumentPanelVM As InstrumentPanelVM
|
||||
Private m_refTopPanelVM As TopPanelVM
|
||||
'Private m_refOptimizePanelVM As OptimizePanelVM
|
||||
'Private m_refCALCPanelVM As CALCPanelVM
|
||||
'Private m_refPartListVM As BTLPartListVM
|
||||
'Private m_refFeatureInPartInRawPartListVM As FeatureInPartInRawPartListVM
|
||||
'Private m_refStatisticsVM As StatisticsVM
|
||||
'Private m_refPParameterListVM As PParameterListVM
|
||||
'Private m_refQParameterListVM As QParameterListVM
|
||||
'Private m_refFeatureManagerVM As FeatureManagerVM
|
||||
'Private m_refAddSectionXMaterialWndVM As AddSectionXMaterialWndVM
|
||||
'Private m_refStatisticsTimePanelVM As StatisticsTimePanelVM
|
||||
'Private m_refOpenProjectFileDialogVM As OpenProjectFileDialogVM
|
||||
'Private m_refRawPartTabVM As RawPartTabVM
|
||||
'Private m_refNestingTabVM As NestingTabVM
|
||||
'Private m_refMachiningTabVM As MachiningTabVM
|
||||
'Private m_refSplitModeVM As SplitModeVM
|
||||
'Private m_refMoveRawModeVM As MoveRawModeVM
|
||||
'Private m_refSimulTabVM As SimulTabVM
|
||||
''Private m_refImportPanelVM As ImportPanelVM
|
||||
Private m_refSliceManagerVM As SliceManagerVM
|
||||
Private m_refTFSEditorVM As TFSEditorVM
|
||||
Private m_refCurrMachiningPanelVM As CurrMachiningPanelVM
|
||||
@@ -60,8 +29,9 @@ Module Map
|
||||
Private m_refViewLayerManagerVM As ViewLayerManagerVM
|
||||
Private m_refShellNumberPanelVM As ShellNumberPanelVM
|
||||
Private m_refShellNumberParamPanelVM As ShellNumberParamPanelVM
|
||||
Private m_refFilledSolidPanelVM As FilledSolidPanelVM
|
||||
Private m_refFilledSolidParamPanelVM As FilledSolidParamPanelVM
|
||||
Private m_refSplashScreen As SplashScreen
|
||||
''Private m_refModifyPartPanelVM As ModifyPartPanelVM
|
||||
Private m_refManagePartPanelVM As ManagePartPanelVM
|
||||
|
||||
#Region "Get"
|
||||
@@ -113,12 +83,6 @@ Module Map
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'Public ReadOnly Property refMainMenuVM As MainMenuVM
|
||||
' Get
|
||||
' Return m_refMainMenuVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
Public ReadOnly Property refMachinePanelVM As MachinePanelVM
|
||||
Get
|
||||
Return m_refMachinePanelVM
|
||||
@@ -161,72 +125,6 @@ Module Map
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'Public ReadOnly Property refMachGroupPanelVM As MyMachGroupPanelVM
|
||||
' Get
|
||||
' Return CoreMap.refMachGroupPanelVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refBottomPanelVM As BottomPanelVM
|
||||
' Get
|
||||
' Return m_refBottomPanelVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refShowBeamPanelVM As ShowBeamPanelVM
|
||||
' Get
|
||||
' Return m_refShowBeamPanelVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refConfigurationPageVM As ConfigurationPageVM
|
||||
' Get
|
||||
' Return m_refConfigurationPageVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refRawPartListVM As RawPartListVM
|
||||
' Get
|
||||
' Return m_refRawPartListVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refPartInRawPartListVM As PartInRawPartListVM
|
||||
' Get
|
||||
' Return m_refPartInRawPartListVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refWarehouseWndVM As WarehouseWndVM
|
||||
' Get
|
||||
' Return m_refWarehouseWndVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refFeatureListVM As FeatureListVM
|
||||
' Get
|
||||
' Return m_refFeatureListVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refFreeContourManagerVM As FreeContourManagerVM
|
||||
' Get
|
||||
' Return m_refFreeContourManagerVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refFreeContourInputVM As FreeContourInputVM
|
||||
' Get
|
||||
' Return m_refFreeContourInputVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refPartManagerVM As PartManagerVM
|
||||
' Get
|
||||
' Return m_refPartManagerVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
Public ReadOnly Property refInstrumentPanelVM As MyInstrumentPanelVM
|
||||
Get
|
||||
Return m_refInstrumentPanelVM
|
||||
@@ -239,120 +137,6 @@ Module Map
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'Public ReadOnly Property refOptimizePanelVM As OptimizePanelVM
|
||||
' Get
|
||||
' Return m_refOptimizePanelVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refCALCPanelVM As CALCPanelVM
|
||||
' Get
|
||||
' Return m_refCALCPanelVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refPartListVM As BTLPartListVM
|
||||
' Get
|
||||
' Return m_refPartListVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refFeatureInPartInRawPartListVM As FeatureInPartInRawPartListVM
|
||||
' Get
|
||||
' Return m_refFeatureInPartInRawPartListVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refStatisticsVM As StatisticsVM
|
||||
' Get
|
||||
' Return m_refStatisticsVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refPParameterListVM As PParameterListVM
|
||||
' Get
|
||||
' Return m_refPParameterListVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refQParameterListVM As QParameterListVM
|
||||
' Get
|
||||
' Return m_refQParameterListVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refFeatureManagerVM As FeatureManagerVM
|
||||
' Get
|
||||
' Return m_refFeatureManagerVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refAddSectionXMaterialWndVM As AddSectionXMaterialWndVM
|
||||
' Get
|
||||
' Return m_refAddSectionXMaterialWndVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refStatisticsTimePanelVM As StatisticsTimePanelVM
|
||||
' Get
|
||||
' Return m_refStatisticsTimePanelVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refOpenProjectFileDialogVM As OpenProjectFileDialogVM
|
||||
' Get
|
||||
' Return m_refOpenProjectFileDialogVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refOptionPanelVM As OptionPanelVM
|
||||
' Get
|
||||
' Return m_refOptionPanelVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refRawPartTabVM As RawPartTabVM
|
||||
' Get
|
||||
' Return m_refRawPartTabVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refNestingTabVM As NestingTabVM
|
||||
' Get
|
||||
' Return m_refNestingTabVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refMachiningTabVM As MachiningTabVM
|
||||
' Get
|
||||
' Return m_refMachiningTabVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refSplitModeVM As SplitModeVM
|
||||
' Get
|
||||
' Return m_refSplitModeVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refMoveRawModeVM As MoveRawModeVM
|
||||
' Get
|
||||
' Return m_refMoveRawModeVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refSimulTabVM As SimulTabVM
|
||||
' Get
|
||||
' Return m_refSimulTabVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Public ReadOnly Property refImportPanelVM As ImportPanelVM
|
||||
' Get
|
||||
' Return m_refImportPanelVM
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
Public ReadOnly Property refSliceManagerVM As SliceManagerVM
|
||||
Get
|
||||
Return m_refSliceManagerVM
|
||||
@@ -425,18 +209,24 @@ Module Map
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public ReadOnly Property refFilledSolidPanelVM As FilledSolidPanelVM
|
||||
Get
|
||||
Return m_refFilledSolidPanelVM
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public ReadOnly Property refFilledSolidParamPanelVM As FilledSolidParamPanelVM
|
||||
Get
|
||||
Return m_refFilledSolidParamPanelVM
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public ReadOnly Property refSplashScreen As SplashScreen
|
||||
Get
|
||||
Return m_refSplashScreen
|
||||
End Get
|
||||
End Property
|
||||
|
||||
''Public ReadOnly Property refModifyPartPanelVM As ModifyPartPanelVM
|
||||
'' Get
|
||||
'' Return m_refModifyPartPanelVM
|
||||
'' End Get
|
||||
''End Property
|
||||
|
||||
Public ReadOnly Property refManagePartPanelVM As ManagePartPanelVM
|
||||
Get
|
||||
Return m_refManagePartPanelVM
|
||||
@@ -457,21 +247,11 @@ Module Map
|
||||
Return Not IsNothing(m_refProjManagerVM)
|
||||
End Function
|
||||
|
||||
'Friend Function SetRefProdManagerVM(ProdManagerVM As ProdManagerVM) As Boolean
|
||||
' m_refProdManagerVM = ProdManagerVM
|
||||
' Return Not IsNothing(m_refProdManagerVM)
|
||||
'End Function
|
||||
|
||||
Friend Function SetRefProjectVM(ProjectVM As ProjectVM) As Boolean
|
||||
m_refProjectVM = ProjectVM
|
||||
Return Not IsNothing(m_refProjectVM)
|
||||
End Function
|
||||
|
||||
'Friend Function SetRefMainMenuVM(MainMenuVM As MainMenuVM) As Boolean
|
||||
' m_refMainMenuVM = MainMenuVM
|
||||
' Return Not IsNothing(m_refMainMenuVM)
|
||||
'End Function
|
||||
|
||||
Friend Function SetRefSceneHostVM(SceneHostVM As SceneHostVM) As Boolean
|
||||
LibMap.SetRefSceneHostVM(SceneHostVM)
|
||||
Return Not IsNothing(LibMap.refSceneHostVM)
|
||||
@@ -486,11 +266,6 @@ Module Map
|
||||
Return Not IsNothing(m_refSecondaryWindowV)
|
||||
End Function
|
||||
|
||||
'Friend Function SetRefShowPanelVM(ShowPanelVM As ShowPanelVM) As Boolean
|
||||
' LibMap.SetRefShowPanelVM(ShowPanelVM)
|
||||
' Return Not IsNothing(LibMap.refShowPanelVM)
|
||||
'End Function
|
||||
|
||||
Friend Function SetRefMachinePanelVM(MachinePanelVM As MachinePanelVM) As Boolean
|
||||
m_refMachinePanelVM = MachinePanelVM
|
||||
Return Not IsNothing(m_refMachinePanelVM)
|
||||
@@ -526,61 +301,6 @@ Module Map
|
||||
Return Not IsNothing(m_refControllerInputPanelVM)
|
||||
End Function
|
||||
|
||||
'Friend Function SetRefMachGroupPanelVM(MachGroupPanelVM As MyMachGroupPanelVM) As Boolean
|
||||
' CoreMap.SetRefMachGroupPanelVM(MachGroupPanelVM)
|
||||
' Return Not IsNothing(CoreMap.refMachGroupPanelVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefBottomPanelVM(BottomPanelVM As BottomPanelVM) As Boolean
|
||||
' m_refBottomPanelVM = BottomPanelVM
|
||||
' Return Not IsNothing(m_refBottomPanelVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefShowBeamPanelVM(ShowBeamPanelVM As ShowBeamPanelVM) As Boolean
|
||||
' m_refShowBeamPanelVM = ShowBeamPanelVM
|
||||
' Return Not IsNothing(m_refShowBeamPanelVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefConfigurationPageVM(ConfigurationPageVM As ConfigurationPageVM) As Boolean
|
||||
' m_refConfigurationPageVM = ConfigurationPageVM
|
||||
' Return Not IsNothing(m_refConfigurationPageVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefRawPartListVM(RawPartListVM As RawPartListVM) As Boolean
|
||||
' m_refRawPartListVM = RawPartListVM
|
||||
' Return Not IsNothing(m_refRawPartListVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefPartInRawPartListVM(PartInRawPartListVM As PartInRawPartListVM) As Boolean
|
||||
' m_refPartInRawPartListVM = PartInRawPartListVM
|
||||
' Return Not IsNothing(m_refPartInRawPartListVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefWarehouseWndVM(WarehouseWndVM As WarehouseWndVM) As Boolean
|
||||
' m_refWarehouseWndVM = WarehouseWndVM
|
||||
' Return Not IsNothing(m_refWarehouseWndVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefFeatureListVM(FeatureListVM As FeatureListVM) As Boolean
|
||||
' m_refFeatureListVM = FeatureListVM
|
||||
' Return Not IsNothing(m_refFeatureListVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefFreeContourManagerVM(FreeContourManagerVM As FreeContourManagerVM) As Boolean
|
||||
' m_refFreeContourManagerVM = FreeContourManagerVM
|
||||
' Return Not IsNothing(m_refFreeContourManagerVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefFreeContourInputVM(FreeContourInputVM As FreeContourInputVM) As Boolean
|
||||
' m_refFreeContourInputVM = FreeContourInputVM
|
||||
' Return Not IsNothing(m_refFreeContourInputVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefPartManagerVM(PartManagerVM As PartManagerVM) As Boolean
|
||||
' m_refPartManagerVM = PartManagerVM
|
||||
' Return Not IsNothing(m_refPartManagerVM)
|
||||
'End Function
|
||||
|
||||
Friend Function SetRefInstrumentPanelVM(InstrumentPanelVM As InstrumentPanelVM) As Boolean
|
||||
m_refInstrumentPanelVM = InstrumentPanelVM
|
||||
Return Not IsNothing(m_refInstrumentPanelVM)
|
||||
@@ -591,101 +311,6 @@ Module Map
|
||||
Return Not IsNothing(m_refTopPanelVM)
|
||||
End Function
|
||||
|
||||
'Friend Function SetRefOptimizePanelVM(OptimizePanelVM As OptimizePanelVM) As Boolean
|
||||
' m_refOptimizePanelVM = OptimizePanelVM
|
||||
' Return Not IsNothing(m_refOptimizePanelVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefCALCPanelVM(CALCPanelVM As CALCPanelVM) As Boolean
|
||||
' m_refCALCPanelVM = CALCPanelVM
|
||||
' Return Not IsNothing(m_refCALCPanelVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefPartListVM(PartListVM As BTLPartListVM) As Boolean
|
||||
' m_refPartListVM = PartListVM
|
||||
' Return Not IsNothing(m_refPartListVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefFeatureInPartInRawPartListVM(FeatureInPartInRawPartListVM As FeatureInPartInRawPartListVM) As Boolean
|
||||
' m_refFeatureInPartInRawPartListVM = FeatureInPartInRawPartListVM
|
||||
' Return Not IsNothing(m_refFeatureInPartInRawPartListVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefStatisticsVM(StatisticsVM As StatisticsVM) As Boolean
|
||||
' m_refStatisticsVM = StatisticsVM
|
||||
' Return Not IsNothing(m_refStatisticsVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefPParameterListVM(PParameterListVM As PParameterListVM) As Boolean
|
||||
' m_refPParameterListVM = PParameterListVM
|
||||
' Return Not IsNothing(m_refPParameterListVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefQParameterListVM(QParameterListVM As QParameterListVM) As Boolean
|
||||
' m_refQParameterListVM = QParameterListVM
|
||||
' Return Not IsNothing(m_refQParameterListVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefFeatureManagerVM(FeatureManagerVM As FeatureManagerVM) As Boolean
|
||||
' m_refFeatureManagerVM = FeatureManagerVM
|
||||
' Return Not IsNothing(m_refFeatureManagerVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefAddSectionXMaterialWndVM(AddSectionXMaterialWndVM As AddSectionXMaterialWndVM) As Boolean
|
||||
' m_refAddSectionXMaterialWndVM = AddSectionXMaterialWndVM
|
||||
' Return Not IsNothing(m_refAddSectionXMaterialWndVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefStatisticsTimePanelVM(StatisticsTimePanelVM As StatisticsTimePanelVM) As Boolean
|
||||
' m_refStatisticsTimePanelVM = StatisticsTimePanelVM
|
||||
' Return Not IsNothing(m_refStatisticsTimePanelVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefOpenProjectFileDialogVM(OpenProjectFileDialogVM As OpenProjectFileDialogVM) As Boolean
|
||||
' m_refOpenProjectFileDialogVM = OpenProjectFileDialogVM
|
||||
' Return Not IsNothing(m_refOpenProjectFileDialogVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefOptionPanelVM(OptionPanelVM As OptionPanelVM) As Boolean
|
||||
' m_refOptionPanelVM = OptionPanelVM
|
||||
' Return Not IsNothing(m_refOptionPanelVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefRawPartTabVM(RawPartTabVM As RawPartTabVM) As Boolean
|
||||
' m_refRawPartTabVM = RawPartTabVM
|
||||
' Return Not IsNothing(m_refRawPartTabVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefNestingTabVM(NestingTabVM As NestingTabVM) As Boolean
|
||||
' m_refNestingTabVM = NestingTabVM
|
||||
' Return Not IsNothing(m_refNestingTabVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefMachiningTabVM(MachiningTabVM As MachiningTabVM) As Boolean
|
||||
' m_refMachiningTabVM = MachiningTabVM
|
||||
' Return Not IsNothing(m_refMachiningTabVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefSplitModeVM(SplitModeVM As SplitModeVM) As Boolean
|
||||
' m_refSplitModeVM = SplitModeVM
|
||||
' Return Not IsNothing(m_refSplitModeVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefMoveRawModeVM(MoveRawModeVM As MoveRawModeVM) As Boolean
|
||||
' m_refMoveRawModeVM = MoveRawModeVM
|
||||
' Return Not IsNothing(m_refMoveRawModeVM)
|
||||
'End Function
|
||||
|
||||
'Friend Function SetRefSimulTabVM(SimulTabVM As SimulTabVM) As Boolean
|
||||
' m_refSimulTabVM = SimulTabVM
|
||||
' Return Not IsNothing(m_refSimulTabVM)
|
||||
'End Function
|
||||
|
||||
''Friend Function SetRefImportPanelVM(ImportPanelVM As ImportPanelVM) As Boolean
|
||||
'' m_refImportPanelVM = ImportPanelVM
|
||||
'' Return Not IsNothing(m_refImportPanelVM)
|
||||
''End Function
|
||||
|
||||
Friend Function SetRefSliceManagerVM(SliceManagerVM As SliceManagerVM) As Boolean
|
||||
m_refSliceManagerVM = SliceManagerVM
|
||||
Return Not IsNothing(m_refSliceManagerVM)
|
||||
@@ -746,16 +371,21 @@ Module Map
|
||||
Return Not IsNothing(m_refShellNumberParamPanelVM)
|
||||
End Function
|
||||
|
||||
Friend Function SetRefFilledSolidPanelVM(FilledSolidPanelVM As FilledSolidPanelVM) As Boolean
|
||||
m_refFilledSolidPanelVM = FilledSolidPanelVM
|
||||
Return Not IsNothing(m_refFilledSolidPanelVM)
|
||||
End Function
|
||||
|
||||
Friend Function SetRefFilledSolidParamPanelVM(FilledSolidParamPanelVM As FilledSolidParamPanelVM) As Boolean
|
||||
m_refFilledSolidParamPanelVM = FilledSolidParamPanelVM
|
||||
Return Not IsNothing(m_refFilledSolidParamPanelVM)
|
||||
End Function
|
||||
|
||||
Friend Function SetRefSplashScreen(SplashScreen As SplashScreen) As Boolean
|
||||
m_refSplashScreen = SplashScreen
|
||||
Return Not IsNothing(m_refSplashScreen)
|
||||
End Function
|
||||
|
||||
''Friend Function SetRefModifyPartPanelVM(ModifyPartPanelVM As ModifyPartPanelVM) As Boolean
|
||||
'' m_refModifyPartPanelVM = ModifyPartPanelVM
|
||||
'' Return Not IsNothing(m_refModifyPartPanelVM)
|
||||
''End Function
|
||||
|
||||
Friend Function SetRefManagePartPanelVM(ManagePartPanelVM As ManagePartPanelVM) As Boolean
|
||||
m_refManagePartPanelVM = ManagePartPanelVM
|
||||
Return Not IsNothing(m_refManagePartPanelVM)
|
||||
|
||||
Reference in New Issue
Block a user