diff --git a/Form1.Designer.vb b/Form1.Designer.vb
index d3901b6..a18edea 100644
--- a/Form1.Designer.vb
+++ b/Form1.Designer.vb
@@ -44,10 +44,10 @@ Partial Class Form1
Me.tsbSaveAs = New System.Windows.Forms.ToolStripButton()
Me.ToolStripButtonNast = New System.Windows.Forms.ToolStripButton()
Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
- Me.tsbDecimale = New System.Windows.Forms.ToolStripComboBox()
- Me.ToolStripLabel2 = New System.Windows.Forms.ToolStripLabel()
Me.ToolStripComboBox1 = New System.Windows.Forms.ToolStripComboBox()
Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel()
+ Me.tsbDecimale = New System.Windows.Forms.ToolStripComboBox()
+ Me.ToolStripLabel2 = New System.Windows.Forms.ToolStripLabel()
Me.tsbStolpci = New System.Windows.Forms.ToolStripComboBox()
Me.ToolStripLabel3 = New System.Windows.Forms.ToolStripLabel()
Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator()
@@ -61,7 +61,7 @@ Partial Class Form1
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.RichTextBox1.BackColor = System.Drawing.SystemColors.ControlLightLight
- Me.RichTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.RichTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None
Me.RichTextBox1.Font = New System.Drawing.Font("Courier New", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(238, Byte))
Me.RichTextBox1.Location = New System.Drawing.Point(9, 39)
Me.RichTextBox1.Margin = New System.Windows.Forms.Padding(0)
@@ -69,7 +69,7 @@ Partial Class Form1
Me.RichTextBox1.ReadOnly = True
Me.RichTextBox1.Size = New System.Drawing.Size(1233, 680)
Me.RichTextBox1.TabIndex = 1
- Me.RichTextBox1.Text = ""
+ Me.RichTextBox1.Text = resources.GetString("RichTextBox1.Text")
Me.RichTextBox1.WordWrap = False
'
'StatusStrip1
@@ -235,21 +235,6 @@ Partial Class Form1
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 29)
'
- 'tsbDecimale
- '
- Me.tsbDecimale.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
- Me.tsbDecimale.DropDownWidth = 50
- Me.tsbDecimale.Items.AddRange(New Object() {"Pika", "Vejica"})
- Me.tsbDecimale.Name = "tsbDecimale"
- Me.tsbDecimale.Size = New System.Drawing.Size(75, 29)
- '
- 'ToolStripLabel2
- '
- Me.ToolStripLabel2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
- Me.ToolStripLabel2.Name = "ToolStripLabel2"
- Me.ToolStripLabel2.Size = New System.Drawing.Size(63, 26)
- Me.ToolStripLabel2.Text = "Decimalna"
- '
'ToolStripComboBox1
'
Me.ToolStripComboBox1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
@@ -267,6 +252,21 @@ Partial Class Form1
Me.ToolStripLabel1.Size = New System.Drawing.Size(34, 26)
Me.ToolStripLabel1.Text = "Kode"
'
+ 'tsbDecimale
+ '
+ Me.tsbDecimale.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+ Me.tsbDecimale.DropDownWidth = 50
+ Me.tsbDecimale.Items.AddRange(New Object() {"Pika", "Vejica"})
+ Me.tsbDecimale.Name = "tsbDecimale"
+ Me.tsbDecimale.Size = New System.Drawing.Size(75, 29)
+ '
+ 'ToolStripLabel2
+ '
+ Me.ToolStripLabel2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+ Me.ToolStripLabel2.Name = "ToolStripLabel2"
+ Me.ToolStripLabel2.Size = New System.Drawing.Size(63, 26)
+ Me.ToolStripLabel2.Text = "Decimalna"
+ '
'tsbStolpci
'
Me.tsbStolpci.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
diff --git a/Form1.resx b/Form1.resx
index 6b18313..a9e7464 100644
--- a/Form1.resx
+++ b/Form1.resx
@@ -117,6 +117,16 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 1. Odpri GSI datoteko
+2. Preveri podatke in po potrebi uredi datoteko (gumb "Uredi").
+3A. Za pripravo Zapisnika Meritev klikni gumb "Meritve".
+3B. Za pripravo seznama koordinat točk klikni gumb "Točke".
+4. Shrani podatke z klikom na gumb "Shrani...".
+
+Za pregled obdelav podatkov si poglej datoteko zapisnika.
+Lokacija zapisnika =
+
124, 17
diff --git a/Form1.vb b/Form1.vb
index b4c0604..e1ea717 100644
--- a/Form1.vb
+++ b/Form1.vb
@@ -12,6 +12,7 @@ Public Class Form1
My.Forms.Form1.Text = My.Application.Info.Title + " " + My.Application.Info.Version.Major.ToString + "." + My.Application.Info.Version.Minor.ToString + "." + My.Application.Info.Version.Build.ToString + "." + My.Application.Info.Version.Revision.ToString
tsbDecimale.Text = My.Settings.DecimalnoLocilo
tsbStolpci.SelectedIndex = My.Settings.Stolpci
+ RichTextBox1.AppendText(My.Settings.DatLogfile.ToString)
End Sub
Public streamLines As Integer = 0
@@ -385,4 +386,5 @@ Public Class Form1
Private Sub ToolStripButtonNast_Click(sender As Object, e As EventArgs) Handles ToolStripButtonNast.Click
FormNastavitve.ShowDialog()
End Sub
+
End Class
diff --git a/Form2.Designer.vb b/Form2.Designer.vb
index 604aa3a..2f0888e 100644
--- a/Form2.Designer.vb
+++ b/Form2.Designer.vb
@@ -173,7 +173,7 @@ Partial Class Form2
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.Name = "Form2"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
- Me.Text = "TPS1100 Convert: Settings"
+ Me.Text = "TPS1100 Convert - Urejanje"
Me.ToolStrip1.ResumeLayout(False)
Me.ToolStrip1.PerformLayout()
Me.StatusStrip1.ResumeLayout(False)
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 367a0c4..dfce39b 100644
--- a/My Project/AssemblyInfo.vb
+++ b/My Project/AssemblyInfo.vb
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
'
-
-
+
+
diff --git a/TPS1100 Convert.vbproj b/TPS1100 Convert.vbproj
index 57dfd0d..24dea76 100644
--- a/TPS1100 Convert.vbproj
+++ b/TPS1100 Convert.vbproj
@@ -32,7 +32,7 @@
true
publish.html
true
- 7
+ 8
2.5.0.%2a
false
true
diff --git a/bin/Release/TPS1100 Convert.application b/bin/Release/TPS1100 Convert.application
index 6697e5b..552b8de 100644
--- a/bin/Release/TPS1100 Convert.application
+++ b/bin/Release/TPS1100 Convert.application
@@ -1,6 +1,6 @@
-
+
@@ -8,13 +8,13 @@
-
+
- SK67vZm5DI6i6PYvGuc4Im/6D3UVI7mcgYD0YKOBAts=
+ hKO2v4E5pqGxlyP3tr8AhpJb2l9VocXFXTWKBLLuzXo=
diff --git a/bin/Release/TPS1100 Convert.exe b/bin/Release/TPS1100 Convert.exe
index c00097f..a0d7fb6 100644
Binary files a/bin/Release/TPS1100 Convert.exe and b/bin/Release/TPS1100 Convert.exe differ
diff --git a/bin/Release/TPS1100 Convert.exe.manifest b/bin/Release/TPS1100 Convert.exe.manifest
index 10a15ef..49571c5 100644
--- a/bin/Release/TPS1100 Convert.exe.manifest
+++ b/bin/Release/TPS1100 Convert.exe.manifest
@@ -1,10 +1,10 @@
-
+
-
+
@@ -43,14 +43,14 @@
-
-
+
+
- YaYx/umhtP3dosqmePwTTr4rn3T4h1kY2oXPDdfvmx4=
+ /7A+F4wCXnaKGKwhzcQpcEfcMlOy58SYt48u+ilAmJc=
diff --git a/bin/Release/app.publish/TPS1100 Convert.exe b/bin/Release/app.publish/TPS1100 Convert.exe
index c00097f..a0d7fb6 100644
Binary files a/bin/Release/app.publish/TPS1100 Convert.exe and b/bin/Release/app.publish/TPS1100 Convert.exe differ
diff --git a/bin/TPS1100-Convert_2.5.0.6_Portable.zip b/bin/TPS1100-Convert_2.5.0.6_Portable.zip
deleted file mode 100644
index e4d7c3b..0000000
Binary files a/bin/TPS1100-Convert_2.5.0.6_Portable.zip and /dev/null differ
diff --git a/bin/TPS1100-Convert_2.5.0.7_Portable.zip b/bin/TPS1100-Convert_2.5.0.7_Portable.zip
new file mode 100644
index 0000000..2152918
Binary files /dev/null and b/bin/TPS1100-Convert_2.5.0.7_Portable.zip differ
diff --git a/bin/TPS1100-Convert_2.5.0.6_Setup.zip b/bin/TPS1100-Convert_2.5.0.7_Setup.zip
similarity index 77%
rename from bin/TPS1100-Convert_2.5.0.6_Setup.zip
rename to bin/TPS1100-Convert_2.5.0.7_Setup.zip
index 20b1e81..c2fc97e 100644
Binary files a/bin/TPS1100-Convert_2.5.0.6_Setup.zip and b/bin/TPS1100-Convert_2.5.0.7_Setup.zip differ