Popravki #2 - 2.5.0.6

README.md

@@ -1,16 +1,35 @@
 # TPS1100-Convert
 
-!["logo"](https://multibox.nohost.me/gitea/boris/TPS1100-Convert/raw/branch/main/TPS1100CNVRT_logo.png)
+!["logo"](https://multibox.nohost.me/gitea/boris/TPS1100-Convert/raw/branch/main/My%20Project/Icons/TPS1100CNVRT_logo.png)
 
-Program za pretvorbo GSI datotek. 
+Program za pretvorbo GSI datotek v obliko primerno za branje.
 
-Priprava in izvoz podatkov.
+Enostavna priprava in izvoz podatkov meritev v različnih oblikah...
 
-- Zapisnik Meritev
+- Zapisnik Meritev (podatki meritev kot so Hz, V, SD, HD,...)
-- Koordinate Točk
+- Koordinate Točk (seznam točk v obliki E, N, Ht, koda in klasifikacija)
 
----
+Program uporablja kodiranje za prepoznavo posameznih elementov meritev.
+
+<br>
+Aplikacija je še v razvoju, zato so nekatere možnosti omejene.<br>
+Prav tako je trenutno potreben točno določen vrstni red zapisa podatkov v GSI datotekah. 
 
 Izdelal: Boris Bilc
 
 Programski jezik: VB.NET
+
+---
+
+## Kodiranje Podatkov
+
+| Koda | Podatki                |
+|------|------------------------|
+| 10   | Quick Set              |
+| 20   | Set Azimuth            |
+| 30   | Resection              |
+| 40   | Free Station           |
+| 50   | Ori. and Ht. Transfer  |
+| 90   | Measured Data          |
+| 99   | Imported/User Data     |
+

SplashScreen1.Designer.vb

@@ -28,14 +28,15 @@ Partial Class SplashScreen1
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.MainLayoutPanel = New System.Windows.Forms.TableLayoutPanel()
-        Me.ApplicationTitle = New System.Windows.Forms.Label()
         Me.DetailsLayoutPanel = New System.Windows.Forms.TableLayoutPanel()
-        Me.Label1 = New System.Windows.Forms.Label()
         Me.Version = New System.Windows.Forms.Label()
+        Me.Label1 = New System.Windows.Forms.Label()
         Me.Copyright = New System.Windows.Forms.Label()
-        Me.LabelCompany = New System.Windows.Forms.Label()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.LinkLabel1 = New System.Windows.Forms.LinkLabel()
+        Me.LabelCompany = New System.Windows.Forms.Label()
+        Me.ApplicationTitle = New System.Windows.Forms.Label()
+        Me.LinkLabel2 = New System.Windows.Forms.LinkLabel()
         Me.PictureBox1 = New System.Windows.Forms.PictureBox()
         Me.MainLayoutPanel.SuspendLayout()
         Me.DetailsLayoutPanel.SuspendLayout()
@@ -47,44 +48,35 @@ Partial Class SplashScreen1
         Me.MainLayoutPanel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
         Me.MainLayoutPanel.ColumnCount = 2
         Me.MainLayoutPanel.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 107.0!))
-        Me.MainLayoutPanel.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 236.0!))
+        Me.MainLayoutPanel.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 291.0!))
         Me.MainLayoutPanel.Controls.Add(Me.DetailsLayoutPanel, 1, 1)
         Me.MainLayoutPanel.Controls.Add(Me.PictureBox1, 0, 0)
         Me.MainLayoutPanel.Controls.Add(Me.ApplicationTitle, 1, 0)
         Me.MainLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill
         Me.MainLayoutPanel.Location = New System.Drawing.Point(0, 0)
         Me.MainLayoutPanel.Name = "MainLayoutPanel"
+        Me.MainLayoutPanel.RowCount = 2
         Me.MainLayoutPanel.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 108.0!))
         Me.MainLayoutPanel.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 148.0!))
         Me.MainLayoutPanel.Size = New System.Drawing.Size(398, 298)
         Me.MainLayoutPanel.TabIndex = 0
         '
