(1) iPerlCommunicationForm displays green/red rectangle as opto-data indication, (2) ProcedureDlg displays date and time of changes, ver. 2.8.314

This commit is contained in:
Milan Hanajik 2016-06-27 15:24:10 +02:00
parent d393a519f3
commit 8a3a0ca6ef
9 changed files with 1983 additions and 1916 deletions

View File

@ -282,7 +282,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
int textBoxesCount;
Label[] labels;
TextBox[] counters;
PictureBox[] counters;
TextBox[] messages;
static IList<WaterMeters.iPerl.WaterMeter> waterMeters;
@ -328,18 +328,18 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
wmLabel41, wmLabel42, wmLabel43, wmLabel44, wmLabel45,
wmLabel46, wmLabel47, wmLabel48,
};
counters = new TextBox[48]
counters = new PictureBox[48]
{
textBox1, textBox2, textBox3, textBox4, textBox5,
textBox6, textBox7, textBox8, textBox9, textBox10,
textBox11, textBox12, textBox13, textBox14, textBox15,
textBox16, textBox17, textBox18, textBox19, textBox20,
textBox21, textBox22, textBox23, textBox24, textBox25,
textBox26, textBox27, textBox28, textBox29, textBox30,
textBox31, textBox32, textBox33, textBox34, textBox35,
textBox36, textBox37, textBox38, textBox39, textBox40,
textBox41, textBox42, textBox43, textBox44, textBox45,
textBox46, textBox47, textBox48,
pictureBox1, pictureBox2, pictureBox3, pictureBox4, pictureBox5,
pictureBox6, pictureBox7, pictureBox8, pictureBox9, pictureBox10,
pictureBox11, pictureBox12, pictureBox13, pictureBox14, pictureBox15,
pictureBox16, pictureBox17, pictureBox18, pictureBox19, pictureBox20,
pictureBox21, pictureBox22, pictureBox23, pictureBox24, pictureBox25,
pictureBox26, pictureBox27, pictureBox28, pictureBox29, pictureBox30,
pictureBox31, pictureBox32, pictureBox33, pictureBox34, pictureBox35,
pictureBox36, pictureBox37, pictureBox38, pictureBox39, pictureBox40,
pictureBox41, pictureBox42, pictureBox43, pictureBox44, pictureBox45,
pictureBox46, pictureBox47, pictureBox48,
};
messages = new TextBox[48]
{
@ -563,7 +563,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
for (int i = 0; i < waterMeters.Count; i++)
{
waterMeters[i].FlushedDataCount = 0;
counters[i].Text = "0";
counters[i].BackColor = Color.Red;
}
///
@ -1374,7 +1374,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
for (int i = 0; i < waterMeters.Count; i++)
{
counters[i].Text = (waterMeters[i].FlushedDataCount % 1000).ToString();
counters[i].BackColor = (waterMeters[i].FlushedDataDelta == 0) ? Color.Red : Color.Green;
}
lock (this)

View File

@ -347,9 +347,21 @@ namespace TBF.BenchControl.WaterMeters.iPerl
public int FlushedDataCount
{
get { return flushedDataCount; }
set { flushedDataCount = value; }
set { flushedDataCount = lastFlushedDataCount = value; }
}
int lastFlushedDataCount;
public int FlushedDataDelta
{
get
{
int retval = flushedDataCount - lastFlushedDataCount;
lastFlushedDataCount = flushedDataCount;
return retval;
}
}
///
/// Opto serial port and worker thread related private variables

View File

@ -101,27 +101,30 @@ namespace TBF
//
// mainSplitContainer.Panel1
//
resources.ApplyResources(this.mainSplitContainer.Panel1, "mainSplitContainer.Panel1");
this.mainSplitContainer.Panel1.Controls.Add(this.tabControl);
//
// mainSplitContainer.Panel2
//
resources.ApplyResources(this.mainSplitContainer.Panel2, "mainSplitContainer.Panel2");
this.mainSplitContainer.Panel2.Controls.Add(this.sharedButtons);
//
// tabControl
//
resources.ApplyResources(this.tabControl, "tabControl");
this.tabControl.Controls.Add(this.generalTabPage);
this.tabControl.Controls.Add(this.historyTabPage);
this.tabControl.Controls.Add(this.metrology1TabPage);
this.tabControl.Controls.Add(this.metrology2TabPage);
this.tabControl.Controls.Add(this.processTabPage);
this.tabControl.Controls.Add(this.parametersTabPage);
resources.ApplyResources(this.tabControl, "tabControl");
this.tabControl.Name = "tabControl";
this.tabControl.SelectedIndex = 0;
this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged);
//
// generalTabPage
//
resources.ApplyResources(this.generalTabPage, "generalTabPage");
this.generalTabPage.Controls.Add(this.fileWriter4ComboBox);
this.generalTabPage.Controls.Add(this.fileWriter3ComboBox);
this.generalTabPage.Controls.Add(this.printer2ComboBox);
@ -156,32 +159,33 @@ namespace TBF
this.generalTabPage.Controls.Add(this.label12);
this.generalTabPage.Controls.Add(this.procNameTextBox);
this.generalTabPage.Controls.Add(this.label1);
resources.ApplyResources(this.generalTabPage, "generalTabPage");
this.generalTabPage.ImageKey = global::TBF.Resources.Strings.Camera;
this.generalTabPage.Name = "generalTabPage";
this.generalTabPage.ToolTipText = global::TBF.Resources.Strings.Camera;
this.generalTabPage.UseVisualStyleBackColor = true;
//
// fileWriter4ComboBox
//
this.fileWriter4ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.fileWriter4ComboBox, "fileWriter4ComboBox");
this.fileWriter4ComboBox.FormattingEnabled = true;
this.fileWriter4ComboBox.Name = "fileWriter4ComboBox";
//
// fileWriter3ComboBox
//
this.fileWriter3ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.fileWriter3ComboBox, "fileWriter3ComboBox");
this.fileWriter3ComboBox.FormattingEnabled = true;
this.fileWriter3ComboBox.Name = "fileWriter3ComboBox";
//
// printer2ComboBox
//
this.printer2ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.printer2ComboBox, "printer2ComboBox");
this.printer2ComboBox.FormattingEnabled = true;
this.printer2ComboBox.Name = "printer2ComboBox";
//
// fileWriter2ComboBox
//
this.fileWriter2ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.fileWriter2ComboBox, "fileWriter2ComboBox");
this.fileWriter2ComboBox.FormattingEnabled = true;
this.fileWriter2ComboBox.Name = "fileWriter2ComboBox";
//
// protocolTitleTextBox
@ -198,6 +202,7 @@ namespace TBF
// metersKindRadioButton2
//
resources.ApplyResources(this.metersKindRadioButton2, "metersKindRadioButton2");
this.metersKindRadioButton2.ImageKey = global::TBF.Resources.Strings.Camera;
this.metersKindRadioButton2.Name = "metersKindRadioButton2";
this.metersKindRadioButton2.TabStop = true;
this.metersKindRadioButton2.UseVisualStyleBackColor = true;
@ -205,63 +210,69 @@ namespace TBF
// metersKindRadioButton1
//
resources.ApplyResources(this.metersKindRadioButton1, "metersKindRadioButton1");
this.metersKindRadioButton1.ImageKey = global::TBF.Resources.Strings.Camera;
this.metersKindRadioButton1.Name = "metersKindRadioButton1";
this.metersKindRadioButton1.TabStop = true;
this.metersKindRadioButton1.UseVisualStyleBackColor = true;
//
// transitionEndComboBox
//
this.transitionEndComboBox.FormattingEnabled = true;
resources.ApplyResources(this.transitionEndComboBox, "transitionEndComboBox");
this.transitionEndComboBox.FormattingEnabled = true;
this.transitionEndComboBox.Name = "transitionEndComboBox";
//
// transitionEndLabel
//
resources.ApplyResources(this.transitionEndLabel, "transitionEndLabel");
this.transitionEndLabel.ImageKey = global::TBF.Resources.Strings.Camera;
this.transitionEndLabel.Name = "transitionEndLabel";
//
// transitionStartComboBox
//
this.transitionStartComboBox.FormattingEnabled = true;
resources.ApplyResources(this.transitionStartComboBox, "transitionStartComboBox");
this.transitionStartComboBox.FormattingEnabled = true;
this.transitionStartComboBox.Name = "transitionStartComboBox";
//
// transitionStartLabel
//
resources.ApplyResources(this.transitionStartLabel, "transitionStartLabel");
this.transitionStartLabel.ImageKey = global::TBF.Resources.Strings.Camera;
this.transitionStartLabel.Name = "transitionStartLabel";
//
// fileWriter1ComboBox
//
this.fileWriter1ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.fileWriter1ComboBox, "fileWriter1ComboBox");
this.fileWriter1ComboBox.FormattingEnabled = true;
this.fileWriter1ComboBox.Name = "fileWriter1ComboBox";
//
// printer1ComboBox
//
this.printer1ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.printer1ComboBox, "printer1ComboBox");
this.printer1ComboBox.FormattingEnabled = true;
this.printer1ComboBox.Name = "printer1ComboBox";
//
// dataEntryComboBox
//
this.dataEntryComboBox.FormattingEnabled = true;
resources.ApplyResources(this.dataEntryComboBox, "dataEntryComboBox");
this.dataEntryComboBox.FormattingEnabled = true;
this.dataEntryComboBox.Name = "dataEntryComboBox";
//
// resultsWriterLabel
//
resources.ApplyResources(this.resultsWriterLabel, "resultsWriterLabel");
this.resultsWriterLabel.ImageKey = global::TBF.Resources.Strings.Camera;
this.resultsWriterLabel.Name = "resultsWriterLabel";
//
// resultsPrinterLabel
//
resources.ApplyResources(this.resultsPrinterLabel, "resultsPrinterLabel");
this.resultsPrinterLabel.ImageKey = global::TBF.Resources.Strings.Camera;
this.resultsPrinterLabel.Name = "resultsPrinterLabel";
//
// dataEntryLabel
//
resources.ApplyResources(this.dataEntryLabel, "dataEntryLabel");
this.dataEntryLabel.ImageKey = global::TBF.Resources.Strings.Camera;
this.dataEntryLabel.Name = "dataEntryLabel";
//
// notesTextBox
@ -272,6 +283,7 @@ namespace TBF
// label18
//
resources.ApplyResources(this.label18, "label18");
this.label18.ImageKey = global::TBF.Resources.Strings.Camera;
this.label18.Name = "label18";
//
// watermetersTextBox
@ -282,6 +294,7 @@ namespace TBF
// watermetersLabel
//
resources.ApplyResources(this.watermetersLabel, "watermetersLabel");
this.watermetersLabel.ImageKey = global::TBF.Resources.Strings.Camera;
this.watermetersLabel.Name = "watermetersLabel";
//
// lastChangedOnTextBox
@ -292,6 +305,7 @@ namespace TBF
// label15
//
resources.ApplyResources(this.label15, "label15");
this.label15.ImageKey = global::TBF.Resources.Strings.Camera;
this.label15.Name = "label15";
//
// lastChangedByTextBox
@ -302,6 +316,7 @@ namespace TBF
// label16
//
resources.ApplyResources(this.label16, "label16");
this.label16.ImageKey = global::TBF.Resources.Strings.Camera;
this.label16.Name = "label16";
//
// createdOnTextBox
@ -312,6 +327,7 @@ namespace TBF
// label14
//
resources.ApplyResources(this.label14, "label14");
this.label14.ImageKey = global::TBF.Resources.Strings.Camera;
this.label14.Name = "label14";
//
// createdByTextBox
@ -322,6 +338,7 @@ namespace TBF
// label13
//
resources.ApplyResources(this.label13, "label13");
this.label13.ImageKey = global::TBF.Resources.Strings.Camera;
this.label13.Name = "label13";
//
// descriptionTextBox
@ -332,6 +349,7 @@ namespace TBF
// label12
//
resources.ApplyResources(this.label12, "label12");
this.label12.ImageKey = global::TBF.Resources.Strings.Camera;
this.label12.Name = "label12";
//
// procNameTextBox
@ -342,19 +360,22 @@ namespace TBF
// label1
//
resources.ApplyResources(this.label1, "label1");
this.label1.ImageKey = global::TBF.Resources.Strings.Camera;
this.label1.Name = "label1";
//
// historyTabPage
//
this.historyTabPage.Controls.Add(this.historyListViewEx);
resources.ApplyResources(this.historyTabPage, "historyTabPage");
this.historyTabPage.Controls.Add(this.historyListViewEx);
this.historyTabPage.ImageKey = global::TBF.Resources.Strings.Camera;
this.historyTabPage.Name = "historyTabPage";
this.historyTabPage.ToolTipText = global::TBF.Resources.Strings.Camera;
this.historyTabPage.UseVisualStyleBackColor = true;
//
// historyListViewEx
//
this.historyListViewEx.AllowColumnReorder = true;
resources.ApplyResources(this.historyListViewEx, "historyListViewEx");
this.historyListViewEx.AllowColumnReorder = true;
this.historyListViewEx.DoubleClickActivation = false;
this.historyListViewEx.FullRowSelect = true;
this.historyListViewEx.GridLines = true;
@ -364,15 +385,17 @@ namespace TBF
//
// metrology1TabPage
//
this.metrology1TabPage.Controls.Add(this.metrology1ListViewEx);
resources.ApplyResources(this.metrology1TabPage, "metrology1TabPage");
this.metrology1TabPage.Controls.Add(this.metrology1ListViewEx);
this.metrology1TabPage.ImageKey = global::TBF.Resources.Strings.Camera;
this.metrology1TabPage.Name = "metrology1TabPage";
this.metrology1TabPage.ToolTipText = global::TBF.Resources.Strings.Camera;
this.metrology1TabPage.UseVisualStyleBackColor = true;
//
// metrology1ListViewEx
//
this.metrology1ListViewEx.AllowColumnReorder = true;
resources.ApplyResources(this.metrology1ListViewEx, "metrology1ListViewEx");
this.metrology1ListViewEx.AllowColumnReorder = true;
this.metrology1ListViewEx.DoubleClickActivation = false;
this.metrology1ListViewEx.FullRowSelect = true;
this.metrology1ListViewEx.GridLines = true;
@ -383,15 +406,17 @@ namespace TBF
//
// metrology2TabPage
//
this.metrology2TabPage.Controls.Add(this.metrology2ListViewEx);
resources.ApplyResources(this.metrology2TabPage, "metrology2TabPage");
this.metrology2TabPage.Controls.Add(this.metrology2ListViewEx);
this.metrology2TabPage.ImageKey = global::TBF.Resources.Strings.Camera;
this.metrology2TabPage.Name = "metrology2TabPage";
this.metrology2TabPage.ToolTipText = global::TBF.Resources.Strings.Camera;
this.metrology2TabPage.UseVisualStyleBackColor = true;
//
// metrology2ListViewEx
//
this.metrology2ListViewEx.AllowColumnReorder = true;
resources.ApplyResources(this.metrology2ListViewEx, "metrology2ListViewEx");
this.metrology2ListViewEx.AllowColumnReorder = true;
this.metrology2ListViewEx.DoubleClickActivation = false;
this.metrology2ListViewEx.FullRowSelect = true;
this.metrology2ListViewEx.GridLines = true;
@ -402,15 +427,17 @@ namespace TBF
//
// processTabPage
//
this.processTabPage.Controls.Add(this.processListViewEx);
resources.ApplyResources(this.processTabPage, "processTabPage");
this.processTabPage.Controls.Add(this.processListViewEx);
this.processTabPage.ImageKey = global::TBF.Resources.Strings.Camera;
this.processTabPage.Name = "processTabPage";
this.processTabPage.ToolTipText = global::TBF.Resources.Strings.Camera;
this.processTabPage.UseVisualStyleBackColor = true;
//
// processListViewEx
//
this.processListViewEx.AllowColumnReorder = true;
resources.ApplyResources(this.processListViewEx, "processListViewEx");
this.processListViewEx.AllowColumnReorder = true;
this.processListViewEx.DoubleClickActivation = false;
this.processListViewEx.FullRowSelect = true;
this.processListViewEx.GridLines = true;
@ -421,15 +448,17 @@ namespace TBF
//
// parametersTabPage
//
this.parametersTabPage.Controls.Add(this.parametersListViewEx);
resources.ApplyResources(this.parametersTabPage, "parametersTabPage");
this.parametersTabPage.Controls.Add(this.parametersListViewEx);
this.parametersTabPage.ImageKey = global::TBF.Resources.Strings.Camera;
this.parametersTabPage.Name = "parametersTabPage";
this.parametersTabPage.ToolTipText = global::TBF.Resources.Strings.Camera;
this.parametersTabPage.UseVisualStyleBackColor = true;
//
// parametersListViewEx
//
this.parametersListViewEx.AllowColumnReorder = true;
resources.ApplyResources(this.parametersListViewEx, "parametersListViewEx");
this.parametersListViewEx.AllowColumnReorder = true;
this.parametersListViewEx.DoubleClickActivation = false;
this.parametersListViewEx.FullRowSelect = true;
this.parametersListViewEx.Name = "parametersListViewEx";

