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

Syncfusion geupdated

Browse Source 
Refactoring durchgeführt
This commit is contained in:
Husky
2019-07-14 11:23:24 +02:00
parent 63cc7cbdf0
commit 7ec76a5edc
11 changed files with 195 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SanSystem/App.config
View File

@@ -7,11 +7,11 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Syncfusion.Shared.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-17.1460.0.49" newVersion="17.1460.0.49" />
<bindingRedirect oldVersion="0.0.0.0-17.2460.0.34" newVersion="17.2460.0.34" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Syncfusion.Licensing" publicKeyToken="632609b4d040f6b4" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-17.1460.0.49" newVersion="17.1460.0.49" />
<bindingRedirect oldVersion="0.0.0.0-17.2460.0.34" newVersion="17.2460.0.34" />
</dependentAssembly>
</assemblyBinding>
</runtime>

2
SanSystem/Program.cs
View File

@@ -20,7 +20,7 @@ namespace SanSystem
if (dongle.CheckDongleVorhanden())
{
dongle.CleanDongle();
Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("MTA3MjIwQDMxMzcyZTMxMmUzMFpGMWh4K3R1aUZERnM0WVQvOTdOK2pkSERKTlZKNzFTcUJZY1pZQ2ZHL1k9");
Global.Instance.LoadLanguage();
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);

40
SanSystem/SanSystem.csproj
View File

@@ -46,46 +46,6 @@
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Chart.Base, Version=17.1460.0.49, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Chart.Base.17.1.0.49\lib\net46\Syncfusion.Chart.Base.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Chart.Windows, Version=17.1460.0.49, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Chart.Windows.17.1.0.49\lib\net46\Syncfusion.Chart.Windows.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Core.WinForms, Version=17.1460.0.49, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Core.WinForms.17.1.0.49\lib\net46\Syncfusion.Core.WinForms.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Grid.Base, Version=17.1460.0.49, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Grid.Base.17.1.0.49\lib\net46\Syncfusion.Grid.Base.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Grid.Windows, Version=17.1460.0.49, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Grid.Windows.17.1.0.49\lib\net46\Syncfusion.Grid.Windows.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Licensing, Version=17.1460.0.49, Culture=neutral, PublicKeyToken=632609b4d040f6b4, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Licensing.17.1.0.49\lib\net46\Syncfusion.Licensing.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.SfInput.WinForms, Version=17.1460.0.49, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.SfInput.WinForms.17.1.0.49\lib\net46\Syncfusion.SfInput.WinForms.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.SfSpellChecker.WPF, Version=17.1460.0.49, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.SfSpellChecker.WPF.17.1.0.49\lib\net46\Syncfusion.SfSpellChecker.WPF.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Shared.Base, Version=17.1460.0.49, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Shared.Base.17.1.0.49\lib\net46\Syncfusion.Shared.Base.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Shared.Windows, Version=17.1460.0.49, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Shared.Windows.17.1.0.49\lib\net46\Syncfusion.Shared.Windows.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.SpellChecker.Base, Version=17.1460.0.49, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.SpellChecker.Base.17.1.0.49\lib\net46\Syncfusion.SpellChecker.Base.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Tools.Base, Version=17.1460.0.49, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Tools.Base.17.1.0.49\lib\net46\Syncfusion.Tools.Base.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Tools.Windows, Version=17.1460.0.49, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Tools.Windows.17.1.0.49\lib\net46\Syncfusion.Tools.Windows.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Design" />

79
SanSystem/UCInliner.cs
View File

@@ -13,8 +13,8 @@ using System.IO;
using SanShared;
using FluentFTP;
using System.Collections;
using Syncfusion.Windows.Forms.Chart;
using CSVParser;
using BerichtGen;
namespace SanSystem
{
@@ -213,71 +213,7 @@ namespace SanSystem
}
private static ChartControl getGraph(List<UVcsvStrukture> input,string type)
{
Size size = new Size(600, 400);
ChartControl chartControl = new ChartControl();
chartControl.Size = size;
ChartAxis axis = chartControl.PrimaryYAxis;
ChartAxisLayout layout1 = new ChartAxisLayout();
layout1.Spacing = 12;
layout1.Axes.Add(axis);
chartControl.ChartArea.YLayouts.Add(layout1);
ChartSeries mychart = new ChartSeries(type, ChartSeriesType.Line);
int counter = 0;
foreach (UVcsvStrukture pars in input)
{
if (type.Equals("Temperatur"))
mychart.Points.Add(counter, pars.Temperatur);
else if (type.Equals("Druck"))
mychart.Points.Add(counter, pars.Druck);
else
throw new Exception("Kein gültiger Aufruf");
counter++;
}
mychart.YAxis = axis;
switch(type)
{
case "Temperatur":
axis.Title = "°C";
break;
case "Druck":
axis.Title = "[bar]";
break;
}
axis.TitleFont = new Font("Segeo UI", 14F);
chartControl.LegendsPlacement = ChartPlacement.Outside;
chartControl.LegendPosition = ChartDock.Bottom;
chartControl.LegendAlignment = ChartAlignment.Center;
chartControl.Title.Visible = false;
chartControl.Series.Add(mychart);
chartControl.Skins = Skins.Metro;
axis.EdgeLabelsDrawingMode = ChartAxisEdgeLabelsDrawingMode.Shift;
return chartControl;
}
private bool AccessCSV()
@@ -295,15 +231,8 @@ namespace SanSystem
inliner.AnfangAushaertung = struktures.Select(x => x.Zeitstempel).Min();
inliner.EndeAushaertung = struktures.Select(x => x.Zeitstempel).Max();
ChartControl tempChart = getGraph(struktures,"Temperatur");
if (tempChart == null) return false;
else
tempChart.SaveImage(Path.Combine(destinationPath, "linerGraph_temp.jpg"));
ChartControl druckChart = getGraph(struktures, "Druck");
if (druckChart == null) return false;
else
druckChart.SaveImage(Path.Combine(destinationPath, "linerGraph_druck.jpg"));
return true;
return makeGraphic.GetGraphics(struktures, destinationPath);
}
private void btn_create_protokol_Click(object sender, EventArgs e)