marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

After FAI

Browse Source
This commit is contained in:
Roland Drabesch
2022-09-22 16:07:58 +02:00
parent 8472b242ee
commit e293fc408e
39 changed files with 1261 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj
+2 -3
View File
@@ -100,9 +100,8 @@
<PropertyGroup />
<PropertyGroup />
<PropertyGroup />
<PropertyGroup>
<NoWin32Manifest>true</NoWin32Manifest>
</PropertyGroup>
<PropertyGroup />
<PropertyGroup />
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
Common/CordonelPreadjustmentUi/MeterStateControl.cs
+11 -1
View File
@@ -117,7 +117,7 @@ namespace CordonelPreadjustmentUi
Log($"avgTof;{x}({sumTof}/{countTof})");
checkTempMeter = interPol(TempFromTofLUT, x);
Meter.CurrentRecords.Clear();
}
@@ -175,6 +175,10 @@ namespace CordonelPreadjustmentUi
var x2 = 0.000;
var y2 = 0.000;
decimal checkTempMeter;
try
{
if ((x <= points[0].Item1) && (x >= points.Last().Item1))
{
var i = 0;
@@ -199,6 +203,12 @@ namespace CordonelPreadjustmentUi
}
return checkTempMeter;
}
catch (Exception ex)
{
return 2;
}
}
public void setImage(Bitmap img)
Common/CordonelPreadjustmentUi/PreAdjustmentControl.Designer.cs
Generated
+1 -1
View File
@@ -548,7 +548,7 @@
// l_SettingsPreparationMetersize
//
this.l_SettingsPreparationMetersize.AutoSize = true;
this.l_SettingsPreparationMetersize.Location = new System.Drawing.Point(416, 64);
this.l_SettingsPreparationMetersize.Location = new System.Drawing.Point(416, 72);
this.l_SettingsPreparationMetersize.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.l_SettingsPreparationMetersize.Name = "l_SettingsPreparationMetersize";
this.l_SettingsPreparationMetersize.Size = new System.Drawing.Size(55, 13);
Common/CordonelPreadjustmentUi/PreAdjustmentControl.cs
+3 -3
View File
@@ -912,7 +912,7 @@ namespace CordonelPreadjustmentUi
if (culture.Name == "de-DE")
{
Message = "Warten bis Temperaturakquirierung beendet";
Message = "Warten bis Temperaturakquirierung beendet ist";
}
else
{
@@ -927,7 +927,7 @@ namespace CordonelPreadjustmentUi
if (culture.Name == "de-DE")
{
Message = "Warten bis Temperaturkalibrierung beendet";
Message = "Warten bis Temperaturkalibrierung beendet ist";
}
else
{
@@ -942,7 +942,7 @@ namespace CordonelPreadjustmentUi
if (culture.Name == "de-DE")
{
Message = "Warten bis Spühlvorgang beendet";
Message = "Warten bis Spülvorgang beendet ist";
}
else
{
Common/CordonelPreadjustmentUi/Processes/Actions/LoginProcess.cs
+1 -1
View File
@@ -37,7 +37,7 @@ namespace CordonelPreadjustmentUi.Processes.Actions
pp.DebugMessage($"Load Temp {tempmeterctl.Slot} with {MeterStateControl.TempMode.CalcTof}\n");
tempmeterctl.StartTempWatch(MeterStateControl.TempMode.CalcTof);
}
}
else
{
pp.DebugMessage($"Load Temp {tempmeterctl.Slot} with {MeterStateControl.TempMode.Hand}\n");