View File

@ -337,11 +337,11 @@ namespace TBF
descriptionTextBox.Text = LoadedProcedure.Description;
createdByTextBox.Text = LoadedProcedure.CreationUser;
createdOnTextBox.Text = LoadedProcedure.CreationTime.ToShortDateString();
createdOnTextBox.Text = LoadedProcedure.CreationTime.ToString();
lastChangedByTextBox.Text = LoadedProcedure.LastChgUser;
if (LoadedProcedure.LastChgTime > LoadedProcedure.CreationTime)
{
lastChangedOnTextBox.Text = LoadedProcedure.LastChgTime.ToShortDateString();
lastChangedOnTextBox.Text = LoadedProcedure.LastChgTime.ToString();
}
watermetersTextBox.Text = LoadedProcedure.Watermeters;
protocolTitleTextBox.Text = LoadedProcedure.ProtocolTitle;
@ -388,8 +388,6 @@ namespace TBF
Text = string.Format("{0} '{1}'", Strings.Procedure, LoadedProcedure.Name);
LoadedProcedure.Description = descriptionTextBox.Text;
LoadedProcedure.LastChgUser = User.CurrentUser.Name;
LoadedProcedure.LastChgTime = DateTime.Now;
LoadedProcedure.Watermeters = watermetersTextBox.Text;
LoadedProcedure.ProtocolTitle = protocolTitleTextBox.Text;
@ -502,7 +500,7 @@ namespace TBF
found = true;
ListViewItem item = new ListViewItem(p.Name);
item.SubItems.Add(p.Revision.ToString());
item.SubItems.Add(p.LastChgTime.ToShortDateString());
item.SubItems.Add(p.LastChgTime.ToString());
item.SubItems.Add(p.LastChgUser.ToString());
item.SubItems.Add(p.Description);
historyListViewEx.Items.Add(item);

