Husky/MainSoftware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Husky
2021-02-23 21:20:20 +01:00
parent 48d7f66a55
commit 7658dbdedd
12 changed files with 123 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ConsoleApplication/ConsoleApplication.csproj
View File

@@ -3,6 +3,8 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\DataGen\DataGen.csproj" /> <ProjectReference Include="..\DataGen\DataGen.csproj" />
<ProjectReference Include="..\DPGetDataContract\DPGetDataContract.csproj" /> <ProjectReference Include="..\DPGetDataContract\DPGetDataContract.csproj" />
<ProjectReference Include="..\ProtokollWriterContract\ProtokollWriterContract.csproj" />
<ProjectReference Include="..\ProtokollWriter\ProtokollWriter.csproj" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>

4
ConsoleApplication/Program.cs
View File

@@ -10,8 +10,8 @@ namespace ConsoleApplication
{ {
static void Main(string[] args) static void Main(string[] args)
{ {
IDPGetDataContract eingabe = new ProtokollWriter(); IDPGetDataContract eingabe = new MeasureDataGen();
(eingabe as ProtokollWriter).GenerateUnterdruck(DateTime.Now,-100); (eingabe as MeasureDataGen).GenerateUnterdruck(DateTime.Now,-100);
Debugger.Break(); Debugger.Break();
Console.WriteLine("Hello World!"); Console.WriteLine("Hello World!");
} }

3
DPGetDataContract/DPGetDataContract.csproj
View File

@@ -1,4 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<ProjectReference Include="..\Models\Models.csproj" />
</ItemGroup>
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>

12
DPGetDataContract/GetDataStructure.cs
View File

@@ -1,12 +0,0 @@
using System;
namespace DPGetDataContract
{
public class GetDataStructure
{
public int Eintrag;
public DateTime Datum;
public string Druck;
public EDataType Methode;
}
}

4
DPGetDataContract/IDPGetDataContract.cs
View File

@@ -1,8 +1,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Models;
namespace DPGetDataContract { namespace DPGetDataContract {
public interface IDPGetDataContract { public interface IDPGetDataContract {
List<GetDataStructure> ReadMessureList {get;} List<MeasureData> ReadMessureList {get;}
} }
} }

2
DataGen/DataGen.csproj
View File

@@ -2,8 +2,10 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\DPGetDataContract\DPGetDataContract.csproj" /> <ProjectReference Include="..\DPGetDataContract\DPGetDataContract.csproj" />
<ProjectReference Include="..\Models\Models.csproj" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup> </PropertyGroup>

147
DataGen/ProtokollWriter.cs → DataGen/MeasureDataGen.cs
View File

@@ -4,19 +4,20 @@ using System.Threading;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using DPGetDataContract; using DPGetDataContract;
using Models;
namespace DataGen namespace DataGen
{ {
public class ProtokollWriter : IDPGetDataContract public class MeasureDataGen : IDPGetDataContract
{ {
List<GetDataStructure> messureList = new List<GetDataStructure>(); List<MeasureData> messureList = new List<MeasureData>();
public List<GetDataStructure> ReadMessureList { get => messureList;} public List<MeasureData> ReadMessureList { get => messureList;}
public void GenerateUnterdruck(DateTime startprüfung, double prüfdruck, bool failure=false) { public void GenerateUnterdruck(DateTime startprüfung, double prüfdruck, bool failure=false) {
int messreiheID = -1; int messreiheID = -1;
List<GetDataStructure> messreihen = new List<GetDataStructure>(); List<MeasureData> messreihen = new List<MeasureData>();
List<double> druckwerte = new List<double>(); List<double> druckwerte = new List<double>();
double druck = 0.0; double druck = 0.0;
bool druckerreicht = false; bool druckerreicht = false;
@@ -35,84 +36,84 @@ namespace DataGen
Random zufall = new Random(DateTime.Now.Millisecond); Random zufall = new Random(DateTime.Now.Millisecond);
druck -= Convert.ToDouble((zufall.Next(1000, 10000) / 1000.0)); druck -= Convert.ToDouble((zufall.Next(1000, 10000) / 1000.0));
druckwerte.Add(druck); druckwerte.Add(druck);
messreihen.Add(new GetDataStructure() messreihen.Add(new MeasureData()
{ {
Datum = start, Datum = start,
Druck = druck.ToString(), Pressure = druck.ToString(),
Eintrag = messreiheID, EintragID = messreiheID,
Methode = EDataType.LEERPHASE MeasureType = EMeasureType.LEERPHASE
}); });
Thread.Sleep(100); Thread.Sleep(100);
} }
#endregion #endregion
messreihen.Add(new GetDataStructure() messreihen.Add(new MeasureData()
{ {
Datum = start, Datum = start,
Druck = druck.ToString(), Pressure = druck.ToString(),
Eintrag = messreiheID, EintragID = messreiheID,
Methode = EDataType.BEFÜLLPHASE MeasureType = EMeasureType.BEFÜLLPHASE
}); });
start = start.AddMinutes(2); start = start.AddMinutes(2);
messreiheID++; messreiheID++;
messreihen.Add(new GetDataStructure() messreihen.Add(new MeasureData()
{ {
Datum = start, Datum = start,
Druck = druck.ToString(), Pressure = druck.ToString(),
Eintrag = messreiheID, EintragID = messreiheID,
Methode = EDataType.PRÜFUNGSPHASE MeasureType = EMeasureType.PRÜFUNGSPHASE
}); });
start = start.AddMinutes(15); start = start.AddMinutes(15);
start = start.AddSeconds(3); start = start.AddSeconds(3);
messreiheID++; messreiheID++;
messreihen.Add(new GetDataStructure() messreihen.Add(new MeasureData()
{ {
Datum = start, Datum = start,
Druck = druck.ToString(), Pressure = druck.ToString(),
Eintrag = messreiheID, EintragID = messreiheID,
Methode = EDataType.PRÜFUNGSPHASE MeasureType = EMeasureType.PRÜFUNGSPHASE
}); });
start = start.AddSeconds(2); start = start.AddSeconds(2);
messreiheID++; messreiheID++;
messreihen.Add(new GetDataStructure() messreihen.Add(new MeasureData()
{ {
Datum = start, Datum = start,
Druck = druck.ToString(), Pressure = druck.ToString(),
Eintrag = messreiheID, EintragID = messreiheID,
Methode = EDataType.BEFÜLLPHASE MeasureType = EMeasureType.BEFÜLLPHASE
}); });
start = start.AddSeconds(2); start = start.AddSeconds(2);
messreiheID++; messreiheID++;
messreihen.Add(new GetDataStructure() messreihen.Add(new MeasureData()
{ {
Datum = start, Datum = start,
Druck = druck.ToString(), Pressure = druck.ToString(),
Eintrag = messreiheID, EintragID = messreiheID,
Methode = EDataType.LEERPHASE MeasureType = EMeasureType.LEERPHASE
}); });
start = start.AddSeconds(2); start = start.AddSeconds(2);
messreiheID++; messreiheID++;
messreihen.Add(new GetDataStructure() messreihen.Add(new MeasureData()
{ {
Datum = start, Datum = start,
Druck = "0,000", Pressure = "0,000",
Eintrag = messreiheID, EintragID = messreiheID,
Methode = EDataType.LEERPHASE MeasureType = EMeasureType.LEERPHASE
}) ; }) ;
start = start.AddSeconds(1); start = start.AddSeconds(1);
messreiheID++; messreiheID++;
messreihen.Add(new GetDataStructure() messreihen.Add(new MeasureData()
{ {
Datum = start, Datum = start,
Druck = "0,000", Pressure = "0,000",
Eintrag = messreiheID, EintragID = messreiheID,
Methode = EDataType.LEERPHASE MeasureType = EMeasureType.LEERPHASE
}); });
messureList = messreihen; messureList = messreihen;
} }
public void GenerateÜberdruck(DateTime startprüfung, double prüfdruck, bool failure=false) { public void GenerateÜberdruck(DateTime startprüfung, double prüfdruck, bool failure=false) {
List<GetDataStructure> messreihen = new List<GetDataStructure>(); List<MeasureData> messreihen = new List<MeasureData>();
string prüfdatum = startprüfung.ToShortDateString(); string prüfdatum = startprüfung.ToShortDateString();
bool Bestanden = !failure; bool Bestanden = !failure;
@@ -136,12 +137,12 @@ namespace DataGen
{ {
druck += Convert.ToDouble((zufall.Next(1000, 10000) / 1000.0)); druck += Convert.ToDouble((zufall.Next(1000, 10000) / 1000.0));
druckwerte.Add(druck); druckwerte.Add(druck);
messreihen.Add(new GetDataStructure() messreihen.Add(new MeasureData()
{ {
Datum = start, Datum = start,
Eintrag = messreiheID, EintragID = messreiheID,
Druck = druck.ToString(), Pressure = druck.ToString(),
Methode = EDataType.BEFÜLLPHASE MeasureType = EMeasureType.BEFÜLLPHASE
}); });
messreiheID++; messreiheID++;
} }
@@ -161,12 +162,12 @@ namespace DataGen
start = start.AddSeconds(2); start = start.AddSeconds(2);
druck -= dpt; druck -= dpt;
druckwerte.Add(druck); druckwerte.Add(druck);
messreihen.Add(new GetDataStructure() messreihen.Add(new MeasureData()
{ {
Druck = druck.ToString(), Pressure = druck.ToString(),
Methode = EDataType.BERUHUNGSZEIT, MeasureType = EMeasureType.BERUHUNGSZEIT,
Datum = start, Datum = start,
Eintrag = messreiheID EintragID = messreiheID
}); });
messreiheID++; messreiheID++;
} }
@@ -181,12 +182,12 @@ namespace DataGen
druck -= druckabfall; druck -= druckabfall;
if (druck < 0) druck = 0; if (druck < 0) druck = 0;
druckwerte.Add(druck); druckwerte.Add(druck);
messreihen.Add(new GetDataStructure() messreihen.Add(new MeasureData()
{ {
Druck = druck.ToString(), Pressure = druck.ToString(),
Methode = EDataType.BERUHUNGSZEIT, MeasureType = EMeasureType.BERUHUNGSZEIT,
Datum = start, Datum = start,
Eintrag = messreiheID EintragID = messreiheID
}); });
messreiheID++; messreiheID++;
} }
@@ -206,12 +207,12 @@ namespace DataGen
} }
druckwerte.Add(druck); druckwerte.Add(druck);
messreihen.Add(new GetDataStructure() messreihen.Add(new MeasureData()
{ {
Datum = start, Datum = start,
Eintrag = messreiheID, EintragID = messreiheID,
Methode = EDataType.PRÜFUNGSPHASE, MeasureType = EMeasureType.PRÜFUNGSPHASE,
Druck = druck.ToString() Pressure = druck.ToString()
}); });
messreiheID++; messreiheID++;
Thread.Sleep(100); Thread.Sleep(100);
@@ -221,22 +222,22 @@ namespace DataGen
#region EndePrüfung #region EndePrüfung
start = start.AddSeconds(2); start = start.AddSeconds(2);
messreiheID++; messreiheID++;
messreihen.Add(new GetDataStructure() messreihen.Add(new MeasureData()
{ {
Datum = start, Datum = start,
Eintrag = messreiheID, EintragID = messreiheID,
Methode = EDataType.ENDEPRÜFUNGMARKER, MeasureType = EMeasureType.ENDEPRÜFUNGMARKER,
Druck = druck.ToString() Pressure = druck.ToString()
}) ; }) ;
start = start.AddSeconds(4); start = start.AddSeconds(4);
messreihen.Add(new GetDataStructure() messreihen.Add(new MeasureData()
{ {
Druck = druckwerte.Last().ToString(), Pressure = druckwerte.Last().ToString(),
Datum = start, Datum = start,
Methode = EDataType.ENDEPRÜFUNGMARKER, MeasureType = EMeasureType.ENDEPRÜFUNGMARKER,
Eintrag = messreiheID EintragID = messreiheID
}) ; }) ;
while(druck > 10) while(druck > 10)
@@ -245,28 +246,28 @@ namespace DataGen
double abbau = druck / 2; double abbau = druck / 2;
druck -= abbau; druck -= abbau;
druckwerte.Add(druck); druckwerte.Add(druck);
messreihen.Add(new GetDataStructure() messreihen.Add(new MeasureData()
{ {
Datum = start, Datum = start,
Druck = druck.ToString(), Pressure = druck.ToString(),
Eintrag = messreiheID, EintragID = messreiheID,
Methode = EDataType.LEERPHASE MeasureType = EMeasureType.LEERPHASE
}); });
messreiheID++; messreiheID++;
} }
messreihen.Add(new GetDataStructure() messreihen.Add(new MeasureData()
{ {
Datum = start.AddSeconds(2), Datum = start.AddSeconds(2),
Druck = "0,0", Pressure = "0,0",
Eintrag = messreiheID, EintragID = messreiheID,
Methode = EDataType.LEERPHASE MeasureType = EMeasureType.LEERPHASE
}); });
messreihen.Add(new GetDataStructure() messreihen.Add(new MeasureData()
{ {
Datum = start.AddSeconds(4), Datum = start.AddSeconds(4),
Druck = "0,0", Pressure = "0,0",
Eintrag = messreiheID+1, EintragID = messreiheID+1,
Methode = EDataType.ENDEPRÜFUNGMARKER MeasureType = EMeasureType.ENDEPRÜFUNGMARKER
}); });
#endregion #endregion

