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

- correzione visibilita' slider orizzontale

Browse Source 
- aggiornamento grafico StatusBar, SliceManager, ecc...
This commit is contained in:
Emmanuele Sassi
2022-12-30 19:11:09 +01:00
parent ba09f8634e
commit 970a11c758
95 changed files with 848 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Icarus/Icarus.vbproj
+13 -12
View File
@@ -236,6 +236,7 @@
<Compile Include="ShowPanel\ShowPanelV.xaml.vb">
<DependentUpon>ShowPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ShowPanel\ShowPanelVM.vb" />
<Compile Include="ShowValueSlider\ShowValueSlider.xaml.vb">
<DependentUpon>ShowValueSlider.xaml</DependentUpon>
</Compile>
@@ -567,16 +568,11 @@
<Resource Include="Resources\ViewPanel\LookFromBACK.png" />
<Resource Include="Resources\ViewPanel\LookFromBOTTOM.png" />
<Resource Include="Resources\ViewPanel\LookFromFRONT.png" />
<Resource Include="Resources\ViewPanel\LookFromISO_NE.png" />
<Resource Include="Resources\ViewPanel\LookFromISO_NW.png" />
<Resource Include="Resources\ViewPanel\LookFromISO_SE.png" />
<Resource Include="Resources\ViewPanel\LookFromISO_SW.png" />
<Resource Include="Resources\ViewPanel\LookFromLEFT.png" />
<Resource Include="Resources\ViewPanel\LookFromRIGHT.png" />
<Resource Include="Resources\ViewPanel\LookFromTOP.png" />
<Resource Include="Resources\ViewPanel\ZoomAll.png" />
<Resource Include="Resources\ViewPanel\ZoomIn.png" />
<Resource Include="Resources\ViewPanel\ZoomOut.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\ShowPanel\CurveDir.png" />
@@ -585,10 +581,7 @@
<Resource Include="Resources\ShowPanel\RenderingWF.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\InstrumentPanel\Analyze.png" />
<Resource Include="Resources\InstrumentPanel\ChangeParam.png" />
<Resource Include="Resources\InstrumentPanel\GetDist.png" />
<Resource Include="Resources\InstrumentPanel\Statistics.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\TreeView\Folder.png" />
@@ -600,7 +593,6 @@
<Resource Include="Resources\DrawPanel\Line2P.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\GridViewPanel\Cplane3POINTS.png" />
<Resource Include="Resources\GridViewPanel\CplaneBACK.png" />
<Resource Include="Resources\GridViewPanel\CplaneBOTTOM.png" />
<Resource Include="Resources\GridViewPanel\CplaneELEVATION.png" />
@@ -608,11 +600,8 @@
<Resource Include="Resources\GridViewPanel\CplaneLEFT.png" />
<Resource Include="Resources\GridViewPanel\CplaneOBJECT.png" />
<Resource Include="Resources\GridViewPanel\CplaneORIGIN.png" />
<Resource Include="Resources\GridViewPanel\CplanePERPCURVE.png" />
<Resource Include="Resources\GridViewPanel\CplaneRIGHT.png" />
<Resource Include="Resources\GridViewPanel\CplaneROTATE.png" />
<Resource Include="Resources\GridViewPanel\CplaneTOP.png" />
<Resource Include="Resources\GridViewPanel\CplaneView.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\DrawPanel\Delete.png" />
@@ -676,6 +665,18 @@
<ItemGroup>
<Resource Include="Resources\TopPanel\MachiningDb.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\StatusBar\GridVisibility.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\InstrumentPanel\EdgeAnalysis.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\ViewPanel\CplaneView.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\StatusBar\GridVisibilityWhite.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR32.exe
Icarus/InstrumentPanel/InstrumentPanelV.xaml
+23 -11
View File
@@ -1,14 +1,26 @@
<EgtFloating:EgtFloatingPanel x:Class="InstrumentPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
<StackPanel x:Class="InstrumentPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Orientation="Horizontal">
<ToggleButton ToolTip="{Binding GetDistToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
IsChecked="{Binding GetDistIsChecked}">
<Image Source="/Resources/InstrumentPanel/GetDist.png" Stretch="Uniform"/>
IsChecked="{Binding GetDistIsChecked}"
Width="15"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_ToggleButton}">
<Image Source="/Resources/InstrumentPanel/GetDist.png"
Height="25"
Width="25"
HorizontalAlignment="Center"
Style="{StaticResource Button_Image}"/>
</ToggleButton>
</EgtFloating:EgtFloatingPanel>
<ToggleButton ToolTip="{Binding EdgeAnalysisToolTip}"
IsChecked="{Binding bEdgeAnalysis_IsChecked}"
IsEnabled="{Binding bEdgeAnalysis_IsEnabled}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_ToggleButton}">
<Image Source="/Resources/InstrumentPanel/EdgeAnalysis.png"
Style="{StaticResource Button_Image}"/>
</ToggleButton>
</StackPanel>
Icarus/LeftPanel/LeftPanelVM.vb
+1 -1
View File
@@ -58,7 +58,7 @@ Public Class LeftPanelVM
''Map.refModifyPartPanelVM.Init()
Map.refManagePartPanelVM.Init(ManagePartPanelVM.ManagePartType.MODIFY)
End Select
Map.refViewLayerManagerVM.UpdateForced()
If Not IsNothing(Map.refViewLayerManagerVM) Then Map.refViewLayerManagerVM.UpdateForced()
NotifyPropertyChanged(NameOf(SelPanel))
End Sub
Icarus/MachinePanel/MachinePanelV.xaml
+3 -46
View File
@@ -4,52 +4,9 @@
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsEnabled="{Binding MachPanel_IsEnabled}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Grid Margin="0,0,5,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<!--<TextBlock Grid.Row="0" Grid.Column="0" Text="Macchina corrente" VerticalAlignment="Center" Margin="0,0,5,0"/>-->
<!--Combobox per selezionare la macchina corrente-->
<!--<ComboBox ItemsSource="{Binding Path=MachineList}"
SelectedItem="{Binding Path=SelectedMachine}"
DisplayMemberPath="Name"
SelectedValuePath="Name"
Height="22" Width="150"
Grid.Row="0" Grid.Column="1"/>-->
<!--<Rectangle HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Fill="LightGray"/>-->
<TextBlock Text="{Binding SelectedMachine.Name}"
Style="{StaticResource OptionTextBlock}"/>
</Grid>
<!--<StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center">
<Button Command="{Binding ToolDbCommand}" ToolTip="{Binding ToolDBToolTip}"
Style="{StaticResource ToolBar_TextButton}" Content="{Binding ToolDBMsg}"/>
<Button Command="{Binding MachDbCommand}" ToolTip="{Binding MachiningDbToolTip}"
Style="{StaticResource ToolBar_TextButton}" Content="{Binding MachiningDbMsg}"/>
--><!--<Button Command="{Binding SetUpCommand}" ToolTip="{Binding SetUpToolTip}"
Style="{StaticResource ToolBar_TextButton}" Content="{Binding SetUpMsg}"
Background="{Binding SetUp_Background}"/>--><!--
<Button ToolTip="{Binding BeamTable_ToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding BeamTable_Command}"
Visibility="{Binding BeamTable_Visibility}">
<Image Source="/Resources/Configuration/MachiningsTable.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding WallTable_ToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding WallTable_Command}"
Visibility="{Binding WallTable_Visibility}">
<Image Source="/Resources/Configuration/MachiningsTable.png" Stretch="Uniform"/>
</Button>
--><!--<Button Command="{Binding MachOptionsCommand}" ToolTip="{Binding OptionsToolTip}">
<Image Source="/Resources/ProjectManager/Options.png" Height="22" />
</Button>--><!--
</StackPanel>-->
FontSize="18"
HorizontalAlignment="Center"
Style="{StaticResource BaseTextBlock}"/>
</Grid>
Icarus/MachiningDb/MachiningDbV.xaml
+201 -202
View File
@@ -1,204 +1,203 @@
<UserControl x:Class="MachiningDbV"
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"
Width="300">
<Border VerticalAlignment="Center"
Style="{StaticResource RightPanel_Border}">
<Border x:Class="MachiningDbV"
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"
Width="310"
VerticalAlignment="center"
Style="{StaticResource BottomGrayRow_Border}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Button Content="New"
Command="{Binding New_Command}"
IsEnabled="{Binding IsEnabled}"
Style="{StaticResource ToolBar_TextButton}"/>
<Button Content="Save"
Grid.Column="1"
Command="{Binding Save_Command}"
IsEnabled="{Binding IsEnabled}"
Style="{StaticResource ToolBar_TextButton}"/>
<Button Content="Delete"
Grid.Column="2"
Command="{Binding Delete_Command}"
IsEnabled="{Binding IsEnabled}"
Style="{StaticResource ToolBar_TextButton}"/>
<Button Grid.Column="3"
Command="{Binding Import_Command}"
ToolTip="{Binding ImportToolTip}"
IsEnabled="{Binding ImpExp_IsEnabled}"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/MachiningDB/Import.png" Stretch="Uniform"/>
</Button>
<Button Grid.Column="4"
Command="{Binding Export_Command}"
ToolTip="{Binding ImportToolTip}"
IsEnabled="{Binding ImpExp_IsEnabled}"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/MachiningDB/Export.png" Stretch="Uniform"/>
</Button>
</Grid>
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<ComboBox Name="MachiningCombo"
ItemsSource="{Binding MachiningList}"
SelectedItem="{Binding SelMachining}"
DisplayMemberPath="ghName"
Visibility="{Binding Combo_Visibility}"
Style="{StaticResource FeatureComboBox}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding SelectedItem.sName, ElementName=MachiningCombo, UpdateSourceTrigger=Explicit}"
IsExplicitFocused="{Binding UserShouldEditValueNow}"
Visibility="{Binding Name_Visibility}"
Style="{StaticResource OptionTextBox}"/>
<Button Grid.Column="1"
Command="{Binding EditName_Command}"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/TopPanel/Edit.png"/>
</Button>
</Grid>
<ScrollViewer Grid.Row="3"
VerticalScrollBarVisibility="Auto"
HorizontalScrollBarVisibility="Disabled">
<ItemsControl Grid.Row="1"
ItemsSource="{Binding SelectedItem.CathegoryList, ElementName=MachiningCombo}"
IsEnabled="{Binding IsEnabled}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Vertical"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<Expander Header="{Binding sName}"
IsExpanded="{Binding Cathegory_IsExpanded}"
VerticalContentAlignment="Top">
<ItemsControl ItemsSource="{Binding MachiningParamList}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<UniformGrid Columns="1"
HorizontalAlignment="Stretch"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.Resources>
<DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding sName}"/>
<TextBox Grid.Column="1"
Text="{Binding sValue}"/>
<!--<Button Grid.Column="2"
Content="R"
Command="{Binding ResetParam_Command}"
CommandParameter="dCurrStrandH"
IsEnabled="{Binding bCurrStrandH_IsModified}"
VerticalContentAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5,0,0,0"
Style="{StaticResource ToolBar_SmallButton}"/>-->
</Grid>
</DataTemplate>
<DataTemplate DataType="{x:Type PrintApp:ComboMachiningParam}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
<!--<ColumnDefinition Width="Auto"/>-->
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding sName}"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding ValueList}"
SelectedItem="{Binding SelValue}"
HorizontalAlignment="Stretch"/>
<!--<Button Grid.Column="1"
Content="R"
Command="{Binding ResetParam_Command}"
CommandParameter="dCurrStrandH"
IsEnabled="{Binding bCurrStrandH_IsModified}"
VerticalContentAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5,0,0,0"
Style="{StaticResource ToolBar_SmallButton}"/>-->
</Grid>
</DataTemplate>
<DataTemplate DataType="{x:Type PrintApp:CheckMachiningParam}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
<!--<ColumnDefinition Width="Auto"/>-->
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding sName}"/>
<CheckBox Grid.Column="1"
IsChecked="{Binding bValue}"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
<!--<Button Grid.Column="1"
Content="R"
Command="{Binding ResetParam_Command}"
CommandParameter="dCurrStrandH"
IsEnabled="{Binding bCurrStrandH_IsModified}"
VerticalContentAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5,0,0,0"
Style="{StaticResource ToolBar_SmallButton}"/>-->
</Grid>
</DataTemplate>
<DataTemplate DataType="{x:Type PrintApp:MaterialMachiningParam}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
<!--<ColumnDefinition Width="Auto"/>-->
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding sName}"/>
<CheckBox Grid.Column="1"
IsChecked="{Binding bValue}"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
<!--<Button Grid.Column="1"
Content="R"
Command="{Binding ResetParam_Command}"
CommandParameter="dCurrStrandH"
IsEnabled="{Binding bCurrStrandH_IsModified}"
VerticalContentAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5,0,0,0"
Style="{StaticResource ToolBar_SmallButton}"/>-->
</Grid>
</DataTemplate>
</ItemsControl.Resources>
</ItemsControl>
</Expander>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</ScrollViewer>
<UniformGrid Grid.Row="4" Rows="1">
<Button Content="Ok"
Command="{Binding Ok_Command}"
IsEnabled="{Binding IsEnabled}"
Style="{StaticResource ToolBar_TextButton}"/>
</UniformGrid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Button Content="New"
Command="{Binding New_Command}"
IsEnabled="{Binding IsEnabled}"
Style="{StaticResource ToolBar_TextButton}"/>
<Button Content="Save"
Grid.Column="1"
Command="{Binding Save_Command}"
IsEnabled="{Binding IsEnabled}"
Style="{StaticResource ToolBar_TextButton}"/>
<Button Content="Delete"
Grid.Column="2"
Command="{Binding Delete_Command}"
IsEnabled="{Binding IsEnabled}"
Style="{StaticResource ToolBar_TextButton}"/>
<Button Grid.Column="3"
Command="{Binding Import_Command}"
ToolTip="{Binding ImportToolTip}"
IsEnabled="{Binding ImpExp_IsEnabled}"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/MachiningDB/Import.png" Stretch="Uniform"/>
</Button>
<Button Grid.Column="4"
Command="{Binding Export_Command}"
ToolTip="{Binding ImportToolTip}"
IsEnabled="{Binding ImpExp_IsEnabled}"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/MachiningDB/Export.png" Stretch="Uniform"/>
</Button>
</Grid>
</Border>
</UserControl>
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<ComboBox Name="MachiningCombo"
ItemsSource="{Binding MachiningList}"
SelectedItem="{Binding SelMachining}"
DisplayMemberPath="ghName"
Visibility="{Binding Combo_Visibility}"
Style="{StaticResource FeatureComboBox}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding SelectedItem.sName, ElementName=MachiningCombo, UpdateSourceTrigger=Explicit}"
IsExplicitFocused="{Binding UserShouldEditValueNow}"
Visibility="{Binding Name_Visibility}"
Style="{StaticResource OptionTextBox}"/>
<Button Grid.Column="1"
Command="{Binding EditName_Command}"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/TopPanel/Edit.png"/>
</Button>
</Grid>
<ScrollViewer Grid.Row="3"
VerticalScrollBarVisibility="Auto"
HorizontalScrollBarVisibility="Disabled">
<ItemsControl Grid.Row="1"
ItemsSource="{Binding SelectedItem.CathegoryList, ElementName=MachiningCombo}"
IsEnabled="{Binding IsEnabled}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Vertical"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<Expander Header="{Binding sName}"
IsExpanded="{Binding Cathegory_IsExpanded}"
VerticalContentAlignment="Top">
<ItemsControl ItemsSource="{Binding MachiningParamList}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<UniformGrid Columns="1"
HorizontalAlignment="Stretch"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.Resources>
<DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding sName}"/>
<TextBox Grid.Column="1"
Text="{Binding sValue}"/>
<!--<Button Grid.Column="2"
Content="R"
Command="{Binding ResetParam_Command}"
CommandParameter="dCurrStrandH"
IsEnabled="{Binding bCurrStrandH_IsModified}"
VerticalContentAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5,0,0,0"
Style="{StaticResource ToolBar_SmallButton}"/>-->
</Grid>
</DataTemplate>
<DataTemplate DataType="{x:Type PrintApp:ComboMachiningParam}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
<!--<ColumnDefinition Width="Auto"/>-->
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding sName}"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding ValueList}"
SelectedItem="{Binding SelValue}"
HorizontalAlignment="Stretch"/>
<!--<Button Grid.Column="1"
Content="R"
Command="{Binding ResetParam_Command}"
CommandParameter="dCurrStrandH"
IsEnabled="{Binding bCurrStrandH_IsModified}"
VerticalContentAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5,0,0,0"
Style="{StaticResource ToolBar_SmallButton}"/>-->
</Grid>
</DataTemplate>
<DataTemplate DataType="{x:Type PrintApp:CheckMachiningParam}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
<!--<ColumnDefinition Width="Auto"/>-->
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding sName}"/>
<CheckBox Grid.Column="1"
IsChecked="{Binding bValue}"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
<!--<Button Grid.Column="1"
Content="R"
Command="{Binding ResetParam_Command}"
CommandParameter="dCurrStrandH"
IsEnabled="{Binding bCurrStrandH_IsModified}"
VerticalContentAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5,0,0,0"
Style="{StaticResource ToolBar_SmallButton}"/>-->
</Grid>
</DataTemplate>
<DataTemplate DataType="{x:Type PrintApp:MaterialMachiningParam}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
<!--<ColumnDefinition Width="Auto"/>-->
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding sName}"/>
<CheckBox Grid.Column="1"
IsChecked="{Binding bValue}"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
<!--<Button Grid.Column="1"
Content="R"
Command="{Binding ResetParam_Command}"
CommandParameter="dCurrStrandH"
IsEnabled="{Binding bCurrStrandH_IsModified}"
VerticalContentAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5,0,0,0"
Style="{StaticResource ToolBar_SmallButton}"/>-->
</Grid>
</DataTemplate>
</ItemsControl.Resources>
</ItemsControl>
</Expander>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</ScrollViewer>
<UniformGrid Grid.Row="4" Rows="1">
<Button Content="Ok"
Command="{Binding Ok_Command}"
IsEnabled="{Binding IsEnabled}"
Style="{StaticResource ToolBar_TextButton}"/>
</UniformGrid>
</Grid>
</Border>
Icarus/MainWindow/MainWindowV.xaml
+1 -1
View File
@@ -18,7 +18,7 @@
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="70"/>
<RowDefinition Height="60"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<PrintApp:SceneHostV Grid.Row="1"/>
Icarus/ProjManager/ProjManagerV.xaml
+14 -7
View File
@@ -9,7 +9,8 @@
<Button Command="{Binding New_Command}"
ToolTip="{Binding NewToolTip}"
IsEnabled="{Binding ProjCmd_IsEnabled}"
Style="{StaticResource TopPanel_Button}">
Margin="0,0,2.5,0"
Style="{StaticResource ProjManager_Button}">
<Image Source="/Resources/ProjectManager/New.png"
Style="{StaticResource Button_Image}"/>
</Button>
@@ -18,7 +19,8 @@
ContextMenuService.Placement="Bottom"
Tag="{Binding}"
IsEnabled="{Binding ProjCmd_IsEnabled}"
Style="{StaticResource TopPanel_Button}">
Margin="2.5,0,2.5,0"
Style="{StaticResource ProjManager_Button}">
<Button.ContextMenu>
<ContextMenu ItemsSource="{Binding MruFileNames}"
Style="{StaticResource Icarus_ContextMenu}">
@@ -37,21 +39,24 @@
<Button Command="{Binding SaveCommand}"
ToolTip="{Binding SaveToolTip}"
IsEnabled="{Binding ProjCmd_IsEnabled}"
Style="{StaticResource TopPanel_Button}">
Margin="2.5,0,2.5,0"
Style="{StaticResource ProjManager_Button}">
<Image Source="/Resources/ProjectManager/Save.png"
Style="{StaticResource Button_Image}"/>
</Button>
<Button Command="{Binding SaveAsCommand}"
ToolTip="{Binding SaveAsToolTip}"
IsEnabled="{Binding ProjCmd_IsEnabled}"
Style="{StaticResource TopPanel_Button}">
Margin="2.5,0,2.5,0"
Style="{StaticResource ProjManager_Button}">
<Image Source="/Resources/ProjectManager/SaveAs.png"
Style="{StaticResource Button_Image}"/>
</Button>
<Button Command="{Binding ImportCommand}"
ToolTip="{Binding ImportToolTip}"
IsEnabled="{Binding ProjCmd_IsEnabled}"
Style="{StaticResource TopPanel_Button}">
Margin="2.5,0,2.5,0"
Style="{StaticResource ProjManager_Button}">
<Image Source="/Resources/ProjectManager/Import.png"
Style="{StaticResource Button_Image}"/>
</Button>
@@ -61,13 +66,15 @@
</Button>-->
<Button Command="{Binding OptionsCommand}"
ToolTip="{Binding OptionsToolTip}"
Style="{StaticResource TopPanel_Button}">
Margin="2.5,0,2.5,0"
Style="{StaticResource ProjManager_Button}">
<Image Source="/Resources/ProjectManager/Options.png"
Style="{StaticResource Button_Image}"/>
</Button>
<Button Command="{Binding SendFeedbackCommand}"
ToolTip="{Binding SendFeedbackToolTip}"
Style="{StaticResource TopPanel_Button}">
Margin="2.5,0,0,0"
Style="{StaticResource ProjManager_Button}">
<Image Source="/Resources/ProjectManager/Send.png"
Style="{StaticResource Button_Image}"/>
</Button>
Icarus/Project/ProjectV.xaml
+63 -21
View File
@@ -1,59 +1,101 @@
<DockPanel x:Class="ProjectV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
xmlns:PrintApp="clr-namespace:Icarus">
<Grid DockPanel.Dock="Top">
<PrintApp:TopPanelV Grid.Column="1"
DataContext="{StaticResource TopPanelVM }"/>
</Grid>
<Grid DockPanel.Dock="Bottom">
<Grid DockPanel.Dock="Bottom"
Height="67">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="315"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="315"/>
</Grid.ColumnDefinitions>
<!--StatusBar -->
<PrintApp:StatusBarV DataContext="{StaticResource StatusBarVM}"/>
<PrintApp:MachinePanelV Grid.Column="1"
DataContext="{StaticResource MachinePanelVM}"/>
<PrintApp:ControllerInputPanelV Grid.ColumnSpan="2"
DataContext="{StaticResource ControllerInputPanelVM}"
HorizontalAlignment="Center"/>
<PrintApp:ShowPanelV Grid.Column="2"
DataContext="{StaticResource ShowPanelVM}"/>
<PrintApp:ViewPanelV Grid.Column="3"
DataContext="{StaticResource ViewPanelVM}"/>
<PrintApp:InstrumentPanelV Grid.Column="4"
DataContext="{StaticResource InstrumentPanelVM}"/>
<PrintApp:StatusBarV Grid.Column="6"
DataContext="{StaticResource StatusBarVM}"/>
</Grid>
<DockPanel DockPanel.Dock="Bottom"
LastChildFill="False">
<PrintApp:SliceManagerV DockPanel.Dock="Right"
DataContext="{StaticResource SliceManagerVM}"
Margin="5"/>
<PrintApp:LayerAdvancementSliderV DockPanel.Dock="Bottom"
DataContext="{StaticResource SliderManagerVM}"
HorizontalAlignment="Center"/>
<Grid DockPanel.Dock="Bottom"
<!--<Grid DockPanel.Dock="Bottom"
HorizontalAlignment="Stretch">
<PrintApp:ControllerInputPanelV Grid.Column="3"
DataContext="{StaticResource ControllerInputPanelVM}"
HorizontalAlignment="Center"/>
</Grid>
</Grid>-->
</DockPanel>
<PrintApp:ViewLayerManagerV DockPanel.Dock="Bottom"
HorizontalAlignment="Left"
DataContext="{StaticResource ViewLayerManagerVM}"/>
<Grid DockPanel.Dock="Left">
<PrintApp:LeftPanelV Grid.Row="1"
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<PrintApp:LeftPanelV Grid.ColumnSpan="2"
DataContext="{StaticResource LeftPanelVM}"
VerticalAlignment="Center"
Visibility="{Binding DataContext.LeftPanel_Visibility,
RelativeSource={RelativeSource AncestorType={x:Type PrintApp:ProjectV}}}"/>
<PrintApp:ViewLayerManagerV Grid.Row="1"
VerticalAlignment="Bottom"
HorizontalAlignment="Left"
DataContext="{StaticResource ViewLayerManagerVM}"/>
</Grid>
<Grid DockPanel.Dock="Right">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="2*"/>
<RowDefinition Height="20*"/>
<RowDefinition Height="2*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid Grid.ColumnSpan="2"
Grid.Row="1"
HorizontalAlignment="Right">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<PrintApp:LayerIndexSliderV DataContext="{StaticResource SliderManagerVM}"
VerticalAlignment="Stretch"
HorizontalAlignment="Right"/>
<PrintApp:RightPanelV Grid.Column="1"
DataContext="{StaticResource RightPanelVM}"/>
</Grid>
<PrintApp:SliceManagerV Grid.Column="1"
Grid.Row="3"
DataContext="{StaticResource SliceManagerVM}"
HorizontalAlignment="Right"/>
</Grid>
<PrintApp:RightPanelV DockPanel.Dock="Right"
DataContext="{StaticResource RightPanelVM}"/>
<PrintApp:LayerIndexSliderV DockPanel.Dock="Right"
DataContext="{StaticResource SliderManagerVM}"
VerticalAlignment="Stretch"/>
<!-- Grid che occupa lo spazio della scena -->
<Grid Background="Transparent"/>
Icarus/Resources/DrawPanel/AddPointCurve.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 765 B

