aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician
diff options
context:
space:
mode:
authorRoy <roy.mail.net@gmail.com>2018-02-11 21:46:22 +0200
committerRoy <roy.mail.net@gmail.com>2018-02-11 21:46:22 +0200
commita84ca3e4bee123600c08f8897eca5be83b3ffcf8 (patch)
treecccdce1734f55c0647b5c19c1fcc733be92ddbf6 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician
parenta801f688bde7b6c75f47ca4ebd2991271c521d34 (diff)
downloadTango-a84ca3e4bee123600c08f8897eca5be83b3ffcf8.tar.gz
Tango-a84ca3e4bee123600c08f8897eca5be83b3ffcf8.zip
Added TechView for Developer..
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs25
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml4
2 files changed, 23 insertions, 6 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index e3cbb61cd..d87652e42 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -1,4 +1,5 @@
-using Google.Protobuf.Collections;
+using GalaSoft.MvvmLight.Ioc;
+using Google.Protobuf.Collections;
using Microsoft.Win32;
using RealTimeGraphEx.Controllers;
using System;
@@ -98,6 +99,16 @@ namespace Tango.MachineStudio.Technician.ViewModels
set { _disableRendering = value; RaisePropertyChangedAuto(); OnDisableRenderingChanged(); }
}
+ private bool _hideMenu;
+ /// <summary>
+ /// Gets or sets a value indicating whether [hide menu].
+ /// </summary>
+ public bool HideMenu
+ {
+ get { return _hideMenu; }
+ set { _hideMenu = value; RaisePropertyChangedAuto(); }
+ }
+
#endregion
#region Commands
@@ -112,7 +123,13 @@ namespace Tango.MachineStudio.Technician.ViewModels
#region Constructors
- public MachineTechViewVM(IStudioApplicationManager applicationManager, INotificationProvider notificationProvider)
+ [PreferredConstructor]
+ public MachineTechViewVM(IStudioApplicationManager applicationManager, INotificationProvider notificationProvider) : this(applicationManager, notificationProvider, true)
+ {
+
+ }
+
+ public MachineTechViewVM(IStudioApplicationManager applicationManager, INotificationProvider notificationProvider, bool loadLastProject)
{
_notification = notificationProvider;
_singleControllers = new Dictionary<SingleGraphItem, GraphController>();
@@ -132,7 +149,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
_lastTechProjectFile = SettingsManager.Default.MachineStudio.TechnicianModule.LasTechProjectFile;
- if (File.Exists(_lastTechProjectFile))
+ if (File.Exists(_lastTechProjectFile) && loadLastProject)
{
OpenProjectFile(_lastTechProjectFile);
}
@@ -703,7 +720,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
await MachineOperator.StopThreadJogging(new ThreadAbortJoggingRequest());
}
};
- }
+ }
#endregion
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
index 3ad0330a8..7042be696 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
@@ -19,7 +19,7 @@
d:DesignHeight="720" d:DesignWidth="1280" d:DataContext="{d:DesignInstance Type=vm:MachineTechViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MachineTechViewVM}">
<UserControl.Resources>
- <ResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Resources/MaterialDesign.xaml"></ResourceDictionary>
+ <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" />
</UserControl.Resources>
<Grid>
@@ -35,7 +35,7 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
- <Menu Padding="5" Background="#C6ECECEC">
+ <Menu Padding="5" Background="#C6ECECEC" Visibility="{Binding HideMenu,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
<MenuItem Header="File">
<MenuItem Command="{Binding OpenProjectCommand}" MinWidth="180" Header="Open" VerticalContentAlignment="Center">
<MenuItem.Icon>