14
Dichtheitsprüfung.sln
View File

@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtokollWriterContract", "
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Models", "Models\Models.csproj", "{E5A85D83-CEC8-4925-B8AA-068BD6B50528}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Models", "Models\Models.csproj", "{E5A85D83-CEC8-4925-B8AA-068BD6B50528}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtokollWriter", "ProtokollWriter\ProtokollWriter.csproj", "{9762AAF6-BB07-4416-9522-3D2A05C4216A}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -86,5 +88,17 @@ Global
{E5A85D83-CEC8-4925-B8AA-068BD6B50528}.Release|x64.Build.0 = Release|Any CPU {E5A85D83-CEC8-4925-B8AA-068BD6B50528}.Release|x64.Build.0 = Release|Any CPU
{E5A85D83-CEC8-4925-B8AA-068BD6B50528}.Release|x86.ActiveCfg = Release|Any CPU {E5A85D83-CEC8-4925-B8AA-068BD6B50528}.Release|x86.ActiveCfg = Release|Any CPU
{E5A85D83-CEC8-4925-B8AA-068BD6B50528}.Release|x86.Build.0 = Release|Any CPU {E5A85D83-CEC8-4925-B8AA-068BD6B50528}.Release|x86.Build.0 = Release|Any CPU
{9762AAF6-BB07-4416-9522-3D2A05C4216A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9762AAF6-BB07-4416-9522-3D2A05C4216A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9762AAF6-BB07-4416-9522-3D2A05C4216A}.Debug|x64.ActiveCfg = Debug|Any CPU
{9762AAF6-BB07-4416-9522-3D2A05C4216A}.Debug|x64.Build.0 = Debug|Any CPU
{9762AAF6-BB07-4416-9522-3D2A05C4216A}.Debug|x86.ActiveCfg = Debug|Any CPU
{9762AAF6-BB07-4416-9522-3D2A05C4216A}.Debug|x86.Build.0 = Debug|Any CPU
{9762AAF6-BB07-4416-9522-3D2A05C4216A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9762AAF6-BB07-4416-9522-3D2A05C4216A}.Release|Any CPU.Build.0 = Release|Any CPU
{9762AAF6-BB07-4416-9522-3D2A05C4216A}.Release|x64.ActiveCfg = Release|Any CPU
{9762AAF6-BB07-4416-9522-3D2A05C4216A}.Release|x64.Build.0 = Release|Any CPU
{9762AAF6-BB07-4416-9522-3D2A05C4216A}.Release|x86.ActiveCfg = Release|Any CPU
{9762AAF6-BB07-4416-9522-3D2A05C4216A}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

6
DPGetDataContract/EDataType.cs → Models/EMeasureType.cs
View File

@@ -1,8 +1,6 @@
using System; namespace Models
namespace DPGetDataContract
{ {
public enum EDataType { public enum EMeasureType {
LEERPHASE = 0, // 004 LEERPHASE = 0, // 004
BEFÜLLPHASE = 1, // 000 BEFÜLLPHASE = 1, // 000
BERUHUNGSZEIT = 2, // 001 BERUHUNGSZEIT = 2, // 001

7
Models/MeasureData.cs
View File

@@ -1,10 +1,9 @@
using System; using System;
namespace Models { namespace Models
public enum EMeasureType { {
}
public class MeasureData { public class MeasureData {
public int EintragID {get;set;}
public DateTime Datum {get;set;} public DateTime Datum {get;set;}
public string Pressure {get;set;} public string Pressure {get;set;}
public EMeasureType MeasureType {get;set;} public EMeasureType MeasureType {get;set;}

11
ProtokollWriter/ProtokollWriter.csproj Normal file
View File

@@ -0,0 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<ProjectReference Include="..\ProtokollWriterContract\ProtokollWriterContract.csproj" />
</ItemGroup>
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
</Project>