After

Width:  |  Height:  |  Size: 758 B

Icarus/Resources/DrawPanel/Delete.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 448 B

After

Width:  |  Height:  |  Size: 476 B

Icarus/Resources/DrawPanel/Extrude.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 912 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Icarus/Resources/DrawPanel/ModifyCurve.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 732 B

After

Width:  |  Height:  |  Size: 739 B

Icarus/Resources/DrawPanel/Point.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 406 B

After

Width:  |  Height:  |  Size: 311 B

Icarus/Resources/DrawPanel/RemovePointCurve.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 859 B

After

Width:  |  Height:  |  Size: 836 B

Icarus/Resources/GridViewPanel/Cplane3POINTS.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 768 B

Icarus/Resources/GridViewPanel/CplaneBACK.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 698 B

Icarus/Resources/GridViewPanel/CplaneBOTTOM.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 732 B

Icarus/Resources/GridViewPanel/CplaneELEVATION.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 617 B

After

Width:  |  Height:  |  Size: 668 B

Icarus/Resources/GridViewPanel/CplaneFRONT.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 612 B

Icarus/Resources/GridViewPanel/CplaneLEFT.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 831 B

Icarus/Resources/GridViewPanel/CplaneOBJECT.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 759 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Icarus/Resources/GridViewPanel/CplaneORIGIN.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 572 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Icarus/Resources/GridViewPanel/CplanePERPCURVE.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 937 B

