Skip to content

Commit

Permalink
Anzeigefenster ergänzt
Browse files Browse the repository at this point in the history
  • Loading branch information
Elias Ruemmler committed Mar 7, 2019
1 parent 054bb10 commit 0fbfde6
Show file tree
Hide file tree
Showing 11 changed files with 445 additions and 13 deletions.
67 changes: 67 additions & 0 deletions FlowCalc/ChartView.Designer.cs
View file

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

165 changes: 165 additions & 0 deletions FlowCalc/ChartView.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Diagnostics;
using System.Drawing;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using ZedGraph;

namespace FlowCalc
{
public partial class ChartView : Form
{
public Dictionary<string, PointPairList> Data { get; set; }

public Tuple<double, double> PowerPoint
{
get
{
return m_PowerPoint;
}
set
{
m_PowerPoint = value;
CreateChart(zedGraphControl1);
}
}
private Tuple<double, double> m_PowerPoint;

public string WindowTitle
{
get
{
var versionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location);
return string.Concat(typeof(Form1).Assembly.GetName().Name, " ", versionInfo.ProductVersion);
}
}

public ChartView(string title)
{
InitializeComponent();

this.Text = string.Concat(WindowTitle, " - ", title);
this.Icon = Properties.Resources.iconfinder_100_Pressure_Reading_183415;

Data = new Dictionary<string, PointPairList>();

SetupChart(zedGraphControl1);
}

public void AddCurve(string name, double[] xQ, double[] yH)
{
if (Data.ContainsKey(name))
Data.Remove(name);

Data.Add(name, new PointPairList(xQ, yH));

CreateChart(zedGraphControl1);
}

private void SetupChart(ZedGraphControl zgc)
{
zgc.BorderStyle = BorderStyle.None;

var pane = zgc.GraphPane;

pane.Title.IsVisible = false;
pane.XAxis.Title.Text = "Volumenstrom Q in m³/h";
pane.XAxis.Type = AxisType.Exponent;
pane.XAxis.Scale.Exponent = 0.7;
pane.XAxis.Scale.MajorStep = 1;
pane.XAxis.Scale.Min = 0;
pane.XAxis.MajorGrid.IsVisible = true;
//pane.XAxis.MajorGrid.DashOff = 0;
pane.YAxis.Title.Text = "Meter Wassersäule H in mWS";

pane.Legend.Border.IsVisible = false;
}

private void CreateChart(ZedGraphControl zgc)
{
var pane = zgc.GraphPane;

//Needed for redrawing the chart, to remove old curves
pane.CurveList.Clear();

int i = 0;

if (PowerPoint != null)
{

LineItem wp = pane.AddCurve("Arbeitspunkt", new double[1] { PowerPoint.Item1 },
new double[1] { PowerPoint.Item2 }, Color.DarkOrange);

wp.Line.IsOptimizedDraw = true;
wp.Line.IsVisible = false;
wp.Symbol.Type = SymbolType.Diamond;
wp.Symbol.Size = 6f;
wp.Symbol.Fill.Type = FillType.Solid;

wp = pane.AddCurve("Arbeitspunkt Q", new double[2] { PowerPoint.Item1, PowerPoint.Item1 },
new double[2] { 0, PowerPoint.Item2 }, Color.DarkOrange);

wp.Label.IsVisible = false;
wp.Line.IsOptimizedDraw = true;
wp.Line.Style = System.Drawing.Drawing2D.DashStyle.Dash;
wp.Line.Width = 1f;
wp.Symbol.IsVisible = false;

wp = pane.AddCurve("Arbeitspunkt H", new double[2] { 0, PowerPoint.Item1 },
new double[2] { PowerPoint.Item2, PowerPoint.Item2 }, Color.DarkOrange);

wp.Label.IsVisible = false;
wp.Line.IsOptimizedDraw = true;
wp.Line.Style = System.Drawing.Drawing2D.DashStyle.Dash;
wp.Line.Width = 1;
wp.Symbol.IsVisible = false;
}

foreach (var curveData in Data)
{
//Add the data
LineItem curve = pane.AddCurve(curveData.Key, curveData.Value, GetColorByIndex(i++));

curve.Line.IsOptimizedDraw = true;
curve.Line.Width = 2f;
curve.Symbol.Type = SymbolType.Circle;
curve.Symbol.Size = 3f;
curve.Symbol.Fill.Type = FillType.Solid;
curve.Symbol.IsAntiAlias = true; //Makes the circles smoother
}

//Refresh the graph in order to show the new data
zgc.AxisChange();
zgc.Refresh();
}

private Color GetColorByIndex(int i)
{
switch (i)
{
case 0:
return Color.DodgerBlue;
case 1:
return Color.DeepPink;
case 2:
return Color.SpringGreen;
case 3:
return Color.Crimson;
case 4:
return Color.DarkCyan;
case 5:
return Color.Gold;
default:
return Color.Salmon;
}
}
}


}
120 changes: 120 additions & 0 deletions FlowCalc/ChartView.resx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
8 changes: 4 additions & 4 deletions FlowCalc/Controller.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ public bool LoadPump(string path)
return true;
}

public double CalcFlowRate(double pressure)
public void CalcFlowRate(double pressure)
{
SystemPressure = pressure;

if (SystemHead > Pump.MaxTotalHead)
return 0;

return LinInterp.LinearInterpolation(Pump.GetPerformanceHeadValues(), Pump.GetPerformanceFlowValues(), SystemHead);
SystemFlowRate = 0;
else
SystemFlowRate = LinInterp.LinearInterpolation(Pump.GetPerformanceHeadValues(), Pump.GetPerformanceFlowValues(), SystemHead);
}

#endregion Services
Expand Down
9 changes: 9 additions & 0 deletions FlowCalc/FlowCalc.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="ChartView.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ChartView.Designer.cs">
<DependentUpon>ChartView.cs</DependentUpon>
</Compile>
<Compile Include="Controller.cs" />
<Compile Include="Form1.cs">
<SubType>Form</SubType>
Expand All @@ -74,6 +80,9 @@
<Compile Include="Pump.cs" />
<Compile Include="PumpPerformancePoint.cs" />
<Compile Include="PoolSystem\BaseFitting.cs" />
<EmbeddedResource Include="ChartView.resx">
<DependentUpon>ChartView.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource>
Expand Down
Loading

0 comments on commit 0fbfde6

Please sign in to comment.