Verzija 2.7.0.0 RC

App.config

@@ -67,6 +67,9 @@
             <setting name="Pisava" serializeAs="String">
                 <value />
             </setting>
+            <setting name="KodaStojisceOri" serializeAs="String">
+                <value>3</value>
+            </setting>
         </TPS1100_Convert.My.MySettings>
     </userSettings>
 </configuration>

CHANGELOG.md

@@ -9,7 +9,9 @@ Zapisnik razvoja programa TPS1100 Convert.
 Datum: 2024/06/15
 
 - Novo: Priprava GEO datoteke za preračun v Geo programu
-- Dodano: Izpis kode točke za orientacije v seznamu točk
+- Dodano izpisovanje kode točke za orientacije v seznamu točk
+- Sprememnjena vidnost polj za vnost stojišča in temp/pritiska v urejevalniku GSI datotek
+- Odstranjena koda za "StakeOut" (ni uporabna)
 
 ---
 

Form1.Designer.vb

@@ -36,16 +36,17 @@ Partial Class Form1
         Me.ToolStripButtonPripravi = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
         Me.tsbOpenFile = New System.Windows.Forms.ToolStripButton()
-        Me.LabelDatoteka = New System.Windows.Forms.ToolStripLabel()
         Me.ButtonUrediDat = New System.Windows.Forms.ToolStripButton()
+        Me.LabelDatoteka = New System.Windows.Forms.ToolStripLabel()
         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()
+        Me.ToolStripButtonNavodila = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripButtonNast = New System.Windows.Forms.ToolStripButton()
         Me.OpenFileDialogTocke = New System.Windows.Forms.OpenFileDialog()
         Me.StatusStrip1.SuspendLayout()
         Me.ToolStrip1.SuspendLayout()
@@ -58,6 +59,7 @@ Partial Class Form1
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.RichTextBox1.BackColor = System.Drawing.SystemColors.Control
         Me.RichTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.RichTextBox1.Cursor = System.Windows.Forms.Cursors.IBeam
         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)
@@ -127,7 +129,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.ToolStripButtonGeo, Me.ToolStripSeparator4, Me.tsbSaveAs, Me.ToolStripButtonNast, Me.ToolStripSeparator3})
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButtonPripravi, Me.ToolStripSeparator2, Me.tsbOpenFile, Me.ButtonUrediDat, Me.tsbFileName, Me.LabelDatoteka, Me.ToolStripSeparator1, Me.tsbConvert, Me.tsbPointsOnly, Me.tsbHelp, Me.ToolStripButtonGeo, Me.ToolStripSeparator4, Me.tsbSaveAs, Me.ToolStripButtonNavodila, Me.ToolStripSeparator3, Me.ToolStripButtonNast})
         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)
@@ -158,15 +160,6 @@ Partial Class Form1
         Me.tsbOpenFile.Text = "Odpri GSI"
         Me.tsbOpenFile.ToolTipText = "Izberi GSI datoteko..."
         '
-        'LabelDatoteka
-        '
-        Me.LabelDatoteka.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.LabelDatoteka.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_window_50
-        Me.LabelDatoteka.Name = "LabelDatoteka"
-        Me.LabelDatoteka.Size = New System.Drawing.Size(30, 34)
-        Me.LabelDatoteka.Text = "Datoteka"
-        Me.LabelDatoteka.ToolTipText = "Ni datoteke"
-        '
         'ButtonUrediDat
         '
         Me.ButtonUrediDat.Enabled = False
@@ -177,6 +170,15 @@ Partial Class Form1
         Me.ButtonUrediDat.Text = "Uredi"
         Me.ButtonUrediDat.ToolTipText = "Uredi podatke GSI datoteke..."
         '
+        'LabelDatoteka
+        '
+        Me.LabelDatoteka.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.LabelDatoteka.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_window_50
+        Me.LabelDatoteka.Name = "LabelDatoteka"
+        Me.LabelDatoteka.Size = New System.Drawing.Size(30, 34)
+        Me.LabelDatoteka.Text = "Datoteka"
+        Me.LabelDatoteka.ToolTipText = "Ni datoteke"
+        '
         'tsbConvert
         '
         Me.tsbConvert.Enabled = False
@@ -233,6 +235,22 @@ Partial Class Form1
         Me.tsbSaveAs.Size = New System.Drawing.Size(93, 34)
         Me.tsbSaveAs.Text = "Shrani ..."
         '
+        'ToolStripButtonNavodila
+        '
+        Me.ToolStripButtonNavodila.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+        Me.ToolStripButtonNavodila.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_question_mark_48
+        Me.ToolStripButtonNavodila.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButtonNavodila.Name = "ToolStripButtonNavodila"
+        Me.ToolStripButtonNavodila.Size = New System.Drawing.Size(88, 34)
+        Me.ToolStripButtonNavodila.Text = "Navodila"
+        Me.ToolStripButtonNavodila.ToolTipText = "Odpri PDF z navodili..."
+        '
+        'ToolStripSeparator3
+        '
+        Me.ToolStripSeparator3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 37)
+        '
         'ToolStripButtonNast
         '
         Me.ToolStripButtonNast.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
@@ -243,12 +261,6 @@ Partial Class Form1
         Me.ToolStripButtonNast.Text = "Nastavitve"
         Me.ToolStripButtonNast.ToolTipText = "Odpri Nastavitve..."
         '
-        'ToolStripSeparator3
-        '
-        Me.ToolStripSeparator3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 37)
-        '
         'OpenFileDialogTocke
         '
         Me.OpenFileDialogTocke.Filter = "Datoteke točk|*.koo;*.txt|All files|*.*"
@@ -299,4 +311,5 @@ Partial Class Form1
     Friend WithEvents ToolStripButtonPripravi As ToolStripButton
     Friend WithEvents OpenFileDialogTocke As OpenFileDialog
     Friend WithEvents ToolStripButtonGeo As ToolStripButton
+    Friend WithEvents ToolStripButtonNavodila As ToolStripButton
 End Class

Form1.resx

@@ -118,7 +118,8 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="RichTextBox1.Text" xml:space="preserve">
-    <value>GSI v Zapisnik Meritev ali Seznam Točk...
+    <value>-------------------------
+Pretvori GSI
 
 1. Odpri GSI datoteko.
 2. Preveri podatke in po potrebi uredi datoteko (gumb "Uredi").
@@ -126,7 +127,8 @@
 3B. Za pripravo seznama koordinat točk klikni gumb "Točke".
 4. Shrani podatke z klikom na gumb "Shrani...".
 
-Uvozi KOO/TXT in pripravi GSI datoteko...
+-------------------------
+Pripravi GSI datoteko
 
 A. Uvozi datoteko z koordinatami točk z klikom na "Pripravi GSI".
    Format datoteke: Pt E N H (Med podatki je presledek ali tabulator)

Form1.vb

@@ -1,4 +1,5 @@
 Imports System.IO
