- nuova grafica per simulazione
- introdotta possibilita' di muovere coordinate macchina in simulazione - introduzione nuova EgtTextBox2 - nuova grafica per ControllerInputPanel - nuovo componente che gestisce visibilita' macchina - gestita stop e uscita da simulazione su chiusura programma -
This commit is contained in:
Emmanuele Sassi
@@ -105,6 +105,7 @@ Public Module ConstIni
|
||||
'Public Const S_SIMUL As String = "Simul"
|
||||
'Public Const K_SLIDERX As String = "SliderX"
|
||||
'Public Const K_SLIDERVAL As String = "SliderVal"
|
||||
Public Const K_MACHVIEWMODE As String = "MachViewMode"
|
||||
|
||||
Public Const S_PRINTING3D As String = "3dPrinting"
|
||||
Public Const K_3PRNBASEDIR As String = "BaseDir"
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ControllerInput_TextBlock}"/>
|
||||
<TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged}"
|
||||
Width="200"
|
||||
Width="150"
|
||||
Visibility="{Binding Text_Visibility}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource ControllerInputPanel_TextBox}">
|
||||
@@ -52,14 +52,14 @@
|
||||
Visibility="{Binding ShowBtn_Visibility}"
|
||||
Content="{Binding ShowMsg}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource EgtWPFLib5_InputButton}"/>
|
||||
Style="{StaticResource RightPanel_Button}"/>
|
||||
<Button Grid.Column="1"
|
||||
Content="{Binding OkMsg}"
|
||||
Command="{Binding Done_Command}"
|
||||
Visibility="{Binding DoneBtn_Visibility}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource EgtWPFLib5_InputButton}">
|
||||
<!--<Image Source="\Resources\"/>-->
|
||||
Style="{StaticResource RightPanel_Button}">
|
||||
<Image Source="\Resources\Common\Ok.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
|
||||
@@ -53,10 +53,10 @@
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="X"
|
||||
VerticalAlignment="Center"/>
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
|
||||
Grid.Column="1"
|
||||
Margin="5,0,0,0"
|
||||
Style="{StaticResource LeftPanel_TextBox}"/>
|
||||
<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">
|
||||
|
||||
+18
-9
@@ -118,10 +118,6 @@
|
||||
<DependentUpon>ChooseMachineWndV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ChooseMachineWnd\ChooseMachineWndVM.vb" />
|
||||
<Compile Include="ChooseReferenceWnd\ChooseReferenceWndV.xaml.vb">
|
||||
<DependentUpon>ChooseReferenceWndV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ChooseReferenceWnd\ChooseReferenceWndVM.vb" />
|
||||
<Compile Include="Constants\Const3dPrint.vb" />
|
||||
<Compile Include="Constants\ConstBeam.vb" />
|
||||
<Compile Include="Constants\ConstColumns.vb" />
|
||||
@@ -169,6 +165,10 @@
|
||||
<DependentUpon>MachinePanelV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="MachinePanel\MachinePanelVM.vb" />
|
||||
<Compile Include="MachineViewPanel\MachineViewPanelV.xaml.vb">
|
||||
<DependentUpon>MachineViewPanelV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="MachineViewPanel\MachineViewPanelVM.vb" />
|
||||
<Compile Include="MachiningDb\MachiningDbV.xaml.vb">
|
||||
<DependentUpon>MachiningDbV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
@@ -322,10 +322,6 @@
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="ChooseReferenceWnd\ChooseReferenceWndV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="ControllerInputPanel\ControllerInputPanelV.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
@@ -347,8 +343,8 @@
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="ImportExportMachiningPanel\ImportExportMachiningPanelV.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>XamlIntelliSenseFileGenerator</Generator>
|
||||
</Page>
|
||||
<Page Include="InstrumentPanel\InstrumentPanelV.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
@@ -362,6 +358,10 @@
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="MachineViewPanel\MachineViewPanelV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="MachiningDb\MachiningDbV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
@@ -740,6 +740,15 @@
|
||||
<Resource Include="Resources\TopPanel\StrandH.png" />
|
||||
<Resource Include="Resources\TopPanel\StrandW.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\Common\Cancel.png" />
|
||||
<Resource Include="Resources\Common\Ok.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\SimulationPanel\HeadMode.png" />
|
||||
<Resource Include="Resources\SimulationPanel\MachMode.png" />
|
||||
<Resource Include="Resources\SimulationPanel\ToolMode.png" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR32.exe
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
<UserControl x:Class="MachineViewPanelV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
VerticalContentAlignment="Top">
|
||||
<ComboBox SelectedIndex="{Binding ghSelMachView}"
|
||||
Height="40"
|
||||
Width="40"
|
||||
Style="{StaticResource SelViewSlider_ComboBox}">
|
||||
<ComboBoxItem>
|
||||
<Image Source="\Resources\SimulationPanel\HeadMode.png"
|
||||
Style="{StaticResource ComboBox.Image}"/>
|
||||
</ComboBoxItem>
|
||||
<ComboBoxItem>
|
||||
<Image Source="\Resources\SimulationPanel\HeadMode.png"
|
||||
Style="{StaticResource ComboBox.Image}"/>
|
||||
</ComboBoxItem>
|
||||
<ComboBoxItem>
|
||||
<Image Source="\Resources\SimulationPanel\MachMode.png"
|
||||
Style="{StaticResource ComboBox.Image}"/>
|
||||
</ComboBoxItem>
|
||||
</ComboBox>
|
||||
</UserControl>
|
||||
@@ -0,0 +1,3 @@
|
||||
Public Class MachineViewPanelV
|
||||
|
||||
End Class
|
||||
@@ -0,0 +1,35 @@
|
||||
Imports EgtUILib
|
||||
Imports EgtWPFLib5
|
||||
|
||||
Public Class MachineViewPanelVM
|
||||
Inherits VMBase
|
||||
|
||||
Private m_nSelMachView As MCH_LOOK
|
||||
Public Property ghSelMachView As Integer
|
||||
Get
|
||||
Return m_nSelMachView - 1
|
||||
End Get
|
||||
Set(value As Integer)
|
||||
m_nSelMachView = value + 1
|
||||
If Not IsNothing(Map.refSimulationPanelVM) Then
|
||||
Dim MySimul As SimulationVM = Map.refSimulationPanelVM.MySimul
|
||||
MySimul.SetMachLook(m_nSelMachView)
|
||||
' aggiorno lo stato della macchina e la sua visualizzazione
|
||||
EgtSetMachineLook(MySimul.GetMachLook())
|
||||
WriteMainPrivateProfileString(S_SIMUL, K_MACHVIEWMODE, m_nSelMachView)
|
||||
End If
|
||||
EgtDraw()
|
||||
End Set
|
||||
End Property
|
||||
Friend Sub SetSelViewSlider(value As MCH_LOOK)
|
||||
m_nSelMachView = value
|
||||
NotifyPropertyChanged(NameOf(ghSelMachView))
|
||||
End Sub
|
||||
|
||||
Sub New()
|
||||
' leggo vista macchina da ini e la imposto
|
||||
Dim DefaultMachViewMode As Integer = GetMainPrivateProfileInt(S_SIMUL, K_MACHVIEWMODE, 3)
|
||||
SetSelViewSlider(DefaultMachViewMode)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
@@ -73,11 +73,12 @@
|
||||
HorizontalAlignment="Stretch"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource RightPanel_ComboBox}"/>
|
||||
<EgtWPFLib5:EgtTextBox Text="{Binding SelectedItem.sName, ElementName=MachiningCombo, UpdateSourceTrigger=Explicit}"
|
||||
IsExplicitFocused="{Binding UserShouldEditValueNow}"
|
||||
Visibility="{Binding Name_Visibility}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource OptionTextBox}"/>
|
||||
<EgtWPFLib5:EgtTextBox2 Text="{Binding SelectedItem.sName, ElementName=MachiningCombo, UpdateSourceTrigger=Explicit}"
|
||||
IsExplicitFocused="{Binding UserShouldEditValueNow}"
|
||||
ExplicitUpdateSource="EnterKeyPressOrLostFocus"
|
||||
Visibility="{Binding Name_Visibility}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource OptionTextBox2}"/>
|
||||
<Button Grid.Column="1"
|
||||
Command="{Binding EditName_Command}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
@@ -232,10 +233,12 @@
|
||||
</ItemsControl>
|
||||
</ScrollViewer>
|
||||
<Button Grid.Row="4"
|
||||
Content="Ok"
|
||||
Command="{Binding Ok_Command}"
|
||||
IsEnabled="{Binding IsEnabled}"
|
||||
Margin="0,2.5,0,0"
|
||||
Style="{StaticResource RightPanel_HalfRound_Button}"/>
|
||||
Style="{StaticResource RightPanel_HalfRound_Button}">
|
||||
<Image Source="\Resources\Common\Ok.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
@@ -274,6 +274,10 @@ Public Class MainWindowVM
|
||||
If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
|
||||
Return
|
||||
End If
|
||||
' gestisco la chiusura della simulazione
|
||||
If Map.refRightPanelVM.SelPanel = RightPanelVM.Panels.SIMULATION AndAlso Not IsNothing(Map.refSimulationPanelVM) Then
|
||||
Map.refSimulationPanelVM.MySimul.ResetSimulation()
|
||||
End If
|
||||
' Gestisco eventuale file corrente modificato
|
||||
Dim bOk As Boolean = True
|
||||
'bOk = ProjFileVM.VerifyProjectModification(Map.refProjManagerVM.CurrProj, ProjectType.PROJ)
|
||||
|
||||
@@ -96,6 +96,7 @@
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<!--<PrintApp:MachineViewPanelV DataContext="{StaticResource MachineViewPanelVM}"/>-->
|
||||
<PrintApp:LayerIndexSliderV DataContext="{StaticResource SliderManagerVM}"
|
||||
VerticalAlignment="Stretch"
|
||||
HorizontalAlignment="Right"/>
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 476 B |
Binary file not shown.
|
After Width: | Height: | Size: 558 B |
Binary file not shown.
|
Before Width: | Height: | Size: 391 B After Width: | Height: | Size: 397 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 537 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 576 B |
Binary file not shown.
|
Before Width: | Height: | Size: 394 B After Width: | Height: | Size: 468 B |
Binary file not shown.
|
Before Width: | Height: | Size: 549 B After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 550 B After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 412 B After Width: | Height: | Size: 460 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 426 B |
Binary file not shown.
|
Before Width: | Height: | Size: 850 B After Width: | Height: | Size: 924 B |
Binary file not shown.
|
Before Width: | Height: | Size: 357 B After Width: | Height: | Size: 362 B |
Binary file not shown.
|
Before Width: | Height: | Size: 396 B After Width: | Height: | Size: 432 B |
Binary file not shown.
|
Before Width: | Height: | Size: 408 B After Width: | Height: | Size: 422 B |
@@ -26,8 +26,8 @@ Public Class MySimulation
|
||||
#Region "CONSTRUCTOR"
|
||||
|
||||
Sub New()
|
||||
SetPlayImagePath("/Resources/SimulTab/Play.png")
|
||||
SetPauseImagePath("/Resources/SimulTab/Pause.png")
|
||||
SetPlayImagePath("/Resources/SimulationPanel/Play.png")
|
||||
SetPauseImagePath("/Resources/SimulationPanel/Pause.png")
|
||||
SetPauseMsg(EgtMsg(90561)) ' Pausa
|
||||
SetStopMsg(EgtMsg(90562)) ' Simulazione interrotta
|
||||
SetHomeMsg(EgtMsg(90564)) ' Home
|
||||
@@ -94,16 +94,16 @@ Public Class MySimulation
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub OnPostSetSimulationStatus(value As MCH_SIM_ST)
|
||||
'If OmagOFFICE.refMainWindowVM.MainWindowM.nUserLevel >= 10 AndAlso
|
||||
' (GetStatus() = MCH_SIM_ST.UI_PAUSE OrElse GetStatus() = MCH_SIM_ST.UI_STOP) Then
|
||||
' For Index = 0 To MachineAxisList.Count - 1
|
||||
' MachineAxisList(Index).IsReadOnlyAxesValue = False
|
||||
' Next
|
||||
'Else
|
||||
' For Index = 0 To MachineAxisList.Count - 1
|
||||
' MachineAxisList(Index).IsReadOnlyAxesValue = True
|
||||
' Next
|
||||
'End If
|
||||
If Map.refMainWindowVM.MainWindowM.nUserLevel >= 5 AndAlso
|
||||
(GetStatus() = MCH_SIM_ST.UI_PAUSE OrElse GetStatus() = MCH_SIM_ST.UI_STOP) Then
|
||||
For Index = 0 To MachineAxisList.Count - 1
|
||||
MachineAxisList(Index).IsReadOnlyAxesValue = False
|
||||
Next
|
||||
Else
|
||||
For Index = 0 To MachineAxisList.Count - 1
|
||||
MachineAxisList(Index).IsReadOnlyAxesValue = True
|
||||
Next
|
||||
End If
|
||||
End Sub
|
||||
|
||||
#End Region ' METHODS
|
||||
|
||||
@@ -1,8 +1,25 @@
|
||||
<UserControl x:Class="SimulationPanelV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
<Border VerticalAlignment="Center"
|
||||
Style="{StaticResource RightPanel_Border}">
|
||||
<Grid x:Class="SimulationPanelV"
|
||||
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"
|
||||
Width="310"
|
||||
VerticalAlignment="Center">
|
||||
<Grid.Resources>
|
||||
<SolidColorBrush x:Key="SliderThumb.Track.Background" Color="{StaticResource Icarus_Blue_Color}"/>
|
||||
<SolidColorBrush x:Key="SliderThumb.Track.Border" Color="{StaticResource Icarus_Blue_Color}"/>
|
||||
</Grid.Resources>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Border Margin="0,0,0,2.5"
|
||||
Style="{StaticResource Title_Border}">
|
||||
<TextBlock Text="SIMULATION"
|
||||
Style="{StaticResource Title_TextBlock}"/>
|
||||
</Border>
|
||||
<Border Grid.Row="1"
|
||||
Margin="0,2.5,0,0"
|
||||
Style="{StaticResource BottomGrayRow_Border}">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
@@ -10,119 +27,121 @@
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<GroupBox Header="{Binding MachViewMsg}" Margin="0,0,0,5">
|
||||
<ComboBox ItemsSource="{Binding MachViewList}"
|
||||
SelectedIndex="{Binding nSelMachView}"/>
|
||||
<!--<UniformGrid Columns="3">
|
||||
|
||||
<Button Command="{Binding ToolModeCommand}"
|
||||
Style="{StaticResource OptionPanel_NestingButton}">
|
||||
<Image Source="/Resources/SimulTab/ToolMode.png" Stretch="Uniform"/>
|
||||
<StackPanel DataContext="{Binding MySimul}"
|
||||
Margin="2.5">
|
||||
<UniformGrid Columns="3"
|
||||
Margin="0,2.5,0,2.5">
|
||||
<Button Grid.Column="0"
|
||||
Grid.Row="3"
|
||||
Command="{Binding StepCommand}"
|
||||
ToolTip="{Binding OneStepToolTip}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource SimulationPanel_Button}">
|
||||
<Image Source="/Resources/SimulationPanel/PlayStep.png"
|
||||
Style="{StaticResource SimulationButton_Image}"/>
|
||||
</Button>
|
||||
<Button Command="{Binding HeadModeCommand}"
|
||||
Style="{StaticResource OptionPanel_NestingButton}">
|
||||
<Image Source="/Resources/SimulTab/HeadMode.png" Stretch="Uniform"/>
|
||||
<Button Grid.Column="1"
|
||||
Grid.Row="3"
|
||||
Command="{Binding PlayPauseCommand}"
|
||||
ToolTip="{Binding PlayPauseToolTip}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource SimulationPanel_Button}">
|
||||
<Image Source="{Binding PlayPauseImage}"
|
||||
Style="{StaticResource SimulationButton_Image}"/>
|
||||
</Button>
|
||||
<Button Command="{Binding MachModeCommand}"
|
||||
Style="{StaticResource OptionPanel_NestingButton}">
|
||||
<Image Source="/Resources/SimulTab/MachMode.png" Stretch="Uniform"/>
|
||||
<Button Grid.Column="2" Grid.Row="3"
|
||||
Command="{Binding StopCommand}"
|
||||
ToolTip="{Binding StopHomeToolTip}"
|
||||
Margin="2.5,0,2.5,0"
|
||||
Style="{StaticResource SimulationPanel_Button}">
|
||||
<Image Source="/Resources/SimulationPanel/Stop.png"
|
||||
Style="{StaticResource SimulationButton_Image}"/>
|
||||
</Button>
|
||||
|
||||
</UniformGrid>-->
|
||||
</GroupBox>
|
||||
</UniformGrid>
|
||||
<TextBlock Text="{Binding StatusMsg}"
|
||||
TextAlignment="Center"
|
||||
Margin="2.5"
|
||||
Style="{StaticResource Simulation_TextBlock}"/>
|
||||
<Slider Name="SpeedSlider"
|
||||
Foreground="{StaticResource Icarus_Gray}"
|
||||
Value="{Binding SliderValue}"
|
||||
Minimum="1"
|
||||
Maximum="100"
|
||||
TickPlacement="TopLeft"
|
||||
TickFrequency="5"
|
||||
Margin="2.5"
|
||||
Style="{StaticResource LayerIndex_Slider}"/>
|
||||
<Grid Margin="2.5">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Border Style="{StaticResource SimulPanel_KeyValue_Border}">
|
||||
<TextBlock Text="{Binding TName}"
|
||||
Margin="2.5,2.5,2.5,2.5"
|
||||
Style="{StaticResource Simulation_TextBlock}"/>
|
||||
</Border>
|
||||
<Border Grid.Column="1"
|
||||
Style="{StaticResource SimulPanel_KeyValue_Border}">
|
||||
<TextBlock Text="{Binding SValue}"
|
||||
Margin="2.5,2.5,2.5,2.5"
|
||||
Style="{StaticResource Simulation_TextBlock}"/>
|
||||
</Border>
|
||||
<Border Grid.Row="1"
|
||||
Style="{StaticResource SimulPanel_KeyValue_Border}">
|
||||
<TextBlock Text="{Binding GCode}"
|
||||
Margin="2.5,2.5,2.5,2.5"
|
||||
Style="{StaticResource Simulation_TextBlock}"/>
|
||||
</Border>
|
||||
<Border Grid.Column="1"
|
||||
Grid.Row="1"
|
||||
Style="{StaticResource SimulPanel_KeyValue_Border}">
|
||||
<TextBlock Text="{Binding FValue}"
|
||||
Margin="2.5,2.5,2.5,2.5"
|
||||
Style="{StaticResource Simulation_TextBlock}"/>
|
||||
</Border>
|
||||
|
||||
<GroupBox Grid.Row="1"
|
||||
BorderThickness="0">
|
||||
<StackPanel DataContext="{Binding MySimul}">
|
||||
<UniformGrid Columns="3" Margin="0,10,0,5">
|
||||
|
||||
<Button Command="{Binding StepCommand}" Grid.Column="0" Grid.Row="3"
|
||||
Style="{StaticResource OptionPanel_NestingButton}"
|
||||
ToolTip="{Binding OneStepToolTip}" Margin="0,0,2.5,0">
|
||||
<Image Source="/Resources/SimulationPanel/PlayStep.png"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"
|
||||
Height="50" Width="50"/>
|
||||
</Button>
|
||||
|
||||
<Button Command="{Binding PlayPauseCommand}" Grid.Column="1" Grid.Row="3"
|
||||
Style="{StaticResource OptionPanel_NestingButton}"
|
||||
ToolTip="{Binding PlayPauseToolTip}" Margin="2.5,0,2.5,0">
|
||||
<Image Source="{Binding PlayPauseImage}" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" Height="50" Width="50"/>
|
||||
</Button>
|
||||
|
||||
<Button Command="{Binding StopCommand}" Grid.Column="2" Grid.Row="3"
|
||||
Style="{StaticResource OptionPanel_NestingButton}"
|
||||
ToolTip="{Binding StopHomeToolTip}" Margin="2.5,0,0,0">
|
||||
<Image Source="/Resources/SimulationPanel/Stop.png"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"
|
||||
Height="50" Width="50"/>
|
||||
</Button>
|
||||
|
||||
</UniformGrid>
|
||||
|
||||
<TextBlock Text="{Binding StatusMsg}" FontSize="15" TextAlignment="Center" Margin="10,5,10,0"/>
|
||||
|
||||
<Slider Name="SpeedSlider" Grid.Row="5" Grid.ColumnSpan="3" Height="30"
|
||||
Minimum="1" Maximum="100" TickPlacement="BottomRight" TickFrequency="10"
|
||||
Margin="0,5,0,0" Value="{Binding SliderValue}"/>
|
||||
<Grid Margin="0,0,0,5">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="0.5*"/>
|
||||
<RowDefinition Height="0.5*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<TextBlock Text="{Binding TName}" Grid.Row="0" FontSize="15" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" TextAlignment="Center" Margin="5,5,5,0" Grid.ColumnSpan="2" />
|
||||
<TextBlock Text="{Binding SValue}" Grid.Row="0" Grid.Column="2" FontSize="15" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" TextAlignment="Right" Margin="0,5,5,5" />
|
||||
<TextBlock Text="{Binding GCode}" Grid.Row="1" FontSize="15" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" TextAlignment="Center" Margin="5,5,5,0" Grid.ColumnSpan="2" />
|
||||
<TextBlock Text="{Binding FValue}" Grid.Row="1" Grid.Column="2" FontSize="15" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" TextAlignment="Right" Margin="0,5,5,5" />
|
||||
|
||||
</Grid>
|
||||
|
||||
<ItemsControl ItemsSource="{Binding MachineAxisList}" Margin="0,0,0,5">
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Grid Margin="0,0,0,5">
|
||||
</Grid>
|
||||
<ItemsControl ItemsSource="{Binding MachineAxisList}"
|
||||
Margin="2.5"
|
||||
BorderThickness="0"
|
||||
Padding="0">
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Border Style="{StaticResource SimulPanel_KeyValue_Border}"
|
||||
Margin="0,1,0,1">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="2*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock Text="{Binding Token}" FontSize="15"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"
|
||||
TextWrapping="Wrap" TextAlignment="Center"/>
|
||||
<TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}" Grid.Column="1"
|
||||
IsReadOnly="{Binding IsReadOnlyAxesValue}"
|
||||
IsEnabled="{Binding IsEnabledAxesValue}"
|
||||
TextAlignment="Right">
|
||||
<TextBox.InputBindings>
|
||||
<KeyBinding Key="Enter" Command="{Binding ManualAxisModifyCommand}"/>
|
||||
</TextBox.InputBindings>
|
||||
</TextBox>
|
||||
|
||||
<TextBlock Text="{Binding Token}"
|
||||
Style="{StaticResource Simulation_TextBlock}"/>
|
||||
<EgtWPFLib5:EgtTextBox Grid.Column="1"
|
||||
BorderThickness="0"
|
||||
Text="{Binding Value, UpdateSourceTrigger=Explicit}"
|
||||
IsReadOnly="{Binding IsReadOnlyAxesValue}"
|
||||
IsEnabled="{Binding IsEnabledAxesValue}"
|
||||
Style="{StaticResource SimulationPanel_Axes_TextBox}">
|
||||
</EgtWPFLib5:EgtTextBox>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
</StackPanel>
|
||||
</GroupBox>
|
||||
<UniformGrid Grid.Row="3"
|
||||
Rows="1">
|
||||
<Button Content="Ok"
|
||||
Command="{Binding Ok_Command}"
|
||||
Style="{StaticResource ToolBar_TextButton}"/>
|
||||
</UniformGrid>
|
||||
|
||||
</Border>
|
||||
</DataTemplate>
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
</StackPanel>
|
||||
<Button Grid.Row="3"
|
||||
Command="{Binding Ok_Command}"
|
||||
Style="{StaticResource RightPanel_HalfRound_Button}">
|
||||
<Image Source="\Resources\Common\Ok.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
</UserControl>
|
||||
</Grid>
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
Imports System.Collections.ObjectModel
|
||||
Imports System.IO
|
||||
Imports EgtUILib
|
||||
Imports EgtUILib
|
||||
Imports EgtWPFLib5
|
||||
|
||||
Public Class SimulationPanelVM
|
||||
@@ -8,12 +6,6 @@ Public Class SimulationPanelVM
|
||||
|
||||
#Region "FIELDS & PROPERTIES"
|
||||
|
||||
Public Enum MachViews As Integer
|
||||
TOOL = 0
|
||||
HEAD = 1
|
||||
MACHINE = 2
|
||||
End Enum
|
||||
|
||||
Private m_dPrevAngVertDegView As Double
|
||||
Private m_dPrevAngHorizDegView As Double
|
||||
|
||||
@@ -28,50 +20,9 @@ Public Class SimulationPanelVM
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_MachViewList As New List(Of String)({"Tool", "Head", "Machine"})
|
||||
Public ReadOnly Property MachViewList As List(Of String)
|
||||
Get
|
||||
Return m_MachViewList
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private m_nSelMachView As MachViews
|
||||
Public Property nSelMachView As Integer
|
||||
Get
|
||||
Return m_nSelMachView
|
||||
End Get
|
||||
Set(value As Integer)
|
||||
m_nSelMachView = value
|
||||
Select Case m_nSelMachView
|
||||
Case MachViews.TOOL
|
||||
ToolMode()
|
||||
Case MachViews.HEAD
|
||||
HeadMode()
|
||||
Case MachViews.MACHINE
|
||||
MachMode()
|
||||
End Select
|
||||
End Set
|
||||
End Property
|
||||
Friend Sub SetSelMachView(value As MachViews)
|
||||
nSelMachView = value
|
||||
NotifyPropertyChanged(NameOf(nSelMachView))
|
||||
End Sub
|
||||
|
||||
' Definizione comandi
|
||||
Private m_cmdOk As ICommand
|
||||
Private m_cmdToolMode As ICommand
|
||||
Private m_cmdHeadMode As ICommand
|
||||
Private m_cmdMachMode As ICommand
|
||||
|
||||
#Region "Messages"
|
||||
|
||||
Public ReadOnly Property MachViewMsg As String
|
||||
Get
|
||||
Return "View"
|
||||
End Get
|
||||
End Property
|
||||
|
||||
#End Region ' Messages
|
||||
|
||||
#Region "ToolTip"
|
||||
|
||||
@@ -101,8 +52,6 @@ Public Class SimulationPanelVM
|
||||
' Creo riferimento a questa classe in OmagOFFICEMap
|
||||
Map.SetRefSimulationPanelVM(Me)
|
||||
MySimul = New MySimulation
|
||||
' leggo vista macchina da ini e la imposto
|
||||
SetSelMachView(MachViews.MACHINE)
|
||||
End Sub
|
||||
|
||||
#End Region ' CONSTRUCTOR
|
||||
@@ -242,93 +191,6 @@ Public Class SimulationPanelVM
|
||||
|
||||
#End Region ' Ok
|
||||
|
||||
#Region "ToolModeCommand"
|
||||
|
||||
''' <summary>
|
||||
''' Returns a command that create a new tool.
|
||||
''' </summary>
|
||||
Public ReadOnly Property ToolModeCommand As ICommand
|
||||
Get
|
||||
If m_cmdToolMode Is Nothing Then
|
||||
m_cmdToolMode = New Command(AddressOf ToolMode)
|
||||
End If
|
||||
Return m_cmdToolMode
|
||||
End Get
|
||||
End Property
|
||||
|
||||
''' <summary>
|
||||
''' Creata the new tool. This method is invoked by the NewCommand.
|
||||
''' </summary>
|
||||
Public Sub ToolMode()
|
||||
' aggiorno lo stato
|
||||
If MySimul.GetMachLook() <> MCH_LOOK.TAB_TOOL Then
|
||||
MySimul.SetMachLook(MCH_LOOK.TAB_TOOL)
|
||||
End If
|
||||
' aggiorno lo stato della macchina e la sua visualizzazione
|
||||
EgtSetMachineLook(MySimul.GetMachLook())
|
||||
EgtDraw()
|
||||
End Sub
|
||||
|
||||
#End Region ' ToolModeCommand
|
||||
|
||||
#Region "HeadModeCommand"
|
||||
|
||||
''' <summary>
|
||||
''' Returns a command that create a new tool.
|
||||
''' </summary>
|
||||
Public ReadOnly Property HeadModeCommand As ICommand
|
||||
Get
|
||||
If m_cmdHeadMode Is Nothing Then
|
||||
m_cmdHeadMode = New Command(AddressOf HeadMode)
|
||||
End If
|
||||
Return m_cmdHeadMode
|
||||
End Get
|
||||
End Property
|
||||
|
||||
''' <summary>
|
||||
''' Creata the new tool. This method is invoked by the NewCommand.
|
||||
''' </summary>
|
||||
Public Sub HeadMode()
|
||||
' aggiorno lo stato
|
||||
If MySimul.GetMachLook() <> MCH_LOOK.TAB_HEAD Then
|
||||
MySimul.SetMachLook(MCH_LOOK.TAB_HEAD)
|
||||
End If
|
||||
' aggiorno lo stato della macchina e la sua visualizzazione
|
||||
EgtSetMachineLook(MySimul.GetMachLook())
|
||||
EgtDraw()
|
||||
End Sub
|
||||
|
||||
#End Region ' HeadModeCommand
|
||||
|
||||
#Region "MachModeCommand"
|
||||
|
||||
''' <summary>
|
||||
''' Returns a command that create a new tool.
|
||||
''' </summary>
|
||||
Public ReadOnly Property MachModeCommand As ICommand
|
||||
Get
|
||||
If m_cmdMachMode Is Nothing Then
|
||||
m_cmdMachMode = New Command(AddressOf MachMode)
|
||||
End If
|
||||
Return m_cmdMachMode
|
||||
End Get
|
||||
End Property
|
||||
|
||||
''' <summary>
|
||||
''' Creata the new tool. This method is invoked by the NewCommand.
|
||||
''' </summary>
|
||||
Public Sub MachMode()
|
||||
' aggiorno lo stato
|
||||
If MySimul.GetMachLook() <> MCH_LOOK.ALL Then
|
||||
MySimul.SetMachLook(MCH_LOOK.ALL)
|
||||
End If
|
||||
' aggiorno lo stato della macchina e la sua visualizzazione
|
||||
EgtSetMachineLook(MySimul.GetMachLook())
|
||||
EgtDraw()
|
||||
End Sub
|
||||
|
||||
#End Region ' MachModeCommand
|
||||
|
||||
#End Region ' COMMANDS
|
||||
|
||||
End Class
|
||||
|
||||
@@ -616,11 +616,11 @@ Public Class TopPanelVM
|
||||
' { 'X', EgtNumToString( EgtToUiUnits( dPosX), 1)},
|
||||
' { 'Y', EgtNumToString( EgtToUiUnits( dPosY), 1)})
|
||||
|
||||
Dim ChooseReferenceWndVM As New ChooseReferenceWndVM
|
||||
Dim ChooseReferenceWndV As New ChooseReferenceWndV(Application.Current.MainWindow, ChooseReferenceWndVM)
|
||||
If Not ChooseReferenceWndV.ShowDialog() Then Return
|
||||
'Dim ChooseReferenceWndVM As New ChooseReferenceWndVM
|
||||
'Dim ChooseReferenceWndV As New ChooseReferenceWndV(Application.Current.MainWindow, ChooseReferenceWndVM)
|
||||
'If Not ChooseReferenceWndV.ShowDialog() Then Return
|
||||
|
||||
Dim gg = ChooseReferenceWndVM.SelReference
|
||||
'Dim gg = ChooseReferenceWndVM.SelReference
|
||||
'' Aggiungo il box del solido
|
||||
'Dim nBoxId As Integer = EgtSurftmb(nAuxId, b3Solid, False, GDB_RT.GLOB)
|
||||
|
||||
|
||||
@@ -46,6 +46,7 @@
|
||||
<PrintApp:SimulationPanelVM x:Key="SimulationPanelVM"/>
|
||||
<PrintApp:ReferencePanelVM x:Key="ReferencePanelVM"/>
|
||||
<PrintApp:ViewLayerManagerVM x:Key="ViewLayerManagerVM"/>
|
||||
<PrintApp:MachineViewPanelVM x:Key="MachineViewPanelVM"/>
|
||||
<!--<PrintApp:ModifyPartPanelVM x:Key="ModifyPartPanelVM"/>-->
|
||||
<PrintApp:ManagePartPanelVM x:Key="ManagePartPanelVM"/>
|
||||
<!--<EgtBEAMWALL:CALCPanelVM x:Key="CALCPanelVM"/>
|
||||
@@ -378,6 +379,11 @@
|
||||
<Setter Property="Template" Value="{StaticResource Button.HalfRoundButton}"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="SimulationPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
|
||||
<Setter Property="Height" Value="86"/>
|
||||
<Setter Property="Width" Value="86"/>
|
||||
</Style>
|
||||
|
||||
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
||||
|
||||
<!-- ToggleButton Style -->
|
||||
@@ -768,7 +774,7 @@
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
<Setter Property="HorizontalAlignment" Value="Center"/>
|
||||
</Style>
|
||||
|
||||
|
||||
|
||||
<Style x:Key="TSFEditor_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlock}">
|
||||
<Setter Property="HorizontalAlignment" Value="Center"/>
|
||||
@@ -779,12 +785,18 @@
|
||||
<Setter Property="HorizontalAlignment" Value="Left"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
</Style>
|
||||
|
||||
|
||||
<Style x:Key="ControllerInput_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlock}">
|
||||
<Setter Property="HorizontalAlignment" Value="Left"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="Simulation_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlock}">
|
||||
<Setter Property="FontSize" Value="18"/>
|
||||
<Setter Property="HorizontalAlignment" Value="Center"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
</Style>
|
||||
|
||||
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
||||
|
||||
<!-- TextBox -->
|
||||
@@ -800,6 +812,18 @@
|
||||
<Setter Property="ExplicitUpdateSource" Value="EnterKeyPress"/>
|
||||
</Style>
|
||||
|
||||
<Style TargetType="{x:Type EgtWPFLib5:EgtTextBox2}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox2}}">
|
||||
<Setter Property="Height" Value="22"/>
|
||||
<Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
|
||||
<Setter Property="FontWeight" Value="Normal"/>
|
||||
<Setter Property="FontSize" Value="12"/>
|
||||
<Setter Property="Foreground" Value="{StaticResource Icarus_Gray}"/>
|
||||
<Setter Property="VerticalContentAlignment" Value="Center"/>
|
||||
<Setter Property="HorizontalContentAlignment" Value="Right"/>
|
||||
<Setter Property="ExplicitUpdateSource" Value="EnterKeyPress"/>
|
||||
<Setter Property="TextAlignment" Value="Right"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="BaseTextBox" TargetType="{x:Type TextBox}">
|
||||
<Setter Property="Height" Value="22"/>
|
||||
<Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
|
||||
@@ -826,6 +850,9 @@
|
||||
<Style x:Key="OptionTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
|
||||
<Setter Property="Margin" Value="0,0,5,0"/>
|
||||
</Style>
|
||||
<Style x:Key="OptionTextBox2" TargetType="{x:Type EgtWPFLib5:EgtTextBox2}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox2}}">
|
||||
<Setter Property="Margin" Value="0,0,5,0"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="PartParam_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
|
||||
<Setter Property="Width" Value="150"/>
|
||||
@@ -838,8 +865,13 @@
|
||||
<Setter Property="HorizontalContentAlignment" Value="Right"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="LeftPanel_TextBox2" TargetType="{x:Type EgtWPFLib5:EgtTextBox2}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox2}}">
|
||||
<Setter Property="Width" Value="50"/>
|
||||
<Setter Property="VerticalContentAlignment" Value="Center"/>
|
||||
<Setter Property="HorizontalContentAlignment" Value="Right"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="ControllerInputPanel_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource BaseTextBox}">
|
||||
<Setter Property="Height" Value="22"/>
|
||||
<Setter Property="VerticalContentAlignment" Value="Center"/>
|
||||
<Setter Property="HorizontalContentAlignment" Value="Right"/>
|
||||
</Style>
|
||||
@@ -854,6 +886,13 @@
|
||||
<Setter Property="TextAlignment" Value="Center"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="SimulationPanel_Axes_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
|
||||
<Setter Property="FontSize" Value="18"/>
|
||||
<Setter Property="BorderThickness" Value="0"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
<Setter Property="TextAlignment" Value="Center"/>
|
||||
</Style>
|
||||
|
||||
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
||||
|
||||
<!-- Image -->
|
||||
@@ -861,7 +900,13 @@
|
||||
<Style x:Key="Button_Image" TargetType="{x:Type Image}">
|
||||
<Setter Property="Stretch" Value="Uniform" />
|
||||
</Style>
|
||||
|
||||
|
||||
<Style x:Key="SimulationButton_Image" TargetType="{x:Type Image}">
|
||||
<Setter Property="Height" Value="60"/>
|
||||
<Setter Property="Width" Value="60"/>
|
||||
<Setter Property="Stretch" Value="Uniform" />
|
||||
</Style>
|
||||
|
||||
<!--<Style x:Key="ToggleButton_ControlTemplate_Image" TargetType="{x:Type Image}">
|
||||
<Setter Property="Stretch" Value="Uniform" />
|
||||
<Setter Property="Focusable" Value="False" />
|
||||
@@ -1398,6 +1443,15 @@
|
||||
<Setter Property="Padding" Value="0"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="SimulPanel_KeyValue_Border" TargetType="Border">
|
||||
<Setter Property="Background" Value="White" />
|
||||
<Setter Property="BorderThickness" Value="1" />
|
||||
<Setter Property="CornerRadius" Value="4" />
|
||||
<Setter Property="BorderBrush" Value="{StaticResource Icarus_Gray}" />
|
||||
<Setter Property="Padding" Value="4"/>
|
||||
<Setter Property="Margin" Value="0"/>
|
||||
</Style>
|
||||
|
||||
<!--<Style x:Key="ToggleButton_ControlTemplate_Border" TargetType="Border">
|
||||
<Setter Property="CornerRadius" Value="4"/>
|
||||
<Setter Property="Background" Value="{TemplateBinding Background}"/>
|
||||
@@ -1648,7 +1702,7 @@
|
||||
</Trigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
|
||||
|
||||
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
||||
|
||||
<!-- ComboBox -->
|
||||
@@ -2949,9 +3003,9 @@
|
||||
Visibility="Collapsed"/>
|
||||
</Border>
|
||||
<Border x:Name="TrackBackground"
|
||||
Background="{StaticResource SliderThumb.Track.Background}"
|
||||
BorderBrush="{StaticResource SliderThumb.Track.Border}"
|
||||
BorderThickness="1"
|
||||
Background="{DynamicResource SliderThumb.Track.Background}"
|
||||
BorderBrush="{DynamicResource SliderThumb.Track.Border}"
|
||||
BorderThickness="0"
|
||||
Margin="0"
|
||||
Padding="0"
|
||||
Grid.Row="1"
|
||||
|
||||
Reference in New Issue
Block a user