v2.7.0.0

2024-06-16 05:10:11 +02:00
parent 1afcecab7c
commit de5ae3920c
26 changed files with 7032 additions and 103 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -0,0 +1,54 @@
+# TPS1100 Convert - Change log
+
+Zapisnik razvoja programa TPS1100 Convert.
+
+---
+
+## Verzija - 2.6.x
+
+Datum: -----
+
+- 
+
+---
+
+## Verzija - 2.5.x
+
+Datum: 2024/06/10
+
+- Dodan menu z nastavitvami
+
+---
+
+## Verzija - 2.4
+
+Datum: 2024/06/03
+
+- Dodan urejevalnik GSI datotek
+- Dodana opcija za izbiro decimalnega ločila (Pika/Vejica)
+- Dodana opcija za izbiro ločila med podatki (Presledek/Tabulator)
+- Izpis zapisnika meritev kot tabela
+
+---
+
+## Verzija - 2.1
+
+Datum: 2018/12/27
+
+- Združen izpis seznama koordinat točk (Merjene Točke + Vse Točke)
+
+---
+
+## Verzija - 2.0
+
+Datum: 2018/12/27
+
+- Dodano izpisovanje kodiranja v "Zapisnik Meritve"
+
+---
+
+## Verzija - 1.0
+
+Datum: 2016/06/26
+
+- Prva izdaja programa
--- a/Form1.Designer.vb
+++ b/Form1.Designer.vb
@ -41,6 +41,7 @@ Partial Class Form1
        Me.tsbConvert = New System.Windows.Forms.ToolStripButton()
        Me.tsbPointsOnly = New System.Windows.Forms.ToolStripButton()
        Me.tsbHelp = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripButtonGeo = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
        Me.tsbSaveAs = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripButtonNast = New System.Windows.Forms.ToolStripButton()
@ -55,8 +56,8 @@ Partial Class Form1
        Me.RichTextBox1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
            Or System.Windows.Forms.AnchorStyles.Left) _
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.RichTextBox1.BackColor = System.Drawing.Color.Ivory
-        Me.RichTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.RichTextBox1.BackColor = System.Drawing.SystemColors.Control
+        Me.RichTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None
        Me.RichTextBox1.Font = New System.Drawing.Font("Courier New", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(238, Byte))
        Me.RichTextBox1.Location = New System.Drawing.Point(9, 47)
        Me.RichTextBox1.Margin = New System.Windows.Forms.Padding(0, 0, 0, 1)
@ -126,7 +127,7 @@ Partial Class Form1
        '
        Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(30, 30)
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButtonPripravi, Me.ToolStripSeparator2, Me.tsbOpenFile, Me.LabelDatoteka, Me.tsbFileName, Me.ButtonUrediDat, Me.ToolStripSeparator1, Me.tsbConvert, Me.tsbPointsOnly, Me.tsbHelp, Me.ToolStripSeparator4, Me.tsbSaveAs, Me.ToolStripButtonNast, Me.ToolStripSeparator3})
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButtonPripravi, Me.ToolStripSeparator2, Me.tsbOpenFile, Me.LabelDatoteka, Me.tsbFileName, Me.ButtonUrediDat, Me.ToolStripSeparator1, Me.tsbConvert, Me.tsbPointsOnly, Me.tsbHelp, Me.ToolStripButtonGeo, Me.ToolStripSeparator4, Me.tsbSaveAs, Me.ToolStripButtonNast, Me.ToolStripSeparator3})
        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
        Me.ToolStrip1.Name = "ToolStrip1"
        Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(10, 5, 10, 5)
@ -208,6 +209,15 @@ Partial Class Form1
        Me.tsbHelp.Text = "Info"
        Me.tsbHelp.ToolTipText = "O programu..."
        '
+        'ToolStripButtonGeo
+        '
+        Me.ToolStripButtonGeo.Enabled = False
+        Me.ToolStripButtonGeo.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_drawing_compass_48
+        Me.ToolStripButtonGeo.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButtonGeo.Name = "ToolStripButtonGeo"
+        Me.ToolStripButtonGeo.Size = New System.Drawing.Size(64, 34)
+        Me.ToolStripButtonGeo.Text = "GEO"
+        '
        'ToolStripSeparator4
        '
        Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
@ -288,4 +298,5 @@ Partial Class Form1
    Friend WithEvents ToolStripButtonNast As ToolStripButton
    Friend WithEvents ToolStripButtonPripravi As ToolStripButton
    Friend WithEvents OpenFileDialogTocke As OpenFileDialog
+    Friend WithEvents ToolStripButtonGeo As ToolStripButton
 End Class
--- a/Form1.resx
+++ b/Form1.resx
@ -128,12 +128,14 @@

 Uvozi KOO/TXT in pripravi GSI datoteko...

-A. Uvozi datoteko z koordinatami točk z klikom na "Uvozi".
-   Zapis: Pt E N H (Med podatki je presledek ali tabulator)
-B. Izdelana bo GSI datoteka z istim imenom in lokacijo kot izvorna datoteka.
+A. Uvozi datoteko z koordinatami točk z klikom na "Pripravi GSI".
+   Format datoteke: Pt E N H (Med podatki je presledek ali tabulator)
+B. Izdelana bo GSI datoteka, ki jo nato shranimo z klikom na "Shrani GSI".
 C. Prenesi novo GSI datoeko na instrument v mapo \GSI.

-Za pregled obdelav podatkov si poglej datoteko zapisnika.
+
+
+Zgodovina obdelanih podatkov je zapisana v datoteko...
 Lokacija zapisnika = </value>
  </data>
  <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--- a/Form1.vb
+++ b/Form1.vb
@ -9,7 +9,7 @@ Public Class Form1
            My.Settings.DatLogfile = DatotekaLogfile
            My.Settings.Save()
        End If
-        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
+        My.Forms.Form1.Text = My.Application.Info.Title + " " + My.Application.Info.Version.Major.ToString + "." + My.Application.Info.Version.Minor.ToString
        RichTextBox1.AppendText(My.Settings.DatLogfile.ToString)

        If My.Settings.Pisava = "" Then
@ -44,6 +44,7 @@ Public Class Form1
            tsbSaveAs.Enabled = False
            tsbConvert.Enabled = True
            tsbPointsOnly.Enabled = True
+            ToolStripButtonGeo.Enabled = True
            ButtonUrediDat.Enabled = True
            RichTextBox1.BackColor = SystemColors.Info
            LabelDatoteka.Image = My.Resources.icons8_ok_50
@ -177,6 +178,14 @@ Public Class Form1
                                data = vbCrLf + "Imported/User-Entered:" + vbCrLf + "----------------------" + vbCrLf + "PtID" + dataStolpci + "E" + dataStolpci + "N" + dataStolpci + "H"
                                PodatkiStojisce = False
                            End If
+                            If dataKoda = My.Settings.KodaStojisce Then
+                                data = vbCrLf + "Stojišče:" + vbCrLf + "----------------------" + vbCrLf + "PtID" + dataStolpci + "InstHt"
+                                PodatkiStojisce = False
+                            End If
+                            If dataKoda = My.Settings.KodaStojisceInfo Then
+                                data = vbCrLf + "Temperatura/Pritisk:" + vbCrLf + "----------------------" + vbCrLf + "Temp" + dataStolpci + "Pritisk"
+                                PodatkiStojisce = False
+                            End If
                            If dataKoda = "STA_OFFS" Then
                                data = "Offsets:" + vbCrLf
                                PodatkiStojisce = False
@ -195,10 +204,10 @@ Public Class Form1
                    ElseIf wordIndex = "58" Then    ' Prism constant
                        numData = data / 10000
                        data = dataStolpci + Format(numData, "0.0000")
-                    ElseIf wordIndex = "71" Then    ' Point Code
+                    ElseIf wordIndex = "71" Or wordIndex = "72" Then    ' Point Code
                        dataTmp = Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
-                        If dataTmp = "" Then
-                            data = ""
+                        If dataKoda = My.Settings.KodaStojisce Then
+                            data = dataTmp
                        Else
                            data = dataStolpci + dataTmp
                        End If
@ -306,10 +315,12 @@ Public Class Form1
                    data = Microsoft.VisualBasic.Right(readLine, 17)
                    If wordIndex = "41" Then
                        Dim dataInfo As String = Microsoft.VisualBasic.Right(readLine, 16).TrimStart("0"c)