+Imports System.Runtime.InteropServices.ComTypes
 
 Public Class Form1
 
@@ -163,15 +164,11 @@ Public Class Form1
                                 PodatkiStojisce = True
                             End If
                             If dataKoda = My.Settings.KodaMeasOri Then
-                                data = vbCrLf + "Orientation:" + vbCrLf + "----------------------" + vbCrLf + "PtID" + dataStolpci + "Azi" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "RefHt" + dataStolpci + "PrCons" + dataStolpci + "HtDif" + dataStolpci + "E" + dataStolpci + "N" + dataStolpci + "H" + dataStolpci + "PtCode"
+                                data = vbCrLf + "Orientacija:" + vbCrLf + "----------------------" + vbCrLf + "PtID" + dataStolpci + "Azi" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "RefHt" + dataStolpci + "PrCons" + dataStolpci + "HtDif" + dataStolpci + "E" + dataStolpci + "N" + dataStolpci + "H" + dataStolpci + "PtCode"
                                 PodatkiStojisce = False
                             End If
                             If dataKoda = My.Settings.KodaMeas Then
-                                data = vbCrLf + "Measured:" + vbCrLf + "----------------------" + vbCrLf + "PtID" + dataStolpci + "Azi" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "RefHt" + dataStolpci + "PrCons" + dataStolpci + "HtDif" + dataStolpci + "E" + dataStolpci + "N" + dataStolpci + "H" + dataStolpci + "PtCode"
+                                data = vbCrLf + "Merjeno:" + vbCrLf + "----------------------" + vbCrLf + "PtID" + dataStolpci + "Azi" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "RefHt" + dataStolpci + "PrCons" + dataStolpci + "HtDif" + dataStolpci + "E" + dataStolpci + "N" + dataStolpci + "H" + dataStolpci + "PtCode"
-                                PodatkiStojisce = False
-                            End If
-                            If dataKoda = My.Settings.KodaStake Then
-                                data = vbCrLf + "Staked:" + vbCrLf + "----------------------" + vbCrLf + "PtID" + dataStolpci + "Azi" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "RefHt" + dataStolpci + "PrCons" + dataStolpci + "HtDif" + dataStolpci + "E" + dataStolpci + "N" + dataStolpci + "H" + dataStolpci + "PtCode"
                                 PodatkiStojisce = False
                             End If
                             If dataKoda = My.Settings.KodaUserImport Then
@@ -179,11 +176,15 @@ Public Class Form1
                                 PodatkiStojisce = False
                             End If
                             If dataKoda = My.Settings.KodaStojisce Then
-                                data = vbCrLf + "Stojišče:" + vbCrLf + "----------------------" + vbCrLf + "PtID" + dataStolpci + "InstHt"
+                                data = vbCrLf + "Stojišče Info:" + vbCrLf + "----------------------" + vbCrLf + "StID" + dataStolpci + "InstHt" + vbCrLf
                                 PodatkiStojisce = False
                             End If
                             If dataKoda = My.Settings.KodaStojisceInfo Then
-                                data = vbCrLf + "Temperatura/Pritisk:" + vbCrLf + "----------------------" + vbCrLf + "Temp" + dataStolpci + "Pritisk"
+                                data = vbCrLf + "Temp./Pritisk:" + vbCrLf + "----------------------" + vbCrLf + "Temp" + dataStolpci + "Pritisk" + vbCrLf
+                                PodatkiStojisce = False
+                            End If
+                            If dataKoda = My.Settings.KodaStojisceOri Then
+                                data = vbCrLf + "Orientacija:" + vbCrLf + "----------------------" + vbCrLf + "OrID" + dataStolpci + "Hz" + vbCrLf
                                 PodatkiStojisce = False
                             End If
                             If dataKoda = "STA_OFFS" Then
@@ -204,13 +205,35 @@ Public Class Form1
                     ElseIf wordIndex = "58" Then    ' Prism constant
                         numData = data / 10000
                         data = dataStolpci + Format(numData, "0.0000")
-                    ElseIf wordIndex = "71" Or wordIndex = "72" Then    ' Point Code
+                    ElseIf wordIndex = "71" Then    ' Point Code
                         dataTmp = Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
                         If dataKoda = My.Settings.KodaStojisce Then
                             data = dataTmp
-                        Else
+                        End If
+                        If dataKoda = My.Settings.KodaStojisceInfo Then
+                            data = dataTmp
+                        End If
+                        If dataKoda = My.Settings.KodaStojisceOri Then
+                            data = dataTmp
+                        End If
+                        If dataTmp = "" Then
+                            data = ""
+                        End If
+                    ElseIf wordIndex = "72" Then    ' Point Code
+                        dataTmp = Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
+                        If dataKoda = My.Settings.KodaStojisce Then
+                            Dim dataNum As Double
+                            dataNum = dataTmp / 1000
+                            data = dataStolpci + Format(dataNum, "0.000")
+                        End If
+                        If dataKoda = My.Settings.KodaStojisceInfo Then
                             data = dataStolpci + dataTmp
                         End If
+                        If dataKoda = My.Settings.KodaStojisceOri Then
+                            Dim dataNum As Double
+                            dataNum = dataTmp / 100000
+                            data = dataStolpci + Format(dataNum, "0.0000")
+                        End If
                     ElseIf wordIndex = "79" Then    ' Point Code
                         dataTmp = Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
                         If dataTmp = "" Then
@@ -315,7 +338,7 @@ 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.KodaStake Then
+                        If dataInfo = My.Settings.KodaMeas Then
                             measuredPoints = 1
                         ElseIf dataInfo = My.Settings.KodaUserImport Then
                             measuredPoints = 2
@@ -461,6 +484,7 @@ Public Class Form1
         End If
     End Sub
 
+    ' Priprava GEO datoteke
     Private Sub ToolStripButtonGeo_Click(sender As Object, e As EventArgs) Handles ToolStripButtonGeo.Click
         RichTextBox1.Clear()
         RichTextBox1.BackColor = Color.LemonChiffon
@@ -469,47 +493,90 @@ Public Class Form1
         Dim streamReader As StreamReader = New StreamReader(OpenFileDialog1.FileName)
         Dim i As Integer = 0
         Dim lin As Integer = 0
+        Dim infoTemp As String = "20"
+        Dim infoPress As String = "759.81"
 
+        ' Branje datoteke
         Do Until streamReader.EndOfStream
-            ' Read and Split each line to separate it into fields
+            ' Beri datoteko po vrsticah, razdelitev na posamezne podatke (array)
-            Dim izpisText As String = ""
             Dim line() As String = streamReader.ReadLine().Split(" ")
-            line(0) = Replace(line(0), "*", "")
+            line(0) = Replace(line(0), "*", "") ' Odstrani * na začetku vrstice
+
+            Dim izpisText As String = ""
 
             If Microsoft.VisualBasic.Left(line(0), 2) = "41" Then
+
                 dataKoda = Microsoft.VisualBasic.Right(line(0), 16).TrimStart("0"c)
 