Icarus/Resources/GridViewPanel/CplaneRIGHT.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 780 B

Icarus/Resources/GridViewPanel/CplaneROTATE.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

Icarus/Resources/GridViewPanel/CplaneTOP.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 687 B

Icarus/Resources/GridViewPanel/CplaneView.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

Icarus/Resources/GridViewPanel/CurveDir.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 883 B

Icarus/Resources/GridViewPanel/GetDist.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 331 B

Icarus/Resources/GridViewPanel/LookFromBACK.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 547 B

Icarus/Resources/GridViewPanel/LookFromBOTTOM.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 570 B

Icarus/Resources/GridViewPanel/LookFromFRONT.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 528 B

Icarus/Resources/GridViewPanel/LookFromGrid.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

Icarus/Resources/GridViewPanel/LookFromISO_NE.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 619 B

Icarus/Resources/GridViewPanel/LookFromISO_NW.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 694 B

Icarus/Resources/GridViewPanel/LookFromISO_SE.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 684 B

Icarus/Resources/GridViewPanel/LookFromISO_SW.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 677 B

Icarus/Resources/GridViewPanel/LookFromLEFT.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 563 B

Icarus/Resources/GridViewPanel/LookFromRIGHT.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 564 B

Icarus/Resources/GridViewPanel/LookFromTOP.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 552 B