-                        If dataInfo = My.Settings.KodaMeas Or dataInfo = My.Settings.KodaMeasOri Or dataInfo = My.Settings.KodaStake Then
+                        If dataInfo = My.Settings.KodaMeas Or dataInfo = My.Settings.KodaStake Then
                            measuredPoints = 1
                        ElseIf dataInfo = My.Settings.KodaUserImport Then
                            measuredPoints = 2
+                        ElseIf dataInfo = My.Settings.KodaMeasOri Then
+                            measuredPoints = 3
                        Else
                            measuredPoints = 0
                        End If
@ -346,10 +357,12 @@ Public Class Form1
                        If My.Settings.DecimalnoLocilo = "Pika" Then
                            data = data.ToString.Replace(",", ".")
                        End If
-                        If measuredPoints = 2 Then
-                            RichTextBox1.AppendText(dataStolpci + data + dataStolpci + "REF")
-                        Else
+                        If measuredPoints = 1 Then
                            RichTextBox1.AppendText(dataStolpci + data + dataStolpci + "MEAS")
+                        ElseIf measuredPoints = 2 Then
+                            RichTextBox1.AppendText(dataStolpci + data + dataStolpci + "REF")
+                        ElseIf measuredPoints = 3 Then
+                            RichTextBox1.AppendText(dataStolpci + data + dataStolpci + "ORI")
                        End If
                    ElseIf wordIndex = "84" And measuredPoints >= 1 Then    ' Station Easting
                        numData = data / 1000
@ -448,4 +461,134 @@ Public Class Form1
        End If
    End Sub

+    Private Sub ToolStripButtonGeo_Click(sender As Object, e As EventArgs) Handles ToolStripButtonGeo.Click
+        RichTextBox1.Clear()
+        RichTextBox1.BackColor = Color.LemonChiffon
+        Dim measuredPoints As Integer = 0
+        Dim dataKoda As String = ""
+        Dim streamReader As StreamReader = New StreamReader(OpenFileDialog1.FileName)
+        Dim i As Integer = 0
+        Dim lin As Integer = 0
+
+        Do Until streamReader.EndOfStream
+            ' Read and Split each line to separate it into fields
+            Dim izpisText As String = ""
+            Dim line() As String = streamReader.ReadLine().Split(" ")
+            line(0) = Replace(line(0), "*", "")
+
+            If Microsoft.VisualBasic.Left(line(0), 2) = "41" Then
+                dataKoda = Microsoft.VisualBasic.Right(line(0), 16).TrimStart("0"c)
+
+                If dataKoda = My.Settings.KodaMeas Then
+                    izpisText = "0 0" + vbCrLf
+                    measuredPoints = 1
+                End If
+
+                If dataKoda = My.Settings.KodaMeasOri Then
+                    izpisText = "20 759.81" + vbCrLf
+                    measuredPoints = 0
+                End If
+
+                If dataKoda = My.Settings.KodaQuickSet And lin > 0 Then
+                    izpisText = "-1 0 0 0 0" + vbCrLf
+                    measuredPoints = 0
+                End If
+
+                If dataKoda = My.Settings.KodaSetAzi And lin > 0 Then
+                    izpisText = "-1 0 0 0 0" + vbCrLf
+                    measuredPoints = 0
+                End If
+
+                If dataKoda = My.Settings.KodaResection And lin > 0 Then
+                    izpisText = "-1 0 0 0 0" + vbCrLf
+                    measuredPoints = 0
+                End If
+
+                If dataKoda = My.Settings.KodaFreeStation And lin > 0 Then
+                    izpisText = "-1 0 0 0 0" + vbCrLf
+                    measuredPoints = 0
+                End If
+
+                If dataKoda = My.Settings.KodaOriHtTrans And lin > 0 Then
+                    izpisText = "-1 0 0 0 0" + vbCrLf
+                    measuredPoints = 0
+                End If
+            End If
+
+            If Microsoft.VisualBasic.Left(line(0), 2) = "11" Then
+                If dataKoda = My.Settings.KodaMeas Then
+                    Dim dataId As String
+                    dataId = Microsoft.VisualBasic.Right(line(0), 16).TrimStart("0"c)
+                    Dim dataAzi As String
+                    dataAzi = Microsoft.VisualBasic.Right(line(1), 17)
+                    Dim numAzi As Double
+                    numAzi = dataAzi / 100000
+                    Dim dataV As String
+                    dataV = Microsoft.VisualBasic.Right(line(2), 17)
+                    Dim numV As Double
+                    numV = dataV / 100000
+                    Dim dataSD As String
+                    dataSD = Microsoft.VisualBasic.Right(line(3), 17)
+                    Dim numSD As Double
+                    numSD = dataSD / 1000
+                    Dim dataHr As String
+                    dataHr = Microsoft.VisualBasic.Right(line(5), 17)
+                    Dim numHr As Double
+                    numHr = dataHr / 1000
+
+                    izpisText = dataId + " " + Format(numAzi, "0.0000").ToString + " " + Format(numV, "0.0000").ToString + " " + Format(numSD, "0.000").ToString + " " + Format(numHr, "0.000").ToString + vbCrLf
+                End If
+
+                If dataKoda = My.Settings.KodaMeasOri Then
+                    Dim dataId As String
+                    dataId = Microsoft.VisualBasic.Right(line(0), 16).TrimStart("0"c)
+                    Dim dataAzi As Double
+                    dataAzi = Microsoft.VisualBasic.Right(line(1), 17)
+                    Dim numAzi As Double
+                    numAzi = dataAzi / 100000
+                    izpisText = dataId + " " + Format(numAzi, "0.0000").ToString + vbCrLf
+                End If
+
+                If dataKoda = My.Settings.KodaQuickSet Then
+                    If Microsoft.VisualBasic.Left(line(1), 2) = "84" Then
+                        Dim dataSta As String
+                        dataSta = Microsoft.VisualBasic.Right(line(0), 16).TrimStart("0"c)
+                        Dim dataHi As Double
+                        dataHi = Microsoft.VisualBasic.Right(line(4), 17)
+                        Dim numHi As Double
+                        numHi = dataHi / 1000
+                        izpisText = dataSta + " " + Format(numHi, "0.000").ToString + vbCrLf
+                    End If
+                End If
+                ' ElseIf dataKoda = My.Settings.KodaSetAzi Then
+                ' 
+                ' ElseIf dataKoda = My.Settings.KodaResection Then
+                ' 
+                If dataKoda = My.Settings.KodaFreeStation Then
+                    If Microsoft.VisualBasic.Left(line(1), 2) = "25" Then
+                        Dim dataSta As String
+                        dataSta = Microsoft.VisualBasic.Right(line(0), 16).TrimStart("0"c)
+                        Dim dataHi As Double
+                        dataHi = Microsoft.VisualBasic.Right(line(6), 17)
+                        Dim numHi As Double
+                        numHi = dataHi / 1000
+                        izpisText = dataSta + " " + Format(numHi, "0.000").ToString + vbCrLf
+                    End If
+                End If
+                ' ElseIf dataKoda = My.Settings.KodaOriHtTrans Then
+            End If
+            RichTextBox1.AppendText(izpisText)
+            lin = lin + 1
+            ToolStripProgressBar1.Value = lin
+        Loop
+        RichTextBox1.AppendText("-1 0 0 0 0" + vbCrLf)
+
+        streamReader.Close()
+        streamReader.Dispose()
+        ToolStripStatusLabel1.Text = "Prebrano: " + lin.ToString + "/" + ToolStripProgressBar1.Maximum.ToString + " vrstic"
+        SaveFileDialog1.Filter = "GEO datoteka|*.GEO"
+        SaveFileDialog1.FileName = Path.GetFileNameWithoutExtension(OpenFileDialogTocke.FileName)
+        tsbSaveAs.Enabled = True
+        tsbSaveAs.Text = "Shrani GEO"
+    End Sub
 End Class
--- a/Form2.Designer.vb
+++ b/Form2.Designer.vb
@ -26,15 +26,22 @@ Partial Class Form2
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Form2))
        Me.RichTextBoxEdit = New System.Windows.Forms.RichTextBox()
        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+        Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton()
        Me.BtnShraniF2 = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
        Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel()
        Me.ComBoxKoda = New System.Windows.Forms.ToolStripComboBox()