+                If dataKoda = My.Settings.KodaStojisce Then
+                    Dim infoSta As String
+                    infoSta = Microsoft.VisualBasic.Right(line(1), 16).TrimStart("0"c)
+                    Dim infoStaHt As String
+                    infoStaHt = Microsoft.VisualBasic.Right(line(2), 17).TrimStart("0"c)
+                    Dim numStaHt As Double
+                    numStaHt = infoStaHt / 1000
+                    izpisText = infoSta + " " + Format(numStaHt, "0.000").ToString + vbCrLf
+                    measuredPoints = 0
+                End If
+
+                ' Nastavi podatke o temperaturi in pritisku, če je podana koda za "KodaStojisceInfo"
+                ' Sicer uporabi prednastavljene vrednosti "infoTemp" in "infoPress"
+                If dataKoda = My.Settings.KodaStojisceInfo Then
+                    infoTemp = Microsoft.VisualBasic.Right(line(1), 16).TrimStart("0"c)
+                    infoPress = Microsoft.VisualBasic.Right(line(2), 16).TrimStart("0"c)
+                    Dim numPress As Double
+                    numPress = infoPress * 0.750062
+                    infoPress = Format(numPress, "0.00").ToString
+                    izpisText = infoTemp + " " + infoPress + vbCrLf
+                    measuredPoints = 0
+                End If
+
+                If dataKoda = My.Settings.KodaStojisceOri Then
+                    Dim infoOri As String
+                    infoOri = Microsoft.VisualBasic.Right(line(1), 16).TrimStart("0"c)
+                    Dim infoOriHz As String
+                    infoOriHz = Microsoft.VisualBasic.Right(line(2), 17).TrimStart("0"c)
+                    Dim numOriHz As Double
+                    numOriHz = infoOriHz / 100000
+                    izpisText = infoOri + " " + Format(numOriHz, "0.0000").ToString + vbCrLf
+                    measuredPoints = 0
+                End If
+
+                If dataKoda = My.Settings.KodaUserImport Then
+                    measuredPoints = 0
+                End If
+
+                If dataKoda = My.Settings.KodaMeasOri Then
+                    izpisText = infoTemp + " " + infoPress + vbCrLf
+                    measuredPoints = 0
+                End If
+
                 If dataKoda = My.Settings.KodaMeas Then
                     izpisText = "0 0" + vbCrLf
                     measuredPoints = 1
                 End If
 
-                If dataKoda = My.Settings.KodaMeasOri Then
+                If dataKoda = My.Settings.KodaQuickSet And lin > 0 And measuredPoints = 1 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
+                If dataKoda = My.Settings.KodaSetAzi And lin > 0 And measuredPoints = 1 Then
                     izpisText = "-1 0 0 0 0" + vbCrLf
                     measuredPoints = 0
                 End If
 
-                If dataKoda = My.Settings.KodaResection And lin > 0 Then
+                If dataKoda = My.Settings.KodaResection And lin > 0 And measuredPoints = 1 Then
                     izpisText = "-1 0 0 0 0" + vbCrLf
                     measuredPoints = 0
                 End If
 
-                If dataKoda = My.Settings.KodaFreeStation And lin > 0 Then
+                If dataKoda = My.Settings.KodaFreeStation And lin > 0 And measuredPoints = 1 Then
                     izpisText = "-1 0 0 0 0" + vbCrLf
                     measuredPoints = 0
                 End If
 
-                If dataKoda = My.Settings.KodaOriHtTrans And lin > 0 Then
+                If dataKoda = My.Settings.KodaOriHtTrans And lin > 0 And measuredPoints = 1 Then
                     izpisText = "-1 0 0 0 0" + vbCrLf
                     measuredPoints = 0
                 End If
@@ -591,4 +658,8 @@ Public Class Form1
         tsbSaveAs.Enabled = True
         tsbSaveAs.Text = "Shrani GEO"
     End Sub
+
+    Private Sub ToolStripButtonNavodila_Click(sender As Object, e As EventArgs) Handles ToolStripButtonNavodila.Click
+        Process.Start("Navodila.pdf")
+    End Sub
 End Class

Form2.Designer.vb

@@ -36,6 +36,8 @@ Partial Class Form2
         Me.ToolStripTextBox1 = New System.Windows.Forms.ToolStripTextBox()
         Me.ToolStripLabel3 = New System.Windows.Forms.ToolStripLabel()
         Me.ToolStripTextBox2 = New System.Windows.Forms.ToolStripTextBox()
+        Me.ToolStripLabel6 = New System.Windows.Forms.ToolStripLabel()
+        Me.ToolStripTextBox5 = 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()
@@ -71,7 +73,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.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.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.ToolStripLabel6, Me.ToolStripTextBox5, 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)
@@ -112,12 +114,14 @@ Partial Class Form2
         '
         'ComBoxKoda
         '
+        Me.ComBoxKoda.AutoSize = False
         Me.ComBoxKoda.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.ComBoxKoda.DropDownWidth = 180
+        Me.ComBoxKoda.DropDownWidth = 200
         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() {"User-Entered", "Merjeno", "Orientacija", "Quick Set", "Set Azimuth", "Resection", "Free Station", "Ori. & Ht. Transfer", "Stojišče", "Temperatura/Pritisk"})
+        Me.ComBoxKoda.Items.AddRange(New Object() {" ", "1   | Setup: Quick Set", "2   | Setup: Set Azimuth", "3   | Setup: Resection", "4   | Setup: Free Station", "5   | Setup: Ori. & Ht. Transfer", "6   | Measure: Orientation", "7   | Measure: Points", "8   | Points: User/Imported", "9   | Info: Station + Ht.", "10 | Info: Temp. + Press.", "11 | Info: Orientation + Hz"})
+        Me.ComBoxKoda.MaxDropDownItems = 15
         Me.ComBoxKoda.Name = "ComBoxKoda"
-        Me.ComBoxKoda.Size = New System.Drawing.Size(180, 27)
+        Me.ComBoxKoda.Size = New System.Drawing.Size(200, 25)
         Me.ComBoxKoda.ToolTipText = "Izberi kodo..."
         '
         'ToolStripButton1
@@ -132,8 +136,8 @@ Partial Class Form2
         'ToolStripLabel2
         '
         Me.ToolStripLabel2.Name = "ToolStripLabel2"
-        Me.ToolStripLabel2.Size = New System.Drawing.Size(47, 24)
+        Me.ToolStripLabel2.Size = New System.Drawing.Size(36, 24)
-        Me.ToolStripLabel2.Text = "Stojišče"
+        Me.ToolStripLabel2.Text = "PntID"
         Me.ToolStripLabel2.Visible = False
         '
         'ToolStripTextBox1
@@ -141,7 +145,8 @@ Partial Class Form2
         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.Text = "NAME"
+        Me.ToolStripTextBox1.ToolTipText = "Ime točke"
         Me.ToolStripTextBox1.Visible = False
         '
         'ToolStripLabel3
