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

ReSharper: -GenesisMeter

Browse Source
This commit is contained in:
Thomas Wiedebusch
2022-11-02 08:35:09 +01:00
parent 6553883ac0
commit 33b4cdd171
7 changed files with 66 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/.vs/config/applicationhost.config
+1 -1
View File
@@ -155,7 +155,7 @@
</site>
<site name="MeterProcessState" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\ProgrammeSensus\Repo\Lab\La_Operations\laa_production\Common\Service\MeterProcessState" />
<virtualDirectory path="/" physicalPath="D:\Projekte\SENSUS_GitLab\laa_production\Common\Service\MeterProcessState" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:56011:localhost" />
Common/Common.sln.DotSettings.user
+2
View File
@@ -29,6 +29,8 @@
<s:Boolean x:Key="/Default/Environment/Hierarchy/EntityFrameworkOptions/IsAlreadyNotifiedAboutEntityFramework/@EntryValue">True</s:Boolean>
<s:String x:Key="/Default/Environment/Highlighting/HighlightingSourceSnapshotLocation/@EntryValue">C:\Users\Thomas\AppData\Local\Temp\JetBrains\ReSharperPlatformVs15\vAny_33007af5\CoverageData\_Common.-1885154465\Snapshot\snapshot.utdcvr</s:String>
<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=a44a776d_002Dd671_002D4675_002Dac7b_002Db6775ec7f289/@EntryIndexedValue">&lt;SessionState ContinuousTestingIsOn="True" ContinuousTestingMode="1" IsActive="True" Name="All tests from Solution" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
&lt;Solution /&gt;&#xD;
&lt;/SessionState&gt;</s:String>
Common/CordonelAssemblyLine/Converter/MathConverter.cs
+51 -31
View File
@@ -5,55 +5,75 @@ using System.Windows.Data;
namespace CordonelAssemblyLine.Converter
{
/// <inheritdoc />
/// <summary>
/// Conversion between strings and doubles
/// </summary>
public class MathConverter : IValueConverter
{
public Object Convert(Object value, Type targetType, Object parameter, System.Globalization.CultureInfo culture)
/// <summary>
/// Converts a string to double which contains a pure floating point value
/// </summary>
/// <param name="value">string containing the double</param>
/// <param name="targetType">UNUSED</param>
/// <param name="parameter">UNUSED</param>
/// <param name="culture"></param>
/// <returns>value in double format</returns>
public Object Convert(Object value, Type targetType, Object parameter, CultureInfo culture)
{
return double.Parse((String)value, CultureInfo.CurrentUICulture);
return double.Parse((String)value ?? string.Empty, CultureInfo.CurrentUICulture);
}
public Object ConvertBack(Object value, Type targetType, Object parameter, System.Globalization.CultureInfo culture)
/// <summary>
/// Converts a string containing an exponential value to a pure double returned as string
/// </summary>
/// <param name="value"></param>
/// <param name="targetType"></param>
/// <param name="parameter"></param>
/// <param name="culture"></param>
/// <returns></returns>
public Object ConvertBack(Object value, Type targetType, Object parameter, CultureInfo culture)
{
String format = "";
String strValue = (String)value;
strValue = strValue.Replace("x", "*").Replace("X", "*");
if (strValue.ToUpper().Contains("E"))
if (strValue != null)
{
strValue = strValue.Replace("x", "*").Replace("X", "*");
return double.Parse(strValue, CultureInfo.InvariantCulture).ToString(format);
//2E-07
}
else if (strValue.Contains("^-") && strValue.Contains("*"))
{
var split = strValue.Split('*');
var mulit = double.Parse(split.First());
var powNumber = double.Parse(split.Last().Split('^').First());
var powBy = double.Parse(split.Last().Split('^').Last());
if (strValue.ToUpper().Contains("E"))
{
return double.Parse(strValue, CultureInfo.InvariantCulture).ToString(format);
}
return (mulit * Math.Pow(powNumber, powBy)).ToString(format);
//2*10^-3
}
else if (strValue.Contains("-") && strValue.Contains("*"))
{
if (strValue.Contains("^-") && strValue.Contains("*"))
{
var split = strValue.Split('*');
var multiply = double.Parse(split.First());
var powNumber = double.Parse(split.Last().Split('^').First());
var powBy = double.Parse(split.Last().Split('^').Last());
return (multiply * Math.Pow(powNumber, powBy)).ToString(format);
}
var split = strValue.Split('*');
var mulit = double.Parse(split.First());
var powNumber = double.Parse(split.Last().Split('-').First());
var powBy = double.Parse(split.Last().Split('-').Last());
powBy = powBy * -1;
return (mulit * Math.Pow(powNumber, powBy)).ToString(format);
}
else if (strValue.Contains("0,0"))
{
return double.Parse(strValue, CultureInfo.CurrentUICulture).ToString(format);
}
if (strValue.Contains("-") && strValue.Contains("*"))
{
var split = strValue.Split('*');
var multiply = double.Parse(split.First());
var powNumber = double.Parse(split.Last().Split('-').First());
var powBy = double.Parse(split.Last().Split('-').Last());
powBy *= -1;
return (multiply * Math.Pow(powNumber, powBy)).ToString(format);
}
if (strValue.Contains("0,0") || strValue.Contains("0.0"))
{
return double.Parse(strValue, CultureInfo.CurrentUICulture).ToString(format);
}
}
return value;
}
}
}
Common/Hardware/Interfaces/Protocols/TransmitProtocol/IrdaTransmitProtocol.cs
+4 -4
View File
@@ -97,10 +97,10 @@ namespace Xylem.Common.Hardware.Interfaces.Protocols.TransmitProtocol
// check the record length and start of frame information
if (irdaRecord.Count < IrdaProtocolFrameLength + irdaRecord[IrdaPayLoadLengthIndex]
|| irdaRecord[IrdaSyncByteIndex] != IrdaSyncByte
|| ((irdaRecord[IrdaHeaderIndex] & IrdaReceiveHeaderMask) != (IrdaReceiveHeader & IrdaReceiveHeaderMask)
&& (irdaRecord[IrdaHeaderIndex] != IrdaWakeupHeader)
|| (irdaRecord[IrdaMessageIndex] != IrdaMessageId)
&& irdaRecord[IrdaMessageIndex] != IrdaWakeupId))
|| (((irdaRecord[IrdaHeaderIndex] & IrdaReceiveHeaderMask) != (IrdaReceiveHeader & IrdaReceiveHeaderMask)
&& (irdaRecord[IrdaHeaderIndex] != IrdaWakeupHeader))
|| ((irdaRecord[IrdaMessageIndex] != IrdaMessageId)
&& irdaRecord[IrdaMessageIndex] != IrdaWakeupId)))
{
var error = new ApplicationException("Reply from IrDA is invalid.");
Logger.Error(error.Message, error);
Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs
+6 -4
View File
@@ -1627,9 +1627,14 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
/// Read Privilege is always needed to BUGFIX read access to PCB ID
/// </summary>
/// <returns>PCB ID</returns>
/// <remarks date="2022-Okt-20" author="T.Wiedebusch">
/// - PcbId handling corrected:
/// - read pcbId locally,
/// </remarks>
public String GetPcbId(Int32 expectedLength = 12, Int32 retriesLeft = 2)
{
var pcbId = "";
if (RequestPort == null)
{
return "Request port not assigned";
@@ -1638,11 +1643,9 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
_logger.Info($"Slot:{Slot} - Get privilege level");
ReadRegister(Register.Configexchange.Privilege);
_logger.Info($"Slot:{Slot} - Get PCB identification old{PcbId}");
var listPcb = new List<Byte>();
var listPcb = new List<Byte>();
var hasZero = false;
var maxReads = 4;
while (!hasZero)
@@ -1665,7 +1668,6 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
}
}
_logger.Info("First read ");
if (listPcb.Any())
{
Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
+1 -1
View File
@@ -1 +1 @@
46bd00889699f5a20a4981a22f62b66368323855
1a3d4919c9c702245832d925951f2b7cb72fc333
Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
+1 -1
View File
@@ -1 +1 @@
81d60b90addc793525740e9993e19bf6665bd401
f64d563def603c89cafafa61a3219ba97e1e344c