diff --git a/CHANGELOG.md b/CHANGELOG.md index 06fcb6f..6ac10df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,8 @@ Zapisnik razvoja programa TPS1100 Convert. ## v2.7.0.6 (2024/06/26) -### Novo - - Preverjanje za posodobitev aplikacije +- Popravljeno branje decimalnega ločila v "Pripravi GSI". --- diff --git a/Form1.Designer.vb b/Form1.Designer.vb index e124799..9dae887 100644 --- a/Form1.Designer.vb +++ b/Form1.Designer.vb @@ -241,12 +241,12 @@ Partial Class Form1 'ToolStripButton1 ' Me.ToolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image Me.ToolStripButton1.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_caps_lock_on_50 Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton1.Name = "ToolStripButton1" - Me.ToolStripButton1.Size = New System.Drawing.Size(34, 34) + Me.ToolStripButton1.Size = New System.Drawing.Size(100, 34) Me.ToolStripButton1.Text = "Na Začetek" + Me.ToolStripButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage ' 'OpenFileDialogTocke ' diff --git a/Form1.vb b/Form1.vb index e07dcf2..d62a7ae 100644 --- a/Form1.vb +++ b/Form1.vb @@ -127,7 +127,7 @@ Public Class Form1 ToolStripButtonGeo.Enabled = True ButtonUrediDat.Enabled = True RichTextBox1.BackColor = SystemColors.Info - RichTextBox1.SelectionStart = 0 + ' RichTextBox1.SelectionStart = 0 LabelDatoteka.Image = My.Resources.icons8_ok_50 My.Settings.Save() Else @@ -150,7 +150,7 @@ Public Class Form1 streamLines = streamLines + 1 Dim readLine As String = streamReader.ReadLine().Replace(" ", vbTab) readLine = readLine.Replace(";", vbTab) - readLine = readLine.Replace(".", ",") + readLine = readLine.Replace(",", ".") Dim line() As String = readLine.Split(vbTab) Dim podPtId As String = "*11" + Format(streamLines, "0000") + "+" + line(0).PadLeft(16, "0") + " " Dim izrE As Double = line(1) * 1000 @@ -171,7 +171,7 @@ Public Class Form1 tsbSaveAs.Enabled = True ShraniToolStripMenuItem.Enabled = True tsbSaveAs.Text = "Shrani GSI" - RichTextBox1.SelectionStart = 0 + ' RichTextBox1.SelectionStart = 0 End If End Sub @@ -420,7 +420,7 @@ Public Class Form1 tsbSaveAs.Enabled = True ShraniToolStripMenuItem.Enabled = True tsbSaveAs.Text = "Shrani Zapisnik" - RichTextBox1.SelectionStart = 0 + ' RichTextBox1.SelectionStart = 0 End Sub Private Sub tsbPointsOnly_Click(sender As Object, e As EventArgs) Handles tsbPointsOnly.Click @@ -432,7 +432,7 @@ Public Class Form1 End If RichTextBox1.Clear() - RichTextBox1.BackColor = Color.LightGray + RichTextBox1.BackColor = Color.PaleTurquoise Dim measuredPoints As Integer = 0 Dim dataKoda As Integer = 0 Dim streamReader As StreamReader = New StreamReader(OpenFileDialog1.FileName) @@ -558,13 +558,13 @@ Public Class Form1 tsbSaveAs.Enabled = True ShraniToolStripMenuItem.Enabled = True tsbSaveAs.Text = "Shrani Točke" - RichTextBox1.SelectionStart = 0 + ' RichTextBox1.SelectionStart = 0 End Sub ' Priprava GEO datoteke Private Sub ToolStripButtonGeo_Click(sender As Object, e As EventArgs) Handles ToolStripButtonGeo.Click RichTextBox1.Clear() - RichTextBox1.BackColor = Color.PaleTurquoise + RichTextBox1.BackColor = Color.LightGray Dim measuredPoints As Integer = 0 Dim dataKoda As String = "" Dim streamReader As StreamReader = New StreamReader(OpenFileDialog1.FileName) @@ -738,8 +738,7 @@ Public Class Form1 tsbSaveAs.Enabled = True ShraniToolStripMenuItem.Enabled = True tsbSaveAs.Text = "Shrani GEO" - RichTextBox1.SelectionStart = 0 - + 'RichTextBox1.SelectionStart = 0 End Sub Private Sub InfoOAplikacijiToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles InfoOAplikacijiToolStripMenuItem.Click @@ -840,6 +839,5 @@ Public Class Form1 Private Sub ToolStripButton1_Click_1(sender As Object, e As EventArgs) Handles ToolStripButton1.Click RichTextBox1.SelectionStart = 0 - End Sub End Class diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index a0ef6c3..885eeea 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/bin/TPS1100-Convert_2.7.0.6_Portable.zip b/bin/TPS1100-Convert_2.7.0.6_Portable.zip deleted file mode 100644 index 6a5c831..0000000 Binary files a/bin/TPS1100-Convert_2.7.0.6_Portable.zip and /dev/null differ diff --git a/bin/TPS1100-Convert_2.7.0.8_Portable.zip b/bin/TPS1100-Convert_2.7.0.8_Portable.zip new file mode 100644 index 0000000..81d7331 Binary files /dev/null and b/bin/TPS1100-Convert_2.7.0.8_Portable.zip differ diff --git a/version.txt b/version.txt index d9b703e..549a016 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.7.0.6 \ No newline at end of file +2.7.0.8 \ No newline at end of file