Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 45 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs
index 0f6ab3314..4584d3508 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs
@@ -13,5 +13,50 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         public List<MachineVersion> MachineVersions { get; set; }
 
         public MachineVersion SelectedMachineVersion { get; set; }
+
+        private bool _isNewMachine;
+        public bool IsNewMachine
+        {
+            get { return _isNewMachine; }
+            set { _isNewMachine = value; RaisePropertyChangedAuto(); }
+        }
+
+        private String _serialNumber;
+        public String SerialNumber
+        {
+            get { return _serialNumber; }
+            set { _serialNumber = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+        }
+
+        private String _name;
+        public String Name
+        {
+            get { return _name; }
+            set { _name = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+        }
+
+        private bool _generateDispensers;
+        public bool GenerateDispensers
+        {
+            get { return _generateDispensers; }
+            set { _generateDispensers = value; RaisePropertyChangedAuto(); }
+        }
+
+        private double _dispenserFactor;
+        public double DispenserFactor
+        {
+            get { return _dispenserFactor; }
+            set { _dispenserFactor = value; RaisePropertyChangedAuto(); }
+        }
+
+        public MachineCreationDialogVM() : base()
+        {
+            DispenserFactor = 2.34;
+        }
+
+        protected override bool CanOK()
+        {
+            return base.CanOK() && !String.IsNullOrWhiteSpace(SerialNumber) && !String.IsNullOrWhiteSpace(Name);
+        }
     }
 }