-        Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripLabel2 = New System.Windows.Forms.ToolStripLabel()
+        Me.ToolStripTextBox1 = New System.Windows.Forms.ToolStripTextBox()
+        Me.ToolStripLabel3 = New System.Windows.Forms.ToolStripLabel()
+        Me.ToolStripTextBox2 = New System.Windows.Forms.ToolStripTextBox()
+        Me.ToolStripLabel4 = New System.Windows.Forms.ToolStripLabel()
+        Me.ToolStripTextBox3 = New System.Windows.Forms.ToolStripTextBox()
+        Me.ToolStripLabel5 = New System.Windows.Forms.ToolStripLabel()
+        Me.ToolStripTextBox4 = New System.Windows.Forms.ToolStripTextBox()
+        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
        Me.ToolStripStatusLabel1 = New System.Windows.Forms.ToolStripStatusLabel()
        Me.SaveFileDialog2 = New System.Windows.Forms.SaveFileDialog()
@ -55,7 +62,7 @@ Partial Class Form2
        Me.RichTextBoxEdit.Font = New System.Drawing.Font("Courier New", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.RichTextBoxEdit.Location = New System.Drawing.Point(12, 35)
        Me.RichTextBoxEdit.Name = "RichTextBoxEdit"
-        Me.RichTextBoxEdit.Size = New System.Drawing.Size(1160, 551)
+        Me.RichTextBoxEdit.Size = New System.Drawing.Size(1160, 581)
        Me.RichTextBoxEdit.TabIndex = 2
        Me.RichTextBoxEdit.Text = ""
        Me.RichTextBoxEdit.WordWrap = False
@ -64,7 +71,7 @@ Partial Class Form2
        '
        Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BtnShraniF2, Me.ToolStripSeparator3, Me.ToolStripButton3, Me.ToolStripSeparator1, Me.ToolStripLabel1, Me.ComBoxKoda, Me.ToolStripButton2, Me.ToolStripSeparator2, Me.ToolStripButton1})
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton3, Me.BtnShraniF2, Me.ToolStripSeparator3, Me.ToolStripLabel1, Me.ComBoxKoda, Me.ToolStripButton1, Me.ToolStripLabel2, Me.ToolStripTextBox1, Me.ToolStripLabel3, Me.ToolStripTextBox2, Me.ToolStripLabel4, Me.ToolStripTextBox3, Me.ToolStripLabel5, Me.ToolStripTextBox4, Me.ToolStripSeparator2, Me.ToolStripButton2})
        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
        Me.ToolStrip1.Name = "ToolStrip1"
        Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(10, 5, 10, 0)
@ -72,8 +79,18 @@ Partial Class Form2
        Me.ToolStrip1.TabIndex = 3
        Me.ToolStrip1.Text = "ToolStrip1"
        '
+        'ToolStripButton3
+        '
+        Me.ToolStripButton3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+        Me.ToolStripButton3.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_50
+        Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton3.Name = "ToolStripButton3"
+        Me.ToolStripButton3.Size = New System.Drawing.Size(58, 24)
+        Me.ToolStripButton3.Text = "Zapri"
+        '
        'BtnShraniF2
        '
+        Me.BtnShraniF2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
        Me.BtnShraniF2.Enabled = False
        Me.BtnShraniF2.Image = Global.TPS1100_Convert.My.Resources.Resources.Save_as_24
        Me.BtnShraniF2.ImageTransparentColor = System.Drawing.Color.Magenta
@ -83,39 +100,106 @@ Partial Class Form2
        '
        'ToolStripSeparator3
        '
+        Me.ToolStripSeparator3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 27)
        '
-        'ToolStripButton3
-        '
-        Me.ToolStripButton3.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_50
-        Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton3.Name = "ToolStripButton3"
-        Me.ToolStripButton3.Size = New System.Drawing.Size(58, 24)
-        Me.ToolStripButton3.Text = "Zapri"
-        '
-        'ToolStripSeparator1
-        '
-        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 27)
-        '
        'ToolStripLabel1
        '
        Me.ToolStripLabel1.Name = "ToolStripLabel1"
-        Me.ToolStripLabel1.Size = New System.Drawing.Size(45, 24)
-        Me.ToolStripLabel1.Text = "Koda >"
+        Me.ToolStripLabel1.Size = New System.Drawing.Size(37, 24)
+        Me.ToolStripLabel1.Text = "Koda:"
        '
        'ComBoxKoda
        '
+        Me.ComBoxKoda.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
        Me.ComBoxKoda.DropDownWidth = 180
        Me.ComBoxKoda.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.ComBoxKoda.Items.AddRange(New Object() {"10: Quick Set", "20: Set Azimuth", "30: Resection", "40: Free Station", "50: Ori. & Ht. Transfer", "90: Measured", "99: Imported/User-Entered"})
+        Me.ComBoxKoda.Items.AddRange(New Object() {"User-Entered", "Merjeno", "Orientacija", "Quick Set", "Set Azimuth", "Resection", "Free Station", "Ori. & Ht. Transfer", "Stojišče", "Temperatura/Pritisk"})
        Me.ComBoxKoda.Name = "ComBoxKoda"
        Me.ComBoxKoda.Size = New System.Drawing.Size(180, 27)
        Me.ComBoxKoda.ToolTipText = "Izberi kodo..."
        '
+        'ToolStripButton1
+        '
+        Me.ToolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+        Me.ToolStripButton1.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_undo_48
+        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton1.Name = "ToolStripButton1"
+        Me.ToolStripButton1.Size = New System.Drawing.Size(65, 24)
+        Me.ToolStripButton1.Text = "Povrni"
+        '
+        'ToolStripLabel2
+        '
+        Me.ToolStripLabel2.Name = "ToolStripLabel2"
+        Me.ToolStripLabel2.Size = New System.Drawing.Size(47, 24)
+        Me.ToolStripLabel2.Text = "Stojišče"
+        Me.ToolStripLabel2.Visible = False
+        '
+        'ToolStripTextBox1
+        '
+        Me.ToolStripTextBox1.Font = New System.Drawing.Font("Segoe UI", 9.0!)
+        Me.ToolStripTextBox1.Name = "ToolStripTextBox1"
+        Me.ToolStripTextBox1.Size = New System.Drawing.Size(90, 27)
+        Me.ToolStripTextBox1.Text = "STA"
+        Me.ToolStripTextBox1.Visible = False
+        '
+        'ToolStripLabel3
+        '
+        Me.ToolStripLabel3.Name = "ToolStripLabel3"
+        Me.ToolStripLabel3.Size = New System.Drawing.Size(41, 24)
+        Me.ToolStripLabel3.Text = "H Inst."
+        Me.ToolStripLabel3.Visible = False
+        '
+        'ToolStripTextBox2
+        '
+        Me.ToolStripTextBox2.Font = New System.Drawing.Font("Segoe UI", 9.0!)
+        Me.ToolStripTextBox2.Name = "ToolStripTextBox2"
+        Me.ToolStripTextBox2.Size = New System.Drawing.Size(60, 27)
+        Me.ToolStripTextBox2.Text = "0.000"
+        Me.ToolStripTextBox2.ToolTipText = "Višina instrumenta (m)"
+        Me.ToolStripTextBox2.Visible = False
+        '
+        'ToolStripLabel4
+        '
+        Me.ToolStripLabel4.Name = "ToolStripLabel4"
+        Me.ToolStripLabel4.Size = New System.Drawing.Size(73, 24)
+        Me.ToolStripLabel4.Text = "Temperatura"
+        Me.ToolStripLabel4.Visible = False
+        '
+        'ToolStripTextBox3
+        '
+        Me.ToolStripTextBox3.Font = New System.Drawing.Font("Segoe UI", 9.0!)
+        Me.ToolStripTextBox3.Name = "ToolStripTextBox3"
+        Me.ToolStripTextBox3.Size = New System.Drawing.Size(50, 27)
+        Me.ToolStripTextBox3.Text = "20.0"
+        Me.ToolStripTextBox3.ToolTipText = "Temperatura (°C)"
+        Me.ToolStripTextBox3.Visible = False
+        '
+        'ToolStripLabel5
+        '
+        Me.ToolStripLabel5.Name = "ToolStripLabel5"
+        Me.ToolStripLabel5.Size = New System.Drawing.Size(39, 24)
+        Me.ToolStripLabel5.Text = "Pritisk"
+        Me.ToolStripLabel5.Visible = False
+        '
+        'ToolStripTextBox4
+        '
+        Me.ToolStripTextBox4.Font = New System.Drawing.Font("Segoe UI", 9.0!)
+        Me.ToolStripTextBox4.Name = "ToolStripTextBox4"
+        Me.ToolStripTextBox4.Size = New System.Drawing.Size(60, 27)
+        Me.ToolStripTextBox4.Text = "970"
+        Me.ToolStripTextBox4.ToolTipText = "Pritisk (mbar)"
+        Me.ToolStripTextBox4.Visible = False
+        '
+        'ToolStripSeparator2
+        '
+        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 27)
+        '
        'ToolStripButton2
        '