@@ -160,6 +165,22 @@ Partial Class Form2
         Me.ToolStripTextBox2.ToolTipText = "Višina instrumenta (m)"
         Me.ToolStripTextBox2.Visible = False
         '
+        'ToolStripLabel6
+        '
+        Me.ToolStripLabel6.Name = "ToolStripLabel6"
+        Me.ToolStripLabel6.Size = New System.Drawing.Size(21, 24)
+        Me.ToolStripLabel6.Text = "Hz"
+        Me.ToolStripLabel6.Visible = False
+        '
+        'ToolStripTextBox5
+        '
+        Me.ToolStripTextBox5.Font = New System.Drawing.Font("Segoe UI", 9.0!)
+        Me.ToolStripTextBox5.Name = "ToolStripTextBox5"
+        Me.ToolStripTextBox5.Size = New System.Drawing.Size(70, 27)
+        Me.ToolStripTextBox5.Text = "0.0000"
+        Me.ToolStripTextBox5.ToolTipText = "Hz /Azimut ""D.MMSS"""
+        Me.ToolStripTextBox5.Visible = False
+        '
         'ToolStripLabel4
         '
         Me.ToolStripLabel4.Name = "ToolStripLabel4"
@@ -188,7 +209,7 @@ Partial Class Form2
         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.Text = "1013"
         Me.ToolStripTextBox4.ToolTipText = "Pritisk (mbar)"
         Me.ToolStripTextBox4.Visible = False
         '
@@ -280,4 +301,6 @@ Partial Class Form2
     Friend WithEvents ToolStripTextBox3 As ToolStripTextBox
     Friend WithEvents ToolStripLabel5 As ToolStripLabel
     Friend WithEvents ToolStripTextBox4 As ToolStripTextBox
+    Friend WithEvents ToolStripLabel6 As ToolStripLabel
+    Friend WithEvents ToolStripTextBox5 As ToolStripTextBox
 End Class

Form2.vb

@@ -1,4 +1,5 @@
-Imports System.IO
+Imports System.Collections.Specialized.BitVector32
+Imports System.IO
 Imports System.Windows.Forms.VisualStyles.VisualStyleElement
 
 Public Class Form2
@@ -22,6 +23,7 @@ Public Class Form2
         ToolStripStatusLabel1.Text = "Prebrano: " + i.ToString + " | Datoteka: " + My.Settings.ZadnjaMapa + "\" + My.Settings.Datoteka
         DatotekaSpemembe = False
         BtnShraniF2.Enabled = False
+        ComBoxKoda.SelectedIndex = 0
         streamReader.Close()
         streamReader.Dispose()
     End Sub
@@ -67,52 +69,70 @@ Public Class Form2
 
 
     Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click
-
+        ' 0 ---
+        ' 1 Setup:  Quick Set
+        ' 2 Setup: Set Azimuth
+        ' 3 Setup:  Resection
+        ' 4 Setup:  Free Station
+        ' 5 Setup:  Ori. & Ht. Transfer
+        ' 6 Measure: Orientation
+        ' 7 Measure: Points
+        ' 8 Data:   User-Entered
+        ' 9 Info:   Station
+        ' 10 Info:   Temp. & Press.
         Dim dataTekst As String = ""
-        If ComBoxKoda.SelectedIndex = 0 Then    ' Koda User-Entered/Import
+        If ComBoxKoda.SelectedIndex <= 0 Then
-            dataTekst = "*410000+" + My.Settings.KodaUserImport.PadLeft(16, "0") + " "
+
-            BtnShraniF2.Enabled = True
+        ElseIf ComBoxKoda.SelectedIndex = 1 Then    ' Koda Setup: Quick Set
-            DatotekaSpemembe = True
-        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    ' Koda Orientacija
-            dataTekst = "*410000+" + My.Settings.KodaMeasOri.PadLeft(16, "0") + " "
-            BtnShraniF2.Enabled = True
-            DatotekaSpemembe = True
-        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    ' Koda Setup: Set Azimut
+        ElseIf ComBoxKoda.SelectedIndex = 2 Then    ' Koda Setup: Set Azimut
             dataTekst = "*410000+" + My.Settings.KodaSetAzi.PadLeft(16, "0") + " "
             BtnShraniF2.Enabled = True
             DatotekaSpemembe = True
-        ElseIf ComBoxKoda.SelectedIndex = 5 Then    ' Koda Setup: Resection
+        ElseIf ComBoxKoda.SelectedIndex = 3 Then    ' Koda Setup: Resection
             dataTekst = "*410000+" + My.Settings.KodaResection.PadLeft(16, "0") + " "
             BtnShraniF2.Enabled = True
             DatotekaSpemembe = True
-        ElseIf ComBoxKoda.SelectedIndex = 6 Then    ' Koda Setup: Free Station
+        ElseIf ComBoxKoda.SelectedIndex = 4 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
+        ElseIf ComBoxKoda.SelectedIndex = 5 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
+        ElseIf ComBoxKoda.SelectedIndex = 6 Then    ' Koda Orientacija
+            dataTekst = "*410000+" + My.Settings.KodaMeasOri.PadLeft(16, "0") + " "
+            BtnShraniF2.Enabled = True
+            DatotekaSpemembe = True
+        ElseIf ComBoxKoda.SelectedIndex = 7 Then    ' Koda Meritve
+            dataTekst = "*410000+" + My.Settings.KodaMeas.PadLeft(16, "0") + " "
+            BtnShraniF2.Enabled = True
+            DatotekaSpemembe = True
+        ElseIf ComBoxKoda.SelectedIndex = 8 Then    ' Koda User-Entered/Import
+            dataTekst = "*410000+" + My.Settings.KodaUserImport.PadLeft(16, "0") + " "
+            BtnShraniF2.Enabled = True
+            DatotekaSpemembe = True
+        ElseIf ComBoxKoda.SelectedIndex = 9 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
+        ElseIf ComBoxKoda.SelectedIndex = 10 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
+        ElseIf ComBoxKoda.SelectedIndex = 11 Then    ' Koda Orientacija
+            Dim kodaOri As String = ToolStripTextBox1.Text.PadLeft(16, "0")
+            Dim kodaOriHz As Double = ToolStripTextBox5.Text.Replace(",", ".") * 100000
+            dataTekst = "*410000+" + My.Settings.KodaStojisceOri.PadLeft(16, "0") + " 71....+" + kodaOri.PadLeft(16, "0") + " 72....+" + Format(kodaOriHz, "0000000000000000").ToString + " "
+            BtnShraniF2.Enabled = True
+            DatotekaSpemembe = True
         End If
         RichTextBoxEdit.Focus()
         RichTextBoxEdit.SelectionStart = RichTextBoxEdit.GetFirstCharIndexOfCurrentLine
@@ -129,17 +149,19 @@ Public Class Form2
     End Sub
 
     Private Sub ComBoxKoda_Click(sender As Object, e As EventArgs) Handles ComBoxKoda.SelectedIndexChanged