-        'ApplicationTitle
-        '
-        Me.ApplicationTitle.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.ApplicationTitle.BackColor = System.Drawing.Color.Transparent
-        Me.ApplicationTitle.Font = New System.Drawing.Font("Gill Sans MT Condensed", 24.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.ApplicationTitle.Location = New System.Drawing.Point(117, 24)
-        Me.ApplicationTitle.Name = "ApplicationTitle"
-        Me.ApplicationTitle.Size = New System.Drawing.Size(270, 59)
-        Me.ApplicationTitle.TabIndex = 0
-        Me.ApplicationTitle.Text = "TPS1100 Convert"
-        Me.ApplicationTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
-        '
         'DetailsLayoutPanel
         '
         Me.DetailsLayoutPanel.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.DetailsLayoutPanel.BackColor = System.Drawing.Color.Transparent
-        Me.DetailsLayoutPanel.ColumnCount = 1
+        Me.DetailsLayoutPanel.ColumnCount = 2
-        Me.DetailsLayoutPanel.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 247.0!))
+        Me.DetailsLayoutPanel.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 156.0!))
+        Me.DetailsLayoutPanel.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 143.0!))
         Me.DetailsLayoutPanel.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 142.0!))
         Me.DetailsLayoutPanel.Controls.Add(Me.Version, 0, 0)
         Me.DetailsLayoutPanel.Controls.Add(Me.Label1, 0, 1)
         Me.DetailsLayoutPanel.Controls.Add(Me.Copyright, 0, 4)
-        Me.DetailsLayoutPanel.Controls.Add(Me.Button1, 0, 5)
         Me.DetailsLayoutPanel.Controls.Add(Me.LinkLabel1, 0, 3)
         Me.DetailsLayoutPanel.Controls.Add(Me.LabelCompany, 0, 2)
-        Me.DetailsLayoutPanel.Location = New System.Drawing.Point(113, 115)
+        Me.DetailsLayoutPanel.Controls.Add(Me.Button1, 1, 5)
+        Me.DetailsLayoutPanel.Controls.Add(Me.LinkLabel2, 1, 3)
+        Me.DetailsLayoutPanel.Location = New System.Drawing.Point(114, 115)
         Me.DetailsLayoutPanel.Name = "DetailsLayoutPanel"
         Me.DetailsLayoutPanel.RowCount = 6
         Me.DetailsLayoutPanel.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 70.27027!))
@@ -93,21 +85,9 @@ Partial Class SplashScreen1
         Me.DetailsLayoutPanel.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!))
         Me.DetailsLayoutPanel.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 21.0!))
         Me.DetailsLayoutPanel.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31.0!))
-        Me.DetailsLayoutPanel.Size = New System.Drawing.Size(279, 175)
+        Me.DetailsLayoutPanel.Size = New System.Drawing.Size(276, 175)
         Me.DetailsLayoutPanel.TabIndex = 1
         '
-        'Label1
-        '
-        Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.Left
-        Me.Label1.AutoSize = True
-        Me.Label1.BackColor = System.Drawing.Color.Transparent
-        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label1.Location = New System.Drawing.Point(3, 54)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(91, 13)
-        Me.Label1.TabIndex = 4
-        Me.Label1.Text = "Napisal: Boris Bilc"
-        '
         'Version
         '
         Me.Version.Anchor = System.Windows.Forms.AnchorStyles.Left
@@ -120,6 +100,18 @@ Partial Class SplashScreen1
         Me.Version.TabIndex = 1
         Me.Version.Text = "Version {0}.{1:00}"
         '
+        'Label1
+        '
+        Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.Left
+        Me.Label1.AutoSize = True
+        Me.Label1.BackColor = System.Drawing.Color.Transparent
+        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label1.Location = New System.Drawing.Point(3, 54)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(91, 13)
+        Me.Label1.TabIndex = 4
+        Me.Label1.Text = "Napisal: Boris Bilc"
+        '
         'Copyright
         '
         Me.Copyright.Anchor = System.Windows.Forms.AnchorStyles.Left
@@ -132,22 +124,10 @@ Partial Class SplashScreen1
         Me.Copyright.TabIndex = 2
         Me.Copyright.Text = "Copyright"
         '
-        'LabelCompany
-        '
-        Me.LabelCompany.Anchor = System.Windows.Forms.AnchorStyles.Left
-        Me.LabelCompany.AutoSize = True
-        Me.LabelCompany.BackColor = System.Drawing.Color.Transparent
-        Me.LabelCompany.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.LabelCompany.Location = New System.Drawing.Point(3, 76)
-        Me.LabelCompany.Name = "LabelCompany"
-        Me.LabelCompany.Size = New System.Drawing.Size(59, 15)
-        Me.LabelCompany.TabIndex = 3
-        Me.LabelCompany.Text = "Company"
-        '
         'Button1
         '