+        Me.ToolStripButton2.Enabled = False
        Me.ToolStripButton2.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_advance_48
        Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta
        Me.ToolStripButton2.Name = "ToolStripButton2"
@ -123,23 +207,10 @@ Partial Class Form2
        Me.ToolStripButton2.Text = "Vstavi"
        Me.ToolStripButton2.ToolTipText = "Vstavi vrstico..."
        '
-        'ToolStripSeparator2
-        '
-        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 27)
-        '
-        'ToolStripButton1
-        '
-        Me.ToolStripButton1.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_undo_48
-        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.ToolStripButton1.Size = New System.Drawing.Size(65, 24)
-        Me.ToolStripButton1.Text = "Povrni"
-        '
        'StatusStrip1
        '
        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabel1})
-        Me.StatusStrip1.Location = New System.Drawing.Point(0, 589)
+        Me.StatusStrip1.Location = New System.Drawing.Point(0, 619)
        Me.StatusStrip1.Name = "StatusStrip1"
        Me.StatusStrip1.Size = New System.Drawing.Size(1184, 22)
        Me.StatusStrip1.TabIndex = 4
@ -167,7 +238,7 @@ Partial Class Form2
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1184, 611)
+        Me.ClientSize = New System.Drawing.Size(1184, 641)
        Me.Controls.Add(Me.StatusStrip1)
        Me.Controls.Add(Me.ToolStrip1)
        Me.Controls.Add(Me.RichTextBoxEdit)
@ -191,7 +262,6 @@ Partial Class Form2
    Friend WithEvents RichTextBoxEdit As RichTextBox
    Friend WithEvents ToolStrip1 As ToolStrip
    Friend WithEvents BtnShraniF2 As ToolStripButton
-    Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
    Friend WithEvents ToolStripLabel1 As ToolStripLabel
    Friend WithEvents ComBoxKoda As ToolStripComboBox
    Friend WithEvents ToolStripButton2 As ToolStripButton
@ -202,4 +272,12 @@ Partial Class Form2
    Friend WithEvents SaveFileDialog2 As SaveFileDialog
    Friend WithEvents ToolStripButton3 As ToolStripButton
    Friend WithEvents ToolStripSeparator3 As ToolStripSeparator
+    Friend WithEvents ToolStripLabel2 As ToolStripLabel
+    Friend WithEvents ToolStripTextBox1 As ToolStripTextBox
+    Friend WithEvents ToolStripTextBox2 As ToolStripTextBox
+    Friend WithEvents ToolStripLabel3 As ToolStripLabel
+    Friend WithEvents ToolStripLabel4 As ToolStripLabel
+    Friend WithEvents ToolStripTextBox3 As ToolStripTextBox
+    Friend WithEvents ToolStripLabel5 As ToolStripLabel
+    Friend WithEvents ToolStripTextBox4 As ToolStripTextBox
 End Class
--- a/Form2.vb
+++ b/Form2.vb
@ -2,14 +2,9 @@
 Imports System.Windows.Forms.VisualStyles.VisualStyleElement

 Public Class Form2
-
+    
    Public DatotekaSpemembe As Boolean = False
    Private Sub Form2_Load(sender As Object, e As EventArgs) Handles MyBase.Activated
-        ' PropertyGrid1.SelectedObject = My.Settings
-        ' ' Attribute for the user-scope settings.
-        ' Dim userAttr As New System.Configuration.UserScopedSettingAttribute
-        ' Dim attrs As New System.ComponentModel.AttributeCollection(userAttr)
-        ' PropertyGrid1.BrowsableAttributes = attrs
        Form1.Hide()
        RichTextBoxEdit.Clear()

@ -70,40 +65,59 @@ Public Class Form2
        ' End If
    End Sub

+
    Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click
-        RichTextBoxEdit.Focus()
-        RichTextBoxEdit.SelectionStart = RichTextBoxEdit.GetFirstCharIndexOfCurrentLine
-        SendKeys.Send("+{HOME}")
-        If ComBoxKoda.SelectedIndex = 0 Then
-            RichTextBoxEdit.SelectedText = "*410000+0000000000000010 " + vbCrLf
+
+        Dim dataTekst As String = ""
+        If ComBoxKoda.SelectedIndex = 0 Then    ' Koda User-Entered/Import
+            dataTekst = "*410000+" + My.Settings.KodaUserImport.PadLeft(16, "0") + " "
            BtnShraniF2.Enabled = True
            DatotekaSpemembe = True
-        ElseIf ComBoxKoda.SelectedIndex = 1 Then
-            RichTextBoxEdit.SelectedText = "*410000+0000000000000020 " + vbCrLf
+        ElseIf ComBoxKoda.SelectedIndex = 1 Then    ' Koda Meritve
+            dataTekst = "*410000+" + My.Settings.KodaMeas.PadLeft(16, "0") + " "
            BtnShraniF2.Enabled = True
            DatotekaSpemembe = True
-        ElseIf ComBoxKoda.SelectedIndex = 2 Then
-            RichTextBoxEdit.SelectedText = "*410000+0000000000000030 " + vbCrLf
+        ElseIf ComBoxKoda.SelectedIndex = 2 Then    ' Koda Orientacija
+            dataTekst = "*410000+" + My.Settings.KodaMeasOri.PadLeft(16, "0") + " "
            BtnShraniF2.Enabled = True
            DatotekaSpemembe = True
-        ElseIf ComBoxKoda.SelectedIndex = 3 Then
-            RichTextBoxEdit.SelectedText = "*410000+0000000000000040 " + vbCrLf
+        ElseIf ComBoxKoda.SelectedIndex = 3 Then    ' Koda Setup: Quick Set
+            dataTekst = "*410000+" + My.Settings.KodaQuickSet.PadLeft(16, "0") + " "
            BtnShraniF2.Enabled = True
            DatotekaSpemembe = True
-        ElseIf ComBoxKoda.SelectedIndex = 4 Then
-            RichTextBoxEdit.SelectedText = "*410000+0000000000000050 " + vbCrLf
+        ElseIf ComBoxKoda.SelectedIndex = 4 Then    ' Koda Setup: Set Azimut
+            dataTekst = "*410000+" + My.Settings.KodaSetAzi.PadLeft(16, "0") + " "
            BtnShraniF2.Enabled = True
            DatotekaSpemembe = True
-        ElseIf ComBoxKoda.SelectedIndex = 5 Then
-            RichTextBoxEdit.SelectedText = "*410000+0000000000000090 " + vbCrLf
+        ElseIf ComBoxKoda.SelectedIndex = 5 Then    ' Koda Setup: Resection
+            dataTekst = "*410000+" + My.Settings.KodaResection.PadLeft(16, "0") + " "
            BtnShraniF2.Enabled = True
            DatotekaSpemembe = True
-        ElseIf ComBoxKoda.SelectedIndex = 6 Then
-            RichTextBoxEdit.SelectedText = "*410000+0000000000000099 " + vbCrLf
+        ElseIf ComBoxKoda.SelectedIndex = 6 Then    ' Koda Setup: Free Station
+            dataTekst = "*410000+" + My.Settings.KodaFreeStation.PadLeft(16, "0") + " "
+            BtnShraniF2.Enabled = True
+            DatotekaSpemembe = True
+        ElseIf ComBoxKoda.SelectedIndex = 7 Then    ' Koda Setup: Ori. & Ht. Transfer
+            dataTekst = "*410000+" + My.Settings.KodaOriHtTrans.PadLeft(16, "0") + " "
+            BtnShraniF2.Enabled = True
+            DatotekaSpemembe = True
+        ElseIf ComBoxKoda.SelectedIndex = 8 Then    ' Koda Stojišče
+            Dim kodaStoj As String = ToolStripTextBox1.Text.PadLeft(16, "0")
+            Dim kodaStojVis As Double = ToolStripTextBox2.Text.Replace(",", ".") * 1000
+            dataTekst = "*410000+" + My.Settings.KodaStojisce.PadLeft(16, "0") + " 71....+" + kodaStoj.PadLeft(16, "0") + " 72....+" + Format(kodaStojVis, "0000000000000000").ToString + " "
+            BtnShraniF2.Enabled = True
+            DatotekaSpemembe = True
+        ElseIf ComBoxKoda.SelectedIndex = 9 Then    ' Koda Podatki Temp./Pritisk
+            Dim kodaVremeTemp As Double = ToolStripTextBox3.Text.Replace(",", ".")
+            Dim kodaVremePrit As Double = ToolStripTextBox4.Text.Replace(",", ".") ' 1 mbar/hPa = 0.750062 Torr
+            dataTekst = "*410000+" + My.Settings.KodaStojisceInfo.PadLeft(16, "0") + " 71....+" + Format(kodaVremeTemp, "0000000000000000").ToString + " 72....+" + Format(kodaVremePrit, "0000000000000000").ToString + " "
            BtnShraniF2.Enabled = True
            DatotekaSpemembe = True
        End If
