EgtDOORCreator 2.1j1 :
-> ho tolto dalla OptionPage il tab che si riferisce alle dimensioni dell'Hardware e ho ripristinato il bottone nella barra dei comandi della grafica; -> ho sostituito i bottoni "Hardware" e "Door" con due RadioButton, cambiata anche la posizione; -> ho aggiornato le icone "SaveAs" e "HardwarePart".
@@ -172,6 +172,7 @@
|
||||
<Compile Include="HardwarePart\HardwarePartWindowV.xaml.vb">
|
||||
<DependentUpon>HardwarePartWindowV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HardwarePart\HardwarePartWindowVM.vb" />
|
||||
<Compile Include="Launcher\LauncherModule.vb" />
|
||||
<Compile Include="Launcher\LauncherV.xaml.vb">
|
||||
<DependentUpon>LauncherV.xaml</DependentUpon>
|
||||
@@ -434,6 +435,7 @@
|
||||
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
|
||||
</None>
|
||||
<AppDesigner Include="My Project\" />
|
||||
<Content Include="Resources\TopCommandBar\SaveAsTemplate1.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="App.config" />
|
||||
@@ -478,7 +480,7 @@
|
||||
<Resource Include="Resources\AboutBoxImage.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\Template\TemplateDoor .png" />
|
||||
<Resource Include="Resources\Template\TemplateDoor.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\TopCommandBar\X.png" />
|
||||
@@ -586,6 +588,19 @@
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\TopCommandBar\HPart.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\TopCommandBar\SaveAsTemplate.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\Template\HPart1.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\Template\TemplateDoor1.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\TopCommandBar\Save1.png" />
|
||||
<Resource Include="Resources\TopCommandBar\SaveAs1.png" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtDOORCreator\EgtDOORCreatorR32.exe
|
||||
|
||||
@@ -312,6 +312,19 @@
|
||||
<Setter Property="Width" Value="60"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="ModeButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
|
||||
<Setter Property="Background" Value="{StaticResource EgaltechWhite}"/>
|
||||
<Setter Property="Foreground" Value="{StaticResource EgaltechBlue1}"/>
|
||||
<Setter Property="TextBlock.FontWeight" Value="Normal"/>
|
||||
<Setter Property="Height" Value="30"/>
|
||||
<Setter Property="Width" Value="90"/>
|
||||
<Style.Triggers>
|
||||
<Trigger Property="IsChecked" Value="true">
|
||||
<Setter Property="TextBlock.FontWeight" Value="ExtraBold"/>
|
||||
</Trigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
|
||||
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
||||
|
||||
<!-- TextBox Style -->
|
||||
|
||||
@@ -18,7 +18,8 @@
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
|
||||
<!--<RowDefinition Height="1*"/>-->
|
||||
</Grid.RowDefinitions>
|
||||
@@ -28,7 +29,7 @@
|
||||
</Grid.InputBindings>
|
||||
|
||||
<Border BorderBrush="Gainsboro" BorderThickness="1" Grid.Column="2" Grid.ColumnSpan="4"
|
||||
Grid.RowSpan="6" Margin="5,0,5,0" CornerRadius="3"/>
|
||||
Grid.RowSpan="5" Margin="5,0,5,0" CornerRadius="3"/>
|
||||
|
||||
<TextBlock Grid.Column="0" Grid.Row="0" Text="{Binding WidthMsg}" VerticalAlignment="Center"
|
||||
Style="{StaticResource DoorParamsTxBl}"/>
|
||||
@@ -66,7 +67,8 @@
|
||||
Visibility="{Binding MaterialListIsVisible}"
|
||||
Style="{StaticResource DoorParamsCmBx}"/>
|
||||
|
||||
<TextBlock Grid.Column="3" Grid.Row="0" Text="{Binding EdgeTypeMsg}" VerticalAlignment="Center"
|
||||
<TextBlock Grid.Column="3" Grid.Row="0" Text="{Binding EdgeTypeMsg}"
|
||||
Margin="5,0,15,5" VerticalAlignment="Center"
|
||||
Style="{StaticResource DoorParamsTxBl}"/>
|
||||
|
||||
<TextBlock Grid.Column="2" Grid.Row="1" Text="{Binding LockedgeMsg}" VerticalAlignment="Center"
|
||||
@@ -114,18 +116,18 @@
|
||||
<ColumnDefinition Width="1.5*"/>
|
||||
</Grid.ColumnDefinitions>-->
|
||||
|
||||
<!--<Button Grid.Column="3" Grid.Row="5"
|
||||
Content="{Binding OkMsg}"
|
||||
Command="{Binding OkCommand}"
|
||||
<Button Grid.Column="3" Grid.Row="6"
|
||||
Content="{Binding ApplyMsg}"
|
||||
Command="{Binding ApplyCommand}"
|
||||
Margin="5, 5, 15, 5"
|
||||
IsDefault="True"/>-->
|
||||
IsDefault="True"/>
|
||||
|
||||
<!--<Button Grid.Column="3"
|
||||
<Button Grid.Column="2" Grid.Row="6"
|
||||
Content="{Binding CancelMsg}"
|
||||
IsCancel="True"/>-->
|
||||
<!--</Grid>-->
|
||||
Margin="15, 5, 50, 5"
|
||||
IsCancel="True"/>
|
||||
|
||||
</Grid>
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
</UserControl>
|
||||
|
||||
|
||||
@@ -232,7 +232,7 @@ Public Class HardwarePartVM
|
||||
Return "Material"
|
||||
End Get
|
||||
End Property
|
||||
Public ReadOnly Property OkMsg As String
|
||||
Public ReadOnly Property ApplyMsg As String
|
||||
Get
|
||||
Return "Apply"
|
||||
End Get
|
||||
@@ -315,7 +315,7 @@ Public Class HardwarePartVM
|
||||
Map.refHardwarePageVM.GenericPart.SetMaterial( m_SelectedMaterial )
|
||||
End Try
|
||||
If OptionModule.m_MaterialList.Count > 1 then
|
||||
m_MaterialIsVisible = Visibility.Visible
|
||||
m_MaterialListIsVisble = Visibility.Visible
|
||||
NotifyPropertyChanged("MaterialListIsVisible")
|
||||
End If
|
||||
End If
|
||||
|
||||
@@ -7,8 +7,7 @@
|
||||
BorderBrush="{StaticResource EgaltechBlue1}"
|
||||
WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
|
||||
IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
|
||||
CloseCommand="{Binding CloseOptionsCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
|
||||
Height="300" Width="300">
|
||||
CloseCommand="{Binding CloseOptionsCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
|
||||
<Grid>
|
||||
<ContentControl Content="{Binding HardwarePart}"/>
|
||||
</Grid>
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
Public Class HardwarePartWindowVM
|
||||
|
||||
Private m_HardwarePartV As HardwarePartV
|
||||
Private m_HardwarePartVM As HardwarePartVM
|
||||
|
||||
Public ReadOnly Property HardwarePart As ContentControl
|
||||
Get
|
||||
Return m_HardwarePartV
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Sub new (ref_HardwarePartVM As HardwarePartVM)
|
||||
m_HardwarePartVM = ref_HardwarePartVM
|
||||
m_HardwarePartV = New HardwarePartV(m_HardwarePartVM)
|
||||
End Sub
|
||||
End Class
|
||||
@@ -297,6 +297,7 @@
|
||||
</GroupBox>
|
||||
</TabItem>
|
||||
<TabItem Header="{Binding HardwarePartMsg}"
|
||||
Visibility="Collapsed"
|
||||
IsEnabled="{Binding IsEnableHarwarePart}"
|
||||
Content="{Binding HardwarePart}">
|
||||
<!--<GroupBox Header="{Binding General}" Grid.Row="1" Grid.ColumnSpan="4">
|
||||
|
||||
@@ -9,6 +9,8 @@ Public Class OptionsVM
|
||||
' serve per definire l'indirizzo per la guida (senza aggiungere l'estenzione!)
|
||||
Dim m_Chapter As String
|
||||
|
||||
#Region "HARDWARE PART"
|
||||
|
||||
Private m_HardwarePartV As HardwarePartV
|
||||
Private m_HardwarePartVM As HardwarePartVM
|
||||
|
||||
@@ -45,6 +47,8 @@ Public Class OptionsVM
|
||||
End Set
|
||||
End Property
|
||||
|
||||
#End Region ' Hardware_part
|
||||
|
||||
Public ReadOnly Property LanguageList As ObservableCollection(Of Language)
|
||||
Get
|
||||
Return OptionModule.m_LanguageList
|
||||
|
||||
@@ -4,50 +4,72 @@
|
||||
<StackPanel Orientation="Horizontal">
|
||||
|
||||
<!--Barra superiore dei comandi-->
|
||||
<!--nuovo brand-->
|
||||
<Button Command="{Binding NewDirCommand}" ToolTip="{Binding NewDirToolTip}" Focusable="False">
|
||||
<Image Source="/Resources/TopCommandBar/NewDir.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</Button>
|
||||
<!--nuovo template-->
|
||||
<Button Command="{Binding NewCommand}" ToolTip="{Binding NewToolTip}" Focusable="False">
|
||||
<Image Source="/Resources/TopCommandBar/NewFile.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<!--salva-->
|
||||
<Button Command="{Binding SaveCommand}" ToolTip="{Binding SaveToolTip}" Focusable="False">
|
||||
<!--<Image Source="{Binding IsModifiedImage}" Stretch="Uniform"/>-->
|
||||
<Image Source="/Resources/TopCommandBar/Save.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<!--duplica-->
|
||||
<Button Command="{Binding DuplicaCommand}" ToolTip="{Binding DuplicaToolTip}" Focusable="False">
|
||||
<ContentControl>
|
||||
<Image Source="/Resources/TopCommandBar/DuplicaFile.png" Stretch="Uniform" />
|
||||
</ContentControl>
|
||||
</Button>
|
||||
<!--elimina-->
|
||||
<Button Command="{Binding DeleteCommand}" ToolTip="{Binding DeleteToolTip}" Focusable="False"
|
||||
Visibility="{Binding DisableDeleteCommandHM}">
|
||||
<ContentControl>
|
||||
<Image Source="/Resources/TopCommandBar/Delete.png" Stretch="Uniform" />
|
||||
</ContentControl>
|
||||
</Button>
|
||||
<!--Aaggiorna-->
|
||||
<Button Command="{Binding RefreshDirCommand}" ToolTip="{Binding RefreshDirToolTip}" Focusable="False">
|
||||
<Image Source="/Resources/Refresh/RefreshDir.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<!--go back door--><!--
|
||||
<Button Command="{Binding DoorCommand}" ToolTip="{Binding DoorToolTip}" Focusable="False">
|
||||
<ContentControl>
|
||||
<Image Source="/Resources/TopCommandBar/Door.png" Stretch="Uniform" />
|
||||
</ContentControl>
|
||||
</Button>
|
||||
<!--<Button Command="{Binding DimensionCommand}" ToolTip="{Binding DimensionToolTip}" Focusable="False">
|
||||
<ContentControl>
|
||||
<Image Source="/Resources/TopCommandBar/HPart.png" Stretch="Uniform" Width="25" Height="17" RenderTransformOrigin="0.497,0.509" />
|
||||
</ContentControl>
|
||||
</Button>-->
|
||||
<Button Command="{Binding OptionsCommand}" ToolTip="{Binding OptionsToolTip}" Focusable="False">
|
||||
</Button>-->
|
||||
|
||||
<!--<Button Command="{Binding DimensionCommand}" ToolTip="{Binding DimensionToolTip}" Focusable="False">
|
||||
<ContentControl>
|
||||
<Image Source="/Resources/TopCommandBar/HPart.png" Stretch="Uniform" Width="25" Height="17" RenderTransformOrigin="0.497,0.509" />
|
||||
</ContentControl>
|
||||
</Button>-->
|
||||
<!--Opzioni-->
|
||||
<Button Command="{Binding OptionsCommand}" ToolTip="{Binding OptionsToolTip}" Focusable="False">
|
||||
<Image Source="/Resources/TopCommandBar/Options.png" Height="22" />
|
||||
</Button>
|
||||
<!--feed back-->
|
||||
<Button Command="{Binding SendFeedbackCommand}" ToolTip="{Binding SendFeedbackToolTip}" Focusable="False">
|
||||
<Image Source="/Resources/TopCommandBar/Send.png" Height="22" Margin="3,0,3,0" />
|
||||
</Button>
|
||||
<Button Command="{Binding GuideCommand}" ToolTip="{Binding GuideToolTip}" Focusable="False">
|
||||
<!--help-->
|
||||
<Button Command="{Binding GuideCommand}" ToolTip="{Binding GuideToolTip}" Focusable="False">
|
||||
<ContentControl>
|
||||
<Image Source="/Resources/TopCommandBar/Help.png" Stretch="Uniform" />
|
||||
</ContentControl>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
<!--Hardware-->
|
||||
<RadioButton Style="{StaticResource ModeButton}"
|
||||
ToolTip="{Binding HardwareToolTip}"
|
||||
IsChecked="{Binding HardwareIsChecked}"
|
||||
Content="{Binding HardwareToolTip}">
|
||||
</RadioButton>
|
||||
<!--Door-->
|
||||
<RadioButton Style="{StaticResource ModeButton}"
|
||||
Command="{Binding DoorCommand}" ToolTip="{Binding DoorToolTip}"
|
||||
Content="{Binding DoorToolTip}">
|
||||
</RadioButton>
|
||||
</StackPanel>
|
||||
</UserControl>
|
||||
@@ -110,7 +110,13 @@ Public Class ProjectManagerHardwareVM
|
||||
Public ReadOnly Property DoorToolTip As String
|
||||
Get
|
||||
' Door
|
||||
Return EgtMsg(50308)
|
||||
Return EgtMsg(50308).ToUpper
|
||||
End Get
|
||||
End Property
|
||||
Public ReadOnly Property HardwareToolTip As String
|
||||
Get
|
||||
' Hardware
|
||||
Return EgtMsg(50413).ToUpper
|
||||
End Get
|
||||
End Property
|
||||
Public ReadOnly Property NewDirToolTip As String
|
||||
@@ -532,6 +538,7 @@ Public Class ProjectManagerHardwareVM
|
||||
Map.refCompoPanelVM.GoBackVisibility = Visibility.Collapsed
|
||||
Map.refMainWindowVM.ProjectNameMsg = ""
|
||||
End If
|
||||
Map.refRefreshPanelVM.DimensionVisibility = Visibility.Collapsed
|
||||
' elimino i riferimenti all'hardware corrente
|
||||
Map.refHardwarePageVM.CurrHardware = Nothing
|
||||
' spengo il focus su tutti i bottoni
|
||||
@@ -542,11 +549,22 @@ Public Class ProjectManagerHardwareVM
|
||||
ShowDimensionCommand = Visibility.Collapsed
|
||||
' apro l'ultimo progetto
|
||||
LauncherModule.InitLauncherModule()
|
||||
Map.refProjectManagerVM.DoorIsChecked = true
|
||||
Map.refProjectManagerVM.OpenLastProject()
|
||||
Map.refSceneManagerVM.RefreshBtn()
|
||||
CompoMatch.ResetSTU()
|
||||
End Sub
|
||||
|
||||
Private m_HardwareIsChecked As Boolean =True
|
||||
Public Property HardwareIsChecked As Boolean
|
||||
Get
|
||||
Return m_HardwareIsChecked
|
||||
End Get
|
||||
Set(value As Boolean)
|
||||
m_HardwareIsChecked = value
|
||||
NotifyPropertyChanged("HardwareIsChecked")
|
||||
End Set
|
||||
End Property
|
||||
|
||||
#End Region ' LastProject
|
||||
|
||||
|
||||
@@ -37,19 +37,19 @@
|
||||
<Button Command="{Binding SaveCommand}" ToolTip="{Binding SaveToolTip}" Focusable="False">
|
||||
<Image Source="/Resources/TopCommandBar/Save.png" Stretch="Uniform"/>
|
||||
<!--<Image Source="{Binding IsModifiedImage}" Stretch="Uniform"/>-->
|
||||
</Button>
|
||||
</Button>
|
||||
<!--<Button Command="{Binding SaveAsCommand}" ToolTip="{Binding SaveAsToolTip}">
|
||||
<Image Source="/Resources/TopCommandBar/SaveAs.png" Stretch="Uniform"/>
|
||||
</Button>-->
|
||||
<Button Command="{Binding CreateTemplateCommand}" ToolTip="{Binding TemplateDoorToolTip}" Focusable="False"
|
||||
Visibility="{Binding VisibilityTemplate}">
|
||||
<Image Source="/Resources/TopCommandBar/SaveAs.png" Stretch="Uniform"/>
|
||||
</Button>-->
|
||||
<Button Command="{Binding DuplicaCommand}" ToolTip="{Binding DuplicaToolTip}" Focusable="False">
|
||||
<ContentControl>
|
||||
<Image Source="/Resources/TopCommandBar/SaveAs.png" Stretch="Uniform" />
|
||||
</ContentControl>
|
||||
</Button>
|
||||
<Button Command="{Binding DuplicaCommand}" ToolTip="{Binding DuplicaToolTip}" Focusable="False">
|
||||
<Button Command="{Binding CreateTemplateCommand}" ToolTip="{Binding TemplateDoorToolTip}" Focusable="False"
|
||||
Visibility="{Binding VisibilityTemplate}">
|
||||
<ContentControl>
|
||||
<Image Source="/Resources/TopCommandBar/CopyDDF.png" Stretch="Uniform" />
|
||||
<Image Source="/Resources/TopCommandBar/SaveAsTemplate.png" Stretch="Uniform" />
|
||||
</ContentControl>
|
||||
</Button>
|
||||
<Button Command="{Binding CopyCommand}" ToolTip="{Binding CopyToolTip}" Focusable="False">
|
||||
@@ -66,12 +66,13 @@
|
||||
<!--<Button Command="{Binding RefreshDirCommand}" ToolTip="{Binding RefreshDirToolTip}" Focusable="False">
|
||||
<Image Source="/Resources/Refresh/RefreshDir.png" Stretch="Uniform"/>
|
||||
</Button>-->
|
||||
<Button Command="{Binding HardwareCommand}" ToolTip="{Binding HardwareToolTip}" Focusable="False"
|
||||
<!--Hardware-->
|
||||
<!--<Button Command="{Binding HardwareCommand}" ToolTip="{Binding HardwareToolTip}" Focusable="False"
|
||||
Visibility="{Binding DisableHM}">
|
||||
<ContentControl>
|
||||
<Image Source="/Resources/InstrumentPanel/Hardware.png" Stretch="Uniform" />
|
||||
</ContentControl>
|
||||
</Button>
|
||||
</Button>-->
|
||||
<Button Command="{Binding CreateAssemblyCommand}" ToolTip="{Binding CreateAssemblyToolTip}" Focusable="False"
|
||||
Visibility="{Binding VisibilityCreateAssembly}">
|
||||
<ContentControl>
|
||||
@@ -84,10 +85,21 @@
|
||||
<Button Command="{Binding SendFeedbackCommand}" ToolTip="{Binding SendFeedbackToolTip}" Focusable="False">
|
||||
<Image Source="/Resources/TopCommandBar/Send.png" Height="22" Margin="3,0,3,0" />
|
||||
</Button>
|
||||
<Button Command="{Binding GuideCommand}" ToolTip="{Binding GuideToolTip}" Focusable="False">
|
||||
<ContentControl>
|
||||
<Image Source="/Resources/TopCommandBar/Help.png" Stretch="Uniform" />
|
||||
</ContentControl>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
<Button Command="{Binding GuideCommand}" ToolTip="{Binding GuideToolTip}" Focusable="False">
|
||||
<ContentControl>
|
||||
<Image Source="/Resources/TopCommandBar/Help.png" Stretch="Uniform" />
|
||||
</ContentControl>
|
||||
</Button>
|
||||
<!--Hardware-->
|
||||
<RadioButton Style="{StaticResource ModeButton}" Visibility="{Binding DisableHM}"
|
||||
Command="{Binding HardwareCommand}" ToolTip="{Binding HardwareToolTip}"
|
||||
Content="{Binding HardwareToolTip}">
|
||||
</RadioButton>
|
||||
<!--Door-->
|
||||
<RadioButton Style="{StaticResource ModeButton}" Visibility="{Binding DisableHM}"
|
||||
ToolTip="{Binding DoorToolTip}"
|
||||
IsChecked="{Binding DoorIsChecked}"
|
||||
Content="{Binding DoorToolTip}">
|
||||
</RadioButton>
|
||||
</StackPanel>
|
||||
</UserControl>
|
||||
|
||||
@@ -179,7 +179,13 @@ Public Class ProjectManagerVM
|
||||
Public ReadOnly Property HardwareToolTip As String
|
||||
Get
|
||||
' Hardware
|
||||
Return EgtMsg(50413)
|
||||
Return EgtMsg(50413).ToUpper
|
||||
End Get
|
||||
End Property
|
||||
Public ReadOnly Property DoorToolTip As String
|
||||
Get
|
||||
' Door
|
||||
Return EgtMsg(50308).ToUpper
|
||||
End Get
|
||||
End Property
|
||||
|
||||
@@ -1223,8 +1229,20 @@ Public Class ProjectManagerVM
|
||||
CompoMatch.LoadTableGeometry()
|
||||
Map.refHardwareHelpSceneHostV.CleanHelpProject()
|
||||
Map.refRefreshPanelVM.ButtonVisibility = Visibility.Collapsed
|
||||
Map.refRefreshPanelVM.DimensionVisibility = Visibility.Visible
|
||||
Map.refProjectManagerHardwareVM.HardwareIsChecked = True
|
||||
End Sub
|
||||
|
||||
Private m_DoorIsChecked As Boolean =True
|
||||
Public Property DoorIsChecked As Boolean
|
||||
Get
|
||||
Return m_DoorIsChecked
|
||||
End Get
|
||||
Set(value As Boolean)
|
||||
m_DoorIsChecked = value
|
||||
NotifyPropertyChanged("DoorIsChecked")
|
||||
End Set
|
||||
End Property
|
||||
|
||||
#End Region ' Hardware
|
||||
|
||||
|
||||
|
After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 58 KiB |
|
After Width: | Height: | Size: 1.9 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 511 B |
|
After Width: | Height: | Size: 865 B |
|
After Width: | Height: | Size: 603 B |
|
After Width: | Height: | Size: 577 B |
@@ -7,7 +7,7 @@
|
||||
Visibility="{Binding DimensioningPanel_Visibility}">
|
||||
|
||||
<ToggleButton x:Name="HardwareBtn"
|
||||
Style="{StaticResource GridViewPanelToggleButton}"
|
||||
Style="{StaticResource GridViewPanelToggleButton}"
|
||||
ToolTip="{Binding DimensionToolTip}">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Image Source="/Resources/InstrumentPanel/Dimensioning.png"/>
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
<StackPanel Background="Transparent" Orientation="Horizontal">
|
||||
<ToggleButton ToolTip="{Binding GetDistToolTip}" Style="{StaticResource GridViewPanelToggleButton}" IsChecked="{Binding GetDistIsChecked}">
|
||||
<Image Source="/Resources/InstrumentPanel/GetDist.png" Stretch="Uniform"/>
|
||||
</ToggleButton>
|
||||
<Image Source="/Resources/InstrumentPanel/GetDist.png" Stretch="Uniform" Width="25" />
|
||||
</ToggleButton>
|
||||
</StackPanel>
|
||||
|
||||
</UserControl>
|
||||
|
||||
@@ -7,6 +7,12 @@
|
||||
Command="{Binding Refresh_Command}">
|
||||
<Image Source="/Resources/Refresh/Refresh.png" Stretch="Uniform" Height="22"/>
|
||||
</Button>
|
||||
<Button Command="{Binding Dimension_Command}" Visibility="{Binding DimensionVisibility}"
|
||||
ToolTip="{Binding DimensionToolTip}" Focusable="False">
|
||||
<ContentControl>
|
||||
<Image Source="/Resources/Template/TemplateDoor1.png" Stretch="Uniform" Width="25" RenderTransformOrigin="0.497,0.509" />
|
||||
</ContentControl>
|
||||
</Button>
|
||||
<Button Visibility="{Binding ErrorVisibility}"
|
||||
Command="{Binding ShowError_Command}">
|
||||
<Image Source="/Resources/Refresh/Error.png" Stretch="Uniform" Height="22"/>
|
||||
|
||||
@@ -16,6 +16,17 @@ Public Class RefreshPanelVM
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_DimensionVisibility As Visibility = Visibility.Collapsed
|
||||
Public Property DimensionVisibility As Visibility
|
||||
Get
|
||||
Return m_DimensionVisibility
|
||||
End Get
|
||||
Set(value As Visibility)
|
||||
m_DimensionVisibility = value
|
||||
NotifyPropertyChanged("DimensionVisibility")
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_ButtonVisibility As Visibility = Visibility.Collapsed
|
||||
Public Property ButtonVisibility As Visibility
|
||||
Get
|
||||
@@ -104,6 +115,12 @@ Public Class RefreshPanelVM
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public ReadOnly Property DimensionToolTip As String
|
||||
Get
|
||||
Return "Dimension"
|
||||
End Get
|
||||
End Property
|
||||
|
||||
#End Region
|
||||
|
||||
#Region "ToolTip"
|
||||
@@ -118,6 +135,7 @@ Public Class RefreshPanelVM
|
||||
|
||||
Private m_CmdRefresh As ICommand
|
||||
Private m_CmdShowError As ICommand
|
||||
Private m_CmdDimension As ICommand
|
||||
|
||||
Sub New()
|
||||
Map.SetRefRefreshPanelVM(Me)
|
||||
@@ -157,6 +175,28 @@ Public Class RefreshPanelVM
|
||||
|
||||
#End Region ' ShowError
|
||||
|
||||
#Region "DimensionPart"
|
||||
|
||||
Public ReadOnly Property Dimension_Command As ICommand
|
||||
Get
|
||||
If m_CmdDimension Is Nothing Then
|
||||
m_CmdDimension = New Command(AddressOf DimensionBtn)
|
||||
End If
|
||||
Return m_CmdDimension
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub DimensionBtn()
|
||||
Dim HardwarePartWindow As New HardwarePartWindowV
|
||||
HardwarePartWindow.Height = 280
|
||||
HardwarePartWindow.Width = 550
|
||||
HardwarePartWindow.DataContext = New HardwarePartWindowVM(new HardwarePartVM)
|
||||
HardwarePartWindow.Owner = Application.Current.MainWindow
|
||||
HardwarePartWindow.ShowDialog()
|
||||
End Sub
|
||||
|
||||
#End Region ' DimensionPart
|
||||
|
||||
#End Region ' COMMAND
|
||||
|
||||
End Class
|
||||
|
||||