diff --git a/BerichtGen/Bericht.cs b/BerichtGen/Bericht.cs
index f34f926..79f11f5 100644
--- a/BerichtGen/Bericht.cs
+++ b/BerichtGen/Bericht.cs
@@ -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);
}
}
diff --git a/BerichtGen/Options.Designer.cs b/BerichtGen/Options.Designer.cs
index b5ff1d9..b4e17f5 100644
--- a/BerichtGen/Options.Designer.cs
+++ b/BerichtGen/Options.Designer.cs
@@ -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;
}
}
\ No newline at end of file
diff --git a/BerichtGen/Options.cs b/BerichtGen/Options.cs
index b55c2c9..85c7889 100644
--- a/BerichtGen/Options.cs
+++ b/BerichtGen/Options.cs
@@ -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();
}
}
diff --git a/KlassenBIB/InlinerSanierung.cs b/KlassenBIB/InlinerSanierung.cs
index ae27ed2..0d78cd1 100644
--- a/KlassenBIB/InlinerSanierung.cs
+++ b/KlassenBIB/InlinerSanierung.cs
@@ -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();
diff --git a/KlassenBIB/KlassenBIB.csproj b/KlassenBIB/KlassenBIB.csproj
index 0cdd5e0..261db06 100644
--- a/KlassenBIB/KlassenBIB.csproj
+++ b/KlassenBIB/KlassenBIB.csproj
@@ -55,5 +55,11 @@
+
+
+ {C949087E-20E1-4A17-B021-FAEAD363C1D8}
+ SanShared
+
+
\ No newline at end of file
diff --git a/SanShared/IMakeProtokol.cs b/SanShared/IMakeProtokol.cs
new file mode 100644
index 0000000..fb2b1de
--- /dev/null
+++ b/SanShared/IMakeProtokol.cs
@@ -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);
+ }
+}
diff --git a/SanShared/SanShared.csproj b/SanShared/SanShared.csproj
index b21b308..8eb78c6 100644
--- a/SanShared/SanShared.csproj
+++ b/SanShared/SanShared.csproj
@@ -43,6 +43,7 @@
+
diff --git a/SanSystem/FrmLinerChart.Designer.cs b/SanSystem/FrmLinerChart.Designer.cs
deleted file mode 100644
index 2e6c059..0000000
--- a/SanSystem/FrmLinerChart.Designer.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-namespace SanSystem
-{
- partial class FrmLinerChart
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- 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;
- }
-}
\ No newline at end of file
diff --git a/SanSystem/FrmLinerChart.cs b/SanSystem/FrmLinerChart.cs
deleted file mode 100644
index 2919d29..0000000
--- a/SanSystem/FrmLinerChart.cs
+++ /dev/null
@@ -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();
- }
- }
-}
diff --git a/SanSystem/FrmLinerChart.resx b/SanSystem/FrmLinerChart.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/SanSystem/FrmLinerChart.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/SanSystem/SanSystem.csproj b/SanSystem/SanSystem.csproj
index 5c4652d..9eb6456 100644
--- a/SanSystem/SanSystem.csproj
+++ b/SanSystem/SanSystem.csproj
@@ -65,12 +65,6 @@
-
- Form
-
-
- FrmLinerChart.cs
-
Form
@@ -116,9 +110,6 @@
UCSchachtanbindung.cs
-
- FrmLinerChart.cs
-
frmObjektEdit.cs
diff --git a/SanSystem/UCInliner.Designer.cs b/SanSystem/UCInliner.Designer.cs
index d2194b4..e6b6bc8 100644
--- a/SanSystem/UCInliner.Designer.cs
+++ b/SanSystem/UCInliner.Designer.cs
@@ -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;
}
}
diff --git a/SanSystem/UCInliner.cs b/SanSystem/UCInliner.cs
index b1df75f..8629940 100644
--- a/SanSystem/UCInliner.cs
+++ b/SanSystem/UCInliner.cs
@@ -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());
+ options.ShowDialog();
+ }
}
}