-
+        RichTextBoxEdit.Focus()
+        RichTextBoxEdit.SelectionStart = RichTextBoxEdit.GetFirstCharIndexOfCurrentLine
+        SendKeys.Send("+{HOME}")
+        RichTextBoxEdit.SelectedText = dataTekst + vbCrLf
    End Sub

    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
@ -114,4 +128,47 @@ Public Class Form2
        Me.Close()
    End Sub

+    Private Sub ComBoxKoda_Click(sender As Object, e As EventArgs) Handles ComBoxKoda.SelectedIndexChanged
+        If ComBoxKoda.SelectedIndex = -1 Then
+            ToolStripButton2.Enabled = False
+            ToolStripLabel2.Visible = False
+            ToolStripLabel3.Visible = False
+            ToolStripLabel4.Visible = False
+            ToolStripLabel5.Visible = False
+            ToolStripTextBox1.Visible = False
+            ToolStripTextBox2.Visible = False
+            ToolStripTextBox3.Visible = False
+            ToolStripTextBox4.Visible = False
+        ElseIf ComBoxKoda.SelectedIndex = 8 Then
+            ToolStripButton2.Enabled = True
+            ToolStripLabel2.Visible = True
+            ToolStripTextBox1.Visible = True
+            ToolStripLabel3.Visible = True
+            ToolStripTextBox2.Visible = True
+            ToolStripLabel4.Visible = False
+            ToolStripTextBox3.Visible = False
+            ToolStripLabel5.Visible = False
+            ToolStripTextBox4.Visible = False
+        ElseIf ComBoxKoda.SelectedIndex = 9 Then
+            ToolStripButton2.Enabled = True
+            ToolStripLabel2.Visible = False
+            ToolStripTextBox1.Visible = False
+            ToolStripLabel3.Visible = False
+            ToolStripTextBox2.Visible = False
+            ToolStripLabel4.Visible = True
+            ToolStripTextBox3.Visible = True
+            ToolStripLabel5.Visible = True
+            ToolStripTextBox4.Visible = True
+        Else
+            ToolStripButton2.Enabled = True
+            ToolStripLabel2.Visible = False
+            ToolStripLabel3.Visible = False
+            ToolStripLabel4.Visible = False
+            ToolStripLabel5.Visible = False
+            ToolStripTextBox1.Visible = False
+            ToolStripTextBox2.Visible = False
+            ToolStripTextBox3.Visible = False
+            ToolStripTextBox4.Visible = False
+        End If
+    End Sub
 End Class
--- a/FormKodaStojisce.Designer.vb
+++ b/FormKodaStojisce.Designer.vb
@ -0,0 +1,136 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class FormKodaStojisce
+    Inherits System.Windows.Forms.Form
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FormKodaStojisce))
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.TextBox1 = New System.Windows.Forms.TextBox()
+        Me.TextBox2 = New System.Windows.Forms.TextBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+        Me.TableLayoutPanel1.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(12, 15)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(24, 13)
+        Me.Label1.TabIndex = 0
+        Me.Label1.Text = "Ime"
+        '
+        'TextBox1
+        '
+        Me.TextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.TextBox1.Location = New System.Drawing.Point(80, 12)
+        Me.TextBox1.Name = "TextBox1"
+        Me.TextBox1.Size = New System.Drawing.Size(103, 20)
+        Me.TextBox1.TabIndex = 1
+        '
+        'TextBox2
+        '
+        Me.TextBox2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.TextBox2.Location = New System.Drawing.Point(80, 38)
+        Me.TextBox2.Name = "TextBox2"
+        Me.TextBox2.Size = New System.Drawing.Size(82, 20)
+        Me.TextBox2.TabIndex = 2
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(12, 41)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(47, 13)
+        Me.Label2.TabIndex = 3
+        Me.Label2.Text = "Vis. Inst."
+        '
+        'Button1
+        '
+        Me.Button1.Anchor = System.Windows.Forms.AnchorStyles.Bottom
+        Me.Button1.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.Button1.Location = New System.Drawing.Point(48, 9)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(75, 23)
+        Me.Button1.TabIndex = 4
+        Me.Button1.Text = "OK"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(168, 41)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(15, 13)
+        Me.Label3.TabIndex = 5
+        Me.Label3.Text = "m"
+        '
+        'TableLayoutPanel1
+        '
+        Me.TableLayoutPanel1.ColumnCount = 1
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20.0!))
+        Me.TableLayoutPanel1.Controls.Add(Me.Button1, 0, 0)
+        Me.TableLayoutPanel1.Location = New System.Drawing.Point(12, 64)
+        Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+        Me.TableLayoutPanel1.RowCount = 1
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35.0!))
+        Me.TableLayoutPanel1.Size = New System.Drawing.Size(171, 35)
+        Me.TableLayoutPanel1.TabIndex = 6
+        '
+        'FormKodaStojisce
+        '
+        Me.AcceptButton = Me.Button1
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(194, 111)
+        Me.Controls.Add(Me.TableLayoutPanel1)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.TextBox2)
+        Me.Controls.Add(Me.TextBox1)
+        Me.Controls.Add(Me.Label1)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
+        Me.Name = "FormKodaStojisce"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+        Me.Text = "Koda: Stojišče"
+        Me.TopMost = True
+        Me.TableLayoutPanel1.ResumeLayout(False)
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents Label1 As Label
+    Friend WithEvents TextBox1 As TextBox
+    Friend WithEvents TextBox2 As TextBox
+    Friend WithEvents Label2 As Label
+    Friend WithEvents Button1 As Button
+    Friend WithEvents Label3 As Label
+    Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
+End Class
--- a/FormKodaStojisce.resx
+++ b/FormKodaStojisce.resx
--- a/FormKodaStojisce.vb
+++ b/FormKodaStojisce.vb
@ -0,0 +1,5 @@
+Public Class FormKodaStojisce
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        Me.Close()
+    End Sub
+End Class
--- a/FormKodaVreme.Designer.vb
+++ b/FormKodaVreme.Designer.vb
@ -0,0 +1,148 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class FormKodaVreme
+    Inherits System.Windows.Forms.Form
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FormKodaVreme))
+        Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.TextBox2 = New System.Windows.Forms.TextBox()
+        Me.TextBox1 = New System.Windows.Forms.TextBox()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.TableLayoutPanel1.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'TableLayoutPanel1
+        '
+        Me.TableLayoutPanel1.ColumnCount = 1
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20.0!))
+        Me.TableLayoutPanel1.Controls.Add(Me.Button1, 0, 0)
+        Me.TableLayoutPanel1.Location = New System.Drawing.Point(12, 64)
+        Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+        Me.TableLayoutPanel1.RowCount = 1
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20.0!))
+        Me.TableLayoutPanel1.Size = New System.Drawing.Size(170, 35)
+        Me.TableLayoutPanel1.TabIndex = 12
+        '
+        'Button1
+        '
+        Me.Button1.Anchor = System.Windows.Forms.AnchorStyles.Bottom
+        Me.Button1.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.Button1.Location = New System.Drawing.Point(47, 9)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(75, 23)
+        Me.Button1.TabIndex = 4
+        Me.Button1.Text = "OK"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(12, 41)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(35, 13)
+        Me.Label2.TabIndex = 10
+        Me.Label2.Text = "Pritisk"
+        '
+        'TextBox2
+        '
+        Me.TextBox2.Location = New System.Drawing.Point(85, 38)
+        Me.TextBox2.Name = "TextBox2"
+        Me.TextBox2.Size = New System.Drawing.Size(61, 20)
+        Me.TextBox2.TabIndex = 9
+        Me.TextBox2.Text = "970"
+        Me.TextBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
+        'TextBox1
+        '
+        Me.TextBox1.Location = New System.Drawing.Point(85, 12)
+        Me.TextBox1.Name = "TextBox1"
+        Me.TextBox1.Size = New System.Drawing.Size(61, 20)
+        Me.TextBox1.TabIndex = 8
+        Me.TextBox1.Text = "20"
+        Me.TextBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(12, 15)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(67, 13)
+        Me.Label1.TabIndex = 7
+        Me.Label1.Text = "Temperatura"
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(152, 15)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(18, 13)
+        Me.Label3.TabIndex = 13
+        Me.Label3.Text = "°C"
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(152, 41)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(30, 13)
+        Me.Label4.TabIndex = 14
+        Me.Label4.Text = "mbar"
+        '
+        'FormKodaVreme
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(194, 111)
+        Me.Controls.Add(Me.Label4)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.TableLayoutPanel1)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.TextBox2)
+        Me.Controls.Add(Me.TextBox1)
+        Me.Controls.Add(Me.Label1)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
+        Me.Name = "FormKodaVreme"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+        Me.Text = "Koda: Vreme"
+        Me.TableLayoutPanel1.ResumeLayout(False)
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
+    Friend WithEvents Button1 As Button
+    Friend WithEvents Label2 As Label
+    Friend WithEvents TextBox2 As TextBox
+    Friend WithEvents TextBox1 As TextBox
+    Friend WithEvents Label1 As Label
+    Friend WithEvents Label3 As Label
+    Friend WithEvents Label4 As Label
+End Class
--- a/FormKodaVreme.resx
+++ b/FormKodaVreme.resx
--- a/FormKodaVreme.vb
+++ b/FormKodaVreme.vb
@ -0,0 +1,5 @@
+Public Class FormKodaVreme
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        Me.Close()
+    End Sub
+End Class
--- a/FormNastavitve.Designer.vb
+++ b/FormNastavitve.Designer.vb
@ -677,26 +677,26 @@ Partial Class FormNastavitve
        '
        Me.IzvoziKodeToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_move_to_folder_50
        Me.IzvoziKodeToolStripMenuItem.Name = "IzvoziKodeToolStripMenuItem"