Icarus/Resources/GridViewPanel/LookToCplane.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.2 KiB

Icarus/Resources/GridViewPanel/RenderingHL.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 413 B

Icarus/Resources/GridViewPanel/RenderingSH.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 418 B

Icarus/Resources/GridViewPanel/RenderingWF.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 510 B

Icarus/Resources/GridViewPanel/ZoomAll.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

Icarus/Resources/GridViewPanel/ZoomIn.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 689 B

Icarus/Resources/GridViewPanel/ZoomOut.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 648 B

Icarus/Resources/GridViewPanel/ZoomSel.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

Icarus/Resources/InstrumentPanel/Analyze.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 962 B

Icarus/Resources/InstrumentPanel/ChangeParam.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 351 B

Icarus/Resources/GridViewPanel/Analyze.png → Icarus/Resources/InstrumentPanel/EdgeAnalysis.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 962 B

After

Width:  |  Height:  |  Size: 962 B

Icarus/Resources/InstrumentPanel/GetDist.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 331 B

After

Width:  |  Height:  |  Size: 354 B

Icarus/Resources/InstrumentPanel/Statistics.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 417 B

Icarus/Resources/ProjectManager/Import.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 299 B

After

Width:  |  Height:  |  Size: 347 B

Icarus/Resources/ProjectManager/New.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 374 B

Icarus/Resources/ProjectManager/Open.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 463 B

Icarus/Resources/ProjectManager/Options.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 562 B

After

Width:  |  Height:  |  Size: 456 B

Icarus/Resources/ProjectManager/Save.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 308 B

After

Width:  |  Height:  |  Size: 311 B

Icarus/Resources/ProjectManager/SaveAs.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 344 B

After

Width:  |  Height:  |  Size: 367 B

Icarus/Resources/ShowPanel/CurveDir.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 883 B

After

Width:  |  Height:  |  Size: 466 B

Icarus/Resources/ShowPanel/RenderingHL.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 413 B

After

Width:  |  Height:  |  Size: 429 B

Icarus/Resources/ShowPanel/RenderingSH.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 418 B

After

Width:  |  Height:  |  Size: 370 B

Icarus/Resources/ShowPanel/RenderingWF.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 510 B

After

Width:  |  Height:  |  Size: 509 B

Icarus/Resources/StatusBar/GridVisibility.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 385 B

Icarus/Resources/StatusBar/GridVisibilityWhite.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 218 B

Icarus/Resources/ViewPanel/CplaneView.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 904 B

Icarus/Resources/ViewPanel/LookFromBACK.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 547 B

After

Width:  |  Height:  |  Size: 595 B

Icarus/Resources/ViewPanel/LookFromBOTTOM.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 570 B

After

Width:  |  Height:  |  Size: 506 B

Icarus/Resources/ViewPanel/LookFromFRONT.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 528 B

After

Width:  |  Height:  |  Size: 478 B

Icarus/Resources/ViewPanel/LookFromISO_NE.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 619 B

Icarus/Resources/ViewPanel/LookFromISO_NW.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 694 B

Icarus/Resources/ViewPanel/LookFromISO_SE.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 684 B

Icarus/Resources/ViewPanel/LookFromISO_SW.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 677 B

After

Width:  |  Height:  |  Size: 536 B

Icarus/Resources/ViewPanel/LookFromLEFT.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 563 B

After

Width:  |  Height:  |  Size: 548 B

Icarus/Resources/ViewPanel/LookFromRIGHT.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 564 B

After

Width:  |  Height:  |  Size: 543 B

Icarus/Resources/ViewPanel/LookFromTOP.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 552 B

After

Width:  |  Height:  |  Size: 514 B

Icarus/Resources/ViewPanel/ZoomAll.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 848 B

Icarus/Resources/ViewPanel/ZoomIn.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 689 B

Icarus/Resources/ViewPanel/ZoomOut.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 648 B