View File

@ -117,88 +117,122 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="$this.Text" xml:space="preserve">
<value>Procedura</value>
</data>
<data name="dataEntryLabel.Text" xml:space="preserve">
<value>Vložte data</value>
</data>
<data name="dateClmnHdr.Text" xml:space="preserve">
<value>Datum</value>
</data>
<data name="descriptionClmnHdr.Text" xml:space="preserve">
<value>Popis</value>
</data>
<data name="generalTabPage.Text" xml:space="preserve">
<value>Obecné</value>
</data>
<data name="historyTabPage.Text" xml:space="preserve">
<value>Historie změn</value>
</data>
<data name="changedByClmnHdr.Text" xml:space="preserve">
<value>Změněno</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>Jméno postupu</value>
</data>
<data name="label12.Text" xml:space="preserve">
<value>Stručný popis</value>
</data>
<data name="label13.Text" xml:space="preserve">
<value>Vytvořil</value>
</data>
<data name="label14.Text" xml:space="preserve">
<value>Datum</value>
</data>
<data name="label15.Text" xml:space="preserve">
<value>Datum</value>
</data>
<data name="label16.Text" xml:space="preserve">
<value>Poslední změna</value>
</data>
<data name="label18.Text" xml:space="preserve">
<value>Poznámky</value>
</data>
<data name="metersKindRadioButton1.Text" xml:space="preserve">
<value>Singl</value>
</data>
<data name="metersKindRadioButton2.Text" xml:space="preserve">
<value>Kombinované</value>
</data>
<data name="metrology1TabPage.Text" xml:space="preserve">
<value>Metrologie I.</value>
</data>
<data name="metrology2TabPage.Text" xml:space="preserve">
<value>Metrologie II.</value>
</data>
<data name="parametersTabPage.Text" xml:space="preserve">
<value>Parametry</value>
</data>
<data name="processTabPage.Text" xml:space="preserve">
<value>Proces</value>
</data>
<data name="protocolTitleLabel.Text" xml:space="preserve">
<value>Název protokolu</value>
</data>
<data name="radioButton1.Text" xml:space="preserve">
<value>Jednotlivý</value>
</data>
<data name="radioButton2.Text" xml:space="preserve">
<value>Kombinovaný</value>
</data>
<data name="resultsPrinterLabel.Text" xml:space="preserve">
<value>Tisknout</value>
</data>
<data name="resultsWriterLabel.Text" xml:space="preserve">
<value>Uložit</value>
</data>
<data name="transitionEndLabel.Text" xml:space="preserve">
<value>Vypuštění</value>
</data>
<data name="transitionStartLabel.Text" xml:space="preserve">
<value>Plnění</value>
</data>
<data name="watermetersLabel.Text" xml:space="preserve">
<value>Testované typy měřičů</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="protocolTitleLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>85, 13</value>
</data>
<data name="protocolTitleLabel.Text" xml:space="preserve">
<value>Název protokolu</value>
</data>
<data name="metersKindRadioButton2.Size" type="System.Drawing.Size, System.Drawing">
<value>90, 17</value>
</data>
<data name="metersKindRadioButton2.Text" xml:space="preserve">
<value>Kombinované</value>
</data>
<data name="metersKindRadioButton1.Size" type="System.Drawing.Size, System.Drawing">
<value>48, 17</value>
</data>
<data name="metersKindRadioButton1.Text" xml:space="preserve">
<value>Singl</value>
</data>
<data name="transitionEndLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>55, 13</value>
</data>
<data name="transitionEndLabel.Text" xml:space="preserve">
<value>Vypuštění</value>
</data>
<data name="transitionStartLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>38, 13</value>
</data>
<data name="transitionStartLabel.Text" xml:space="preserve">
<value>Plnění</value>
</data>
<data name="resultsWriterLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>33, 13</value>
</data>
<data name="resultsWriterLabel.Text" xml:space="preserve">
<value>Uložit</value>
</data>
<data name="resultsPrinterLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>48, 13</value>
</data>
<data name="resultsPrinterLabel.Text" xml:space="preserve">
<value>Tisknout</value>
</data>
<data name="dataEntryLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>60, 13</value>
</data>
<data name="dataEntryLabel.Text" xml:space="preserve">
<value>Vložte data</value>
</data>
<data name="label18.Size" type="System.Drawing.Size, System.Drawing">
<value>56, 13</value>
</data>
<data name="label18.Text" xml:space="preserve">
<value>Poznámky</value>
</data>
<data name="watermetersLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>115, 13</value>
</data>
<data name="watermetersLabel.Text" xml:space="preserve">
<value>Testované typy měřičů</value>
</data>
<data name="label15.Size" type="System.Drawing.Size, System.Drawing">
<value>38, 13</value>
</data>
<data name="label15.Text" xml:space="preserve">
<value>Datum</value>
</data>
<data name="label16.Size" type="System.Drawing.Size, System.Drawing">
<value>83, 13</value>
</data>
<data name="label16.Text" xml:space="preserve">
<value>Poslední změna</value>
</data>
<data name="label14.Size" type="System.Drawing.Size, System.Drawing">
<value>38, 13</value>
</data>
<data name="label14.Text" xml:space="preserve">
<value>Datum</value>
</data>
<data name="label13.Size" type="System.Drawing.Size, System.Drawing">
<value>42, 13</value>
</data>
<data name="label13.Text" xml:space="preserve">
<value>Vytvořil</value>
</data>
<data name="label12.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 13</value>
</data>
<data name="label12.Text" xml:space="preserve">
<value>Stručný popis</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>79, 13</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>Jméno postupu</value>
</data>
<data name="generalTabPage.Text" xml:space="preserve">
<value>Obecné</value>
</data>
<data name="historyTabPage.Text" xml:space="preserve">
<value>Historie změn</value>
</data>
<data name="metrology1TabPage.Text" xml:space="preserve">
<value>Metrologie I.</value>
</data>
<data name="metrology2TabPage.Text" xml:space="preserve">
<value>Metrologie II.</value>
</data>
<data name="processTabPage.Text" xml:space="preserve">
<value>Proces</value>
</data>
<data name="parametersTabPage.Text" xml:space="preserve">
<value>Parametry</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Procedura</value>
</data>
</root>

