Skip to content

刘韬 / IonicContaminationTest

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 79a23313 由 刘韬
选项

1

1 个父辈 d69b7023
全部展开
内嵌 并排
正在显示 20 个修改的文件 包含 94 行增加 和 54 行删除
AGauge/AGaugeApp.csproj
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation> <UpgradeBackupLocation>
</UpgradeBackupLocation> </UpgradeBackupLocation>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion> <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl> <PublishUrl>publish\</PublishUrl>
<Install>true</Install> <Install>true</Install>
<InstallFrom>Disk</InstallFrom> <InstallFrom>Disk</InstallFrom>
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<IsWebBootstrapper>false</IsWebBootstrapper> <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
......
AGauge/Properties/Resources.Designer.cs
...@@ -19,7 +19,7 @@ namespace AGaugeApp.Properties { ...@@ -19,7 +19,7 @@ namespace AGaugeApp.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
...@@ -47,8 +47,8 @@ namespace AGaugeApp.Properties { ...@@ -47,8 +47,8 @@ namespace AGaugeApp.Properties {
} }
/// <summary> /// <summary>
/// 使用此强类型资源类，为所有资源查找 /// 重写当前线程的 CurrentUICulture 属性，对
/// 重写当前线程的 CurrentUICulture 属性。 /// 使用此强类型资源类的所有资源查找执行重写。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture { internal static global::System.Globalization.CultureInfo Culture {
......
AGauge/Properties/Settings.Designer.cs
...@@ -12,7 +12,7 @@ namespace AGaugeApp.Properties { ...@@ -12,7 +12,7 @@ namespace AGaugeApp.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
App/FrmTestResult.cs
此文件类型无法预览
App/MetroProduct.Designer.cs
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
this.productPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.productPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.productPanel.Name = "productPanel"; this.productPanel.Name = "productPanel";
this.productPanel.Padding = new System.Windows.Forms.Padding(0, 4, 0, 0); this.productPanel.Padding = new System.Windows.Forms.Padding(0, 4, 0, 0);
this.productPanel.Size = new System.Drawing.Size(877, 655); this.productPanel.Size = new System.Drawing.Size(1066, 655);
this.productPanel.TabIndex = 0; this.productPanel.TabIndex = 0;
// //
// groupBox5 // groupBox5
...@@ -279,11 +279,11 @@ ...@@ -279,11 +279,11 @@
this.areaTextBox.BackColor = System.Drawing.Color.LightGray; this.areaTextBox.BackColor = System.Drawing.Color.LightGray;
this.areaTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; this.areaTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.areaTextBox.Font = new System.Drawing.Font("微软雅黑", 12F); this.areaTextBox.Font = new System.Drawing.Font("微软雅黑", 12F);
this.areaTextBox.Location = new System.Drawing.Point(509, 551); this.areaTextBox.Location = new System.Drawing.Point(649, 551);
this.areaTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.areaTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.areaTextBox.Name = "areaTextBox"; this.areaTextBox.Name = "areaTextBox";
this.areaTextBox.ReadOnly = true; this.areaTextBox.ReadOnly = true;
this.areaTextBox.Size = new System.Drawing.Size(71, 22); this.areaTextBox.Size = new System.Drawing.Size(120, 22);
this.areaTextBox.TabIndex = 39; this.areaTextBox.TabIndex = 39;
// //
// areaUnitLabel // areaUnitLabel
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
this.areaUnitLabel.AutoSize = true; this.areaUnitLabel.AutoSize = true;
this.areaUnitLabel.BackColor = System.Drawing.Color.Transparent; this.areaUnitLabel.BackColor = System.Drawing.Color.Transparent;
this.areaUnitLabel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.areaUnitLabel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.areaUnitLabel.Location = new System.Drawing.Point(588, 552); this.areaUnitLabel.Location = new System.Drawing.Point(777, 552);
this.areaUnitLabel.Name = "areaUnitLabel"; this.areaUnitLabel.Name = "areaUnitLabel";
this.areaUnitLabel.Size = new System.Drawing.Size(35, 20); this.areaUnitLabel.Size = new System.Drawing.Size(35, 20);
this.areaUnitLabel.TabIndex = 40; this.areaUnitLabel.TabIndex = 40;
...@@ -305,7 +305,7 @@ ...@@ -305,7 +305,7 @@
this.waterHighUnitLabel.AutoSize = true; this.waterHighUnitLabel.AutoSize = true;
this.waterHighUnitLabel.BackColor = System.Drawing.Color.Transparent; this.waterHighUnitLabel.BackColor = System.Drawing.Color.Transparent;
this.waterHighUnitLabel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.waterHighUnitLabel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.waterHighUnitLabel.Location = new System.Drawing.Point(588, 605); this.waterHighUnitLabel.Location = new System.Drawing.Point(777, 605);
this.waterHighUnitLabel.Name = "waterHighUnitLabel"; this.waterHighUnitLabel.Name = "waterHighUnitLabel";
this.waterHighUnitLabel.Size = new System.Drawing.Size(29, 20); this.waterHighUnitLabel.Size = new System.Drawing.Size(29, 20);
this.waterHighUnitLabel.TabIndex = 41; this.waterHighUnitLabel.TabIndex = 41;
...@@ -320,7 +320,7 @@ ...@@ -320,7 +320,7 @@
this.saveBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.saveBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.saveBtn.FlatAppearance.BorderSize = 0; this.saveBtn.FlatAppearance.BorderSize = 0;
this.saveBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.saveBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.saveBtn.Location = new System.Drawing.Point(758, 548); this.saveBtn.Location = new System.Drawing.Point(947, 548);
this.saveBtn.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.saveBtn.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.saveBtn.Name = "saveBtn"; this.saveBtn.Name = "saveBtn";
this.saveBtn.Size = new System.Drawing.Size(85, 37); this.saveBtn.Size = new System.Drawing.Size(85, 37);
...@@ -335,7 +335,7 @@ ...@@ -335,7 +335,7 @@
this.saveAsBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.saveAsBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.saveAsBtn.FlatAppearance.BorderSize = 0; this.saveAsBtn.FlatAppearance.BorderSize = 0;
this.saveAsBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.saveAsBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.saveAsBtn.Location = new System.Drawing.Point(658, 598); this.saveAsBtn.Location = new System.Drawing.Point(847, 598);
this.saveAsBtn.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.saveAsBtn.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.saveAsBtn.Name = "saveAsBtn"; this.saveAsBtn.Name = "saveAsBtn";
this.saveAsBtn.Size = new System.Drawing.Size(85, 37); this.saveAsBtn.Size = new System.Drawing.Size(85, 37);
...@@ -351,7 +351,7 @@ ...@@ -351,7 +351,7 @@
this.deleteBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.deleteBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.deleteBtn.FlatAppearance.BorderSize = 0; this.deleteBtn.FlatAppearance.BorderSize = 0;
this.deleteBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.deleteBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.deleteBtn.Location = new System.Drawing.Point(758, 598); this.deleteBtn.Location = new System.Drawing.Point(947, 598);
this.deleteBtn.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.deleteBtn.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.deleteBtn.Name = "deleteBtn"; this.deleteBtn.Name = "deleteBtn";
this.deleteBtn.Size = new System.Drawing.Size(85, 37); this.deleteBtn.Size = new System.Drawing.Size(85, 37);
...@@ -367,7 +367,7 @@ ...@@ -367,7 +367,7 @@
this.btn_Choose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.btn_Choose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.btn_Choose.FlatAppearance.BorderSize = 0; this.btn_Choose.FlatAppearance.BorderSize = 0;
this.btn_Choose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_Choose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_Choose.Location = new System.Drawing.Point(658, 548); this.btn_Choose.Location = new System.Drawing.Point(847, 548);
this.btn_Choose.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_Choose.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btn_Choose.Name = "btn_Choose"; this.btn_Choose.Name = "btn_Choose";
this.btn_Choose.Size = new System.Drawing.Size(85, 37); this.btn_Choose.Size = new System.Drawing.Size(85, 37);
...@@ -384,7 +384,7 @@ ...@@ -384,7 +384,7 @@
this.pb.Location = new System.Drawing.Point(582, 35); this.pb.Location = new System.Drawing.Point(582, 35);
this.pb.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pb.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pb.Name = "pb"; this.pb.Name = "pb";
this.pb.Size = new System.Drawing.Size(266, 469); this.pb.Size = new System.Drawing.Size(455, 469);
this.pb.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pb.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pb.TabIndex = 38; this.pb.TabIndex = 38;
this.pb.TabStop = false; this.pb.TabStop = false;
...@@ -784,7 +784,7 @@ ...@@ -784,7 +784,7 @@
this.productPictureBox.Location = new System.Drawing.Point(565, 18); this.productPictureBox.Location = new System.Drawing.Point(565, 18);
this.productPictureBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.productPictureBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.productPictureBox.Name = "productPictureBox"; this.productPictureBox.Name = "productPictureBox";
this.productPictureBox.Size = new System.Drawing.Size(298, 503); this.productPictureBox.Size = new System.Drawing.Size(487, 503);
this.productPictureBox.TabIndex = 6; this.productPictureBox.TabIndex = 6;
this.productPictureBox.TabStop = false; this.productPictureBox.TabStop = false;
// //
...@@ -794,7 +794,7 @@ ...@@ -794,7 +794,7 @@
this.areaLabel.AutoSize = true; this.areaLabel.AutoSize = true;
this.areaLabel.BackColor = System.Drawing.Color.Transparent; this.areaLabel.BackColor = System.Drawing.Color.Transparent;
this.areaLabel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.areaLabel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.areaLabel.Location = new System.Drawing.Point(464, 552); this.areaLabel.Location = new System.Drawing.Point(606, 551);
this.areaLabel.Name = "areaLabel"; this.areaLabel.Name = "areaLabel";
this.areaLabel.Size = new System.Drawing.Size(37, 20); this.areaLabel.Size = new System.Drawing.Size(37, 20);
this.areaLabel.TabIndex = 26; this.areaLabel.TabIndex = 26;
...@@ -807,11 +807,11 @@ ...@@ -807,11 +807,11 @@
this.waterHighBox.BackColor = System.Drawing.Color.LightGray; this.waterHighBox.BackColor = System.Drawing.Color.LightGray;
this.waterHighBox.BorderStyle = System.Windows.Forms.BorderStyle.None; this.waterHighBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.waterHighBox.Font = new System.Drawing.Font("微软雅黑", 12F); this.waterHighBox.Font = new System.Drawing.Font("微软雅黑", 12F);
this.waterHighBox.Location = new System.Drawing.Point(509, 604); this.waterHighBox.Location = new System.Drawing.Point(649, 604);
this.waterHighBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.waterHighBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.waterHighBox.Name = "waterHighBox"; this.waterHighBox.Name = "waterHighBox";
this.waterHighBox.ReadOnly = true; this.waterHighBox.ReadOnly = true;
this.waterHighBox.Size = new System.Drawing.Size(71, 22); this.waterHighBox.Size = new System.Drawing.Size(120, 22);
this.waterHighBox.TabIndex = 29; this.waterHighBox.TabIndex = 29;
this.waterHighBox.Visible = false; this.waterHighBox.Visible = false;
// //
...@@ -821,7 +821,7 @@ ...@@ -821,7 +821,7 @@
this.waterHighLabel.AutoSize = true; this.waterHighLabel.AutoSize = true;
this.waterHighLabel.BackColor = System.Drawing.Color.Transparent; this.waterHighLabel.BackColor = System.Drawing.Color.Transparent;
this.waterHighLabel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.waterHighLabel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.waterHighLabel.Location = new System.Drawing.Point(408, 605); this.waterHighLabel.Location = new System.Drawing.Point(550, 604);
this.waterHighLabel.Name = "waterHighLabel"; this.waterHighLabel.Name = "waterHighLabel";
this.waterHighLabel.Size = new System.Drawing.Size(93, 20); this.waterHighLabel.Size = new System.Drawing.Size(93, 20);
this.waterHighLabel.TabIndex = 30; this.waterHighLabel.TabIndex = 30;
...@@ -834,7 +834,7 @@ ...@@ -834,7 +834,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScroll = true; this.AutoScroll = true;
this.ClientSize = new System.Drawing.Size(892, 721); this.ClientSize = new System.Drawing.Size(1081, 721);
this.Controls.Add(this.productPanel); this.Controls.Add(this.productPanel);
this.Location = new System.Drawing.Point(0, 0); this.Location = new System.Drawing.Point(0, 0);
this.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6); this.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6);
......
App/MetroProduct.cs
...@@ -371,7 +371,18 @@ namespace App ...@@ -371,7 +371,18 @@ namespace App
m_ParaProduct = product[index][0]; m_ParaProduct = product[index][0];
lengthTextBox.Text = product[index][1]; lengthTextBox.Text = product[index][1];
widthTextBox.Text = product[index][2]; widthTextBox.Text = product[index][2];
areaTextBox.Text = product[index][3]; double m_Length = 0;
double m_Width = 0;
if (!("").Equals(lengthTextBox.Text.Trim()))
{
m_Length = double.Parse(lengthTextBox.Text.Trim());
}
if (!("").Equals(widthTextBox.Text.Trim()))
{
m_Width = double.Parse(widthTextBox.Text.Trim());
}
areaTextBox.Text = (m_Length * m_Width).ToString("#0.00") + "x2=" + (m_Length * m_Width * 2).ToString("#0.00");
waterHighBox.Text = product[index][4]; waterHighBox.Text = product[index][4];
testTimeTextBox.Text = product[index][5]; testTimeTextBox.Text = product[index][5];
...@@ -648,7 +659,7 @@ namespace App ...@@ -648,7 +659,7 @@ namespace App
{ {
m_Width = double.Parse(widthTextBox.Text.Trim()); m_Width = double.Parse(widthTextBox.Text.Trim());
} }
areaTextBox.Text = (m_Length * m_Width).ToString("#0.00"); areaTextBox.Text = (m_Length * m_Width).ToString("#0.00")+"x2="+ (m_Length * m_Width*2).ToString("#0.00");
double pb_Height; double pb_Height;
double pb_Width; double pb_Width;
...@@ -808,7 +819,17 @@ Const.MESSAGEBOX_TITLE_NOTE, "", Const.ERROR_NUM_OVER0); ...@@ -808,7 +819,17 @@ Const.MESSAGEBOX_TITLE_NOTE, "", Const.ERROR_NUM_OVER0);
m_ParaProduct = pn; //产品 m_ParaProduct = pn; //产品
m_ParaProductL = fuction.ChangeLUnit(lengthTextBox.Text); //产品长度 m_ParaProductL = fuction.ChangeLUnit(lengthTextBox.Text); //产品长度
m_ParaProductW = fuction.ChangeLUnit(widthTextBox.Text); //产品宽度 m_ParaProductW = fuction.ChangeLUnit(widthTextBox.Text); //产品宽度
m_ParaProductArea = fuction.ChangeAreaUnit(areaTextBox.Text); //产品面积 double m_Length = 0;
double m_Width = 0;
if (!("").Equals(lengthTextBox.Text.Trim()))
{
m_Length = double.Parse(lengthTextBox.Text.Trim());
}
if (!("").Equals(widthTextBox.Text.Trim()))
{
m_Width = double.Parse(widthTextBox.Text.Trim());
}
m_ParaProductArea = fuction.ChangeAreaUnit((m_Length* m_Width).ToString("#0.00")); //产品面积
m_ParaSuggest = fuction.ChangeLUnit(waterHighBox.Text); //建议进水高度 m_ParaSuggest = fuction.ChangeLUnit(waterHighBox.Text); //建议进水高度
m_ParaTestTime = fuction.ChangeTimeUnit(testTimeTextBox.Text); //测试时间 m_ParaTestTime = fuction.ChangeTimeUnit(testTimeTextBox.Text); //测试时间
m_ParaNotes = this.txtNotes.Text;//产品备注 m_ParaNotes = this.txtNotes.Text;//产品备注
...@@ -987,7 +1008,17 @@ Const.MESSAGEBOX_TITLE_NOTE, "", Const.ERROR_NUM_OVER0); ...@@ -987,7 +1008,17 @@ Const.MESSAGEBOX_TITLE_NOTE, "", Const.ERROR_NUM_OVER0);
m_ParaProduct = productNameComboBox.Text; //产品 m_ParaProduct = productNameComboBox.Text; //产品
m_ParaProductL = fuction.ChangeLUnit(lengthTextBox.Text); //产品长度 m_ParaProductL = fuction.ChangeLUnit(lengthTextBox.Text); //产品长度
m_ParaProductW = fuction.ChangeLUnit(widthTextBox.Text); //产品宽度 m_ParaProductW = fuction.ChangeLUnit(widthTextBox.Text); //产品宽度
m_ParaProductArea = fuction.ChangeAreaUnit(areaTextBox.Text); //产品面积 double m_Length = 0;
double m_Width = 0;
if (!("").Equals(lengthTextBox.Text.Trim()))
{
m_Length = double.Parse(lengthTextBox.Text.Trim());
}
if (!("").Equals(widthTextBox.Text.Trim()))
{
m_Width = double.Parse(widthTextBox.Text.Trim());
}
m_ParaProductArea = fuction.ChangeAreaUnit((m_Length * m_Width).ToString("#0.00")); //产品面积
m_ParaSuggest = fuction.ChangeLUnit(waterHighBox.Text); //建议进水高度 m_ParaSuggest = fuction.ChangeLUnit(waterHighBox.Text); //建议进水高度
m_ParaTestTime = fuction.ChangeTimeUnit(testTimeTextBox.Text); //测试时间 m_ParaTestTime = fuction.ChangeTimeUnit(testTimeTextBox.Text); //测试时间
m_ParaNotes = this.txtNotes.Text;//产品备注 m_ParaNotes = this.txtNotes.Text;//产品备注
......
App/MetroTestResult.cs
...@@ -133,7 +133,7 @@ namespace App ...@@ -133,7 +133,7 @@ namespace App
} }
catch (Exception ex) catch (Exception ex)
{ {
LOGGER.Debug(ex.StackTrace); LOGGER.Debug(ex.ToString());
} }
} }
/** /**
......
App/NewCode/FrmAdjustQuotiety2.cs
...@@ -100,7 +100,7 @@ namespace App ...@@ -100,7 +100,7 @@ namespace App
this.lblECValue2.Text = getMsg("Value"); this.lblECValue2.Text = getMsg("Value");
this.lblMachineModel.Text = getMsg("MachineModel"); this.lblMachineModel.Text = getMsg("MachineModel");
this.lblSerialNumber.Text = getMsg("SerialNumber"); this.lblSerialNumber.Text = getMsg("SerialNumber");
//this.lblCalibrationDate.Text = getMsg("CalibrationDate"); this.lblCalibrationDate.Text = getMsg("CalibrationDate");
this.lbl_WashUpperLimitUnit.Text = "M.OHM"; this.lbl_WashUpperLimitUnit.Text = "M.OHM";
...@@ -145,15 +145,15 @@ namespace App ...@@ -145,15 +145,15 @@ namespace App
txtMachineModel.Text = fuction.GetParameterByParaName(Const.PARA_MachineModel, "currency");//设备型号 txtMachineModel.Text = fuction.GetParameterByParaName(Const.PARA_MachineModel, "currency");//设备型号
txtSerialNumber.Text = fuction.GetParameterByParaName(Const.PARA_SERIALNUMBER, "currency");//序列号 txtSerialNumber.Text = fuction.GetParameterByParaName(Const.PARA_SERIALNUMBER, "currency");//序列号
//string CalibrationDate = fuction.GetParameterByParaName(Const.PARA_CALIBRATIONDATE, "currency");//校准日期 string CalibrationDate = fuction.GetParameterByParaName(Const.PARA_CALIBRATIONDATE, "currency");//校准日期
//if ("0".Equals(CalibrationDate)) if ("0".Equals(CalibrationDate))
//{ {
// dtCalibrationDate.Value = Convert.ToDateTime(DateTime.Now.ToShortDateString()); dtCalibrationDate.Value = Convert.ToDateTime(DateTime.Now.ToShortDateString());
//} }
//else else
//{ {
// dtCalibrationDate.Value = Convert.ToDateTime(CalibrationDate); dtCalibrationDate.Value = Convert.ToDateTime(CalibrationDate);
//} }
} }
private void GetUnit() private void GetUnit()
{ {
...@@ -178,7 +178,7 @@ namespace App ...@@ -178,7 +178,7 @@ namespace App
m_ParaECName2 = txtECName2.Text;//EC2名称 m_ParaECName2 = txtECName2.Text;//EC2名称
m_ParaMachineModel = txtMachineModel.Text;//产品型号 m_ParaMachineModel = txtMachineModel.Text;//产品型号
m_ParaSerialNumber = txtSerialNumber.Text;//序列号 m_ParaSerialNumber = txtSerialNumber.Text;//序列号
//m_ParaCalibrationDate = dtCalibrationDate.Value.Year.ToString() + "-" + dtCalibrationDate.Value.Month.ToString() + "-" + dtCalibrationDate.Value.Day.ToString();//校准日期 m_ParaCalibrationDate = dtCalibrationDate.Value.Year.ToString() + "-" + dtCalibrationDate.Value.Month.ToString() + "-" + dtCalibrationDate.Value.Day.ToString();//校准日期
bool ifOpera = bool ifOpera =
//fuction.CreateParaConfig("", Fuction.m_UserLogin, Const.PARA_ADJUSTQUOTIETY, m_ParaAdjustQuotiety) && //fuction.CreateParaConfig("", Fuction.m_UserLogin, Const.PARA_ADJUSTQUOTIETY, m_ParaAdjustQuotiety) &&
...@@ -200,7 +200,7 @@ namespace App ...@@ -200,7 +200,7 @@ namespace App
//fuction.CreateParaConfig("", Fuction.m_UserLogin, Const.PARA_Solution, m_ParaSolution)&& //fuction.CreateParaConfig("", Fuction.m_UserLogin, Const.PARA_Solution, m_ParaSolution)&&
//fuction.CreateParaConfig("", Fuction.m_UserLogin, Const.PARA_MachineModel, m_ParaMachineModel) && //fuction.CreateParaConfig("", Fuction.m_UserLogin, Const.PARA_MachineModel, m_ParaMachineModel) &&
//fuction.CreateParaConfig("", Fuction.m_UserLogin, Const.PARA_SERIALNUMBER, m_ParaSerialNumber) && //fuction.CreateParaConfig("", Fuction.m_UserLogin, Const.PARA_SERIALNUMBER, m_ParaSerialNumber) &&
//fuction.CreateParaConfig("", Fuction.m_UserLogin, Const.PARA_CALIBRATIONDATE, m_ParaCalibrationDate)&& fuction.CreateParaConfig("", Fuction.m_UserLogin, Const.PARA_CALIBRATIONDATE, m_ParaCalibrationDate)&&
//fuction.CreateParaConfig("",Fuction.m_UserLogin,Const.PARA_INVERTAL,"5"); //fuction.CreateParaConfig("",Fuction.m_UserLogin,Const.PARA_INVERTAL,"5");
fuction.CreateParaConfig("", "currency", Const.PARA_WASHTIME, m_ParaWashTime) && fuction.CreateParaConfig("", "currency", Const.PARA_WASHTIME, m_ParaWashTime) &&
fuction.CreateParaConfig("", "currency", Const.PARA_WASHUPPERLIMIT, m_ParaWashUpperLimit) && fuction.CreateParaConfig("", "currency", Const.PARA_WASHUPPERLIMIT, m_ParaWashUpperLimit) &&
...@@ -313,7 +313,7 @@ namespace App ...@@ -313,7 +313,7 @@ namespace App
txtMachineModel.Text = listData[13];//机器型号 txtMachineModel.Text = listData[13];//机器型号
txtSerialNumber.Text = listData[14];//序列号 txtSerialNumber.Text = listData[14];//序列号
//dtCalibrationDate.Value = Convert.ToDateTime(listData[15]);//校准日期 dtCalibrationDate.Value = Convert.ToDateTime(listData[15]);//校准日期
} }
} }
} }
......
App/Program.cs
...@@ -138,12 +138,12 @@ namespace App ...@@ -138,12 +138,12 @@ namespace App
static void CurrencyDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) static void CurrencyDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{ {
LogUnhandledException(e.ExceptionObject); LogUnhandledException(e.ToString());
} }
static void Application_ThreadExcetption(object sender, System.Threading.ThreadExceptionEventArgs e) static void Application_ThreadExcetption(object sender, System.Threading.ThreadExceptionEventArgs e)
{ {
LogUnhandledException(e.Exception); LogUnhandledException(e.ToString());
} }
static void LogUnhandledException(object exceptionobj) static void LogUnhandledException(object exceptionobj)
......
App/Properties/AssemblyInfo.cs
...@@ -30,6 +30,6 @@ using log4net.Config; ...@@ -30,6 +30,6 @@ using log4net.Config;
// 内部版本号 // 内部版本号
// 修订号 // 修订号
// //
[assembly: AssemblyVersion("3.3.4.0")] [assembly: AssemblyVersion("3.3.4.2")]
[assembly: AssemblyFileVersion("3.3.4.0")] [assembly: AssemblyFileVersion("3.3.4.2")]
[assembly: log4net.Config.DOMConfigurator(ConfigFileExtension = "config", Watch = true)] [assembly: log4net.Config.DOMConfigurator(ConfigFileExtension = "config", Watch = true)]
ZedGraph 5.1 (.net 2)/source/ZedGraph.csproj
...@@ -10,14 +10,14 @@ ...@@ -10,14 +10,14 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ZedGraph</RootNamespace> <RootNamespace>ZedGraph</RootNamespace>
<AssemblyName>ZedGraph</AssemblyName> <AssemblyName>ZedGraph</AssemblyName>
<SignAssembly>true</SignAssembly> <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>zedgraphkey.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>zedgraphkey.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation> <UpgradeBackupLocation>
</UpgradeBackupLocation> </UpgradeBackupLocation>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion> <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl> <PublishUrl>publish\</PublishUrl>
<Install>true</Install> <Install>true</Install>
<InstallFrom>Disk</InstallFrom> <InstallFrom>Disk</InstallFrom>
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<IsWebBootstrapper>false</IsWebBootstrapper> <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
......
ZedGraph 5.1 (.net 2)/source/ZedGraph/IPointList.cs
//============================================================================ //============================================================================
//IPointList interface //IPointList interface
//Copyright © 2005 John Champion //Copyright ?2005 John Champion
// //
//This library is free software; you can redistribute it and/or //This library is free software; you can redistribute it and/or
//modify it under the terms of the GNU Lesser General Public //modify it under the terms of the GNU Lesser General Public
......
ZedGraph 5.1 (.net 2)/source/ZedGraph/Line.cs
//============================================================================ //============================================================================
//ZedGraph Class Library - A Flexible Line Graph/Bar Graph Library in C# //ZedGraph Class Library - A Flexible Line Graph/Bar Graph Library in C#
//Copyright © 2004 John Champion //Copyright ?2004 John Champion
// //
//This library is free software; you can redistribute it and/or //This library is free software; you can redistribute it and/or
//modify it under the terms of the GNU Lesser General Public //modify it under the terms of the GNU Lesser General Public
......
ZedGraph 5.1 (.net 2)/source/ZedGraph/LinearAsOrdinalScale.cs
//============================================================================ //============================================================================
//ZedGraph Class Library - A Flexible Line Graph/Bar Graph Library in C# //ZedGraph Class Library - A Flexible Line Graph/Bar Graph Library in C#
//Copyright © 2005 John Champion //Copyright ?2005 John Champion
// //
//This library is free software; you can redistribute it and/or //This library is free software; you can redistribute it and/or
//modify it under the terms of the GNU Lesser General Public //modify it under the terms of the GNU Lesser General Public
......
ZedGraph 5.1 (.net 2)/source/ZedGraph/OHLCBar.cs
//============================================================================ //============================================================================
//ZedGraph Class Library - A Flexible Line Graph/Bar Graph Library in C# //ZedGraph Class Library - A Flexible Line Graph/Bar Graph Library in C#
//Copyright © 2006 John Champion //Copyright ?2006 John Champion
// //
//This library is free software; you can redistribute it and/or //This library is free software; you can redistribute it and/or
//modify it under the terms of the GNU Lesser General Public //modify it under the terms of the GNU Lesser General Public
......
ZedGraph 5.1 (.net 2)/source/ZedGraph/ValueHandler.cs
//============================================================================ //============================================================================
//ZedGraph Class Library - A Flexible Line Graph/Bar Graph Library in C# //ZedGraph Class Library - A Flexible Line Graph/Bar Graph Library in C#
//Copyright © 2004 John Champion //Copyright ?2004 John Champion
// //
//This library is free software; you can redistribute it and/or //This library is free software; you can redistribute it and/or
//modify it under the terms of the GNU Lesser General Public //modify it under the terms of the GNU Lesser General Public
......
ZedGraph 5.1 (.net 2)/source/ZedGraph/ZedGraphControl.ContextMenu.cs
...@@ -102,6 +102,8 @@ namespace ZedGraph ...@@ -102,6 +102,8 @@ namespace ZedGraph
{ {
// disable context menu by default // disable context menu by default
e.Cancel = true; e.Cancel = true;
this.MenuClick_RestoreScale(sender, EventArgs.Empty);
return;
ContextMenuStrip menuStrip = sender as ContextMenuStrip; ContextMenuStrip menuStrip = sender as ContextMenuStrip;
//Revision: JCarpenter 10/06 //Revision: JCarpenter 10/06
ContextMenuObjectState objState = GetObjectState(); ContextMenuObjectState objState = GetObjectState();
...@@ -136,7 +138,9 @@ namespace ZedGraph ...@@ -136,7 +138,9 @@ namespace ZedGraph
item = new ToolStripMenuItem(); item = new ToolStripMenuItem();
item.Name = "copy"; item.Name = "copy";
item.Tag = "copy"; item.Tag = "copy";
if (getLanguage().Equals("zh-CN")) item.Text = "Copy";
if (getLanguage().Equals("zh-CN"))
{ {
item.Text = _resourceManager.GetString("copy"); item.Text = _resourceManager.GetString("copy");
} }
......
loadingControl/loadingControl.csproj
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
...@@ -10,8 +10,9 @@ ...@@ -10,8 +10,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>loadingControl</RootNamespace> <RootNamespace>loadingControl</RootNamespace>
<AssemblyName>loadingControl</AssemblyName> <AssemblyName>loadingControl</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile> <TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
...@@ -22,6 +23,7 @@ ...@@ -22,6 +23,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
...@@ -30,6 +32,7 @@ ...@@ -30,6 +32,7 @@
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!