Merge branch 'master' of http://private.flyautomation.net:82/panruising/thick_public

Project.FLY.FlyADBase/FLY.Simulation.Coating/HMI.cs

@@ -21,6 +21,7 @@ namespace FLY.Simulation.Coating
         const UInt16 ADDR_D_FilmVelocity=6;//float
         const UInt16 ADDR_C_STATE = 0;//涂布状态 bit 0
 
+        const UInt16 ADDR_C_OK = 2;//设置 0->1 设置
 
         CoatingCtrl mCoatingCtrl;
 
@@ -109,6 +110,7 @@ namespace FLY.Simulation.Coating
             }
         }
 
+
         public double FilmVelocity
         {
             get
@@ -143,6 +145,21 @@ namespace FLY.Simulation.Coating
             }
         }
 
+        public bool OK
+        {
+            get
+            {
+                return mPLCRegister.GetBool(ADDR_C_OK);
+            }
+            set
+            {
+                if (OK != value)
+                {
+                    mPLCRegister.SetBool(ADDR_C_OK, value);
+                    NotifyPropertyChanged("OK");
+                }
+            }
+        }
         public HMI(Coating coating, CoatingCtrl cc, int port)
         {
             mCoatingCtrl = cc;
@@ -158,6 +175,9 @@ namespace FLY.Simulation.Coating
             Addrs.Add(ADDR_D_RightSet, "RightSet");
             Addrs.Add(ADDR_D_Right, "Right");
             Addrs.Add(ADDR_D_FilmVelocity, "FilmVelocity");
+            Addrs.Add(ADDR_C_OK, "OK");
+
+
 
             Misc.BindingOperations.SetBinding(cc.NowCtrl, "Pump", this, "PumpSet", Misc.BindingOperations.BindingMode.TwoWay);
             Misc.BindingOperations.SetBinding(cc.NowCtrl, "LeftDis", this, "Left");
@@ -169,13 +189,19 @@ namespace FLY.Simulation.Coating
             LeftSet = Left;
             RightSet = Right;
             this.PropertyChanged += new PropertyChangedEventHandler(HMI_PropertyChanged);
+
+            
         }
 
         void HMI_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if ((e.PropertyName == "PumpSet") || (e.PropertyName == "LeftSet") || (e.PropertyName == "RightSet"))
+
+            if (e.PropertyName == "OK")
             {
-                mCoatingCtrl.SetCoatingCtrl(PumpSet, LeftSet, RightSet);
+                if (OK == true)
+                {
+                    mCoatingCtrl.SetCoatingCtrl(PumpSet, LeftSet, RightSet);
+                }
             }
         }