-        Me.IzvoziKodeToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.IzvoziKodeToolStripMenuItem.Size = New System.Drawing.Size(133, 22)
        Me.IzvoziKodeToolStripMenuItem.Text = "&Izvozi Kode"
        '
        'UvoziKodeToolStripMenuItem
        '
        Me.UvoziKodeToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_send_file_50
        Me.UvoziKodeToolStripMenuItem.Name = "UvoziKodeToolStripMenuItem"
-        Me.UvoziKodeToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.UvoziKodeToolStripMenuItem.Size = New System.Drawing.Size(133, 22)
        Me.UvoziKodeToolStripMenuItem.Text = "&Uvozi Kode"
        '
        'ToolStripSeparator1
        '
        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(177, 6)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(130, 6)
        '
        'ZapriToolStripMenuItem
        '
        Me.ZapriToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_50
        Me.ZapriToolStripMenuItem.Name = "ZapriToolStripMenuItem"
-        Me.ZapriToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ZapriToolStripMenuItem.Size = New System.Drawing.Size(133, 22)
        Me.ZapriToolStripMenuItem.Text = "&Zapri"
        '
        'FormNastavitve
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("2.6.0.1")>
-<Assembly: AssemblyFileVersion("2.6.0.1")>
+<Assembly: AssemblyVersion("2.7.0.0")>
+<Assembly: AssemblyFileVersion("2.7.0.0")>
 <Assembly: NeutralResourcesLanguage("sl-SI")>
--- a/NAVODILA.docx
+++ b/NAVODILA.docx
--- a/Podatki/TEST.GSI
+++ b/Podatki/TEST.GSI
@ -7,10 +7,11 @@
 *110005+00000000000GS002 21.324+0000000019023040 22.324+0000000010338410 31..00+0000000000007115 32..10+0000000000006914 87..10+0000000000000100 58..16+0000000000000175 33..10-0000000000000268 81..00+0000000531221776 82..00+0000000073023505 83..00+0000000000801350 71....+0000000000000000 
 *110006+00000000000GS003 21.324+0000000003614410 22.324+0000000009121020 31..00+0000000000034333 32..10+0000000000034324 87..10+0000000000000100 58..16+0000000000000175 33..10+0000000000000601 81..00+0000000531243315 82..00+0000000073057988 83..00+0000000000802219 71....+0000000000000000 
 *110007+0000000000011111 25.344+0000000008801190 84..40+0000000465444529 85..40+0000000110546554 86..40+0000000000302353 87..10+0000000000000100 88..10+0000000000001510 
-*410010+0000000000000090 
+*410000+0000000000000080 
 *110008+00000000000GS003 21.324+0000000012415590 22.324+0000000009121020 31..00+0000000000034332 32..10+0000000000034323 87..10+0000000000000100 58..16+0000000000000175 33..10+0000000000000601 81..00+0000000465472895 82..00+0000000110527228 83..00+0000000000302954 71....+0000000000000000 
 *110009+00000000000GS001 21.324+0000000022632260 22.324+0000000008932390 31..00+0000000000029524 32..10+0000000000029523 87..10+0000000000002500 58..16+0000000000000175 33..10-0000000000000755 81..00+0000000465423100 82..00+0000000110526246 83..00+0000000000301598 71....+0000000000000000 
 *110010+00000000000GS002 21.324+0000000027824300 22.324+0000000010339390 31..00+0000000000007112 32..10+0000000000006911 87..10+0000000000000100 58..16+0000000000000175 33..10-0000000000000270 81..00+0000000465437693 82..00+0000000110547564 83..00+0000000000302084 71....+0000000000000000 
+*410000+0000000000000090 
 *110011+0000000000000001 21.324+0000000011254090 22.324+0000000008815450 31..00+0000000000032800 32..10+0000000000032785 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000001205 81..00+0000000465474729 82..00+0000000110533795 83..00+0000000000303558 71....+0000000000000000 
 *110012+0000000000000002 21.324+0000000011144520 22.324+0000000008850390 31..00+0000000000020325 32..10+0000000000020321 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000620 81..00+0000000465463403 82..00+0000000110539024 83..00+0000000000302973 71....+0000000000000000 
 *110013+0000000000000003 21.324+0000000010859200 22.324+0000000008922510 31..00+0000000000011668 32..10+0000000000011667 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000336 81..00+0000000465455561 82..00+0000000110542757 83..00+0000000000302689 71....+0000000000000000 
