Berichte werden jetzt generiert, jedoch liegt es noch im bin datei dann

This commit is contained in:
Husky
2018-07-08 21:18:22 +02:00
parent 1a47c877b4
commit f7be4f6237
13 changed files with 232 additions and 321 deletions

View File

@@ -33,7 +33,7 @@ namespace BerichtGen
}
WordDocument wordDocument = new WordDocument("./documents/JUME/liner_einbau.docx");
/*
string[] fieldnames = null;
string[] fieldvalues = null;
@@ -57,14 +57,14 @@ namespace BerichtGen
}
counter++;
}
*/
//wordDocument.MailMerge.Execute(fieldnames, fieldvalues);
wordDocument.MailMerge.MergeImageField += new MergeImageFieldEventHandler(MailMerge_MergeImageField);
string[] fieldNames = new string[] { "UVImage" };
string[] fieldValues = new string[] { "test.png" };
wordDocument.MailMerge.Execute(fieldNames, fieldValues);
//string[] fieldNames = new string[] { "UVImage" };
//string[] fieldValues = new string[] { "test.png" };
wordDocument.MailMerge.Execute(fieldnames, fieldvalues);
wordDocument.Save("test.docx", Syncfusion.DocIO.FormatType.Docx);
wordDocument.Close();
//wordDocument.MailMerge.ExecuteGroup()
@@ -114,9 +114,10 @@ namespace BerichtGen
private void MailMerge_MergeImageField(object sender, MergeImageFieldEventArgs args)
{
if(args.FieldName == "TestImage")
if(args.FieldName == "UVImage")
{
string source = args.FieldValue.ToString();
args.Image = Image.FromFile(source);
}
}

View File

@@ -29,11 +29,17 @@
private void InitializeComponent()
{
this.btn_start = new System.Windows.Forms.Button();
this.cb_doc = new System.Windows.Forms.CheckBox();
this.cb_pdf = new System.Windows.Forms.CheckBox();
this.rb_yes = new System.Windows.Forms.RadioButton();
this.rb_no = new System.Windows.Forms.RadioButton();
this.label1 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// btn_start
//
this.btn_start.Location = new System.Drawing.Point(176, 249);
this.btn_start.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_start.Location = new System.Drawing.Point(374, 12);
this.btn_start.Name = "btn_start";
this.btn_start.Size = new System.Drawing.Size(75, 67);
this.btn_start.TabIndex = 0;
@@ -41,20 +47,87 @@
this.btn_start.UseVisualStyleBackColor = true;
this.btn_start.Click += new System.EventHandler(this.btn_start_Click);
//
// cb_doc
//
this.cb_doc.AutoSize = true;
this.cb_doc.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cb_doc.Location = new System.Drawing.Point(6, 12);
this.cb_doc.Name = "cb_doc";
this.cb_doc.Size = new System.Drawing.Size(173, 24);
this.cb_doc.TabIndex = 1;
this.cb_doc.Text = "DOC datei erzeugen";
this.cb_doc.UseVisualStyleBackColor = true;
//
// cb_pdf
//
this.cb_pdf.AutoSize = true;
this.cb_pdf.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cb_pdf.Location = new System.Drawing.Point(6, 35);
this.cb_pdf.Name = "cb_pdf";
this.cb_pdf.Size = new System.Drawing.Size(131, 24);
this.cb_pdf.TabIndex = 2;
this.cb_pdf.Text = "PDF erzeugen";
this.cb_pdf.UseVisualStyleBackColor = true;
//
// rb_yes
//
this.rb_yes.AutoSize = true;
this.rb_yes.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.rb_yes.Location = new System.Drawing.Point(221, 62);
this.rb_yes.Name = "rb_yes";
this.rb_yes.Size = new System.Drawing.Size(39, 24);
this.rb_yes.TabIndex = 3;
this.rb_yes.TabStop = true;
this.rb_yes.Text = "ja";
this.rb_yes.UseVisualStyleBackColor = true;
//
// rb_no
//
this.rb_no.AutoSize = true;
this.rb_no.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.rb_no.Location = new System.Drawing.Point(266, 62);
this.rb_no.Name = "rb_no";
this.rb_no.Size = new System.Drawing.Size(57, 24);
this.rb_no.TabIndex = 4;
this.rb_no.TabStop = true;
this.rb_no.Text = "nein";
this.rb_no.UseVisualStyleBackColor = true;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.Location = new System.Drawing.Point(2, 62);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(202, 20);
this.label1.TabIndex = 5;
this.label1.Text = "Nach dem erzeugen öffnen";
//
// Options
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
this.ClientSize = new System.Drawing.Size(477, 113);
this.Controls.Add(this.label1);
this.Controls.Add(this.rb_no);
this.Controls.Add(this.rb_yes);
this.Controls.Add(this.cb_pdf);
this.Controls.Add(this.cb_doc);
this.Controls.Add(this.btn_start);
this.Name = "Options";
this.Text = "Options";
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Button btn_start;
private System.Windows.Forms.CheckBox cb_doc;
private System.Windows.Forms.CheckBox cb_pdf;
private System.Windows.Forms.RadioButton rb_yes;
private System.Windows.Forms.RadioButton rb_no;
private System.Windows.Forms.Label label1;
}
}

