EgtDOORCreato 2.1c2 :

-> aggiunta della pulsante Dimensioni per modificare le dimensioni dell'anta nell'HardwareManager.
This commit is contained in:
Nicola Pievani
2019-03-26 18:54:48 +00:00
parent 2f3f50182a
commit a3cf7ca6c8
4 changed files with 52 additions and 9 deletions
+11
View File
@@ -157,6 +157,9 @@
<Compile Include="HardwareGeometry\GeomtryListConfigV.xaml.vb">
<DependentUpon>GeomtryListConfigV.xaml</DependentUpon>
</Compile>
<Compile Include="HardwarePart\HardwarePartV.xaml.vb">
<DependentUpon>HardwarePartV.xaml</DependentUpon>
</Compile>
<Compile Include="HardwareManager\Hardware.vb" />
<Compile Include="HardwareManager\HardwarePageVM.vb" />
<Compile Include="HardwareManager\HardwarePageV.xaml.vb">
@@ -165,6 +168,7 @@
<Compile Include="HardwareManager\HardwareHelpSceneHostV.xaml.vb">
<DependentUpon>HardwareHelpSceneHostV.xaml</DependentUpon>
</Compile>
<Compile Include="HardwarePart\HardwarePartVM.vb" />
<Compile Include="Launcher\LauncherModule.vb" />
<Compile Include="Launcher\LauncherV.xaml.vb">
<DependentUpon>LauncherV.xaml</DependentUpon>
@@ -270,6 +274,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="HardwarePart\HardwarePartV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="HardwareManager\HardwarePageV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -568,6 +576,9 @@
<ItemGroup>
<Resource Include="Resources\TopCommandBar\IsModify.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\TopCommandBar\HPart.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtDOORCreator\EgtDOORCreatorR32.exe
+2 -2
View File
@@ -72,5 +72,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.1.3.1")>
<Assembly: AssemblyFileVersion("2.1.3.1")>
<Assembly: AssemblyVersion("2.1.3.2")>
<Assembly: AssemblyFileVersion("2.1.3.2")>
+12 -7
View File
@@ -33,16 +33,21 @@
<Image Source="/Resources/TopCommandBar/Door.png" Stretch="Uniform" />
</ContentControl>
</Button>
<Button Command="{Binding OptionsCommand}" ToolTip="{Binding OptionsToolTip}" Focusable="False">
<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">
<Image Source="/Resources/TopCommandBar/Options.png" Height="22" />
</Button>
<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>
</StackPanel>
</UserControl>
@@ -60,6 +60,7 @@ Public Class ProjectManagerHardwareVM
Private m_cmdGuide As ICommand
Private m_cmdDuplica As ICommand
Private m_cmdDoor As ICommand
Private m_cmdDimensionPart As ICommand
#Region "ToolTip"
@@ -118,6 +119,12 @@ Public Class ProjectManagerHardwareVM
Return EgtMsg(50419)
End Get
End Property
Public ReadOnly Property DimensionToolTip As String
Get
' New Directory
Return EgtMsg(50418)
End Get
End Property
Public ReadOnly Property RefreshDirToolTip As String
Get
@@ -543,6 +550,26 @@ Public Class ProjectManagerHardwareVM
#End Region ' LastProject
#Region "Dimension Part"
Public ReadOnly Property DimensionCommand As ICommand
Get
If m_cmdDimensionPart Is Nothing Then
m_cmdDimensionPart = New Command(AddressOf Dimension)
End If
Return m_cmdDimensionPart
End Get
End Property
Public Sub Dimension()
Dim ref_HardwarePartVM As New HardwarePartVM()
Dim HardwarePartWnd As New HardwarePartV(Application.Current.MainWindow, ref_HardwarePartVM)
HardwarePartWnd.ShowDialog()
ref_GeometryListConfigVM = Nothing
End Sub
#End Region ' Dimension Part
#End Region ' Commands
Public Event PropertyChanged As PropertyChangedEventHandler Implements INotifyPropertyChanged.PropertyChanged