Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
1dfe10e93b
8 files changed
+186
-32
No files matched your search
+54
-31
@@ -59,8 +59,8 @@ namespace DyeingComputer.Windows
|
||||
e.Handled = !re.IsMatch(e.Text);
|
||||
}
|
||||
|
||||
private readonly string[] a = {"001","007","008","013","017", "020", "022", "031", "035", "036", "039", "040", "041", "049", "050",
|
||||
"051", "054", "056","064","065","066","067","090","091","093","094" };
|
||||
private readonly string[] a = {"001","007","008","013","015" ,"017", "020", "022", "031", "035", "036", "039", "040", "041", "049", "050",
|
||||
"051", "054", "055", "056","064","065","066","067","090","091","093","094" };
|
||||
|
||||
private void Form1_Load()
|
||||
{
|
||||
@@ -68,6 +68,7 @@ namespace DyeingComputer.Windows
|
||||
this.boxID.Items.Add(Properties.Resources.AddWater + "(" + Properties.Resources.WaterLevel + ")");//水位进水007
|
||||
this.boxID.Items.Add(Properties.Resources.AddWater + "(" + Properties.Resources.Flowmeter + ")");//流量进水008
|
||||
this.boxID.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.WaterLevel + ")");//水位水洗013
|
||||
this.boxID.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.Overflow + ")");//溢流水洗015
|
||||
this.boxID.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.Cooling + ")");//降温水洗017
|
||||
this.boxID.Items.Add(Properties.Resources.Drainage);//排水020
|
||||
this.boxID.Items.Add(Properties.Resources.PumpDrainage);//主泵排水022
|
||||
@@ -80,7 +81,8 @@ namespace DyeingComputer.Windows
|
||||
this.boxID.Items.Add(Properties.Resources.Await);//等待049
|
||||
this.boxID.Items.Add(Properties.Resources.Pressurized);//加压050
|
||||
this.boxID.Items.Add(Properties.Resources.Depressurized);//减压051
|
||||
this.boxID.Items.Add(Properties.Resources.PumpStart);//泵速度054
|
||||
this.boxID.Items.Add(Properties.Resources.Pump + "/"+Properties.Resources.Blower);//泵风机速度054
|
||||
this.boxID.Items.Add(Properties.Resources.PumpStart);//泵启动055
|
||||
this.boxID.Items.Add(Properties.Resources.PumpStops);//泵停止056
|
||||
this.boxID.Items.Add(Properties.Resources.PrepareMedications);//备药064
|
||||
this.boxID.Items.Add(Properties.Resources.AddTheMedicine);//加药065
|
||||
@@ -207,8 +209,8 @@ namespace DyeingComputer.Windows
|
||||
P1N.Text = Properties.Resources.Headwaters;
|
||||
P2N.Text = Properties.Resources.WaterLevel;
|
||||
P3N.Text = Properties.Resources.Time;
|
||||
P4N.Text = Properties.Resources.Target + Properties.Resources.Temperature;
|
||||
P5N.Text = Properties.Resources.Rate;
|
||||
P4N.Text = Properties.Resources.Flowmeter;
|
||||
P5N.Text = Properties.Resources.Target + Properties.Resources.Temperature;
|
||||
P1.Visibility = Visibility.Visible;
|
||||
P1N.Visibility = Visibility.Visible;
|
||||
P2.Visibility = Visibility.Visible;
|
||||
@@ -221,18 +223,21 @@ namespace DyeingComputer.Windows
|
||||
P5N.Visibility = Visibility.Visible;
|
||||
break;
|
||||
case 5:
|
||||
P1N.Text = Properties.Resources.Drainage;
|
||||
P1N.Text = Properties.Resources.Headwaters;
|
||||
P2N.Text = Properties.Resources.WaterLevel;
|
||||
P3N.Text = Properties.Resources.Time;
|
||||
P4N.Text = Properties.Resources.Target + Properties.Resources.Temperature;
|
||||
P5N.Text = Properties.Resources.Rate;
|
||||
P1.Visibility = Visibility.Visible;
|
||||
P1N.Visibility = Visibility.Visible;
|
||||
P2.Visibility = Visibility.Visible;
|
||||
P2N.Visibility = Visibility.Visible;
|
||||
P3.Visibility = Visibility.Collapsed;
|
||||
P3N.Visibility = Visibility.Collapsed;
|
||||
P4.Visibility = Visibility.Collapsed;
|
||||
P4N.Visibility = Visibility.Collapsed;
|
||||
P5.Visibility = Visibility.Collapsed;
|
||||
P5N.Visibility = Visibility.Collapsed;
|
||||
P3.Visibility = Visibility.Visible;
|
||||
P3N.Visibility = Visibility.Visible;
|
||||
P4.Visibility = Visibility.Visible;
|
||||
P4N.Visibility = Visibility.Visible;
|
||||
P5.Visibility = Visibility.Visible;
|
||||
P5N.Visibility = Visibility.Visible;
|
||||
break;
|
||||
case 6:
|
||||
P1N.Text = Properties.Resources.Drainage;
|
||||
@@ -249,11 +254,12 @@ namespace DyeingComputer.Windows
|
||||
P5N.Visibility = Visibility.Collapsed;
|
||||
break;
|
||||
case 7:
|
||||
P1N.Text = Properties.Resources.Time;
|
||||
P1N.Text = Properties.Resources.Drainage;
|
||||
P2N.Text = Properties.Resources.WaterLevel;
|
||||
P1.Visibility = Visibility.Visible;
|
||||
P1N.Visibility = Visibility.Visible;
|
||||
P2.Visibility = Visibility.Collapsed;
|
||||
P2N.Visibility = Visibility.Collapsed;
|
||||
P2.Visibility = Visibility.Visible;
|
||||
P2N.Visibility = Visibility.Visible;
|
||||
P3.Visibility = Visibility.Collapsed;
|
||||
P3N.Visibility = Visibility.Collapsed;
|
||||
P4.Visibility = Visibility.Collapsed;
|
||||
@@ -261,13 +267,12 @@ namespace DyeingComputer.Windows
|
||||
P5.Visibility = Visibility.Collapsed;
|
||||
P5N.Visibility = Visibility.Collapsed;
|
||||
break;
|
||||
case 14:
|
||||
P1N.Text = Properties.Resources.Temperature;
|
||||
P2N.Text = Properties.Resources.Pressure;
|
||||
case 8:
|
||||
P1N.Text = Properties.Resources.Time;
|
||||
P1.Visibility = Visibility.Visible;
|
||||
P1N.Visibility = Visibility.Visible;
|
||||
P2.Visibility = Visibility.Visible;
|
||||
P2N.Visibility = Visibility.Visible;
|
||||
P2.Visibility = Visibility.Collapsed;
|
||||
P2N.Visibility = Visibility.Collapsed;
|
||||
P3.Visibility = Visibility.Collapsed;
|
||||
P3N.Visibility = Visibility.Collapsed;
|
||||
P4.Visibility = Visibility.Collapsed;
|
||||
@@ -290,11 +295,12 @@ namespace DyeingComputer.Windows
|
||||
P5N.Visibility = Visibility.Collapsed;
|
||||
break;
|
||||
case 16:
|
||||
P1N.Text = Properties.Resources.PumpSpeed;
|
||||
P1N.Text = Properties.Resources.Temperature;
|
||||
P2N.Text = Properties.Resources.Pressure;
|
||||
P1.Visibility = Visibility.Visible;
|
||||
P1N.Visibility = Visibility.Visible;
|
||||
P2.Visibility = Visibility.Collapsed;
|
||||
P2N.Visibility = Visibility.Collapsed;
|
||||
P2.Visibility = Visibility.Visible;
|
||||
P2N.Visibility = Visibility.Visible;
|
||||
P3.Visibility = Visibility.Collapsed;
|
||||
P3N.Visibility = Visibility.Collapsed;
|
||||
P4.Visibility = Visibility.Collapsed;
|
||||
@@ -302,7 +308,24 @@ namespace DyeingComputer.Windows
|
||||
P5.Visibility = Visibility.Collapsed;
|
||||
P5N.Visibility = Visibility.Collapsed;
|
||||
break;
|
||||
case 19:
|
||||
case 17:
|
||||
P1N.Text = Properties.Resources.PumpSpeed;
|
||||
P2N.Text = Properties.Resources.Blower;
|
||||
P3N.Text = Properties.Resources.Pressure;
|
||||
P4N.Text = Properties.Resources.Nozzle;
|
||||
P5N.Text = Properties.Resources.Wiggle;
|
||||
P1.Visibility = Visibility.Visible;
|
||||
P1N.Visibility = Visibility.Visible;
|
||||
P2.Visibility = Visibility.Visible;
|
||||
P2N.Visibility = Visibility.Visible;
|
||||
P3.Visibility = Visibility.Visible;
|
||||
P3N.Visibility = Visibility.Visible;
|
||||
P4.Visibility = Visibility.Visible;
|
||||
P4N.Visibility = Visibility.Visible;
|
||||
P5.Visibility = Visibility.Visible;
|
||||
P5N.Visibility = Visibility.Visible;
|
||||
break;
|
||||
case 20:
|
||||
P1N.Text = Properties.Resources.Medicine + Properties.Resources.Tank;
|
||||
P2N.Text = Properties.Resources.Headwaters;
|
||||
P3N.Text = Properties.Resources.WaterLevel;
|
||||
@@ -319,7 +342,7 @@ namespace DyeingComputer.Windows
|
||||
P5.Visibility = Visibility.Visible;
|
||||
P5N.Visibility = Visibility.Visible;
|
||||
break;
|
||||
case 20:
|
||||
case 21:
|
||||
P1N.Text = Properties.Resources.Medicine + Properties.Resources.Tank;
|
||||
P2N.Text = Properties.Resources.Curve;
|
||||
P3N.Text = Properties.Resources.Time;
|
||||
@@ -334,7 +357,7 @@ namespace DyeingComputer.Windows
|
||||
P5.Visibility = Visibility.Collapsed;
|
||||
P5N.Visibility = Visibility.Collapsed;
|
||||
break;
|
||||
case 21:
|
||||
case 22:
|
||||
P1N.Text = Properties.Resources.Medicine + Properties.Resources.Tank;
|
||||
P2N.Text = Properties.Resources.Type;
|
||||
P3N.Text = Properties.Resources.Step;
|
||||
@@ -350,7 +373,7 @@ namespace DyeingComputer.Windows
|
||||
P5.Visibility = Visibility.Collapsed;
|
||||
P5N.Visibility = Visibility.Collapsed;
|
||||
break;
|
||||
case 22:
|
||||
case 23:
|
||||
P1N.Text = Properties.Resources.Medicine + Properties.Resources.Tank;
|
||||
P2N.Text = Properties.Resources.Type;
|
||||
P3N.Text = Properties.Resources.Flowmeter;
|
||||
@@ -365,7 +388,7 @@ namespace DyeingComputer.Windows
|
||||
P5.Visibility = Visibility.Collapsed;
|
||||
P5N.Visibility = Visibility.Collapsed;
|
||||
break;
|
||||
case 23:
|
||||
case 24:
|
||||
P1N.Text = Properties.Resources.Target + Properties.Resources.Temperature;
|
||||
P2N.Text = "PH";
|
||||
P1.Visibility = Visibility.Visible;
|
||||
@@ -379,7 +402,7 @@ namespace DyeingComputer.Windows
|
||||
P5.Visibility = Visibility.Collapsed;
|
||||
P5N.Visibility = Visibility.Collapsed;
|
||||
break;
|
||||
case 24:
|
||||
case 25:
|
||||
P1N.Text = Properties.Resources.Target + Properties.Resources.Temperature;
|
||||
P2N.Text = Properties.Resources.Rate;
|
||||
P3N.Text = "PH";
|
||||
@@ -394,7 +417,7 @@ namespace DyeingComputer.Windows
|
||||
P5.Visibility = Visibility.Collapsed;
|
||||
P5N.Visibility = Visibility.Collapsed;
|
||||
break;
|
||||
case 25:
|
||||
case 26:
|
||||
P1N.Text = Properties.Resources.Time;
|
||||
P1.Visibility = Visibility.Visible;
|
||||
P1N.Visibility = Visibility.Visible;
|
||||
@@ -407,7 +430,7 @@ namespace DyeingComputer.Windows
|
||||
P5.Visibility = Visibility.Collapsed;
|
||||
P5N.Visibility = Visibility.Collapsed;
|
||||
break;
|
||||
case 26:
|
||||
case 27:
|
||||
P1N.Text = Properties.Resources.Beginning+ Properties.Resources.Temperature;
|
||||
P2N.Text = "PH";
|
||||
P1.Visibility = Visibility.Visible;
|
||||
|
||||
Reference in new issue
Block a user