View File

@@ -36,7 +36,7 @@ namespace BerichtGen
void Gen()
{
Bericht bericht = new Bericht();
bericht.Erzeuge("", "", "", grundDaten,bilderObjects);
bericht.Erzeuge(firma,vorlage, speicherpfad, grundDaten,bilderObjects);
}
private void btn_start_Click(object sender, EventArgs e)
@@ -47,6 +47,11 @@ namespace BerichtGen
while (generateProtokollThread.IsAlive) ;
if(rb_yes.Checked)
{
}
this.Close();
}
}

View File

@@ -1,4 +1,6 @@
using System;
using SanShared;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
@@ -8,7 +10,7 @@ using System.Threading.Tasks;
namespace KlassenBIB
{
public sealed class InlinerSanierung : Sanieren
public sealed class InlinerSanierung : Sanieren, IMakeProtokol
{
double kalibrierUnterdruck = -0.5;
double kalibierWalzenAbstand = 0.9;
@@ -41,6 +43,94 @@ namespace KlassenBIB
return mypath;
}
public Hashtable MakeProtokoll(string destinationPath)
{
Hashtable grunddaten = new Hashtable()
{
{"AG_Vorname","" },
{"KLP_Nummer","" },
{"KLP_Datum","" },
{"AG_Ort","" },
{"AG_Strasse","" },
{"AG_Ansprechpartner","" },
{"BM_Ort","" },
{"BM_Strasse","" },
{"BM_Schacht_von","" },
{"BM_Schacht_bis","" },
{"BM_Haltungsmat","" },
{"BM_Haltung_DN","" },
{"BM_Haltunglaenge","" },
{ "KL_Wetter","" },
{ "Temp_Aussen","" },
{ "KL_Temp_Kanal","" },
{ "KL_Gen_true","" },
{ "KL_Gen_false","" },
{ "KL_WH_true","" },
{ "KL_WH_false", "" },
{ "KL_STVO_true","" },
{ "KL_STVO_false","" },
{ "KL_HD_true","" },
{ "KL_mech_true","" },
{ "KL_rob_true","" },
{ "KL_HD_date","" },
{ "KL_Besatzung", "" },
{"liner_laenge","" },
{"Charge_Liner","" },
{"Charge_Harz","" },
{"harz_bedarf_m","" },
{"gesamt_harz","" },
{"temperatur_harz","" },
{"datum_kalibrierung","" },
{"walzen_abstand","" },
{"vakuum","" },
{"time_start","" },
{"time_ende","" },
{"UVImage","" }
};
grunddaten["AG_Vorname"] = "";
grunddaten["KLP_Nummer"] = "";
grunddaten["KLP_Datum"] = DateTime.Now.ToShortDateString();
grunddaten["AG_Ort"] = "";
grunddaten["AG_Strasse"] = "";
grunddaten["AG_Ansprechpartner"] = "";
grunddaten["BM_Ort"] = Inspektionsobjekt.OrtName;
grunddaten["BM_Strasse"] = Inspektionsobjekt.StrasseName;
grunddaten["BM_Schacht_von"] = Inspektionsobjekt.VonPunkt;
grunddaten["BM_Schacht_bis"] = Inspektionsobjekt.BisPunkt ;
grunddaten["BM_Haltungsmat"] = Inspektionsobjekt.RohrMaterial;
grunddaten["BM_Haltung_DN"] = Inspektionsobjekt.Kanalrohrweite;
grunddaten["BM_Haltunglaenge"] = Inspektionsobjekt.Haltungslaenge;
grunddaten["KL_Wetter"] = this.Wetter;
grunddaten["Temp_Aussen"] = this.TempAusen;
grunddaten["KL_Temp_Kanal"] = this.TempKanal;
grunddaten["KL_Gen_true"] = this.GenehmigungVorhanden ? "X" : "" ;
grunddaten["KL_Gen_false"] = this.GenehmigungVorhanden ? "": "X";
grunddaten["KL_WH_true"] = this.WasserhaltungEingerichtet ? "X" : "";
grunddaten["KL_WH_false"] = this.WasserhaltungEingerichtet ? " ":"X" ;
grunddaten["KL_STVO_true"] = this.STVOAbsicherung ? "X" : "";
grunddaten["KL_STVO_false"] = this.STVOAbsicherung ? "":"X";
grunddaten["KL_HD_true"] = "";
grunddaten["KL_mech_true"] = "";
grunddaten["KL_rob_true"] = "";
grunddaten["KL_HD_date"] = "";
grunddaten["KL_Besatzung"] = "";
grunddaten["liner_laenge"] = "";
grunddaten["Charge_Liner"] = this.LinerChargenummer;
grunddaten["Charge_Harz"] = this.HarzChargenummer;
grunddaten["harz_bedarf_m"] = "";
grunddaten["gesamt_harz"] = "";
grunddaten["temperatur_harz"] = this.HarzKalibrierTemperatur;
grunddaten["datum_kalibrierung"] = this.DatumKalibrierung.ToShortDateString();
grunddaten["walzen_abstand"] = this.KalibierWalzenAbstand;
grunddaten["vakuum"] = this.KalibrierUnterdruck;
grunddaten["time_start"] = "";
grunddaten["time_ende"] = "";
grunddaten["UVImage"] = Path.Combine(destinationPath, "linerGraph.jpg");
return grunddaten;
}
public InlinerSanierung()
{
//datumKalibrierung = new DateTime();

View File

@@ -55,5 +55,11 @@
<Compile Include="SavedBilder.cs" />
<Compile Include="SchachtAnbindung.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SanShared\SanShared.csproj">
<Project>{C949087E-20E1-4A17-B021-FAEAD363C1D8}</Project>
<Name>SanShared</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@@ -0,0 +1,14 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SanShared
{
public interface IMakeProtokol
{
Hashtable MakeProtokoll(string destinationPath);
}
}

View File

@@ -43,6 +43,7 @@
<Compile Include="BilderObject.cs" />
<Compile Include="Exceptions\LangNotFoundException.cs" />
<Compile Include="ILanguage.cs" />
<Compile Include="IMakeProtokol.cs" />
<Compile Include="ITemperature.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>

View File

@@ -1,60 +0,0 @@
namespace SanSystem
{
partial class FrmLinerChart
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.button1 = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// button1
//
this.button1.Location = new System.Drawing.Point(90, 67);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(210, 112);
this.button1.TabIndex = 0;
this.button1.Text = "button1";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// FrmLinerChart
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Controls.Add(this.button1);
this.Name = "FrmLinerChart";
this.Text = "FrmLinerChart";
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.Button button1;
}
}

View File

@@ -1,105 +0,0 @@
using Syncfusion.Windows.Forms.Chart;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace SanSystem
{
public partial class FrmLinerChart : Form
{
public FrmLinerChart()
{
InitializeComponent();
}
public void SaveChart()
{
Size size = new Size(800, 400);
ChartControl chartControl = new ChartControl();
chartControl.Size = size;
ChartAxis axis = chartControl.PrimaryYAxis;
ChartAxis axis0 = new ChartAxis(ChartOrientation.Vertical);
ChartAxis axis1 = new ChartAxis(ChartOrientation.Vertical);
ChartAxisLayout layout1 = new ChartAxisLayout();
ChartAxisLayout layout2 = new ChartAxisLayout();
chartControl.Axes.Add(axis0);
chartControl.Axes.Add(axis1);
layout1.Spacing = 12;
layout2.Spacing = 12;
layout1.Axes.Add(axis);
layout2.Axes.Add(axis0);
layout2.Axes.Add(axis1);
chartControl.ChartArea.YLayouts.Add(layout1);
chartControl.ChartArea.YLayouts.Add(layout2);
ChartSeries temperaturChart = new ChartSeries("Temperatur", ChartSeriesType.Line);
ChartSeries druckChart = new ChartSeries("Druck", ChartSeriesType.Line);
string[] input = File.ReadAllLines(@"C:\Users\Damian\Desktop\SanVerwaltung\SanSystem\bin\Debug\projekte\18-850\SW01-SW02\UVAnlage\Trend\Trend022.csv");
int counter = 0;
foreach (string pars in input)
{
string[] parts = pars.Split(',');
if (parts[0].Equals("Group1") || parts[1].Equals("(END)")) continue;
double temperatur = double.Parse(parts[1].Replace('.', ','));
double druck = double.Parse(parts[2].Replace('.', ','));
temperaturChart.Points.Add(counter, temperatur);
druckChart.Points.Add(counter, druck);
counter++;
}
temperaturChart.YAxis = axis;
druckChart.YAxis = axis0;
axis.Title = "°C";
axis.TitleFont = new Font("Segeo UI", 14F);
axis0.Title = "[bar]";
axis0.TitleFont = new Font("Segeo UI", 14F);
chartControl.LegendsPlacement = ChartPlacement.Outside;
chartControl.LegendPosition = ChartDock.Bottom;
chartControl.LegendAlignment = ChartAlignment.Center;
chartControl.Title.Visible = false;
ChartAxis chartAxis = new ChartAxis();
chartAxis.Orientation = ChartOrientation.Horizontal;
chartAxis.Range = new MinMaxInfo(0, 6, 1);
chartAxis.DrawGrid = false;
chartAxis.LineType.Width = 1F;
chartAxis.LineType.ForeColor = Color.Black;
chartControl.Axes.Add(chartAxis);
chartControl.Series.Add(temperaturChart);
chartControl.Series.Add(druckChart);
chartControl.Skins = Skins.Metro;
axis1.OpposedPosition = true;
axis.EdgeLabelsDrawingMode = ChartAxisEdgeLabelsDrawingMode.Shift;
axis0.EdgeLabelsDrawingMode = ChartAxisEdgeLabelsDrawingMode.Shift;
axis1.EdgeLabelsDrawingMode = ChartAxisEdgeLabelsDrawingMode.Shift;
chartControl.SaveImage("./temp.jpg");
}
private void button1_Click(object sender, EventArgs e)
{
SaveChart();
}
}
}

View File

@@ -1,120 +0,0 @@
<?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>

View File

@@ -65,12 +65,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="FrmLinerChart.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmLinerChart.Designer.cs">
<DependentUpon>FrmLinerChart.cs</DependentUpon>
</Compile>
<Compile Include="frmObjektEdit.cs">
<SubType>Form</SubType>
</Compile>
@@ -116,9 +110,6 @@
<Compile Include="UCSchachtanbindung.Designer.cs">
<DependentUpon>UCSchachtanbindung.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="FrmLinerChart.resx">
<DependentUpon>FrmLinerChart.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmObjektEdit.resx">
<DependentUpon>frmObjektEdit.cs</DependentUpon>
</EmbeddedResource>

View File

@@ -30,6 +30,7 @@
{
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.btn_create_graph = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.ftpProgress = new System.Windows.Forms.ProgressBar();
this.btn_transfer_ftp = new System.Windows.Forms.Button();
@@ -70,7 +71,7 @@
this.label11 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label();
this.btn_create_graph = new System.Windows.Forms.Button();
this.btn_create_protokol = new System.Windows.Forms.Button();
this.tabControl1.SuspendLayout();
this.tabPage2.SuspendLayout();
this.groupBox3.SuspendLayout();
@@ -92,6 +93,7 @@
//
// tabPage2
//
this.tabPage2.Controls.Add(this.btn_create_protokol);
this.tabPage2.Controls.Add(this.btn_create_graph);
this.tabPage2.Controls.Add(this.button1);
this.tabPage2.Controls.Add(this.ftpProgress);
@@ -117,6 +119,16 @@
this.tabPage2.Text = "Vorraussetzungen";
this.tabPage2.UseVisualStyleBackColor = true;
//
// btn_create_graph
//
this.btn_create_graph.Location = new System.Drawing.Point(443, 487);
this.btn_create_graph.Name = "btn_create_graph";
this.btn_create_graph.Size = new System.Drawing.Size(138, 67);
this.btn_create_graph.TabIndex = 32;
this.btn_create_graph.Text = "UVGraphic erzeugen";
this.btn_create_graph.UseVisualStyleBackColor = true;
this.btn_create_graph.Click += new System.EventHandler(this.btn_create_graph_Click);
//
// button1
//
this.button1.Location = new System.Drawing.Point(829, 197);
@@ -546,15 +558,15 @@
this.label9.TabIndex = 0;
this.label9.Text = "Harz";
//
// btn_create_graph
// btn_create_protokol
//
this.btn_create_graph.Location = new System.Drawing.Point(608, 457);
this.btn_create_graph.Name = "btn_create_graph";
this.btn_create_graph.Size = new System.Drawing.Size(138, 67);
this.btn_create_graph.TabIndex = 32;
this.btn_create_graph.Text = "UVGraphic erzeugen";
this.btn_create_graph.UseVisualStyleBackColor = true;
this.btn_create_graph.Click += new System.EventHandler(this.btn_create_graph_Click);
this.btn_create_protokol.Location = new System.Drawing.Point(626, 484);
this.btn_create_protokol.Name = "btn_create_protokol";
this.btn_create_protokol.Size = new System.Drawing.Size(107, 69);
this.btn_create_protokol.TabIndex = 33;
this.btn_create_protokol.Text = "Protokoll erzeugen";
this.btn_create_protokol.UseVisualStyleBackColor = true;
this.btn_create_protokol.Click += new System.EventHandler(this.btn_create_protokol_Click);
//
// UCInliner
//
@@ -624,5 +636,6 @@
private System.Windows.Forms.ProgressBar ftpProgress;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button btn_create_graph;
private System.Windows.Forms.Button btn_create_protokol;
}
}

View File

@@ -201,15 +201,10 @@ namespace SanSystem
options.ShowDialog();
}
private void button2_Click(object sender, EventArgs e)
{
FrmLinerChart frmLinerChart = new FrmLinerChart();
frmLinerChart.ShowDialog();
}
private static ChartControl getGraph(string csvFile)
{
Size size = new Size(800, 400);
Size size = new Size(600, 400);
ChartControl chartControl = new ChartControl();
chartControl.Size = size;
@@ -300,5 +295,12 @@ namespace SanSystem
watch.Stop();
MessageBox.Show((watch.ElapsedTicks) + " s");
}
private void btn_create_protokol_Click(object sender, EventArgs e)
{
Hashtable hashtable = inliner.MakeProtokoll(destinationPath);
BerichtGen.Options options = new BerichtGen.Options("JUME", "liner_einbau.docx", "./", hashtable, new List<BilderObject>());
options.ShowDialog();
}
}
}