--- a/Podatki/TEST.koo
+++ b/Podatki/TEST.koo
@ -0,0 +1,44 @@
+GS001	465423.089	110526.243	301.586	REF
+GS002	465437.688	110547.569	302.107	REF
+GS003	465472.908	110527.226	302.945	REF
+11111	465444.529	110546.554	302.353	STA
+GS003	465472.895	110527.228	302.954	MEAS
+GS001	465423.100	110526.246	301.598	MEAS
+GS002	465437.693	110547.564	302.084	MEAS
+1	465474.729	110533.795	303.558	MEAS
+2	465463.403	110539.024	302.973	MEAS
+3	465455.561	110542.757	302.689	MEAS
+4	465446.424	110547.098	302.354	MEAS
+5	465447.834	110549.258	302.521	MEAS
+6	465447.013	110549.645	302.470	MEAS
+7	465447.133	110549.911	302.484	MEAS
+8	465442.260	110552.180	302.590	MEAS
+9	465439.917	110549.069	302.276	MEAS
+10	465434.013	110548.886	302.034	MEAS
+11	465447.924	110549.193	303.527	MEAS
+12	465448.112	110549.481	303.244	MEAS
+13	465452.362	110554.843	304.664	MEAS
+14	465454.504	110557.544	305.149	MEAS
+15	465453.962	110560.654	305.190	MEAS
+16	465451.792	110572.598	306.363	MEAS
+17	465452.236	110573.476	307.192	MEAS
+18	465451.552	110573.751	306.829	MEAS
+19	465460.165	110569.493	306.147	MEAS
+20	465460.732	110564.366	308.875	MEAS
+21	465456.144	110555.142	308.718	MEAS
+22	465466.357	110550.055	310.853	MEAS
+23	465457.019	110582.726	312.411	MEAS
+24	465471.010	110580.229	312.548	MEAS
+31	465443.141	110551.729	303.779	MEAS
+32	465440.407	110548.265	302.097	MEAS
+33	465438.211	110547.118	302.072	MEAS
+34	465434.570	110547.693	301.894	MEAS
+35	465436.599	110547.165	301.948	MEAS
+36	465439.124	110546.897	302.006	MEAS
+37	465441.653	110546.549	302.094	MEAS
+38	465446.526	110544.850	302.298	MEAS
+39	465454.849	110541.033	302.554	MEAS
+40	465460.359	110538.438	302.711	MEAS
+41	465472.352	110532.887	302.986	MEAS
+42	465473.669	110532.696	303.036	MEAS
+43	465474.578	110533.313	303.177	MEAS
--- a/Podatki/TEST.mer
+++ b/Podatki/TEST.mer
@ -0,0 +1,69 @@
+TPS 1100 Zapisnik
++++++++++++++++++++++
+
+Imported/User-Entered:
+----------------------
+PtID	E	N	H
+GS001	465423.089	110526.243	301.586
+GS002	465437.688	110547.569	302.107
+GS003	465472.908	110527.226	302.945
+
+Setup: Free Station
+======================
+PtID	HZ	V	SD	HD	RefHt	PrCons	HtDif	PtCode
+GS001	138.3101	89.3234	29.523	29.522	2.500	0.0175	-0.754	
+GS002	190.2304	103.3841	7.115	6.914	0.100	0.0175	-0.268	
+GS003	36.1441	91.2102	34.333	34.324	0.100	0.0175	0.601	
+
+Station:
+****************
+PtID	HzCor	StnE	StnN	StnH	RefHt	InstHt
+11111	88.0119	465444.529	110546.554	302.353	0.100	1.510
+
+Orientation:
+----------------------
+PtID	Azi	V	SD	HD	RefHt	PrCons	HtDif	E	N	H	PtCode
+GS003	124.1559	91.2102	34.332	34.323	0.100	0.0175	0.601	465472.895	110527.228	302.954	
+GS001	226.3226	89.3239	29.524	29.523	2.500	0.0175	-0.755	465423.100	110526.246	301.598	
+GS002	278.2430	103.3939	7.112	6.911	0.100	0.0175	-0.270	465437.693	110547.564	302.084	
+
+Measured:
+----------------------
+PtID	Azi	V	SD	HD	RefHt	PrCons	HtDif	E	N	H	PtCode
+1	112.5409	88.1545	32.800	32.785	1.300	0.0175	1.205	465474.729	110533.795	303.558	
+2	111.4452	88.5039	20.325	20.321	1.300	0.0175	0.620	465463.403	110539.024	302.973	
+3	108.5920	89.2251	11.668	11.667	1.300	0.0175	0.336	465455.561	110542.757	302.689	
+4	73.5833	96.0303	1.983	1.972	1.300	0.0175	0.001	465446.424	110547.098	302.354	
+5	50.4246	107.2703	4.476	4.270	0.000	0.0344	0.168	465447.834	110549.258	302.521	
+6	38.4642	109.2145	4.204	3.966	0.000	0.0344	0.116	465447.013	110549.645	302.470	
+7	37.4746	107.5859	4.468	4.249	0.000	0.0344	0.131	465447.133	110549.911	302.484	
+8	338.0216	101.5057	6.199	6.067	0.000	0.0344	0.237	465442.260	110552.180	302.590	
+9	298.3616	106.4853	5.488	5.254	0.000	0.0344	-0.078	465439.917	110549.069	302.276	
+10	282.3022	92.4844	10.785	10.772	1.300	0.0175	-0.319	465434.013	110548.886	302.034	
+11	52.0802	94.2821	4.313	4.300	0.000	0.0344	1.174	465447.924	110549.193	303.527	
+12	50.4445	81.3752	4.677	4.627	1.300	0.0175	0.891	465448.112	110549.481	303.244	
+13	43.2242	79.3342	11.597	11.405	1.300	0.0175	2.311	465452.362	110554.843	304.664	
+14	42.1339	80.0701	15.065	14.842	1.300	0.0175	2.796	465454.504	110557.544	305.149	
+15	33.4646	81.1159	17.167	16.965	1.300	0.0175	2.836	465453.962	110560.654	305.190	
+16	15.3456	82.0003	27.304	27.038	1.300	0.0175	4.010	465451.792	110572.598	306.363	
+17	15.5830	80.3654	28.384	28.004	1.300	0.0175	4.838	465452.236	110573.476	307.192	
+18	14.2841	81.2154	28.412	28.090	1.300	0.0175	4.476	465451.552	110573.751	306.829	
+19	34.1646	82.3838	27.992	27.761	1.300	0.0175	3.794	465460.165	110569.493	306.147	
+20	42.1727	78.1433	24.595	24.079	0.000	0.0344	6.522	465460.732	110564.366	308.875	
+21	53.3104	71.2531	15.239	14.445	0.000	0.0344	6.364	465456.144	110555.142	308.718	
+22	80.5316	72.2717	23.186	22.107	0.000	0.0344	8.500	465466.357	110550.055	310.853	
+23	19.0258	77.2433	39.212	38.269	0.000	0.0344	10.058	465457.019	110582.726	312.411	
+24	38.1048	78.3224	43.712	42.840	0.000	0.0344	10.195	465471.010	110580.229	312.548	
+31	344.5857	90.5405	5.359	5.358	0.000	0.0344	1.426	465443.141	110551.729	303.779	
+32	292.3305	95.5811	4.488	4.464	1.300	0.0175	-0.257	465440.407	110548.265	302.097	
+33	275.0604	94.2552	6.362	6.343	1.300	0.0175	-0.282	465438.211	110547.118	302.072	
+34	276.3140	93.4917	10.047	10.024	1.300	0.0175	-0.460	465434.570	110547.693	301.894	
+35	274.2437	94.2524	7.978	7.954	1.300	0.0175	-0.405	465436.599	110547.165	301.948	
+36	273.3758	95.5230	5.445	5.416	1.300	0.0175	-0.347	465439.124	110546.897	302.006	
+37	269.5406	99.1634	2.914	2.876	1.300	0.0175	-0.260	465441.653	110546.549	302.094	
+38	130.2741	95.4557	2.638	2.625	1.300	0.0175	-0.055	465446.526	110544.850	302.298	
+39	118.0836	90.0246	11.703	11.703	1.300	0.0175	0.201	465454.849	110541.033	302.554	
+40	117.0839	89.3129	17.790	17.789	1.300	0.0175	0.358	465460.359	110538.438	302.711	
+41	116.0938	89.1307	31.001	30.998	1.300	0.0175	0.633	465472.352	110532.887	302.986	
+42	115.2603	89.0942	32.271	32.268	1.300	0.0175	0.682	465473.669	110532.696	303.036	
+43	113.4649	88.5545	32.842	32.836	1.300	0.0175	0.824	465474.578	110533.313	303.177	
--- a/Resources/Data/RADO1.GEO
+++ b/Resources/Data/RADO1.GEO
@ -0,0 +1,16 @@
+11111 0.000
+20 780.460
+60001	275.3309
+60002	262.5215
+61002	1.0051
+0 0
+60001	275.3309	92.1850	33.519	2.000
+60002	262.5215	92.0354	35.137	1.400
+61002	1.0051	88.2736	39.435	2.000
+LT1A	145.4020	88.2416	52.883	1.470
+LT1B	113.4540	91.4223	30.516	1.430
+M109G	278.3941	93.2734	32.374	2.000
+201	104.0242	92.5457	8.644	2.500
+202	176.0456	106.2711	0.921	1.400
+203	276.1404	91.3145	7.130	1.400
+-1 0 0 0 0
--- a/Resources/Data/TEST.GSI
+++ b/Resources/Data/TEST.GSI
@ -6,11 +6,14 @@
 *110004+00000000000GS001 21.324+0000000013831010 22.324+0000000008932340 31..00+0000000000029523 32..10+0000000000029522 87..10+0000000000002500 58..16+0000000000000175 33..10-0000000000000754 81..00+0000000531242578 82..00+0000000073008189 83..00+0000000000800864 71....+0000000000000000 
 *110005+00000000000GS002 21.324+0000000019023040 22.324+0000000010338410 31..00+0000000000007115 32..10+0000000000006914 87..10+0000000000000100 58..16+0000000000000175 33..10-0000000000000268 81..00+0000000531221776 82..00+0000000073023505 83..00+0000000000801350 71....+0000000000000000 
 *110006+00000000000GS003 21.324+0000000003614410 22.324+0000000009121020 31..00+0000000000034333 32..10+0000000000034324 87..10+0000000000000100 58..16+0000000000000175 33..10+0000000000000601 81..00+0000000531243315 82..00+0000000073057988 83..00+0000000000802219 71....+0000000000000000 