-        If ComBoxKoda.SelectedIndex = -1 Then
+        If ComBoxKoda.SelectedIndex <= 0 Then
             ToolStripButton2.Enabled = False
             ToolStripLabel2.Visible = False
             ToolStripLabel3.Visible = False
             ToolStripLabel4.Visible = False
             ToolStripLabel5.Visible = False
+            ToolStripLabel6.Visible = False
             ToolStripTextBox1.Visible = False
             ToolStripTextBox2.Visible = False
             ToolStripTextBox3.Visible = False
             ToolStripTextBox4.Visible = False
-        ElseIf ComBoxKoda.SelectedIndex = 8 Then
+            ToolStripTextBox5.Visible = False
+        ElseIf ComBoxKoda.SelectedIndex = 9 Then
             ToolStripButton2.Enabled = True
             ToolStripLabel2.Visible = True
             ToolStripTextBox1.Visible = True
@@ -149,7 +171,9 @@ Public Class Form2
             ToolStripTextBox3.Visible = False
             ToolStripLabel5.Visible = False
             ToolStripTextBox4.Visible = False
-        ElseIf ComBoxKoda.SelectedIndex = 9 Then
+            ToolStripLabel6.Visible = False
+            ToolStripTextBox5.Visible = False
+        ElseIf ComBoxKoda.SelectedIndex = 10 Then
             ToolStripButton2.Enabled = True
             ToolStripLabel2.Visible = False
             ToolStripTextBox1.Visible = False
@@ -159,16 +183,32 @@ Public Class Form2
             ToolStripTextBox3.Visible = True
             ToolStripLabel5.Visible = True
             ToolStripTextBox4.Visible = True
+            ToolStripLabel6.Visible = False
+            ToolStripTextBox5.Visible = False
+        ElseIf ComBoxKoda.SelectedIndex = 11 Then
+            ToolStripButton2.Enabled = True
+            ToolStripLabel2.Visible = True
+            ToolStripTextBox1.Visible = True
+            ToolStripLabel3.Visible = False
+            ToolStripTextBox2.Visible = False
+            ToolStripLabel4.Visible = False
+            ToolStripTextBox3.Visible = False
+            ToolStripLabel5.Visible = False
+            ToolStripTextBox4.Visible = False
+            ToolStripLabel6.Visible = True
+            ToolStripTextBox5.Visible = True
         Else
             ToolStripButton2.Enabled = True
             ToolStripLabel2.Visible = False
             ToolStripLabel3.Visible = False
             ToolStripLabel4.Visible = False
             ToolStripLabel5.Visible = False
+            ToolStripLabel6.Visible = False
             ToolStripTextBox1.Visible = False
             ToolStripTextBox2.Visible = False
             ToolStripTextBox3.Visible = False
             ToolStripTextBox4.Visible = False
+            ToolStripTextBox5.Visible = False
         End If
     End Sub
 End Class

FormNastavitve.Designer.vb

@@ -57,8 +57,6 @@ Partial Class FormNastavitve
         Me.Label3 = New System.Windows.Forms.Label()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.Label5 = New System.Windows.Forms.Label()
-        Me.TextBoxStake = New System.Windows.Forms.TextBox()
-        Me.Label7 = New System.Windows.Forms.Label()
         Me.TextBoxMeas = New System.Windows.Forms.TextBox()
         Me.Label6 = New System.Windows.Forms.Label()
         Me.Label10 = New System.Windows.Forms.Label()
@@ -74,6 +72,9 @@ Partial Class FormNastavitve
         Me.UvoziKodeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
         Me.ZapriToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ButtonShraniZapri = New System.Windows.Forms.Button()
+        Me.TextBoxOriHz = New System.Windows.Forms.TextBox()
+        Me.Label7 = New System.Windows.Forms.Label()
         Me.GroupBox1.SuspendLayout()
         Me.TableLayoutPanel1.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
@@ -241,35 +242,35 @@ Partial Class FormNastavitve
         Me.TableLayoutPanel3.ColumnCount = 2
         Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 75.0!))
         Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle())
-        Me.TableLayoutPanel3.Controls.Add(Me.Label15, 0, 8)
+        Me.TableLayoutPanel3.Controls.Add(Me.Label7, 1, 3)
+        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxOriHz, 0, 3)
         Me.TableLayoutPanel3.Controls.Add(Me.Label14, 0, 0)
-        Me.TableLayoutPanel3.Controls.Add(Me.Label13, 1, 2)
         Me.TableLayoutPanel3.Controls.Add(Me.Label12, 1, 1)
-        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxStojInfo, 0, 2)
-        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxStoj, 0, 1)
-        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxMeasOri, 0, 9)
-        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxQuickSet, 0, 3)
-        Me.TableLayoutPanel3.Controls.Add(Me.Label9, 1, 9)
-        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxSetAzi, 0, 4)
-        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxRes, 0, 5)
-        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxFree, 0, 6)
-        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxOriHt, 0, 7)
-        Me.TableLayoutPanel3.Controls.Add(Me.Label8, 1, 12)
-        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxImport, 0, 12)
-        Me.TableLayoutPanel3.Controls.Add(Me.Label1, 1, 3)
-        Me.TableLayoutPanel3.Controls.Add(Me.Label2, 1, 4)
-        Me.TableLayoutPanel3.Controls.Add(Me.Label3, 1, 5)
-        Me.TableLayoutPanel3.Controls.Add(Me.Label4, 1, 6)
-        Me.TableLayoutPanel3.Controls.Add(Me.Label5, 1, 7)
-        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxStake, 0, 11)
-        Me.TableLayoutPanel3.Controls.Add(Me.Label7, 1, 11)
-        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxMeas, 0, 10)
-        Me.TableLayoutPanel3.Controls.Add(Me.Label6, 1, 10)
         Me.TableLayoutPanel3.Controls.Add(Me.Label10, 1, 0)
-        Me.TableLayoutPanel3.Controls.Add(Me.Label11, 1, 8)
+        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxImport, 0, 12)
+        Me.TableLayoutPanel3.Controls.Add(Me.Label8, 1, 12)
+        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxMeas, 0, 11)
+        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxMeasOri, 0, 10)
+        Me.TableLayoutPanel3.Controls.Add(Me.Label6, 1, 11)
+        Me.TableLayoutPanel3.Controls.Add(Me.Label9, 1, 10)
+        Me.TableLayoutPanel3.Controls.Add(Me.Label15, 0, 9)
+        Me.TableLayoutPanel3.Controls.Add(Me.Label11, 1, 9)
+        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxOriHt, 0, 8)
+        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxFree, 0, 7)
+        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxRes, 0, 6)
+        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxSetAzi, 0, 5)
+        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxQuickSet, 0, 4)
+        Me.TableLayoutPanel3.Controls.Add(Me.Label5, 1, 8)
+        Me.TableLayoutPanel3.Controls.Add(Me.Label4, 1, 7)
+        Me.TableLayoutPanel3.Controls.Add(Me.Label3, 1, 6)
+        Me.TableLayoutPanel3.Controls.Add(Me.Label2, 1, 5)
+        Me.TableLayoutPanel3.Controls.Add(Me.Label1, 1, 4)
+        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxStoj, 0, 1)
+        Me.TableLayoutPanel3.Controls.Add(Me.TextBoxStojInfo, 0, 2)
+        Me.TableLayoutPanel3.Controls.Add(Me.Label13, 1, 2)
         Me.TableLayoutPanel3.Location = New System.Drawing.Point(12, 27)
         Me.TableLayoutPanel3.Name = "TableLayoutPanel3"
