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

OmagOFFICE 2.2c2 :

Browse Source 
- Gestione dei parametri da visualizzare per ciascun utensile del DB Utensile ora è spostata sulla libreria EgtWPFLib5 (come già fatto per Db Lavorazioni)
This commit is contained in:
Renzo Lanza
2020-03-04 11:27:31 +00:00
parent 60994d180b
commit fcf53b9902
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MachinePanel/MachinePanelVM.vb
+10 -4
View File
@@ -143,10 +143,16 @@ Public Class MachinePanelVM
MessageBox.Show(EgtMsg(MSG_TOOLDBERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
Return
End If
Dim ToolDbWindow As New ToolDbWindowV(Application.Current.MainWindow, New ToolDbWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachIniFile, OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx()))
ToolDbWindow.Height = 640
ToolDbWindow.Width = 1024
ToolDbWindow.ShowDialog()
Dim ToolDbWindowVM As New ToolDbWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachIniFile, OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx(), "Stone")
Dim ToolDbWindowV As New ToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
If ToolDbWindowVM.MatType <> 0 Then
ToolDbWindowV.Height = 640
ToolDbWindowV.Width = 1024
ToolDbWindowV.ShowDialog()
Else
Exit Sub
End If
If Not SetUpUtility.IsValidToolHeadExitInSetUp() Then
SetUp_Background = Brushes.Red
My Project/AssemblyInfo.vb
+2 -2
View File
@@ -69,5 +69,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.2.3.1")>
<Assembly: AssemblyFileVersion("2.2.3.1")>
<Assembly: AssemblyVersion("2.2.3.2")>
<Assembly: AssemblyFileVersion("2.2.3.2")>
OmagOFFICE.vbproj
-8
View File
@@ -209,10 +209,6 @@
<Compile Include="MachOptionWindow\MachOptionWindowVM.vb" />
<Compile Include="MySceneHost\MySceneHostVM.vb" />
<Compile Include="MySetUpWindow\MySetUpWindowVM.vb" />
<Compile Include="MyToolDbWindow\MyToolDbWindowV.xaml.vb">
<DependentUpon>MyToolDbWindowV.xaml</DependentUpon>
</Compile>
<Compile Include="MyToolDbWindow\MyToolDbWindowVM.vb" />
<Compile Include="OptionPanel\MachiningTab\MachiningTabV.xaml.vb">
<DependentUpon>MachiningTabV.xaml</DependentUpon>
</Compile>
@@ -373,10 +369,6 @@
<DependentUpon>MainWindowV.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="MyToolDbWindow\MyToolDbWindowV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="OptionPanel\MachiningTab\MachiningTabV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>