Icarus/RibPanel/RibPanelV.xaml
+1 -1
View File
@@ -356,6 +356,6 @@
Grid.Row="9"
IsChecked="{Binding bMachParam_IsChecked}"
Margin="0,2.5,0,2.5"
Style="{StaticResource LeftPanel_ToggleButton}"/>
Style="{StaticResource LeftPanel_Parameters_ToggleButton}"/>
</Grid>
Icarus/ShellNumberPanel/ShellNumberPanelV.xaml
+1 -1
View File
@@ -356,6 +356,6 @@
Grid.Row="9"
IsChecked="{Binding bMachParam_IsChecked}"
Margin="0,2.5,0,2.5"
Style="{StaticResource LeftPanel_ToggleButton}"/>
Style="{StaticResource LeftPanel_Parameters_ToggleButton}"/>
</Grid>
Icarus/ShowPanel/ShowPanelV.xaml
+25 -19
View File
@@ -1,29 +1,35 @@
<EgtFloating:EgtFloatingPanel x:Class="ShowPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
<UniformGrid x:Class="ShowPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Rows="1">
<RadioButton ToolTip="{Binding RenderingWFToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
IsChecked="{Binding WireframeIsChecked}">
<Image Source="/Resources/ShowPanel/RenderingWF.png" Stretch="Uniform"/>
IsChecked="{Binding WireframeIsChecked}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_ToggleButton}">
<Image Source="/Resources/ShowPanel/RenderingWF.png"
Style="{StaticResource Button_Image}"/>
</RadioButton>
<RadioButton ToolTip="{Binding RenderingHLToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
IsChecked="{Binding HiddenLineIsChecked}">
<Image Source="/Resources/ShowPanel/RenderingHL.png" Stretch="Uniform"/>
IsChecked="{Binding HiddenLineIsChecked}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_ToggleButton}">
<Image Source="/Resources/ShowPanel/RenderingHL.png"
Style="{StaticResource Button_Image}"/>
</RadioButton>
<RadioButton ToolTip="{Binding RenderingSHToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
IsChecked="{Binding ShadingIsChecked}">
<Image Source="/Resources/ShowPanel/RenderingSH.png" Stretch="Uniform"/>
IsChecked="{Binding ShadingIsChecked}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_ToggleButton}">
<Image Source="/Resources/ShowPanel/RenderingSH.png"
Style="{StaticResource Button_Image}"/>
</RadioButton>
<ToggleButton ToolTip="{Binding CurveDirToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
IsChecked="{Binding CurveDirIsChecked}">
<Image Source="/Resources/ShowPanel/CurveDir.png" Stretch="Uniform"/>
IsChecked="{Binding CurveDirIsChecked}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_ToggleButton}">
<Image Source="/Resources/ShowPanel/CurveDir.png"
Style="{StaticResource Button_Image}"/>
</ToggleButton>
</EgtFloating:EgtFloatingPanel>
</UniformGrid>
Icarus/ShowPanel/ShowPanelVM.vb
+20
View File
@@ -0,0 +1,20 @@
Imports EgtUILib
Imports EgtWPFLib5
Public Class MyShowPanelVM
Inherits ShowPanelVM
#Region "CONSTRUCTOR"
Sub New()
' modo di visualizzazione
Dim nShowMode As Integer = GetMainPrivateProfileInt(S_SCENE, K_SHOWMODE, SM.SHADING)
Map.refShowPanelVM.SetShowMode(DirectCast(nShowMode, SM))
' visualizzazione freccia direzione su curve
Map.refShowPanelVM.CurveDirIsChecked = EgtGetShowCurveDirection()
End Sub
#End Region ' CONSTRUCTOR
End Class
Icarus/SliceManager/SliceManagerV.xaml
+65 -52
View File
@@ -1,70 +1,83 @@
<UserControl x:Class="SliceManagerV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Width="320">
<Border VerticalAlignment="Bottom"
Style="{StaticResource LeftPanel_Popup_Border}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding ghTime}"
Visibility="{Binding Time_Visibility}"/>
<TextBlock Grid.Row="1"
Text="{Binding ghMass}"
Visibility="{Binding Mass_Visibility}"
Margin="0,0,0,5"/>
<TextBlock Grid.Row="2"
Text="{Binding sLoadingText}"
Visibility="{Binding Loading_Visibility}"
Margin="0,0,0,5"/>
<ProgressBar Grid.Row="3"
Value="{Binding PartialLoading_Value}"
Height="20"
Minimum="0"
Maximum="100"
Visibility="{Binding Loading_Visibility}"
Margin="0,0,0,5"/>
<ProgressBar Grid.Row="4"
Value="{Binding MainLoading_Value}"
Height="20"
Minimum="0"
Maximum="100"
Visibility="{Binding Loading_Visibility}"
Margin="0,0,0,5"/>
<UniformGrid Grid.Row="5"
<Border x:Class="SliceManagerV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Width="310"
MinHeight="92"
CornerRadius="4,4,0,0"
Margin="0,0,5,0"
Style="{StaticResource BottomBlueRow_Border}">
<Grid VerticalAlignment="Bottom">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding ghTime}"
Visibility="{Binding Time_Visibility}"
FontSize="35"
Style="{StaticResource SliceManager_TextBlock}"/>
<TextBlock Grid.Row="1"
Text="{Binding ghMass}"
Visibility="{Binding Mass_Visibility}"
FontSize="18"
Margin="0,0,0,5"
Style="{StaticResource SliceManager_TextBlock}"/>
<TextBlock Grid.Row="2"
Text="{Binding sLoadingText}"
Visibility="{Binding Loading_Visibility}"
FontSize="12"
Margin="0,0,0,5"
Style="{StaticResource SliceManager_TextBlock}"/>
<ProgressBar Grid.Row="3"
Value="{Binding PartialLoading_Value}"
Visibility="{Binding Loading_Visibility}"
Margin="5,2.5,5,2.5"/>
<ProgressBar Grid.Row="4"
Value="{Binding MainLoading_Value}"
Visibility="{Binding Loading_Visibility}"
Margin="5,2.5,5,5"/>
<Grid Grid.Row="5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<UniformGrid Grid.Column="1"
Rows="1">
<Button Content="Slice"
Command="{Binding Slice_Command}"
Style="{StaticResource ToolBar_TextButton}"
IsEnabled="{Binding Buttons_IsEnabled}"
Visibility="{Binding ModifyMode_Visibility}"/>
Visibility="{Binding ModifyMode_Visibility}"
Margin="2.5,0,2.5,0"
Style="{StaticResource SliceMannager_Button}"/>
<Button Content="Update"
Command="{Binding Update_Command}"
Style="{StaticResource ToolBar_TextButton}"
IsEnabled="{Binding Buttons_IsEnabled}"
Visibility="{Binding SliceMode_Visibility}"/>
Visibility="{Binding SliceMode_Visibility}"
Margin="2.5,0,2.5,0"
Style="{StaticResource SliceMannager_Button}"/>
<Button Content="Generate"
Command="{Binding Generate_Command}"
Style="{StaticResource ToolBar_TextButton}"
IsEnabled="{Binding Buttons_IsEnabled}"
Visibility="{Binding SliceMode_Visibility}"/>
Visibility="{Binding SliceMode_Visibility}"
Margin="2.5,0,2.5,0"
Style="{StaticResource SliceMannager_Button}"/>
<Button Content="Simulate"
Command="{Binding Simulate_Command}"
Style="{StaticResource ToolBar_TextButton}"
IsEnabled="{Binding Buttons_IsEnabled}"
Visibility="{Binding SliceMode_Visibility}"/>
Visibility="{Binding SliceMode_Visibility}"
Margin="2.5,0,2.5,0"
Style="{StaticResource SliceMannager_Button}"/>
<Button Content="Exit"
Command="{Binding Exit_Command}"
Style="{StaticResource ToolBar_TextButton}"
IsEnabled="{Binding Buttons_IsEnabled}"
Visibility="{Binding SliceMode_Visibility}"/>
Visibility="{Binding SliceMode_Visibility}"
Margin="2.5,0,2.5,0"
Style="{StaticResource SliceMannager_Button}"/>
</UniformGrid>
</Grid>
</Border>
</UserControl>
</Grid>
</Border>
Icarus/SliceManager/SliceManagerVM.vb
+1 -1
View File
@@ -115,7 +115,7 @@ Public Class SliceManagerVM
Public ReadOnly Property ghTime As String
Get
Dim dtTime As TimeSpan = TimeSpan.FromSeconds(m_dTime)
Return Math.Floor(dtTime.TotalHours) & "hours " & Math.Floor(dtTime.Minutes) & "min " & Math.Ceiling(dtTime.Seconds) & "sec"
Return Math.Floor(dtTime.TotalHours) & ":" & Math.Floor(dtTime.Minutes) & ":" & Math.Ceiling(dtTime.Seconds)
End Get
End Property
Icarus/SliderManager/LayerAdvancementSliderV.xaml
+2 -1
View File
@@ -7,5 +7,6 @@
Maximum="100"
SmallChange="1"
IsEnabled="{Binding LayerAdvancement_IsEnabled}"
Visibility="{Binding LayerAdvancement_Visibility}"/>
Visibility="{Binding LayerAdvancement_Visibility}"
Margin="0,10,0,10"/>
Icarus/SliderManager/SliderManagerVM.vb
+8 -2
View File
@@ -219,7 +219,7 @@ Public Class SliderManagerVM
End Set
End Property
Private m_LayerAdvancement_Visibility As Visibility = Visibility.Collapsed
Private m_LayerAdvancement_Visibility As Visibility = Visibility.Hidden
Public Property LayerAdvancement_Visibility As Visibility
Get
Return m_LayerAdvancement_Visibility
@@ -315,7 +315,7 @@ Public Class SliderManagerVM
Next
End Select
' mostro/nascondo slider orizzontale
m_LayerAdvancement_Visibility = If(m_nSelViewSlider = ViewSliderType.ONLY_SELECTED, Visibility.Visible, Visibility.Collapsed)
m_LayerAdvancement_Visibility = If(m_nSelViewSlider = ViewSliderType.ONLY_SELECTED, Visibility.Visible, Visibility.Hidden)
NotifyPropertyChanged(NameOf(LayerAdvancement_Visibility))
EgtDraw()
End Set
@@ -345,6 +345,12 @@ Public Class SliderManagerVM
Dim Visibility As Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
m_LayerIndex_Visibility = Visibility
NotifyPropertyChanged(NameOf(LayerIndex_Visibility))
If bValue AndAlso m_nSelViewSlider = ViewSliderType.ONLY_SELECTED Then
m_LayerAdvancement_Visibility = Visibility.Visible
ElseIf Not bValue Then
m_LayerAdvancement_Visibility = Visibility.Hidden
End If
NotifyPropertyChanged(NameOf(LayerAdvancement_Visibility))
End Sub
Friend Sub RefreshSlider(nMin As Integer, nMax As Integer)
Icarus/StatusBar/MyStatusBarVM.vb
+85 -34
View File
@@ -33,6 +33,75 @@ Public Class MyStatusBarVM
End Set
End Property
Private m_SnapPointType As SP
Public ReadOnly Property SnapPointType_ToolTip As String
Get
Select Case m_SnapPointType
Case SP.PT_SKETCH
Return EgtMsg(1102) 'Sketch Point
Case SP.PT_GRID
Return EgtMsg(1104) 'Grid Point
Case SP.PT_END
Return EgtMsg(1106) 'End Point
Case SP.PT_MID
Return EgtMsg(1108) 'Mid Point
Case SP.CENTER
Return EgtMsg(1110) 'Center
Case SP.CENTROID
Return EgtMsg(1112) 'Centroid
Case SP.PT_NEAR
Return EgtMsg(1114) 'Near Point
Case SP.PT_INTERS
Return EgtMsg(1116) 'Inters Point
Case SP.PT_TANGENT
Return EgtMsg(1118) 'Tang Point
Case SP.PT_PERPENDICULAR
Return EgtMsg(1120) 'Perp Point
Case SP.PT_MINDIST
Return EgtMsg(1122) 'MinDist Point
Case Else
Return "---"
End Select
End Get
End Property
Public ReadOnly Property SnapPointType_Msg As String
Get
Select Case m_SnapPointType
Case SP.PT_SKETCH
Return "S" 'Sketch Point
Case SP.PT_GRID
Return "G" 'Grid Point
Case SP.PT_END
Return "E" 'End Point
Case SP.PT_MID
Return "M" 'Mid Point
Case SP.CENTER
Return "C" 'Center
Case SP.CENTROID
Return "C" 'Centroid
Case SP.PT_NEAR
Return "N" 'Near Point
Case SP.PT_INTERS
Return "I" 'Inters Point
Case SP.PT_TANGENT
Return "T" 'Tang Point
Case SP.PT_PERPENDICULAR
Return "P" 'Perp Point
Case SP.PT_MINDIST
Return "D" 'MinDist Point
Case Else
Return "-"
End Select
End Get
End Property
Private m_CurrPos As String
Public Shadows ReadOnly Property CurrPos As String
Get
Return m_CurrPos
End Get
End Property
' Definizione comandi
Private m_cmdStopProgress As ICommand
@@ -52,42 +121,24 @@ Public Class MyStatusBarVM
' imposto stato di visualizzazione della griglia
m_bGridVisibility = GetMainPrivateProfileInt(S_GRID, K_SHOWGRID, 1) <> 0
NotifyPropertyChanged(NameOf(bGridVisibility))
' modo di visualizzazione
Dim nShowMode As Integer = GetMainPrivateProfileInt(S_SCENE, K_SHOWMODE, SM.SHADING)
Map.refShowPanelVM.SetShowMode(DirectCast(nShowMode, SM))
' visualizzazione freccia direzione su curve
Map.refShowPanelVM.CurveDirIsChecked = EgtGetShowCurveDirection()
End Sub
Friend Overloads Sub SetSnapPointType(sSnapPntType As SP)
Dim BtnColor As Brush
BtnColor = New SolidColorBrush(SystemColors.ControlColor)
Select Case sSnapPntType
Case SP.PT_SKETCH
Map.refMyStatusBarVM.SetSnapPointType(EgtMsg(1102), BtnColor) 'Sketch Point
Case SP.PT_GRID
Map.refMyStatusBarVM.SetSnapPointType(EgtMsg(1104), BtnColor) 'Grid Point
Case SP.PT_END
Map.refMyStatusBarVM.SetSnapPointType(EgtMsg(1106), BtnColor) 'End Point
Case SP.PT_MID
Map.refMyStatusBarVM.SetSnapPointType(EgtMsg(1108), BtnColor) 'Mid Point
Case SP.CENTER
Map.refMyStatusBarVM.SetSnapPointType(EgtMsg(1110), BtnColor) 'Center
Case SP.CENTROID
Map.refMyStatusBarVM.SetSnapPointType(EgtMsg(1112), BtnColor) 'Centroid
Case SP.PT_NEAR
Map.refMyStatusBarVM.SetSnapPointType(EgtMsg(1114), BtnColor) 'Near Point
Case SP.PT_INTERS
Map.refMyStatusBarVM.SetSnapPointType(EgtMsg(1116), BtnColor) 'Inters Point
Case SP.PT_TANGENT
Map.refMyStatusBarVM.SetSnapPointType(EgtMsg(1118), BtnColor) 'Tang Point
Case SP.PT_PERPENDICULAR
Map.refMyStatusBarVM.SetSnapPointType(EgtMsg(1120), BtnColor) 'Perp Point
Case SP.PT_MINDIST
Map.refMyStatusBarVM.SetSnapPointType(EgtMsg(1122), BtnColor) 'MinDist Point
Case Else
Map.refMyStatusBarVM.SetSnapPointType("---", BtnColor)
End Select
Friend Overloads Sub SetSnapPointType(SnapPntType As SP)
m_SnapPointType = SnapPntType
NotifyPropertyChanged(NameOf(SnapPointType_Msg))
NotifyPropertyChanged(NameOf(SnapPointType_ToolTip))
End Sub
Friend Overloads Sub SetCurrPos(sCurrPos As String)
Dim sSplitCurrPos() As String = sCurrPos.Split(" "c)
Dim dX As Double = 0
Dim dY As Double = 0
Dim dZ As Double = 0
StringToDouble(sSplitCurrPos(0).Trim({"X"c, "x"c, "="c}), dX)
StringToDouble(sSplitCurrPos(1).Trim({"Y"c, "y"c, "="c}), dY)
StringToDouble(sSplitCurrPos(2).Trim({"Z"c, "z"c, "="c}), dZ)
m_CurrPos = "X=" & DoubleToString(dX, -2) & "Y=" & DoubleToString(dY, -2) & "Z=" & DoubleToString(dZ, -2)
NotifyPropertyChanged("CurrPos")
End Sub
Friend Sub ResetStopProgress()
Icarus/StatusBar/StatusBarV.xaml
+75 -158
View File
@@ -1,162 +1,79 @@
<StatusBar x:Class="StatusBarV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:PrintApp="clr-namespace:Icarus"
Background="Transparent">
<Grid x:Class="StatusBarV"
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"
Margin="0,0,5,0"
Background="Transparent">
<StatusBar.ItemsPanel>
<ItemsPanelTemplate>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
</Grid>
</ItemsPanelTemplate>
</StatusBar.ItemsPanel>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<!--Barra di caricamento-->
<StatusBarItem Grid.Column="0">
<ProgressBar Value="{Binding LoadingProgress}"
Height="20" Width="150"
Visibility="{Binding LoadingProgress_Visibility}"/>
</StatusBarItem>
<!--Bottone interruzione caricamento-->
<StatusBarItem Grid.Column="1">
<Button x:Name="StopLoadingBtn"
Command="{Binding StopProgress_Command}" Content="X"
IsEnabled="{Binding StopProgress_IsEnabled}"
Width="{Binding ActualHeight, ElementName=StopLoadingBtn}"
Visibility="{Binding StopProgress_IsVisible}"/>
</StatusBarItem>
<StatusBarItem Grid.Column="2">
<StackPanel Orientation="Horizontal">
<UniformGrid Rows="1"
DataContext="{StaticResource ShowPanelVM}">
<RadioButton ToolTip="{Binding RenderingWFToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
IsChecked="{Binding WireframeIsChecked}">
<Image Source="/Resources/ShowPanel/RenderingWF.png" Stretch="Uniform"/>
</RadioButton>
<RadioButton ToolTip="{Binding RenderingHLToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
IsChecked="{Binding HiddenLineIsChecked}">
<Image Source="/Resources/ShowPanel/RenderingHL.png" Stretch="Uniform"/>
</RadioButton>
<RadioButton ToolTip="{Binding RenderingSHToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
IsChecked="{Binding ShadingIsChecked}">
<Image Source="/Resources/ShowPanel/RenderingSH.png" Stretch="Uniform"/>
</RadioButton>
<ToggleButton ToolTip="{Binding CurveDirToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
IsChecked="{Binding CurveDirIsChecked}">
<Image Source="/Resources/ShowPanel/CurveDir.png" Stretch="Uniform"/>
</ToggleButton>
</UniformGrid>
<UniformGrid Rows="1"
DataContext="{StaticResource ViewPanelVM}">
<Button ToolTip="{Binding ZoomAllToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding ZoomAllCommand}">
<Image Source="/Resources/ViewPanel/ZoomAll.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromTopToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding TopViewCommand}">
<Image Source="/Resources/ViewPanel/LookFromTOP.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromFrontToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding FrontViewCommand}">
<Image Source="/Resources/ViewPanel/LookFromFRONT.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromRightToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding RightViewCommand}">
<Image Source="/Resources/ViewPanel/LookFromRIGHT.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromBackToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding BackViewCommand}">
<Image Source="/Resources/ViewPanel/LookFromBACK.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromLeftToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding LeftViewCommand}">
<Image Source="/Resources/ViewPanel/LookFromLEFT.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromIso_SWToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding IsoViewSWCommand}">
<Image Source="/Resources/ViewPanel/LookFromISO_SW.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding ViewToCPlaneToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding ViewToCPlaneCommand}">
<Image Source="/Resources/GridViewPanel/CplaneView.png" Stretch="Uniform"/>
</Button>
</UniformGrid>
<UniformGrid Rows="1"
DataContext="{StaticResource InstrumentPanelVM}">
<ToggleButton ToolTip="{Binding GetDistToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
IsChecked="{Binding GetDistIsChecked}">
<Image Source="/Resources/InstrumentPanel/GetDist.png" Stretch="Uniform"/>
</ToggleButton>
<ToggleButton ToolTip="{Binding EdgeAnalysisToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
IsChecked="{Binding bEdgeAnalysis_IsChecked}"
IsEnabled="{Binding bEdgeAnalysis_IsEnabled}">
<Image Source="/Resources/InstrumentPanel/Analyze.png" Stretch="Uniform"/>
</ToggleButton>
</UniformGrid>
</StackPanel>
</StatusBarItem>
<!--Stringa di output messaggi-->
<StatusBarItem Grid.Column="3">
<TextBlock Text="{Binding OutputMessage}"
Foreground="{Binding OutputMessage_Foreground}"/>
</StatusBarItem>
<!--Indica se la griglia è attiva o disattiva-->
<StatusBarItem Grid.Column="4">
<ToggleButton Content="{Binding GridVisibilityMsg}"
IsChecked="{Binding bGridVisibility}"
Width="80"/>
</StatusBarItem>
<!--Indica il tipo di punto notevole selezionato-->
<StatusBarItem Grid.Column="5">
<Button Content="{Binding SnapPointType}"
<Border Width="47"
Margin="0,0,2.5,0"
Style="{StaticResource StatusBar_Border}">
<!--Indica il tipo di punto notevole selezionato-->
<TextBlock Text="{Binding SnapPointType_Msg}"
ToolTip="{Binding SnapPointType_ToolTip}"
Background="{Binding SnapPointType_Background}"
IsHitTestVisible="False"
Width="80"/>
</StatusBarItem>
<!--Indica la posizione del mouse quando è sulla scena-->
<StatusBarItem Grid.Column="6">
<TextBlock Text="{Binding CurrPos}"
TextAlignment="Center"
Foreground="Black"
Width="250"/>
</StatusBarItem>
<!--Indica l'unità di misura-->
<StatusBarItem Grid.Column="7">
<TextBlock Text="{Binding MeasureUnit}"
Foreground="Black"
Width="35"/>
</StatusBarItem>
Style="{StaticResource StatusBar_SnapPointType_TextBlock}"/>
</Border>
</StatusBar>
<Border Grid.Column="1"
Width="47"
Margin="2.5,0,2.5,0"
Style="{StaticResource StatusBar_Border}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<!--Indica l'unità di misura-->
<TextBlock Text="{Binding MeasureUnit}"
Foreground="{StaticResource Icarus_Gray}"
FontSize="12"
HorizontalAlignment="Center"
Margin="0,0,0,2.5"/>
<!--Indica se la griglia è attiva o disattiva-->
<ToggleButton Grid.Row="1"
IsChecked="{Binding bGridVisibility}"
Margin="0,2.5,0,0"
Style="{StaticResource StatusBar_ToggleButton}">
<ToggleButton.Template>
<ControlTemplate TargetType="ToggleButton">
<Border x:Name="border" CornerRadius="4" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
<Image Name="LogoImage" Stretch="Uniform" Source="/Resources/StatusBar/GridVisibility.png" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="Source" TargetName="LogoImage" Value="/Resources/StatusBar/GridVisibilityWhite.png"/>
<Setter Property="Background" TargetName="border" Value="{StaticResource Icarus_Gray}"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</ToggleButton.Template>
</ToggleButton>
</Grid>
</Border>
<Border Grid.Column="2"
Margin="2.5,0,0,0"
Style="{StaticResource StatusBar_Border}">
<Grid VerticalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<PrintApp:MachinePanelV DataContext="{StaticResource MachinePanelVM}"/>
<!--Indica la posizione del mouse quando è sulla scena-->
<TextBlock Grid.Row="1"
Text="{Binding CurrPos}"
HorizontalAlignment="Center"
Style="{StaticResource BaseTextBlock}"/>
</Grid>
</Border>
</Grid>
Icarus/TSFEditor/TFSEditorV.xaml
+1 -1
View File
@@ -2,7 +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"
MaxHeight="600"
MinHeight="200"
Width="{Binding ControlWidth}"
IsEnabled="{Binding bTFSEditor_IsEnabled}">
<Border VerticalAlignment="Center"
Icarus/TopPanel/TopPanelV.xaml
+8 -11
View File
@@ -1,11 +1,9 @@
<Border x:Class="TopPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Height="70"
BorderThickness="0,0,0,5"
Background="{StaticResource Icarus_LightBlue}"
BorderBrush="{StaticResource Icarus_Blue}"
IsEnabled="{Binding TopPanel_IsEnabled}">
IsEnabled="{Binding TopPanel_IsEnabled}"
Height="60"
Style="{StaticResource BottomBlueRow_Border}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -18,7 +16,7 @@
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="41"/>
<RowDefinition Height="35"/>
</Grid.RowDefinitions>
<!--<TextBlock Text="PART LIST"
@@ -125,14 +123,13 @@
<ComboBox ItemsSource="{Binding MaterialList}"
SelectedItem="{Binding SelMaterial}"
DisplayMemberPath="sName"
Margin="0,0,5,0"
Style="{StaticResource TopPanel_ComboBox}"/>
Style="{StaticResource TopPanel_ComboBox}" Grid.RowSpan="2"/>
<Button Grid.Column="1"
Command="{Binding MaterialDb_Command}"
Width="40"
Height="40"
Width="35"
Height="35"
Margin="-2"
Style="{StaticResource TopPanel_Button}">
Style="{StaticResource TopPanel_Button}" Grid.ColumnSpan="2" Grid.RowSpan="2">
<Image Source="/Resources/TopPanel/MaterialDb.png" Stretch="Uniform"/>
</Button>
</Grid>
Icarus/Utility/Dictionary.xaml
+196 -21
View File
@@ -16,7 +16,7 @@
<!--<EgtBEAMWALL:ProdManagerVM x:Key="ProdManagerVM"/>
<EgtBEAMWALL:MainMenuVM x:Key="MainMenuVM"/>-->
<PrintApp:ProjectVM x:Key="ProjectVM"/>
<EgtWPFLib5:ShowPanelVM x:Key="ShowPanelVM"/>
<PrintApp:MyShowPanelVM x:Key="ShowPanelVM"/>
<!--<EgtBEAMWALL:ShowBeamPanelVM x:Key="ShowBeamPanelVM"/>-->
<PrintApp:ViewPanelVM x:Key="ViewPanelVM"/>
<PrintApp:SecondaryWindowVM x:Key="SecondaryWindowVM"/>
@@ -133,6 +133,32 @@
<SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4"/>
<SolidColorBrush x:Key="Button.Disabled.Border" Color="#FFADB2B5"/>
<SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383"/>
<ControlTemplate x:Key="Button.HalfRoundButton" TargetType="{x:Type Button}">
<Border x:Name="border" CornerRadius="4,4,0,0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsDefaulted" Value="true">
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
<Setter Property="OpacityMask" Value="#54707070"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
<Style TargetType="{x:Type Button}">
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
<Setter Property="Background" Value="White"/>
@@ -248,25 +274,33 @@
</Style>
<Style x:Key="ProjManager_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
<Setter Property="Height" Value="25"/>
<Setter Property="Width" Value="25"/>
<Setter Property="Background" Value="White"/>
<Setter Property="BorderThickness" Value="0"/>
</Style>
<Style x:Key="TopPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="35"/>
<Setter Property="Width" Value="35"/>
<Setter Property="Background" Value="White"/>
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
<Setter Property="BorderBrush" Value="White"/>
<Setter Property="BorderThickness" Value="0"/>
</Style>
<Style x:Key="TopPanel_CurrMachining_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Background" Value="White" />
<Setter Property="BorderBrush" Value="White"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="Padding" Value="4"/>
<Setter Property="Template" Value="{StaticResource Button.HalfRoundButton}"/>
</Style>
<Style x:Key="SliceMannager_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="28"/>
<Setter Property="Width" Value="64"/>
<Setter Property="BorderBrush" Value="White"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="FontSize" Value="12"/>
<Setter Property="Template" Value="{StaticResource Button.HalfRoundButton}"/>
</Style>
<!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -423,22 +457,97 @@
<Style x:Key="TopPanel_Modify_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="Background" Value="White" />
<Setter Property="Foreground" Value="Black" />
<Setter Property="Foreground" Value="{StaticResource Icarus_Gray}" />
<Setter Property="BorderBrush" Value="White"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="Padding" Value="4"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
<Setter Property="FontWeight" Value="Light"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}">
<Border x:Name="border" CornerRadius="4,4,0,0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="Button.IsDefaulted" Value="true">
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
</Trigger>
<Trigger Property="IsChecked" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Icarus_Gray}"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="White"/>
<!--<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>-->
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
<Setter Property="OpacityMask" Value="#54707070"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="TopPanel_ModifyMode_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="Height" Value="28"/>
<Setter Property="Width" Value="110"/>
<Setter Property="Width" Value="125"/>
<Setter Property="FontSize" Value="12"/>
</Style>
<Style x:Key="LeftPanel_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="Height" Value="28"/>
<Setter Property="Width" Value="125"/>
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="HorizontalContentAlignment" Value="Left"/>
<Setter Property="Padding" Value="20,0,0,0"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}">
<Border x:Name="border" CornerRadius="4" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="Button.IsDefaulted" Value="true">
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
</Trigger>
<Trigger Property="IsChecked" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Icarus_Gray}"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="White"/>
<Setter Property="CornerRadius" TargetName="border" Value="4,0,0,4"/>
<Setter Property="Width" Value="136"/>
<Setter Property="BorderThickness" Value="0"/>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
<Setter Property="OpacityMask" Value="#54707070"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="LeftPanel_Parameters_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="Height" Value="28"/>
<Setter Property="Width" Value="125"/>
<Setter Property="HorizontalAlignment" Value="Left"/>
@@ -452,10 +561,24 @@
</Style.Triggers>
</Style>
<Style x:Key="StatusBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
<Setter Property="FontSize" Value="12"/>
<Setter Property="BorderBrush" Value="White"/>
<Setter Property="BorderThickness" Value="0"/>
</Style>
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!-- TextBlock -->
<Style x:Key="BaseTextBlock" TargetType="{x:Type TextBlock}">
<Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
<Setter Property="FontWeight" Value="Normal"/>
<Setter Property="Foreground" Value="{StaticResource Icarus_Gray}"/>
</Style>
<Style x:Key="ToolsTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
<Setter Property="Margin" Value="10,0,0,0"/>
</Style>
@@ -498,20 +621,28 @@
<Setter Property="VerticalAlignment" Value="Center"/>
</Style>
<Style x:Key="TopPanelFixed_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
<Style x:Key="TopPanelFixed_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlock}">
<Setter Property="FontSize" Value="16"/>
<Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
<Setter Property="FontWeight" Value="Light"/>
<Setter Property="VerticalAlignment" Value="Center"/>
</Style>
<Style x:Key="TopPanelData_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
<Style x:Key="TopPanelData_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlock}">
<Setter Property="FontSize" Value="18"/>
<Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
<Setter Property="FontWeight" Value="Light"/>
<Setter Property="VerticalAlignment" Value="Center"/>
</Style>
<Style x:Key="SliceManager_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlock}">
<Setter Property="Foreground" Value="White"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="HorizontalAlignment" Value="Center"/>
</Style>
<Style x:Key="StatusBar_SnapPointType_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlock}">
<Setter Property="FontSize" Value="35"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="HorizontalAlignment" Value="Center"/>
</Style>
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!-- TextBox -->
@@ -976,7 +1107,17 @@
</Trigger>
</Style.Triggers>
</Style>
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!-- ProgressBar -->
<Style TargetType="{x:Type ProgressBar}">
<Setter Property="Height" Value="15"/>
<Setter Property="Minimum" Value="0"/>
<Setter Property="Maximum" Value="100"/>
</Style>
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!-- MachGroup -->
@@ -1062,11 +1203,29 @@
<Setter Property="Padding" Value="5" />
</Style>
<Style x:Key="BottomBlueRow_Border" TargetType="{x:Type Border}">
<Setter Property="Background" Value="{StaticResource Icarus_LightBlue}" />
<Setter Property="BorderBrush" Value="{StaticResource Icarus_Blue}"/>
<Setter Property="BorderThickness" Value="0,0,0,5"/>
<Setter Property="CornerRadius" Value="0,0,0,0"/>
<Setter Property="Padding" Value="0,0,0,0"/>
<Setter Property="Margin" Value="0,0,0,0"/>
</Style>
<Style x:Key="BottomGrayRow_Border" TargetType="{x:Type Border}">
<Setter Property="Background" Value="White" />
<Setter Property="BorderBrush" Value="{StaticResource Icarus_Gray}"/>
<Setter Property="BorderThickness" Value="0,0,0,5"/>
<Setter Property="CornerRadius" Value="0,0,0,0"/>
<Setter Property="Padding" Value="0,0,0,0"/>
<Setter Property="Margin" Value="0,0,0,0"/>
</Style>
<Style x:Key="TopPanel_Border" TargetType="{x:Type Border}">
<Setter Property="Background" Value="White" />
<Setter Property="BorderBrush" Value="White"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="CornerRadius" Value="4"/>
<Setter Property="CornerRadius" Value="4,4,0,0"/>
<Setter Property="Padding" Value="4"/>
</Style>
@@ -1085,7 +1244,7 @@
<Setter Property="BorderBrush" Value="{StaticResource Icarus_Gray}" />
<Setter Property="Padding" Value="4" />
</Style>
<Style x:Key="LeftPanel_PopupButton_Border" TargetType="Border">
<Setter Property="Background" Value="White" />
<Setter Property="BorderThickness" Value="1" />
@@ -1094,12 +1253,28 @@
<Setter Property="Padding" Value="2.5,4,2.5,4" />
</Style>
<Style x:Key="ViewLayerManager_Border" TargetType="Border">
<Setter Property="Background" Value="White" />
<Setter Property="BorderBrush" Value="White" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="CornerRadius" Value="4" />
<Setter Property="Padding" Value="5" />
</Style>
<Style x:Key="StatusBar_Border" TargetType="Border">
<Setter Property="Background" Value="White" />
<Setter Property="BorderBrush" Value="White" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="CornerRadius" Value="4,4,0,0" />
<Setter Property="Padding" Value="5" />
</Style>
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!-- EgtCustomWindow -->
<Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
<Setter Property="TitleBarHeight" Value="43"/>
<Setter Property="TitleBarHeight" Value="30"/>
<Setter Property="TitleBarBrush" Value="White"/>
<Setter Property="TitleBarForeground" Value="Black"/>
<Setter Property="ShowInTaskbar" Value="False"/>
Icarus/ViewLayerManager/ViewLayerManagerV.xaml
+10 -8
View File
@@ -1,9 +1,10 @@
<UserControl x:Class="ViewLayerManagerV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Margin="10,0,0,0"
IsEnabled="{Binding ViewLayerManager_IsEnabled}"
Visibility="{Binding ViewLayerManager_Visibility}">
<Border x:Class="ViewLayerManagerV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Margin="5,0,0,0"
IsEnabled="{Binding ViewLayerManager_IsEnabled}"
Visibility="{Binding ViewLayerManager_Visibility}"
Style="{StaticResource ViewLayerManager_Border}">
<ItemsControl ItemsSource="{Binding LayerList}">
<ItemsControl.ItemTemplate>
<DataTemplate>
@@ -15,9 +16,10 @@
<CheckBox IsChecked="{Binding bIsVisible}"/>
<TextBlock Grid.Column="1"
Text="{Binding sName}"
Margin="5,0,0,0"/>
Margin="2,0,0,0"
Style="{StaticResource BaseTextBlock}"/>
</Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</UserControl>
</Border>
Icarus/ViewLayerManager/ViewLayerManagerVM.vb
+1
View File
@@ -46,6 +46,7 @@ Public Class ViewLayerManagerVM
New ViewLayer(ViewLayer.ViewLayerType.SOLID_SLICE, "Solid Slice", True),
New ViewLayer(ViewLayer.ViewLayerType.SLICE_TOOLPATH, "Slice Toolpath", True),
New ViewLayer(ViewLayer.ViewLayerType.OTHERS, "Others", True)})
UpdateForced()
End Sub
Friend Sub ResetSolid()
Icarus/ViewPanel/ViewPanelV.xaml
+30 -24
View File
@@ -1,49 +1,55 @@
<EgtFloating:EgtFloatingPanel x:Class="ViewPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
<UniformGrid x:Class="ViewPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Rows="1">
<Button ToolTip="{Binding ZoomAllToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding ZoomAllCommand}">
Command="{Binding ZoomAllCommand}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/ViewPanel/ZoomAll.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromTopToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding TopViewCommand}">
Command="{Binding TopViewCommand}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/ViewPanel/LookFromTOP.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromFrontToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding FrontViewCommand}">
Command="{Binding FrontViewCommand}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/ViewPanel/LookFromFRONT.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromRightToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding RightViewCommand}">
Command="{Binding RightViewCommand}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/ViewPanel/LookFromRIGHT.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromBackToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding BackViewCommand}">
Command="{Binding BackViewCommand}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/ViewPanel/LookFromBACK.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromLeftToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding LeftViewCommand}">
Command="{Binding LeftViewCommand}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/ViewPanel/LookFromLEFT.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromIsoSWToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding IsoViewSWCommand}">
Command="{Binding IsoViewSWCommand}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/ViewPanel/LookFromISO_SW.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding ViewToCPlaneToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding ViewToCPlaneCommand}">
<Image Source="/Resources/GridViewPanel/CplaneView.png" Stretch="Uniform"/>
Command="{Binding ViewToCPlaneCommand}"
Margin="2.5,0,2.5,0"
Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/ViewPanel/CplaneView.png" Stretch="Uniform"/>
</Button>
</EgtFloating:EgtFloatingPanel>
</UniformGrid>