-        Me.TableLayoutPanel3.RowCount = 14
+        Me.TableLayoutPanel3.RowCount = 13
         Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
         Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
         Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
@@ -284,8 +285,7 @@ Partial Class FormNastavitve
         Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
         Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
         Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20.0!))
-        Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20.0!))
+        Me.TableLayoutPanel3.Size = New System.Drawing.Size(239, 390)
-        Me.TableLayoutPanel3.Size = New System.Drawing.Size(239, 402)
         Me.TableLayoutPanel3.TabIndex = 0
         '
         'Label15
@@ -294,7 +294,7 @@ Partial Class FormNastavitve
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.Label15.AutoSize = True
         Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label15.Location = New System.Drawing.Point(3, 240)
+        Me.Label15.Location = New System.Drawing.Point(3, 270)
         Me.Label15.Name = "Label15"
         Me.Label15.Size = New System.Drawing.Size(39, 30)
         Me.Label15.TabIndex = 22
@@ -333,9 +333,9 @@ Partial Class FormNastavitve
         Me.Label12.AutoSize = True
         Me.Label12.Location = New System.Drawing.Point(78, 30)
         Me.Label12.Name = "Label12"
-        Me.Label12.Size = New System.Drawing.Size(44, 30)
+        Me.Label12.Size = New System.Drawing.Size(47, 30)
         Me.Label12.TabIndex = 5
-        Me.Label12.Text = "Stojišče"
+        Me.Label12.Text = "Stojišče "
         Me.Label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'TextBoxStojInfo
@@ -371,7 +371,7 @@ Partial Class FormNastavitve
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.TextBoxMeasOri.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.TextBoxMeasOri.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TextBoxMeasOri.Location = New System.Drawing.Point(3, 273)
+        Me.TextBoxMeasOri.Location = New System.Drawing.Point(3, 303)
         Me.TextBoxMeasOri.Name = "TextBoxMeasOri"
         Me.TextBoxMeasOri.Size = New System.Drawing.Size(69, 22)
         Me.TextBoxMeasOri.TabIndex = 12
@@ -384,7 +384,7 @@ Partial Class FormNastavitve
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.TextBoxQuickSet.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.TextBoxQuickSet.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TextBoxQuickSet.Location = New System.Drawing.Point(3, 93)
+        Me.TextBoxQuickSet.Location = New System.Drawing.Point(3, 123)
         Me.TextBoxQuickSet.Name = "TextBoxQuickSet"
         Me.TextBoxQuickSet.Size = New System.Drawing.Size(69, 22)
         Me.TextBoxQuickSet.TabIndex = 6
@@ -395,7 +395,7 @@ Partial Class FormNastavitve
         Me.Label9.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.Label9.AutoSize = True
-        Me.Label9.Location = New System.Drawing.Point(78, 270)
+        Me.Label9.Location = New System.Drawing.Point(78, 300)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(58, 30)
         Me.Label9.TabIndex = 16
@@ -409,7 +409,7 @@ Partial Class FormNastavitve
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.TextBoxSetAzi.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.TextBoxSetAzi.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TextBoxSetAzi.Location = New System.Drawing.Point(3, 123)
+        Me.TextBoxSetAzi.Location = New System.Drawing.Point(3, 153)
         Me.TextBoxSetAzi.Name = "TextBoxSetAzi"
         Me.TextBoxSetAzi.Size = New System.Drawing.Size(69, 22)
         Me.TextBoxSetAzi.TabIndex = 7
@@ -422,7 +422,7 @@ Partial Class FormNastavitve
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.TextBoxRes.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.TextBoxRes.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TextBoxRes.Location = New System.Drawing.Point(3, 153)
+        Me.TextBoxRes.Location = New System.Drawing.Point(3, 183)
         Me.TextBoxRes.Name = "TextBoxRes"
         Me.TextBoxRes.Size = New System.Drawing.Size(69, 22)
         Me.TextBoxRes.TabIndex = 8
@@ -435,7 +435,7 @@ Partial Class FormNastavitve
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.TextBoxFree.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.TextBoxFree.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TextBoxFree.Location = New System.Drawing.Point(3, 183)
+        Me.TextBoxFree.Location = New System.Drawing.Point(3, 213)
         Me.TextBoxFree.Name = "TextBoxFree"
         Me.TextBoxFree.Size = New System.Drawing.Size(69, 22)
         Me.TextBoxFree.TabIndex = 9
@@ -448,7 +448,7 @@ Partial Class FormNastavitve
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.TextBoxOriHt.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.TextBoxOriHt.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TextBoxOriHt.Location = New System.Drawing.Point(3, 213)
+        Me.TextBoxOriHt.Location = New System.Drawing.Point(3, 243)
         Me.TextBoxOriHt.Name = "TextBoxOriHt"
         Me.TextBoxOriHt.Size = New System.Drawing.Size(69, 22)
         Me.TextBoxOriHt.TabIndex = 10
@@ -484,7 +484,7 @@ Partial Class FormNastavitve
         Me.Label1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(78, 90)
+        Me.Label1.Location = New System.Drawing.Point(78, 120)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(54, 30)
         Me.Label1.TabIndex = 0
@@ -496,7 +496,7 @@ Partial Class FormNastavitve
         Me.Label2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(78, 120)
+        Me.Label2.Location = New System.Drawing.Point(78, 150)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(63, 30)
         Me.Label2.TabIndex = 1
@@ -508,7 +508,7 @@ Partial Class FormNastavitve
         Me.Label3.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(78, 150)
+        Me.Label3.Location = New System.Drawing.Point(78, 180)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(55, 30)
         Me.Label3.TabIndex = 2
@@ -520,7 +520,7 @@ Partial Class FormNastavitve
         Me.Label4.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(78, 180)
+        Me.Label4.Location = New System.Drawing.Point(78, 210)
         Me.Label4.Name = "Label4"
         Me.Label4.Size = New System.Drawing.Size(64, 30)
         Me.Label4.TabIndex = 3
@@ -532,38 +532,13 @@ Partial Class FormNastavitve
         Me.Label5.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(78, 210)
+        Me.Label5.Location = New System.Drawing.Point(78, 240)
         Me.Label5.Name = "Label5"
         Me.Label5.Size = New System.Drawing.Size(103, 30)
         Me.Label5.TabIndex = 4
         Me.Label5.Text = "Ori. and Ht. Transfer"
         Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
