Remove PumpHeight [ci]

Angabe der Pumpenhöhe entfernt. Höhe kann im laufendem Betrieb vernachlässigt werden.
100prznt · Jul 4, 2019 · cbf04fa · cbf04fa
1 parent d9ae9df
commit cbf04fa
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 92 deletions.
diff --git a/FlowCalc/App.config b/FlowCalc/App.config
@@ -37,9 +37,6 @@
             <setting name="FittingsSearchPath" serializeAs="String">
                 <value />
             </setting>
-            <setting name="PumpHeight" serializeAs="String">
-                <value>0</value>
-            </setting>
             <setting name="CalcFlowRate" serializeAs="String">
                 <value>0</value>
             </setting>

diff --git a/FlowCalc/MainView.Designer.cs b/FlowCalc/MainView.Designer.cs
diff --git a/FlowCalc/MainView.cs b/FlowCalc/MainView.cs
@@ -138,14 +138,7 @@ private void btn_CalcFlowRate_Click(object sender, EventArgs e)
             }
             else
                 m_Controller.SuctionPipe = null;
-
-            double pumpHeigth = 0;
-            if (double.TryParse(txt_PumpHeight.Text, out pumpHeigth))
-            {
-                Properties.Settings.Default.PumpHeight = pumpHeigth;
-                Properties.Settings.Default.Save();
-            }
-
+
 
             double pressure = 0;
 

diff --git a/FlowCalc/MainView.resx b/FlowCalc/MainView.resx
@@ -123,9 +123,6 @@
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>157, 17</value>
   </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>157, 17</value>
-  </metadata>
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>254, 17</value>
   </metadata>

diff --git a/FlowCalc/Properties/Settings.Designer.cs b/FlowCalc/Properties/Settings.Designer.cs
diff --git a/FlowCalc/Properties/Settings.settings b/FlowCalc/Properties/Settings.settings
@@ -29,9 +29,6 @@
     <Setting Name="FittingsSearchPath" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="PumpHeight" Type="System.Double" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
     <Setting Name="CalcFlowRate" Type="System.Double" Scope="User">
       <Value Profile="(Default)">0</Value>
     </Setting>

diff --git a/PumpDefinitions/SPS100.xml b/PumpDefinitions/SPS100.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Pump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Modell>SPS-100</Modell>
+  <Manufacturer>OKU Obermaier GmbH</Manufacturer>
+  <PowerOutput>0.55</PowerOutput>
+  <NominalQ>6.2</NominalQ>
+  <NominalH>6</NominalH>
+  <Author>Elias Ruemmler</Author>
+  <AuthorEmail>pool@100prznt.de</AuthorEmail>
+  <PerformanceCurve>
+    <Ipp>
+      <H>9.8</H>
+      <Q>0.75</Q>
+    </Ipp>
+    <Ipp>
+      <H>9.4</H>
+      <Q>1.5</Q>
+    </Ipp>
+    <Ipp>
+      <H>9</H>
+      <Q>2.25</Q>
+    </Ipp>
+    <Ipp>
+      <H>8.5</H>
+      <Q>3</Q>
+    </Ipp>
+    <Ipp>
+      <H>8</H>
+      <Q>3.75</Q>
+    </Ipp>
+    <Ipp>
+      <H>7.5</H>
+      <Q>4.5</Q>
+    </Ipp>
+    <Ipp>
+      <H>7</H>
+      <Q>5.25</Q>
+    </Ipp>
+    <Ipp>
+      <H>6.2</H>
+      <Q>6</Q>
+    </Ipp>
+    <Ipp>
+      <H>5.4</H>
+      <Q>6.75</Q>
+    </Ipp>
+    <Ipp>
+      <H>4.4</H>
+      <Q>7.5</Q>
+    </Ipp>
+    <Ipp>
+      <H>3.2</H>
+      <Q>8.25</Q>
+    </Ipp>
+    <Ipp>
+      <H>2</H>
+      <Q>9</Q>
+    </Ipp>
+  </PerformanceCurve>
+</Pump>