Skip to content

刘韬 / IonicContaminationTest

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

1

1 个父辈 d69b7023
内嵌 并排
正在显示 20 个修改的文件 包含 132 行增加 和 67 行删除
AGauge/AGaugeApp.csproj
......@@ -15,7 +15,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
......@@ -31,6 +31,7 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
......
AGauge/Properties/Resources.Designer.cs
......@@ -19,7 +19,7 @@ namespace AGaugeApp.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /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.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
......@@ -47,8 +47,8 @@ namespace AGaugeApp.Properties {
}
/// <summary>
/// 使用此强类型资源类，为所有资源查找
/// 重写当前线程的 CurrentUICulture 属性。
/// 重写当前线程的 CurrentUICulture 属性，对
/// 使用此强类型资源类的所有资源查找执行重写。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
......
AGauge/Properties/Settings.Designer.cs
......@@ -12,7 +12,7 @@ namespace AGaugeApp.Properties {
[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 {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
App/FrmTestResult.cs
此文件类型无法预览
App/MetroProduct.Designer.cs
......@@ -158,7 +158,7 @@
this.productPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.productPanel.Name = "productPanel";
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;
//
// groupBox5
......@@ -279,11 +279,11 @@
this.areaTextBox.BackColor = System.Drawing.Color.LightGray;
this.areaTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
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.Name = "areaTextBox";
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;
//
// areaUnitLabel
......@@ -292,7 +292,7 @@
this.areaUnitLabel.AutoSize = true;
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.Location = new System.Drawing.Point(588, 552);
this.areaUnitLabel.Location = new System.Drawing.Point(777, 552);
this.areaUnitLabel.Name = "areaUnitLabel";
this.areaUnitLabel.Size = new System.Drawing.Size(35, 20);
this.areaUnitLabel.TabIndex = 40;
......@@ -305,7 +305,7 @@
this.waterHighUnitLabel.AutoSize = true;
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.Location = new System.Drawing.Point(588, 605);
this.waterHighUnitLabel.Location = new System.Drawing.Point(777, 605);
this.waterHighUnitLabel.Name = "waterHighUnitLabel";
this.waterHighUnitLabel.Size = new System.Drawing.Size(29, 20);
this.waterHighUnitLabel.TabIndex = 41;
......@@ -320,7 +320,7 @@
this.saveBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.saveBtn.FlatAppearance.BorderSize = 0;
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.Name = "saveBtn";
this.saveBtn.Size = new System.Drawing.Size(85, 37);
......@@ -335,7 +335,7 @@
this.saveAsBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.saveAsBtn.FlatAppearance.BorderSize = 0;
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.Name = "saveAsBtn";
this.saveAsBtn.Size = new System.Drawing.Size(85, 37);
......@@ -351,7 +351,7 @@
this.deleteBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.deleteBtn.FlatAppearance.BorderSize = 0;
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.Name = "deleteBtn";
this.deleteBtn.Size = new System.Drawing.Size(85, 37);
......@@ -367,7 +367,7 @@
this.btn_Choose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.btn_Choose.FlatAppearance.BorderSize = 0;
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.Name = "btn_Choose";
this.btn_Choose.Size = new System.Drawing.Size(85, 37);
......@@ -384,7 +384,7 @@
this.pb.Location = new System.Drawing.Point(582, 35);
this.pb.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
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.TabIndex = 38;
this.pb.TabStop = false;
......@@ -784,7 +784,7 @@
this.productPictureBox.Location = new System.Drawing.Point(565, 18);
this.productPictureBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
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.TabStop = false;
//
......@@ -794,7 +794,7 @@
this.areaLabel.AutoSize = true;
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.Location = new System.Drawing.Point(464, 552);
this.areaLabel.Location = new System.Drawing.Point(606, 551);
this.areaLabel.Name = "areaLabel";
this.areaLabel.Size = new System.Drawing.Size(37, 20);
this.areaLabel.TabIndex = 26;
......@@ -807,11 +807,11 @@
this.waterHighBox.BackColor = System.Drawing.Color.LightGray;
this.waterHighBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
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.Name = "waterHighBox";
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.Visible = false;
//
......@@ -821,7 +821,7 @@
this.waterHighLabel.AutoSize = true;
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.Location = new System.Drawing.Point(408, 605);
this.waterHighLabel.Location = new System.Drawing.Point(550, 604);
this.waterHighLabel.Name = "waterHighLabel";
this.waterHighLabel.Size = new System.Drawing.Size(93, 20);
this.waterHighLabel.TabIndex = 30;
......@@ -834,7 +834,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
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.Location = new System.Drawing.Point(0, 0);
this.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6);
......
App/MetroProduct.cs
......@@ -371,7 +371,18 @@ namespace App
m_ParaProduct = product[index][0];
lengthTextBox.Text = product[index][1];
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];
testTimeTextBox.Text = product[index][5];
......@@ -648,7 +659,7 @@ namespace App
{
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_Width;
......@@ -808,7 +819,17 @@ Const.MESSAGEBOX_TITLE_NOTE, "", Const.ERROR_NUM_OVER0);
m_ParaProduct = pn; //产品
m_ParaProductL = fuction.ChangeLUnit(lengthTextBox.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_ParaTestTime = fuction.ChangeTimeUnit(testTimeTextBox.Text); //测试时间
m_ParaNotes = this.txtNotes.Text;//产品备注
......@@ -987,7 +1008,17 @@ Const.MESSAGEBOX_TITLE_NOTE, "", Const.ERROR_NUM_OVER0);
m_ParaProduct = productNameComboBox.Text; //产品
m_ParaProductL = fuction.ChangeLUnit(lengthTextBox.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_ParaTestTime = fuction.ChangeTimeUnit(testTimeTextBox.Text); //测试时间
m_ParaNotes = this.txtNotes.Text;//产品备注
......
App/MetroTestResult.cs
......@@ -133,7 +133,7 @@ namespace App
}
catch (Exception ex)
{
LOGGER.Debug(ex.StackTrace);
LOGGER.Debug(ex.ToString());
}
}
/**
......
App/NewCode/FrmAdjustQuotiety2.cs
......@@ -100,7 +100,7 @@ namespace App
this.lblECValue2.Text = getMsg("Value");
this.lblMachineModel.Text = getMsg("MachineModel");
this.lblSerialNumber.Text = getMsg("SerialNumber");
//this.lblCalibrationDate.Text = getMsg("CalibrationDate");
this.lblCalibrationDate.Text = getMsg("CalibrationDate");
this.lbl_WashUpperLimitUnit.Text = "M.OHM";
......@@ -145,15 +145,15 @@ namespace App
txtMachineModel.Text = fuction.GetParameterByParaName(Const.PARA_MachineModel, "currency");//设备型号
txtSerialNumber.Text = fuction.GetParameterByParaName(Const.PARA_SERIALNUMBER, "currency");//序列号
//string CalibrationDate = fuction.GetParameterByParaName(Const.PARA_CALIBRATIONDATE, "currency");//校准日期
//if ("0".Equals(CalibrationDate))
//{
// dtCalibrationDate.Value = Convert.ToDateTime(DateTime.Now.ToShortDateString());
//}
//else
//{
// dtCalibrationDate.Value = Convert.ToDateTime(CalibrationDate);
//}
string CalibrationDate = fuction.GetParameterByParaName(Const.PARA_CALIBRATIONDATE, "currency");//校准日期
if ("0".Equals(CalibrationDate))
{
dtCalibrationDate.Value = Convert.ToDateTime(DateTime.Now.ToShortDateString());
}
else
{
dtCalibrationDate.Value = Convert.ToDateTime(CalibrationDate);
}
}
private void GetUnit()
{
......@@ -178,7 +178,7 @@ namespace App
m_ParaECName2 = txtECName2.Text;//EC2名称
m_ParaMachineModel = txtMachineModel.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 =
//fuction.CreateParaConfig("", Fuction.m_UserLogin, Const.PARA_ADJUSTQUOTIETY, m_ParaAdjustQuotiety) &&
......@@ -200,7 +200,7 @@ namespace App
//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_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("", "currency", Const.PARA_WASHTIME, m_ParaWashTime) &&
fuction.CreateParaConfig("", "currency", Const.PARA_WASHUPPERLIMIT, m_ParaWashUpperLimit) &&
......@@ -313,7 +313,7 @@ namespace App
txtMachineModel.Text = listData[13];//机器型号
txtSerialNumber.Text = listData[14];//序列号
//dtCalibrationDate.Value = Convert.ToDateTime(listData[15]);//校准日期
dtCalibrationDate.Value = Convert.ToDateTime(listData[15]);//校准日期
}
}
}
......
App/NewCode/FrmAdjustQuotiety2.designer.cs
......@@ -81,6 +81,8 @@
this.btnSetting = new System.Windows.Forms.Button();
this.panelCalibration = new App.ucCalibration();
this.panel1 = new System.Windows.Forms.Panel();
this.dtCalibrationDate = new System.Windows.Forms.DateTimePicker();
this.lblCalibrationDate = new System.Windows.Forms.Label();
this.panelTesting.SuspendLayout();
this.panel3.SuspendLayout();
this.panel5.SuspendLayout();
......@@ -111,7 +113,7 @@
this.panelTesting.Controls.Add(this.Y1);
this.panelTesting.Controls.Add(this.Y0);
this.panelTesting.Font = new System.Drawing.Font("微软雅黑", 9F);
this.panelTesting.Location = new System.Drawing.Point(301, 80);
this.panelTesting.Location = new System.Drawing.Point(845, 67);
this.panelTesting.Name = "panelTesting";
this.panelTesting.Size = new System.Drawing.Size(644, 378);
this.panelTesting.TabIndex = 166;
......@@ -319,6 +321,8 @@
//
this.PanelSetting.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.PanelSetting.Controls.Add(this.dtCalibrationDate);
this.PanelSetting.Controls.Add(this.lblCalibrationDate);
this.PanelSetting.Controls.Add(this.lbl_WashTime);
this.PanelSetting.Controls.Add(this.lbl_WashUpperLimit);
this.PanelSetting.Controls.Add(this.txtWTime);
......@@ -448,7 +452,7 @@
this.btn_OK.FlatAppearance.BorderSize = 0;
this.btn_OK.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_OK.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_OK.Location = new System.Drawing.Point(470, 330);
this.btn_OK.Location = new System.Drawing.Point(465, 366);
this.btn_OK.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btn_OK.Name = "btn_OK";
this.btn_OK.Size = new System.Drawing.Size(86, 32);
......@@ -465,7 +469,7 @@
this.btn_Input.FlatAppearance.BorderSize = 0;
this.btn_Input.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_Input.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_Input.Location = new System.Drawing.Point(369, 330);
this.btn_Input.Location = new System.Drawing.Point(364, 366);
this.btn_Input.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btn_Input.Name = "btn_Input";
this.btn_Input.Size = new System.Drawing.Size(86, 32);
......@@ -482,7 +486,7 @@
this.btn_Export.FlatAppearance.BorderSize = 0;
this.btn_Export.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_Export.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_Export.Location = new System.Drawing.Point(268, 330);
this.btn_Export.Location = new System.Drawing.Point(263, 366);
this.btn_Export.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btn_Export.Name = "btn_Export";
this.btn_Export.Size = new System.Drawing.Size(86, 32);
......@@ -517,7 +521,7 @@
// lblEquivalentCoefficient1
//
this.lblEquivalentCoefficient1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblEquivalentCoefficient1.Location = new System.Drawing.Point(-71, 208);
this.lblEquivalentCoefficient1.Location = new System.Drawing.Point(-67, 256);
this.lblEquivalentCoefficient1.Name = "lblEquivalentCoefficient1";
this.lblEquivalentCoefficient1.Size = new System.Drawing.Size(255, 30);
this.lblEquivalentCoefficient1.TabIndex = 137;
......@@ -527,7 +531,7 @@
// lblEquivalentCoefficient2
//
this.lblEquivalentCoefficient2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblEquivalentCoefficient2.Location = new System.Drawing.Point(-71, 252);
this.lblEquivalentCoefficient2.Location = new System.Drawing.Point(-67, 300);
this.lblEquivalentCoefficient2.Name = "lblEquivalentCoefficient2";
this.lblEquivalentCoefficient2.Size = new System.Drawing.Size(255, 30);
this.lblEquivalentCoefficient2.TabIndex = 138;
......@@ -537,7 +541,7 @@
// lblECValue2
//
this.lblECValue2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblECValue2.Location = new System.Drawing.Point(482, 250);
this.lblECValue2.Location = new System.Drawing.Point(486, 298);
this.lblECValue2.Name = "lblECValue2";
this.lblECValue2.Size = new System.Drawing.Size(50, 30);
this.lblECValue2.TabIndex = 149;
......@@ -547,7 +551,7 @@
// lblECValue1
//
this.lblECValue1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblECValue1.Location = new System.Drawing.Point(482, 208);
this.lblECValue1.Location = new System.Drawing.Point(486, 256);
this.lblECValue1.Name = "lblECValue1";
this.lblECValue1.Size = new System.Drawing.Size(50, 30);
this.lblECValue1.TabIndex = 148;
......@@ -559,7 +563,7 @@
this.txtECValue1.BackColor = System.Drawing.Color.White;
this.txtECValue1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtECValue1.Font = new System.Drawing.Font("微软雅黑", 10.5F);
this.txtECValue1.Location = new System.Drawing.Point(540, 210);
this.txtECValue1.Location = new System.Drawing.Point(544, 258);
this.txtECValue1.Name = "txtECValue1";
this.txtECValue1.Size = new System.Drawing.Size(121, 26);
this.txtECValue1.TabIndex = 139;
......@@ -568,7 +572,7 @@
//
this.txtECName2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtECName2.Font = new System.Drawing.Font("微软雅黑", 10.5F);
this.txtECName2.Location = new System.Drawing.Point(249, 254);
this.txtECName2.Location = new System.Drawing.Point(253, 302);
this.txtECName2.Name = "txtECName2";
this.txtECName2.Size = new System.Drawing.Size(121, 26);
this.txtECName2.TabIndex = 147;
......@@ -578,7 +582,7 @@
//
this.txtECName1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtECName1.Font = new System.Drawing.Font("微软雅黑", 10.5F);
this.txtECName1.Location = new System.Drawing.Point(249, 212);
this.txtECName1.Location = new System.Drawing.Point(253, 260);
this.txtECName1.Name = "txtECName1";
this.txtECName1.Size = new System.Drawing.Size(121, 26);
this.txtECName1.TabIndex = 146;
......@@ -587,7 +591,7 @@
// lblECName2
//
this.lblECName2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblECName2.Location = new System.Drawing.Point(193, 252);
this.lblECName2.Location = new System.Drawing.Point(197, 300);
this.lblECName2.Name = "lblECName2";
this.lblECName2.Size = new System.Drawing.Size(50, 30);
this.lblECName2.TabIndex = 145;
......@@ -599,7 +603,7 @@
this.txtECValue2.BackColor = System.Drawing.Color.White;
this.txtECValue2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtECValue2.Font = new System.Drawing.Font("微软雅黑", 10.5F);
this.txtECValue2.Location = new System.Drawing.Point(540, 252);
this.txtECValue2.Location = new System.Drawing.Point(544, 300);
this.txtECValue2.Name = "txtECValue2";
this.txtECValue2.Size = new System.Drawing.Size(121, 26);
this.txtECValue2.TabIndex = 140;
......@@ -607,7 +611,7 @@
// lblECName1
//
this.lblECName1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblECName1.Location = new System.Drawing.Point(193, 210);
this.lblECName1.Location = new System.Drawing.Point(197, 258);
this.lblECName1.Name = "lblECName1";
this.lblECName1.Size = new System.Drawing.Size(50, 30);
this.lblECName1.TabIndex = 144;
......@@ -704,6 +708,25 @@
this.panel1.Size = new System.Drawing.Size(1, 505);
this.panel1.TabIndex = 169;
//
// dtCalibrationDate
//
this.dtCalibrationDate.Location = new System.Drawing.Point(198, 214);
this.dtCalibrationDate.Name = "dtCalibrationDate";
this.dtCalibrationDate.Size = new System.Drawing.Size(200, 23);
this.dtCalibrationDate.TabIndex = 168;
//
// lblCalibrationDate
//
this.lblCalibrationDate.BackColor = System.Drawing.Color.White;
this.lblCalibrationDate.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCalibrationDate.ForeColor = System.Drawing.Color.Black;
this.lblCalibrationDate.Location = new System.Drawing.Point(69, 211);
this.lblCalibrationDate.Name = "lblCalibrationDate";
this.lblCalibrationDate.Size = new System.Drawing.Size(115, 30);
this.lblCalibrationDate.TabIndex = 129;
this.lblCalibrationDate.Text = "校准时间";
this.lblCalibrationDate.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// FrmAdjustQuotiety2
//
this.ClientSize = new System.Drawing.Size(1162, 698);
......@@ -791,5 +814,7 @@
private System.Windows.Forms.TextBox txtWTime;
private ucCalibration panelCalibration;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.DateTimePicker dtCalibrationDate;
private System.Windows.Forms.Label lblCalibrationDate;
}
}
App/Program.cs
......@@ -138,12 +138,12 @@ namespace App
static void CurrencyDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{
LogUnhandledException(e.ExceptionObject);
LogUnhandledException(e.ToString());
}
static void Application_ThreadExcetption(object sender, System.Threading.ThreadExceptionEventArgs e)
{
LogUnhandledException(e.Exception);
LogUnhandledException(e.ToString());
}
static void LogUnhandledException(object exceptionobj)
......
App/Properties/AssemblyInfo.cs
......@@ -30,6 +30,6 @@ using log4net.Config;
// 内部版本号
// 修订号
//
[assembly: AssemblyVersion("3.3.4.0")]
[assembly: AssemblyFileVersion("3.3.4.0")]
[assembly: AssemblyVersion("3.3.4.2")]
[assembly: AssemblyFileVersion("3.3.4.2")]
[assembly: log4net.Config.DOMConfigurator(ConfigFileExtension = "config", Watch = true)]
ZedGraph 5.1 (.net 2)/source/ZedGraph.csproj
......@@ -10,14 +10,14 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ZedGraph</RootNamespace>
<AssemblyName>ZedGraph</AssemblyName>
<SignAssembly>true</SignAssembly>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>zedgraphkey.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
......@@ -33,6 +33,7 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
......
ZedGraph 5.1 (.net 2)/source/ZedGraph/IPointList.cs
//============================================================================
//IPointList interface
//Copyright © 2005 John Champion
//Copyright ?2005 John Champion
//
//This library is free software; you can redistribute it and/or
//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#
//Copyright © 2004 John Champion
//Copyright ?2004 John Champion
//
//This library is free software; you can redistribute it and/or
//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#
//Copyright © 2005 John Champion
//Copyright ?2005 John Champion
//
//This library is free software; you can redistribute it and/or
//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#
//Copyright © 2006 John Champion
//Copyright ?2006 John Champion
//
//This library is free software; you can redistribute it and/or
//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#
//Copyright © 2004 John Champion
//Copyright ?2004 John Champion
//
//This library is free software; you can redistribute it and/or
//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
{
// disable context menu by default
e.Cancel = true;
this.MenuClick_RestoreScale(sender, EventArgs.Empty);
return;
ContextMenuStrip menuStrip = sender as ContextMenuStrip;
//Revision: JCarpenter 10/06
ContextMenuObjectState objState = GetObjectState();
......@@ -136,6 +138,8 @@ namespace ZedGraph
item = new ToolStripMenuItem();
item.Name = "copy";
item.Tag = "copy";
item.Text = "Copy";
if (getLanguage().Equals("zh-CN"))
{
item.Text = _resourceManager.GetString("copy");
......
loadingControl/loadingControl.csproj
<?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>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
......@@ -10,8 +10,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>loadingControl</RootNamespace>
<AssemblyName>loadingControl</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
......@@ -22,6 +23,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
......@@ -30,6 +32,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!