-        'TextBoxStake
-        '
-        Me.TextBoxStake.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.TextBoxStake.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.TextBoxStake.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TextBoxStake.Location = New System.Drawing.Point(3, 333)
-        Me.TextBoxStake.Name = "TextBoxStake"
-        Me.TextBoxStake.Size = New System.Drawing.Size(69, 22)
-        Me.TextBoxStake.TabIndex = 13
-        Me.TextBoxStake.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
-        '
-        'Label7
-        '
-        Me.Label7.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(78, 330)
-        Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(41, 30)
-        Me.Label7.TabIndex = 6
-        Me.Label7.Text = "Staked"
-        Me.Label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        '
         'TextBoxMeas
         '
         Me.TextBoxMeas.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
@@ -571,7 +546,7 @@ Partial Class FormNastavitve
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.TextBoxMeas.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.TextBoxMeas.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TextBoxMeas.Location = New System.Drawing.Point(3, 303)
+        Me.TextBoxMeas.Location = New System.Drawing.Point(3, 333)
         Me.TextBoxMeas.Name = "TextBoxMeas"
         Me.TextBoxMeas.Size = New System.Drawing.Size(69, 22)
         Me.TextBoxMeas.TabIndex = 11
@@ -582,7 +557,7 @@ Partial Class FormNastavitve
         Me.Label6.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(78, 300)
+        Me.Label6.Location = New System.Drawing.Point(78, 330)
         Me.Label6.Name = "Label6"
         Me.Label6.Size = New System.Drawing.Size(54, 30)
         Me.Label6.TabIndex = 5
@@ -608,7 +583,7 @@ Partial Class FormNastavitve
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.Label11.AutoSize = True
         Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label11.Location = New System.Drawing.Point(78, 240)
+        Me.Label11.Location = New System.Drawing.Point(78, 270)
         Me.Label11.Name = "Label11"
         Me.Label11.Size = New System.Drawing.Size(58, 30)
         Me.Label11.TabIndex = 19
@@ -699,11 +674,51 @@ Partial Class FormNastavitve
         Me.ZapriToolStripMenuItem.Size = New System.Drawing.Size(133, 22)
         Me.ZapriToolStripMenuItem.Text = "&Zapri"
         '
+        'ButtonShraniZapri
+        '
+        Me.ButtonShraniZapri.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.ButtonShraniZapri.AutoSize = True
+        Me.ButtonShraniZapri.Image = Global.TPS1100_Convert.My.Resources.Resources.Save_as_24
+        Me.ButtonShraniZapri.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.ButtonShraniZapri.Location = New System.Drawing.Point(473, 396)
+        Me.ButtonShraniZapri.Name = "ButtonShraniZapri"
+        Me.ButtonShraniZapri.Size = New System.Drawing.Size(69, 33)
+        Me.ButtonShraniZapri.TabIndex = 8
+        Me.ButtonShraniZapri.Text = "Shrani"
+        Me.ButtonShraniZapri.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.ButtonShraniZapri.UseVisualStyleBackColor = True
+        '
+        'TextBoxOriHz
+        '
+        Me.TextBoxOriHz.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.TextBoxOriHz.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.TextBoxOriHz.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.TextBoxOriHz.Location = New System.Drawing.Point(3, 93)
+        Me.TextBoxOriHz.Name = "TextBoxOriHz"
+        Me.TextBoxOriHz.Size = New System.Drawing.Size(69, 22)
+        Me.TextBoxOriHz.TabIndex = 9
+        Me.TextBoxOriHz.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
+        'Label7
+        '
+        Me.Label7.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.Label7.AutoSize = True
+        Me.Label7.Location = New System.Drawing.Point(78, 90)
+        Me.Label7.Name = "Label7"
+        Me.Label7.Size = New System.Drawing.Size(79, 30)
+        Me.Label7.TabIndex = 9
+        Me.Label7.Text = "Orientacija (Hz)"
+        Me.Label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
         'FormNastavitve
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(554, 441)
+        Me.Controls.Add(Me.ButtonShraniZapri)
         Me.Controls.Add(Me.GroupBox4)
         Me.Controls.Add(Me.TableLayoutPanel3)
         Me.Controls.Add(Me.GroupBox3)
@@ -757,7 +772,6 @@ Partial Class FormNastavitve
     Friend WithEvents Label4 As Label
     Friend WithEvents Label5 As Label
     Friend WithEvents Label6 As Label
-    Friend WithEvents Label7 As Label
     Friend WithEvents Label8 As Label
     Friend WithEvents TextBoxQuickSet As TextBox
     Friend WithEvents TextBoxSetAzi As TextBox
@@ -765,7 +779,6 @@ Partial Class FormNastavitve
     Friend WithEvents TextBoxFree As TextBox
     Friend WithEvents TextBoxOriHt As TextBox
     Friend WithEvents TextBoxMeas As TextBox
-    Friend WithEvents TextBoxStake As TextBox
     Friend WithEvents TextBoxImport As TextBox
     Friend WithEvents Label9 As Label
     Friend WithEvents TextBoxMeasOri As TextBox
@@ -788,4 +801,7 @@ Partial Class FormNastavitve
     Friend WithEvents UvoziKodeToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
     Friend WithEvents ZapriToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ButtonShraniZapri As Button
+    Friend WithEvents Label7 As Label
+    Friend WithEvents TextBoxOriHz As TextBox
 End Class

FormNastavitve.vb

@@ -13,9 +13,9 @@
             RadioButton4.Checked = True
         End If
 
-        TextBoxLog.Text = My.Settings.DatLogfile.ToString
         TextBoxStoj.Text = My.Settings.KodaStojisce.ToString
         TextBoxStojInfo.Text = My.Settings.KodaStojisceInfo.ToString
+        TextBoxOriHz.Text = My.Settings.KodaStojisceOri.ToString
         TextBoxQuickSet.Text = My.Settings.KodaQuickSet.ToString
         TextBoxSetAzi.Text = My.Settings.KodaSetAzi.ToString
         TextBoxRes.Text = My.Settings.KodaResection.ToString
@@ -23,8 +23,8 @@
         TextBoxOriHt.Text = My.Settings.KodaOriHtTrans.ToString
         TextBoxMeasOri.Text = My.Settings.KodaMeasOri.ToString
         TextBoxMeas.Text = My.Settings.KodaMeas.ToString
-        TextBoxStake.Text = My.Settings.KodaStake.ToString
         TextBoxImport.Text = My.Settings.KodaUserImport.ToString
+        TextBoxLog.Text = My.Settings.DatLogfile.ToString
 
         LabelFontInfo.Text = My.Settings.Pisava + " / " + My.Settings.PisavaVelikost.ToString
 
@@ -47,9 +47,9 @@
             My.Settings.DecimalnoLocilo = "Vejica"
         End If
 
-        My.Settings.DatLogfile = TextBoxLog.Text
         My.Settings.KodaStojisce = TextBoxStoj.Text
         My.Settings.KodaStojisceInfo = TextBoxStojInfo.Text