View File

@ -118,30 +118,6 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="tabControl.Size" type="System.Drawing.Size, System.Drawing">
<value>931, 409</value>
</data>
<data name="mainSplitContainer.Size" type="System.Drawing.Size, System.Drawing">
<value>1034, 409</value>
</data>
<data name="generalTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 371</value>
</data>
<data name="generalTabPage.Text" xml:space="preserve">
<value> Allgemein </value>
</data>
<data name="fileWriter4ComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>148, 335</value>
</data>
<data name="fileWriter3ComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>148, 312</value>
</data>
<data name="printer2ComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>148, 243</value>
</data>
<data name="fileWriter2ComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>148, 289</value>
</data>
<data name="protocolTitleTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>148, 105</value>
</data>
@ -169,9 +145,6 @@
<data name="metersKindRadioButton1.Text" xml:space="preserve">
<value>Einzel</value>
</data>
<data name="transitionEndComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>148, 197</value>
</data>
<data name="transitionEndLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 200</value>
</data>
@ -181,27 +154,12 @@
<data name="transitionEndLabel.Text" xml:space="preserve">
<value>Entwässern</value>
</data>
<data name="transitionStartComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>148, 174</value>
</data>
<data name="transitionStartLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 177</value>
</data>
<data name="transitionStartLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>45, 13</value>
</data>
<data name="transitionStartLabel.Text" xml:space="preserve">
<value>Befüllen</value>
</data>
<data name="fileWriter1ComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>148, 266</value>
</data>
<data name="printer1ComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>148, 220</value>
</data>
<data name="dataEntryComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>148, 151</value>
</data>
<data name="resultsWriterLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 269</value>
</data>
@ -268,12 +226,6 @@
<data name="label15.Text" xml:space="preserve">
<value>Datum</value>
</data>
<data name="lastChangedByTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>148, 82</value>
</data>
<data name="label16.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 85</value>
</data>
<data name="label16.Size" type="System.Drawing.Size, System.Drawing">
<value>102, 13</value>
</data>
@ -292,52 +244,43 @@
<data name="label14.Text" xml:space="preserve">
<value>Datum</value>
</data>
<data name="createdByTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>148, 59</value>
</data>
<data name="label13.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 62</value>
</data>
<data name="label13.Size" type="System.Drawing.Size, System.Drawing">
<value>62, 13</value>
</data>
<data name="label13.Text" xml:space="preserve">
<value>Errstellt von</value>
</data>
<data name="descriptionTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>148, 36</value>
</data>
<data name="descriptionTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>526, 20</value>
</data>
<data name="label12.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 39</value>
</data>
<data name="label12.Size" type="System.Drawing.Size, System.Drawing">
<value>92, 13</value>
</data>
<data name="label12.Text" xml:space="preserve">
<value>Kurzbeschreibung</value>
</data>
<data name="procNameTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>148, 13</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 16</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 13</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>Prüfungsname</value>
</data>
<data name="generalTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 371</value>
</data>
<data name="generalTabPage.Text" xml:space="preserve">
<value> Allgemein </value>
</data>
<data name="historyListViewEx.Size" type="System.Drawing.Size, System.Drawing">
<value>917, 365</value>
</data>
<data name="historyTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 371</value>
</data>
<data name="historyTabPage.Text" xml:space="preserve">
<value>Änderungen</value>
</data>
<data name="historyListViewEx.Size" type="System.Drawing.Size, System.Drawing">
<data name="metrology1ListViewEx.Size" type="System.Drawing.Size, System.Drawing">
<value>917, 365</value>
</data>
<data name="metrology1TabPage.Size" type="System.Drawing.Size, System.Drawing">
@ -346,7 +289,7 @@
<data name="metrology1TabPage.Text" xml:space="preserve">
<value> Metrologie I. </value>
</data>
<data name="metrology1ListViewEx.Size" type="System.Drawing.Size, System.Drawing">
<data name="metrology2ListViewEx.Size" type="System.Drawing.Size, System.Drawing">
<value>917, 365</value>
</data>
<data name="metrology2TabPage.Size" type="System.Drawing.Size, System.Drawing">
@ -355,7 +298,7 @@
<data name="metrology2TabPage.Text" xml:space="preserve">
<value> Metrologie II. </value>
</data>
<data name="metrology2ListViewEx.Size" type="System.Drawing.Size, System.Drawing">
<data name="processListViewEx.Size" type="System.Drawing.Size, System.Drawing">
<value>917, 365</value>
</data>
<data name="processTabPage.Size" type="System.Drawing.Size, System.Drawing">
@ -364,14 +307,17 @@
<data name="processTabPage.Text" xml:space="preserve">
<value> Prüfstrecke </value>
</data>
<data name="processListViewEx.Size" type="System.Drawing.Size, System.Drawing">
<value>917, 365</value>
<data name="parametersListViewEx.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 371</value>
</data>
<data name="parametersTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 371</value>
</data>
<data name="parametersListViewEx.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 371</value>
<data name="tabControl.Size" type="System.Drawing.Size, System.Drawing">
<value>931, 409</value>
</data>
<data name="mainSplitContainer.Size" type="System.Drawing.Size, System.Drawing">
<value>1034, 409</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1034, 409</value>

File diff suppressed because it is too large Load Diff

View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.8.313.1")]
[assembly: AssemblyFileVersion("2.8.313.1")]
[assembly: AssemblyVersion("2.8.314.1")]
[assembly: AssemblyFileVersion("2.8.314.1")]