diff --git a/DyeingComputer.csproj b/DyeingComputer.csproj
index 09ebf75..df00ac5 100644
--- a/DyeingComputer.csproj
+++ b/DyeingComputer.csproj
@@ -98,6 +98,9 @@
+
+ TemperatureControl.xaml
+
CurveDiagramView.xaml
@@ -149,6 +152,10 @@
MainWindow.xaml
Code
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -277,7 +284,6 @@
-
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 1cb6ecb..19cf644 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -375,6 +375,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 NO 的本地化字符串。
+ ///
+ public static string NO {
+ get {
+ return ResourceManager.GetString("NO", resourceCulture);
+ }
+ }
+
///
/// 查找类似 NotExecuted 的本地化字符串。
///
@@ -716,5 +725,14 @@ namespace DyeingComputer.Properties {
return ResourceManager.GetString("WorkOrderNumder", resourceCulture);
}
}
+
+ ///
+ /// 查找类似 YES 的本地化字符串。
+ ///
+ public static string YES {
+ get {
+ return ResourceManager.GetString("YES", resourceCulture);
+ }
+ }
}
}
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index 034d5a2..e3083a8 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -336,4 +336,10 @@
Function
+
+ NO
+
+
+ YES
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 4060c5a..2f4a7d8 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -336,4 +336,10 @@
Invalid features
+
+ NO
+
+
+ YES
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index d94000d..5f9e32f 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -336,4 +336,10 @@
功能
+
+ 否
+
+
+ 是
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
index 8bed079..70f2405 100644
--- a/Properties/Resources.zh-TW.resx
+++ b/Properties/Resources.zh-TW.resx
@@ -336,4 +336,10 @@
機能
+
+ 否
+
+
+ 是
+
\ No newline at end of file
diff --git a/ViewWorkstep/TemperatureControl.xaml b/ViewWorkstep/TemperatureControl.xaml
new file mode 100644
index 0000000..f1c2a58
--- /dev/null
+++ b/ViewWorkstep/TemperatureControl.xaml
@@ -0,0 +1,12 @@
+
+
+
+
+
diff --git a/ViewWorkstep/TemperatureControl.xaml.cs b/ViewWorkstep/TemperatureControl.xaml.cs
new file mode 100644
index 0000000..090f16e
--- /dev/null
+++ b/ViewWorkstep/TemperatureControl.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace DyeingComputer.ViewWorkstep
+{
+ ///
+ /// TemperatureControl.xaml 的交互逻辑
+ ///
+ public partial class TemperatureControl : UserControl
+ {
+ public TemperatureControl()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/Windows/InputBox.xaml b/Windows/InputBox.xaml
index a8a5dd9..b8a7ba0 100644
--- a/Windows/InputBox.xaml
+++ b/Windows/InputBox.xaml
@@ -4,6 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:DyeingComputer.Windows"
+ xmlns:lang="clr-namespace:DyeingComputer.Properties"
mc:Ignorable="d"
WindowStartupLocation="CenterScreen"
ResizeMode ="NoResize"
@@ -12,7 +13,7 @@
-
-
+
+
diff --git a/Windows/ViewStep.xaml b/Windows/ViewStep.xaml
index 9318de3..77c71ae 100644
--- a/Windows/ViewStep.xaml
+++ b/Windows/ViewStep.xaml
@@ -8,15 +8,32 @@
mc:Ignorable="d"
WindowStartupLocation="CenterScreen"
ResizeMode="NoResize"
- Title="SUNLIGHT 800" Height="450" Width="400">
+ Title="SUNLIGHT 800" Height="400" Width="400">
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Windows/ViewStep.xaml.cs b/Windows/ViewStep.xaml.cs
index 2bc8528..670f95c 100644
--- a/Windows/ViewStep.xaml.cs
+++ b/Windows/ViewStep.xaml.cs
@@ -94,5 +94,15 @@ namespace DyeingComputer.Windows
boxNAME.Text = a.ElementAt(i);
}
}
+
+ private void YES_Click(object sender, RoutedEventArgs e)
+ {
+
+ }
+
+ private void NO_Click(object sender, RoutedEventArgs e)
+ {
+ this.Close(); //关闭窗口
+ }
}
}