+        My.Settings.KodaStojisceOri = TextBoxOriHz.Text
         My.Settings.KodaQuickSet = TextBoxQuickSet.Text
         My.Settings.KodaSetAzi = TextBoxSetAzi.Text
         My.Settings.KodaResection = TextBoxRes.Text
@@ -57,8 +57,8 @@
         My.Settings.KodaOriHtTrans = TextBoxOriHt.Text
         My.Settings.KodaMeasOri = TextBoxMeasOri.Text
         My.Settings.KodaMeas = TextBoxMeas.Text
-        My.Settings.KodaStake = TextBoxStake.Text
         My.Settings.KodaUserImport = TextBoxImport.Text
+        My.Settings.DatLogfile = TextBoxLog.Text
 
         My.Settings.Save()
 
@@ -88,6 +88,7 @@
 
         dataNast = dataNast + "KodaStojisce = " + My.Settings.KodaStojisce + vbCrLf
         dataNast = dataNast + "KodaStojisceInfo = " + My.Settings.KodaStojisceInfo + vbCrLf
+        dataNast = dataNast + "KodaStojisceOri = " + My.Settings.KodaStojisceOri + vbCrLf
         dataNast = dataNast + "KodaQuickSet = " + My.Settings.KodaQuickSet + vbCrLf
         dataNast = dataNast + "KodaSetAzi = " + My.Settings.KodaSetAzi + vbCrLf
         dataNast = dataNast + "KodaResection = " + My.Settings.KodaResection + vbCrLf
@@ -95,7 +96,6 @@
         dataNast = dataNast + "KodaOriHtTrans = " + My.Settings.KodaOriHtTrans + vbCrLf
         dataNast = dataNast + "KodaMeasOri = " + My.Settings.KodaMeasOri + vbCrLf
         dataNast = dataNast + "KodaMeas = " + My.Settings.KodaMeas + vbCrLf
-        dataNast = dataNast + "KodaStake = " + My.Settings.KodaStake + vbCrLf
         dataNast = dataNast + "KodaUserImport = " + My.Settings.KodaUserImport + vbCrLf
 
         If SaveFileDialogNast.ShowDialog = DialogResult.OK Then
@@ -109,6 +109,10 @@
     End Sub
 
     Private Sub UvoziKodeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles UvoziKodeToolStripMenuItem.Click
+        ' TODO: Uvoz nastavitev iz datototeke
+    End Sub
 
+    Private Sub ButtonShraniZapri_Click(sender As Object, e As EventArgs) Handles ButtonShraniZapri.Click
+        Me.Close()
     End Sub
 End Class

My Project/Settings.Designer.vb

@@ -296,6 +296,18 @@ Namespace My
                 Me("PisavaVelikost") = value
             End Set
         End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("3")>  _
+        Public Property KodaStojisceOri() As String
+            Get
+                Return CType(Me("KodaStojisceOri"),String)
+            End Get
+            Set
+                Me("KodaStojisceOri") = value
+            End Set
+        End Property
     End Class
 End Namespace
 

My Project/Settings.settings

@@ -62,5 +62,8 @@
     <Setting Name="PisavaVelikost" Type="System.Int32" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="KodaStojisceOri" Type="System.String" Scope="User">
+      <Value Profile="(Default)">3</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

Podatki/TEST.GSI

@@ -49,3 +49,15 @@
 *110045+0000000000000041 21.324+0000000011609380 22.324+0000000008913070 31..00+0000000000031001 32..10+0000000000030998 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000633 81..00+0000000465472352 82..00+0000000110532887 83..00+0000000000302986 71....+0000000000000000 
 *110046+0000000000000042 21.324+0000000011526030 22.324+0000000008909420 31..00+0000000000032271 32..10+0000000000032268 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000682 81..00+0000000465473669 82..00+0000000110532696 83..00+0000000000303036 71....+0000000000000000 
 *110047+0000000000000043 21.324+0000000011346490 22.324+0000000008855450 31..00+0000000000032842 32..10+0000000000032836 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000824 81..00+0000000465474578 82..00+0000000110533313 83..00+0000000000303177 71....+0000000000000000 
+*410010+0000000000000040 
+*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 
+*110007+0000000000011111 25.344+0000000008801190 84..40+0000000465444529 85..40+0000000110546554 86..40+0000000000302353 87..10+0000000000000100 88..10+0000000000001510 
+*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 

Podatki/tps1100_nastavitve.cfg

@@ -0,0 +1,11 @@
+KodaStojisce = 1
+KodaStojisceInfo = 2
+KodaStojisceOri = 3
+KodaQuickSet = 10
+KodaSetAzi = 20
+KodaResection = 30
+KodaFreeStation = 40
+KodaOriHtTrans = 50
+KodaMeasOri = 80
+KodaMeas = 90
+KodaUserImport = 99

TPS1100 Convert.vbproj

@@ -217,6 +217,9 @@
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
     <None Include="App.config" />
+    <None Include="Navodila.pdf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="README.md">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

bin/Release/TPS1100 Convert.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>xGfHjHpgMkc5XmNvyOXeXaxDJe4YrDEgSIDCY0Q3lcM=</dsig:DigestValue>
+        <dsig:DigestValue>0tN4ZgC92KW6BqEWZIv7JJgNNn1f1VSlto9T/qFVl64=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

bin/Release/TPS1100 Convert.exe.config

@@ -67,6 +67,9 @@
             <setting name="Pisava" serializeAs="String">
                 <value />
             </setting>
+            <setting name="KodaStojisceOri" serializeAs="String">
+                <value>3</value>
+            </setting>
         </TPS1100_Convert.My.MySettings>
     </userSettings>
 </configuration>

bin/Release/TPS1100 Convert.exe.manifest

@@ -43,14 +43,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TPS1100 Convert.exe" size="1225728">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TPS1100 Convert.exe" size="1229824">
       <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>Ldy35cdnmM1aFMfYIj2/8VaAmSP6DhzHI2H4kYCJ9Qo=</dsig:DigestValue>
+        <dsig:DigestValue>LionUoY5pimdkx9/3g3ZZ1mEk0X+34QC9qSJHHTbh2E=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -63,13 +63,13 @@
       <dsig:DigestValue>cEKQ3UJZqlT+pcEDo3keS5sCumc6xExVvgGt/ax4Sdc=</dsig:DigestValue>
     </hash>
   </file>
-  <file name="TPS1100 Convert.exe.config" size="3077">
+  <file name="TPS1100 Convert.exe.config" size="3202">
     <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>6QeiyObUvvEWpwgR1xRa8sYIjaN7QELIUAmu9IW4608=</dsig:DigestValue>
+      <dsig:DigestValue>DKmfps4sVKfRIT/JxqpGuBvwquWVy75Q3MES8uE6RL0=</dsig:DigestValue>
     </hash>
   </file>
   <file name="TPS1100CNVRT.ico" size="176342">