+*410000+0000000000000001 71....+0000000000000STA 72....+0000000000000000 
+*410000+0000000000000002 71....+0000000000000020 72....+0000000000000970 
 *110007+0000000000011111 25.344+0000000008801190 84..40+0000000465444529 85..40+0000000110546554 86..40+0000000000302353 87..10+0000000000000100 88..10+0000000000001510 
-*410010+0000000000000090 
+*410000+0000000000000080 
 *110008+00000000000GS003 21.324+0000000012415590 22.324+0000000009121020 31..00+0000000000034332 32..10+0000000000034323 87..10+0000000000000100 58..16+0000000000000175 33..10+0000000000000601 81..00+0000000465472895 82..00+0000000110527228 83..00+0000000000302954 71....+0000000000000000 
 *110009+00000000000GS001 21.324+0000000022632260 22.324+0000000008932390 31..00+0000000000029524 32..10+0000000000029523 87..10+0000000000002500 58..16+0000000000000175 33..10-0000000000000755 81..00+0000000465423100 82..00+0000000110526246 83..00+0000000000301598 71....+0000000000000000 
 *110010+00000000000GS002 21.324+0000000027824300 22.324+0000000010339390 31..00+0000000000007112 32..10+0000000000006911 87..10+0000000000000100 58..16+0000000000000175 33..10-0000000000000270 81..00+0000000465437693 82..00+0000000110547564 83..00+0000000000302084 71....+0000000000000000 
+*410000+0000000000000090 
 *110011+0000000000000001 21.324+0000000011254090 22.324+0000000008815450 31..00+0000000000032800 32..10+0000000000032785 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000001205 81..00+0000000465474729 82..00+0000000110533795 83..00+0000000000303558 71....+0000000000000000 
 *110012+0000000000000002 21.324+0000000011144520 22.324+0000000008850390 31..00+0000000000020325 32..10+0000000000020321 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000620 81..00+0000000465463403 82..00+0000000110539024 83..00+0000000000302973 71....+0000000000000000 
 *110013+0000000000000003 21.324+0000000010859200 22.324+0000000008922510 31..00+0000000000011668 32..10+0000000000011667 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000336 81..00+0000000465455561 82..00+0000000110542757 83..00+0000000000302689 71....+0000000000000000 
--- a/Convert.vbproj
+++ b/Convert.vbproj
@ -32,8 +32,8 @@
    <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
    <WebPage>publish.html</WebPage>
    <AutorunEnabled>true</AutorunEnabled>
-    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>2.6.0.%2a</ApplicationVersion>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>2.7.0.%2a</ApplicationVersion>
    <UseApplicationTrust>false</UseApplicationTrust>
    <CreateDesktopShortcut>true</CreateDesktopShortcut>
    <PublishWizardCompleted>true</PublishWizardCompleted>
@ -134,6 +134,18 @@
    <Compile Include="Form2.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="FormKodaStojisce.Designer.vb">
+      <DependentUpon>FormKodaStojisce.vb</DependentUpon>
+    </Compile>
+    <Compile Include="FormKodaStojisce.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FormKodaVreme.Designer.vb">
+      <DependentUpon>FormKodaVreme.vb</DependentUpon>
+    </Compile>
+    <Compile Include="FormKodaVreme.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="FormNastavitve.Designer.vb">
      <DependentUpon>FormNastavitve.vb</DependentUpon>
    </Compile>
@ -171,6 +183,12 @@
    <EmbeddedResource Include="Form2.resx">
      <DependentUpon>Form2.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="FormKodaStojisce.resx">
+      <DependentUpon>FormKodaStojisce.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FormKodaVreme.resx">
+      <DependentUpon>FormKodaVreme.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="FormNastavitve.resx">
      <DependentUpon>FormNastavitve.vb</DependentUpon>
    </EmbeddedResource>
@ -185,6 +203,7 @@
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
+    <None Include="CHANGELOG.md" />
    <None Include="My Project\app.manifest" />
    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
@ -198,11 +217,15 @@
      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
    </None>
    <None Include="App.config" />
-    <None Include="README.md" />
-    <Resource Include="Podatki\TEST.GSI">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Resource>
-    <None Include="Podatki\TPS1100.crf" />
+    <None Include="README.md">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <AdditionalFiles Include="Podatki\TEST.GSI">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </AdditionalFiles>
+    <AdditionalFiles Include="Podatki\TPS1100.crf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </AdditionalFiles>
    <None Include="TPS1100 Convert_TemporaryKey.pfx" />
  </ItemGroup>
  <ItemGroup>
@ -276,8 +299,12 @@
    <None Include="My Project\Icons\icons8-send-file-50.png" />
    <None Include="My Project\Icons\icons8-support-50.png" />
    <None Include="My Project\Icons\icons8-question-mark-48.png" />
-    <None Include="Podatki\GSI_code.txt" />
-    <None Include="Podatki\GSI_DataCodes.txt" />
+    <AdditionalFiles Include="Podatki\GSI_code.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </AdditionalFiles>
+    <AdditionalFiles Include="Podatki\GSI_DataCodes.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </AdditionalFiles>
    <None Include="My Project\Icons\icons8-check-file-50.png" />
    <Content Include="Podatki\TEST.txt" />
    <Content Include="TPS1100CNVRT.ico" />
--- a/Convert.application
+++ b/Convert.application
@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="TPS1100 Convert.application" version="2.6.0.0" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <assemblyIdentity name="TPS1100 Convert.application" version="2.7.0.0" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
  <description asmv2:publisher="2B geoinformatika d.o.o." asmv2:product="TPS1100 Convert" xmlns="urn:schemas-microsoft-com:asm.v1" />
  <deployment install="true" mapFileExtensions="true" co.v1:createDesktopShortcut="true" />
  <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
    <framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
  </compatibleFrameworks>
  <dependency>
-    <dependentAssembly dependencyType="install" codebase="TPS1100 Convert.exe.manifest" size="5491">
-      <assemblyIdentity name="TPS1100 Convert.exe" version="2.6.0.0" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" type="win32" />
+    <dependentAssembly dependencyType="install" codebase="TPS1100 Convert.exe.manifest" size="5492">
+      <assemblyIdentity name="TPS1100 Convert.exe" version="2.7.0.0" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" type="win32" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>o5W/oVnOifrWJjtGunSFNB5wzxZkVslxXrzG4GtEugs=</dsig:DigestValue>
+        <dsig:DigestValue>xGfHjHpgMkc5XmNvyOXeXaxDJe4YrDEgSIDCY0Q3lcM=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/bin/Release/TPS1100
+++ b/bin/Release/TPS1100
--- a/Convert.exe.manifest
+++ b/Convert.exe.manifest
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="TPS1100 Convert.exe" version="2.6.0.0" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" type="win32" />
+  <asmv1:assemblyIdentity name="TPS1100 Convert.exe" version="2.7.0.0" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" type="win32" />
  <description asmv2:iconFile="TPS1100CNVRT.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
  <application />
  <entryPoint>
-    <assemblyIdentity name="TPS1100 Convert" version="2.6.0.0" language="neutral" processorArchitecture="msil" />
+    <assemblyIdentity name="TPS1100 Convert" version="2.7.0.0" language="neutral" processorArchitecture="msil" />
    <commandLine file="TPS1100 Convert.exe" parameters="" />
  </entryPoint>
  <trustInfo>
@ -43,14 +43,14 @@
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TPS1100 Convert.exe" size="873984">
-      <assemblyIdentity name="TPS1100 Convert" version="2.6.0.0" language="neutral" processorArchitecture="msil" />
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TPS1100 Convert.exe" size="1225728">
+      <assemblyIdentity name="TPS1100 Convert" version="2.7.0.0" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>IlN/wRity9wYSJmiRGkVcCvpKFIfdptb9lBFHzrFV+g=</dsig:DigestValue>
+        <dsig:DigestValue>Ldy35cdnmM1aFMfYIj2/8VaAmSP6DhzHI2H4kYCJ9Qo=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/bin/Release/app.publish/TPS1100
+++ b/bin/Release/app.publish/TPS1100
--- a/bin/TPS1100-Convert_2.5.0.8_Portable.zip
+++ b/bin/TPS1100-Convert_2.5.0.8_Portable.zip