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

Geschwindigkeit anpassung durchgeführt

Browse Source
This commit is contained in:
Husky
2019-10-02 21:21:46 +02:00
parent b47bf96cf7
commit a5ce175d5e
7 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BerichtGen/Bericht.cs
View File

@@ -151,7 +151,7 @@ namespace BerichtGen
private void MailMerge_MergeImageField(object sender, MergeImageFieldEventArgs args) private void MailMerge_MergeImageField(object sender, MergeImageFieldEventArgs args)
{ {
if(args.FieldName == "UVImageTemp" || args.FieldName == "UVImageDruck") if(args.FieldName == "UVImageTemp" || args.FieldName == "UVImageDruck" || args.FieldName == "UVImageSpeed")
{ {
string source = args.FieldValue.ToString(); string source = args.FieldValue.ToString();
if (!File.Exists(source)) return; if (!File.Exists(source)) return;

8
CSVParser/BlueLight.cs
View File

@@ -23,6 +23,7 @@ namespace CSVParser
int geschwindigkeit; int geschwindigkeit;
bool gestarted = false;
foreach (string partial in Input) foreach (string partial in Input)
{ {
UVcsvStrukture strukture = new UVcsvStrukture(); UVcsvStrukture strukture = new UVcsvStrukture();
@@ -42,13 +43,18 @@ namespace CSVParser
double.TryParse(parts[5].Replace("\"","").Replace('.', ','), out druck); double.TryParse(parts[5].Replace("\"","").Replace('.', ','), out druck);
if (geschwindigkeit > 100) geschwindigkeit = 0; if (geschwindigkeit > 100) geschwindigkeit = 0;
if (geschwindigkeit > 50) geschwindigkeit = 1;
strukture.Zeitstempel = zeit; strukture.Zeitstempel = zeit;
strukture.Druck = druck; strukture.Druck = druck;
strukture.Geschwindigkeit = geschwindigkeit; strukture.Geschwindigkeit = geschwindigkeit;
strukture.Temperatur = temperatur; strukture.Temperatur = temperatur;
result.Add(strukture); if (!geschwindigkeit.Equals(0) && gestarted.Equals(false))
gestarted = true;
if(gestarted == true)
result.Add(strukture);
} }
return result; return result;

4
KlassenBIB/InlinerSanierung.cs
View File

@@ -25,7 +25,7 @@ namespace KlassenBIB
string harzTyp; string harzTyp;
string linerTyp; string linerTyp;
double harzbedarf = 1.8; double harzbedarf = 1.8;
uint rueckholgeschwindigkeit = 24; uint rueckholgeschwindigkeit;
bool geschlosseneEnde = false; bool geschlosseneEnde = false;
bool preliner = false; bool preliner = false;
DateTime anfangAushaertung; DateTime anfangAushaertung;
@@ -105,6 +105,7 @@ namespace KlassenBIB
{"time_ende","" }, {"time_ende","" },
{"UVImageTemp","" }, {"UVImageTemp","" },
{"UVImageDruck","" }, {"UVImageDruck","" },
{"UVImageSpeed","" },
{"liner_type","" }, {"liner_type","" },
{"rueckhol_speed","" }, {"rueckhol_speed","" },
{"harz_type","" } {"harz_type","" }
@@ -150,6 +151,7 @@ namespace KlassenBIB
grunddaten["time_ende"] = this.EndeAushaertung; grunddaten["time_ende"] = this.EndeAushaertung;
grunddaten["UVImageTemp"] = Path.Combine(destinationPath, "linerGraph_temp.jpg"); grunddaten["UVImageTemp"] = Path.Combine(destinationPath, "linerGraph_temp.jpg");
grunddaten["UVImageDruck"] = Path.Combine(destinationPath, "linerGraph_druck.jpg"); grunddaten["UVImageDruck"] = Path.Combine(destinationPath, "linerGraph_druck.jpg");
grunddaten["UVImageSpeed"] = Path.Combine(destinationPath, "linerGraph_speed.jpg");
grunddaten["rueckhol_speed"] = rueckholgeschwindigkeit; grunddaten["rueckhol_speed"] = rueckholgeschwindigkeit;
grunddaten["liner_type"] = LinerTyp; grunddaten["liner_type"] = LinerTyp;
grunddaten["harz_type"] = HarzTyp; grunddaten["harz_type"] = HarzTyp;

7
SanSystem/SanSystem.csproj
View File

@@ -238,8 +238,11 @@
<None Include="documents\JUME\KalibrierungAuflistung.docx"> <None Include="documents\JUME\KalibrierungAuflistung.docx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="documents\JUME\liner_einbau.docx"> <None Include="documents\JUME\liner_einbauBlueLight.docx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="documents\JUME\liner_einbauUV_Relining.docx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Include="documents\JUME\Massenstatistik.docx"> <None Include="documents\JUME\Massenstatistik.docx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

3
SanSystem/UCInliner.cs
View File

@@ -234,6 +234,7 @@ namespace SanSystem
inliner.AnfangAushaertung = struktures.Select(x => x.Zeitstempel).Min(); inliner.AnfangAushaertung = struktures.Select(x => x.Zeitstempel).Min();
inliner.EndeAushaertung = struktures.Select(x => x.Zeitstempel).Max(); inliner.EndeAushaertung = struktures.Select(x => x.Zeitstempel).Max();
inliner.Rueckholgeschwindigkeit = 0;
} }
catch(FileNotFoundException ex) catch(FileNotFoundException ex)
{ {
@@ -253,7 +254,7 @@ namespace SanSystem
Hashtable hashtable = inliner.MakeProtokoll(destinationPath,Database.Datenbank.Instance.loadedProjekt); Hashtable hashtable = inliner.MakeProtokoll(destinationPath,Database.Datenbank.Instance.loadedProjekt);
DirectoryInfo directory = Directory.GetParent(destinationPath); DirectoryInfo directory = Directory.GetParent(destinationPath);
string speicherpfad = directory.FullName; string speicherpfad = directory.FullName;
BerichtGen.FrmOptions options = new BerichtGen.FrmOptions("JUME", "liner_einbau.docx", speicherpfad,inliner.Inspektionsobjekt.Objektbezeichnung, hashtable, new List<BilderObject>()); BerichtGen.FrmOptions options = new BerichtGen.FrmOptions("JUME", "liner_einbauBlueLight.docx", speicherpfad,inliner.Inspektionsobjekt.Objektbezeichnung, hashtable, new List<BilderObject>());
options.ShowDialog(); options.ShowDialog();
} }

BIN
SanSystem/documents/JUME/liner_einbauBlueLight.docx Normal file
View File

Binary file not shown.

0
SanSystem/documents/JUME/liner_einbau.docx → SanSystem/documents/JUME/liner_einbauUV_Relining.docx
View File