-        Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button1.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.Button1.Location = New System.Drawing.Point(201, 147)
+        Me.Button1.Location = New System.Drawing.Point(190, 146)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(75, 25)
         Me.Button1.TabIndex = 2
@@ -165,6 +145,42 @@ Partial Class SplashScreen1
         Me.LinkLabel1.TabStop = True
         Me.LinkLabel1.Text = "Spletna Stran"
         '
+        'LabelCompany
+        '
+        Me.LabelCompany.Anchor = System.Windows.Forms.AnchorStyles.Left
+        Me.LabelCompany.AutoSize = True
+        Me.LabelCompany.BackColor = System.Drawing.Color.Transparent
+        Me.LabelCompany.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.LabelCompany.Location = New System.Drawing.Point(3, 76)
+        Me.LabelCompany.Name = "LabelCompany"
+        Me.LabelCompany.Size = New System.Drawing.Size(59, 15)
+        Me.LabelCompany.TabIndex = 3
+        Me.LabelCompany.Text = "Company"
+        '
+        'ApplicationTitle
+        '
+        Me.ApplicationTitle.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.ApplicationTitle.BackColor = System.Drawing.Color.Transparent
+        Me.ApplicationTitle.Font = New System.Drawing.Font("Gill Sans MT Condensed", 24.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.ApplicationTitle.Location = New System.Drawing.Point(117, 24)
+        Me.ApplicationTitle.Name = "ApplicationTitle"
+        Me.ApplicationTitle.Size = New System.Drawing.Size(270, 59)
+        Me.ApplicationTitle.TabIndex = 0
+        Me.ApplicationTitle.Text = "TPS1100 Convert"
+        Me.ApplicationTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        '
+        'LinkLabel2
+        '
+        Me.LinkLabel2.Anchor = System.Windows.Forms.AnchorStyles.Left
+        Me.LinkLabel2.AutoSize = True
+        Me.LinkLabel2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.LinkLabel2.Location = New System.Drawing.Point(159, 103)
+        Me.LinkLabel2.Name = "LinkLabel2"
+        Me.LinkLabel2.Size = New System.Drawing.Size(87, 13)
+        Me.LinkLabel2.TabIndex = 6
+        Me.LinkLabel2.TabStop = True
+        Me.LinkLabel2.Text = "Repositorij Git"
+        '
         'PictureBox1
         '
         Me.PictureBox1.Image = Global.TPS1100_Convert.My.Resources.Resources.TPS1100CNVRT_logo
@@ -201,4 +217,5 @@ Partial Class SplashScreen1
     Friend WithEvents Label1 As Label
     Friend WithEvents LinkLabel1 As LinkLabel
     Friend WithEvents PictureBox1 As PictureBox
+    Friend WithEvents LinkLabel2 As LinkLabel
 End Class

SplashScreen1.vb

@@ -43,4 +43,9 @@ Public NotInheritable Class SplashScreen1
         Dim webAddress As String = "https://2bgeo.si/"
         Process.Start(webAddress)
     End Sub
+
+    Private Sub LinkLabel2_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel2.LinkClicked
+        Dim webAddress2 As String = "https://multibox.nohost.me/gitea/boris/TPS1100-Convert"
+        Process.Start(webAddress2)
+    End Sub
 End Class

TPS1100 Convert.vbproj

@@ -32,7 +32,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
     <AutorunEnabled>true</AutorunEnabled>
-    <ApplicationRevision>6</ApplicationRevision>
+    <ApplicationRevision>7</ApplicationRevision>
     <ApplicationVersion>2.5.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>

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>rWAB+XagaGJqYXePX/Rq4e9r7LrjNaey5Sc0VOch4+s=</dsig:DigestValue>
+        <dsig:DigestValue>SK67vZm5DI6i6PYvGuc4Im/6D3UVI7mcgYD0YKOBAts=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

bin/Release/TPS1100 Convert.exe.manifest

@@ -43,14 +43,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TPS1100 Convert.exe" size="835072">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TPS1100 Convert.exe" size="837120">
       <assemblyIdentity name="TPS1100 Convert" version="2.5.0.6" 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>ZO6/OrSE/+39WjRnKb1hciN32v1Fw/5P60uF88i7A2I=</dsig:DigestValue>
+        <dsig:DigestValue>YaYx/umhtP3dosqmePwTTr4rn3T4h1kY2oXPDdfvmx4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>