Skip to content

Commit

Permalink
Leistungsdaten ergänzt [ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
Elias Ruemmler committed May 18, 2020
1 parent e8e2c94 commit bdee97f
Show file tree
Hide file tree
Showing 17 changed files with 153 additions and 40 deletions.
21 changes: 19 additions & 2 deletions FlowCalc/Controller.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,7 @@ public void GeneratePdfReport(string path, double poolVolume, double filterDiame
var t2 = new XUnit(13, XGraphicsUnit.Millimeter);
var t3 = new XUnit(20, XGraphicsUnit.Millimeter);
var t10 = new XUnit(100, XGraphicsUnit.Millimeter);
var t16 = new XUnit(160, XGraphicsUnit.Millimeter);

int yLineH3 = 7;
int yOffsH3 = -1;
Expand Down Expand Up @@ -527,8 +528,24 @@ public void GeneratePdfReport(string path, double poolVolume, double filterDiame
gfx.DrawString("3-fach:", p3, XBrushes.Black, new XPoint(t10 - 50, new XUnit(yRes + yLineH3 * 2, XGraphicsUnit.Millimeter)));
gfx.DrawString("Filtergeschwindigkeit:", p3, XBrushes.Black, new XPoint(t2, new XUnit(yRes + yLineH3 * 3, XGraphicsUnit.Millimeter)));

gfx.DrawString($"{tCycle1.Hours} Stunden {tCycle1.Minutes} Minuten", h3, XBrushes.Black, new XPoint(t10, new XUnit(yRes + yLineH3, XGraphicsUnit.Millimeter)));
gfx.DrawString($"{tCycle3.Hours} Stunden {tCycle3.Minutes} Minuten", h3, XBrushes.Black, new XPoint(t10, new XUnit(yRes + yLineH3 * 2, XGraphicsUnit.Millimeter)));
if (tCycle1.TotalHours > 24)
gfx.DrawString($"> 24 Stunden", h3, XBrushes.Red, new XPoint(t10, new XUnit(yRes + yLineH3, XGraphicsUnit.Millimeter)));
else
{
gfx.DrawString($"{tCycle1.Hours} Stunden {tCycle1.Minutes} Minuten", h3, XBrushes.Black, new XPoint(t10, new XUnit(yRes + yLineH3, XGraphicsUnit.Millimeter)));
if (Pump.PowerInput > 0)
gfx.DrawString($"{(tCycle1.TotalHours * Pump.PowerInput).ToString("f1")} kWh", h3, XBrushes.Black, new XPoint(t16, new XUnit(yRes + yLineH3, XGraphicsUnit.Millimeter)));
}

if (tCycle3.TotalHours > 24)
gfx.DrawString($"> 24 Stunden", h3, XBrushes.Red, new XPoint(t10, new XUnit(yRes + yLineH3 * 2, XGraphicsUnit.Millimeter)));
else
{
gfx.DrawString($"{tCycle3.Hours} Stunden {tCycle3.Minutes} Minuten", h3, XBrushes.Black, new XPoint(t10, new XUnit(yRes + yLineH3 * 2, XGraphicsUnit.Millimeter)));
if (Pump.PowerInput > 0)
gfx.DrawString($"{(tCycle3.TotalHours * Pump.PowerInput).ToString("f1")} kWh", h3, XBrushes.Black, new XPoint(t16, new XUnit(yRes + yLineH3 * 2, XGraphicsUnit.Millimeter)));
}

gfx.DrawString(filterSpeed.ToString("f2") + " m/h", h3, filterSpeedBrush, new XPoint(t10, new XUnit(yRes + yLineH3 * 3, XGraphicsUnit.Millimeter)));


Expand Down
109 changes: 80 additions & 29 deletions FlowCalc/MainView.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion FlowCalc/MainView.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,20 @@ private void applyPumpDefinition()
{
txt_PumpModel.Text = m_Controller.Pump.ModellName;
txt_PumpManufracturer.Text = m_Controller.Pump.Manufacturer;
txt_PumpPowerOut.Text = m_Controller.Pump.PowerOutput + " kW";
if (m_Controller.Pump.PowerInput <= 0)
txt_PumpPowerIn.Text = "-";
else
txt_PumpPowerIn.Text = m_Controller.Pump.PowerInput + " kW";
if (m_Controller.Pump.PowerOutput <= 0)
txt_PumpPowerOut.Text = "-";
else
txt_PumpPowerOut.Text = m_Controller.Pump.PowerOutput + " kW";
txt_PumpNominalFlowRate.Text = m_Controller.Pump.NominalFlowRate + " m³/h";
txt_PumpNominalHead.Text = m_Controller.Pump.NominalDynamicHead + " m WS";
txt_PumpMaxHead.Text = m_Controller.Pump.MaxTotalHead.ToString("f2") + " m WS";

lbl_PumpFileAuthor.Text = m_Controller.Pump.AuthorPumpFile;
lbl_PumpDataSourceUrl.Text = m_Controller.Pump.DataSourceUrl;
toolTip1.SetToolTip(lbl_PumpFileAuthor, m_Controller.Pump.AuthorEmailPumpFile);

this.Text = string.Concat(WindowTitle, " - ", m_Controller.PumpDefinitionPath);
Expand Down
19 changes: 18 additions & 1 deletion FlowCalc/Pump.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,21 @@ public class Pump
[XmlElement("NominalH")]
public double NominalDynamicHead { get; set; }

/// <summary>
/// Leistungsaufname Motor P_1
/// in [kW]
/// </summary>
[Category("Leistungsdaten")]
[DisplayName("Leistungsaufnahme in kW (P1)")]
[Description("Leistungaufnahme")]
public double PowerInput { get; set; }

/// <summary>
/// Leistung an der Motorwelle P_2
/// in [kW]
/// </summary>
[Category("Leistungsdaten")]
[DisplayName("Motorleistung in kW")]
[DisplayName("Motorleistung in kW (P2)")]
[Description("Leistung an der Motorwelle.")]
public double PowerOutput { get; set; }

Expand All @@ -97,6 +106,14 @@ public class Pump
[XmlElement("AuthorEmail")]
public string AuthorEmailPumpFile { get; set; }

/// <summary>
/// Quelle der Pumpendaten
/// </summary>
[Category("Metadaten")]
[DisplayName("Datenquelle (URL)")]
[Description("Quelle der Pumpendaten, zum Beispiel Hersteller-Website.")]
public string DataSourceUrl { get; set; }

/// <summary>
/// Leistungskurve
/// </summary>
Expand Down
4 changes: 3 additions & 1 deletion PumpDefinitions/AquaPlus11.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
<Manufacturer>Aqua TechniX GmbH</Manufacturer>
<NominalQ>11</NominalQ>
<NominalH>9</NominalH>
<PowerInput>0.69</PowerInput>
<PowerOutput>0.45</PowerOutput>
<Author>Elias Ruemmler</Author>
<AuthorEmail>pool@100prznt.de</AuthorEmail>
<AuthorEmail>pool@100prznt.de</AuthorEmail>
<DataSourceUrl>https://aquatechnix.de/aquatechnix-poolpumpen/plus/</DataSourceUrl>
<PerformanceCurve>
<Ipp>
<H>13.461929824561407</H>
Expand Down
2 changes: 2 additions & 0 deletions PumpDefinitions/AquaPlus4.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
<Manufacturer>Aqua TechniX GmbH</Manufacturer>
<NominalQ>4</NominalQ>
<NominalH>8</NominalH>
<PowerInput>0.36</PowerInput>
<PowerOutput>0.18</PowerOutput>
<Author>Elias Ruemmler</Author>
<AuthorEmail>pool@100prznt.de</AuthorEmail>
<DataSourceUrl>https://aquatechnix.de/aquatechnix-poolpumpen/plus/</DataSourceUrl>
<PerformanceCurve>
<Ipp>
<H>9.8</H>
Expand Down
2 changes: 2 additions & 0 deletions PumpDefinitions/AquaPlus6.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
<Manufacturer>Aqua TechniX GmbH</Manufacturer>
<NominalQ>6</NominalQ>
<NominalH>8</NominalH>
<PowerInput>0.45</PowerInput>
<PowerOutput>0.25</PowerOutput>
<Author>Elias Ruemmler</Author>
<AuthorEmail>pool@100prznt.de</AuthorEmail>
<DataSourceUrl>https://aquatechnix.de/aquatechnix-poolpumpen/plus/</DataSourceUrl>
<PerformanceCurve>
<Ipp>
<H>10.863865546218491</H>
Expand Down
2 changes: 2 additions & 0 deletions PumpDefinitions/AquaPlus8.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
<Pump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Modell>AquaPlus 8</Modell>
<Manufacturer>Aqua TechniX GmbH</Manufacturer>
<PowerInput>0.6</PowerInput>
<PowerOutput>0.40</PowerOutput>
<NominalQ>8</NominalQ>
<NominalH>9</NominalH>
<Author>Elias Ruemmler</Author>
<AuthorEmail>pool@100prznt.de</AuthorEmail>
<DataSourceUrl>https://aquatechnix.de/aquatechnix-poolpumpen/plus/</DataSourceUrl>
<PerformanceCurve>
<Ipp>
<H>12</H>
Expand Down
2 changes: 2 additions & 0 deletions PumpDefinitions/BaduMagicII11.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
<Manufacturer>SPECK Pumpen Verkaufsgesellschaft GmbH</Manufacturer>
<NominalQ>11</NominalQ>
<NominalH>8</NominalH>
<PowerInput>0.65</PowerInput>
<PowerOutput>0.45</PowerOutput>
<Author>Elias Ruemmler</Author>
<AuthorEmail>pool@100prznt.de</AuthorEmail>
<DataSourceUrl>https://www.speck-pumps.com/media/pdf/f3/04/b8/BA_Magic.pdf</DataSourceUrl>
<PerformanceCurve>
<Ipp>
<H>14.012371001031998</H>
Expand Down
2 changes: 2 additions & 0 deletions PumpDefinitions/BaduMagicII6.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
<Manufacturer>SPECK Pumpen Verkaufsgesellschaft GmbH</Manufacturer>
<NominalQ>6</NominalQ>
<NominalH>8</NominalH>
<PowerInput>0.45</PowerInput>
<PowerOutput>0.25</PowerOutput>
<Author>Elias Ruemmler</Author>
<AuthorEmail>pool@100prznt.de</AuthorEmail>
<DataSourceUrl>https://www.speck-pumps.com/media/pdf/f3/04/b8/BA_Magic.pdf</DataSourceUrl>
<PerformanceCurve>
<Ipp>
<H>11.965034965034967</H>
Expand Down
2 changes: 2 additions & 0 deletions PumpDefinitions/BaduMagicII8.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
<Manufacturer>SPECK Pumpen Verkaufsgesellschaft GmbH</Manufacturer>
<NominalQ>8</NominalQ>
<NominalH>8</NominalH>
<PowerInput>0.6</PowerInput>
<PowerOutput>0.4</PowerOutput>
<Author>Elias Ruemmler</Author>
<AuthorEmail>pool@100prznt.de</AuthorEmail>
<DataSourceUrl>https://www.speck-pumps.com/media/pdf/f3/04/b8/BA_Magic.pdf</DataSourceUrl>
<PerformanceCurve>
<Ipp>
<H>13.9724358974359</H>
Expand Down
Loading

0 comments on commit bdee97f

Please sign in to comment.