diff --git a/Form1.Designer.vb b/Form1.Designer.vb
index c49d06f..18c5352 100644
--- a/Form1.Designer.vb
+++ b/Form1.Designer.vb
@@ -59,9 +59,9 @@ 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.SystemColors.GradientInactiveCaption
+ Me.RichTextBox1.BackColor = System.Drawing.Color.Ivory
Me.RichTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None
- Me.RichTextBox1.Font = New System.Drawing.Font("Courier New", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(238, Byte))
+ 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, 39)
Me.RichTextBox1.Margin = New System.Windows.Forms.Padding(0)
Me.RichTextBox1.Name = "RichTextBox1"
@@ -262,10 +262,11 @@ Partial Class Form1
'tsbSaveAs
'
Me.tsbSaveAs.Enabled = False
+ Me.tsbSaveAs.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.tsbSaveAs.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_save_as_50
Me.tsbSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
Me.tsbSaveAs.Name = "tsbSaveAs"
- Me.tsbSaveAs.Size = New System.Drawing.Size(78, 26)
+ Me.tsbSaveAs.Size = New System.Drawing.Size(85, 26)
Me.tsbSaveAs.Text = "Shrani ..."
'
'ToolStripButtonNast
diff --git a/Form1.resx b/Form1.resx
index 7f65d80..09040a1 100644
--- a/Form1.resx
+++ b/Form1.resx
@@ -118,7 +118,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Pretvorba is GSI v Zapisnik Meritev ali Seznam Točk...
+ GSI v Zapisnik Meritev ali Seznam Točk...
1. Odpri GSI datoteko.
2. Preveri podatke in po potrebi uredi datoteko (gumb "Uredi").
@@ -126,7 +126,7 @@
3B. Za pripravo seznama koordinat točk klikni gumb "Točke".
4. Shrani podatke z klikom na gumb "Shrani...".
-Pretvorba iz KOO/TXT v GSI datoteko...
+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)
diff --git a/Form1.vb b/Form1.vb
index 6a95a9f..7aa7a91 100644
--- a/Form1.vb
+++ b/Form1.vb
@@ -137,7 +137,7 @@ Public Class Form1
'data = "Code= " + numData.ToString
If My.Settings.KodeUporabnik = "Da" Then
If data = "+0000000000000010" Then
- data = vbCrLf + "Setup: Quick Set" + vbCrLf + "============================="
+ data = vbCrLf + "Setup: Quick Set" + vbCrLf + "=============================" + vbCrLf + "Hz" + dataStolpci + "V" + dataStolpci + "SD"
PodatkiStojisce = True
End If
If data = "+0000000000000020" Then
@@ -157,7 +157,7 @@ Public Class Form1
PodatkiStojisce = True
End If
If data = "+0000000000000090" Then
- data = vbCrLf + "Measured:" + vbCrLf + "----------------------" + vbCrLf + "PtID" + dataStolpci + "HZ" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "ReflHt" + dataStolpci + "PrCon" + dataStolpci + "HtDif" + dataStolpci + "E" + dataStolpci + "N" + dataStolpci + "H" + dataStolpci + "PtCode"
+ data = vbCrLf + "Measured:" + vbCrLf + "----------------------" + vbCrLf + "PtID" + dataStolpci + "Azi" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "ReflHt" + dataStolpci + "PrCon" + dataStolpci + "HtDif" + dataStolpci + "E" + dataStolpci + "N" + dataStolpci + "H" + dataStolpci + "PtCode"
PodatkiStojisce = False
End If
If data = "+0000000000000099" Then
@@ -189,6 +189,13 @@ Public Class Form1
Else
data = dataStolpci + dataTmp
End If
+ ElseIf wordIndex = "79" Then ' Point Code
+ dataTmp = Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
+ If dataTmp = "" Then
+ data = ""
+ Else
+ data = dataStolpci + dataTmp
+ End If
ElseIf wordIndex = "81" And PodatkiStojisce = False Then ' Target Easting
numData = data / 1000
data = dataStolpci + Format(numData, "0.000")
diff --git a/TPS1100 Convert.vbproj b/TPS1100 Convert.vbproj
index f0dd041..68b4ac1 100644
--- a/TPS1100 Convert.vbproj
+++ b/TPS1100 Convert.vbproj
@@ -46,7 +46,8 @@
true
true
bin\Debug\
- TPS1100 Convert.xml
+
+
42016,41999,42017,42018,42019,42032,42036,42020,42021,42022
@@ -56,7 +57,8 @@
true
true
bin\Release\
- TPS1100 Convert.xml
+
+
42016,41999,42017,42018,42019,42032,42036,42020,42021,42022
diff --git a/bin/Release/TPS1100 Convert.application b/bin/Release/TPS1100 Convert.application
index 36cf7e0..ff0754b 100644
--- a/bin/Release/TPS1100 Convert.application
+++ b/bin/Release/TPS1100 Convert.application
@@ -1,6 +1,6 @@
-
+
@@ -8,13 +8,13 @@
-
+
- BtmlQm9KiHooPuy/gx0Bj4ILkS0F70Jmzr4w79qOwpk=
+ idoYJglS+nGZHbmd7/Py+LjeKZVeG8zBtQ3SbEH+rLo=
diff --git a/bin/Release/TPS1100 Convert.exe b/bin/Release/TPS1100 Convert.exe
index 7ceda54..3b8d22a 100644
Binary files a/bin/Release/TPS1100 Convert.exe and b/bin/Release/TPS1100 Convert.exe differ
diff --git a/bin/Release/TPS1100 Convert.exe.manifest b/bin/Release/TPS1100 Convert.exe.manifest
index d5fcbc5..c0a877a 100644
--- a/bin/Release/TPS1100 Convert.exe.manifest
+++ b/bin/Release/TPS1100 Convert.exe.manifest
@@ -1,6 +1,6 @@
-
+
@@ -50,7 +50,7 @@
- v6Xjj3LP9Hy7w/iSjGiCtVHIosjuOv/FZPygHSAEVO8=
+ OlzHJEc9SK+xbs6bsc6XVsgxiWywGQfasrgGgQ4hEzM=
diff --git a/bin/Release/TPS1100 Convert.xml b/bin/Release/TPS1100 Convert.xml
deleted file mode 100644
index e475572..0000000
--- a/bin/Release/TPS1100 Convert.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-
-
-
-
-TPS1100 Convert
-
-
-
-
-
- A strongly-typed resource class, for looking up localized strings, etc.
-
-
-
-
- Returns the cached ResourceManager instance used by this class.
-
-
-
-
- Overrides the current thread's CurrentUICulture property for all
- resource lookups using this strongly typed resource class.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Byte[].
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
- Looks up a localized resource of type System.Drawing.Bitmap.
-
-
-
-
-Znak za decimalno ločilo
-
-
-
-
diff --git a/bin/Release/app.publish/TPS1100 Convert.exe b/bin/Release/app.publish/TPS1100 Convert.exe
index 7ceda54..3b8d22a 100644
Binary files a/bin/Release/app.publish/TPS1100 Convert.exe and b/bin/Release/app.publish/TPS1100 Convert.exe differ
diff --git a/bin/TPS1100-Convert_2.5.0.7_Portable.zip b/bin/TPS1100-Convert_2.5.0.7_Portable.zip
deleted file mode 100644
index 2152918..0000000
Binary files a/bin/TPS1100-Convert_2.5.0.7_Portable.zip and /dev/null differ
diff --git a/bin/TPS1100-Convert_2.5.0.7_Setup.zip b/bin/TPS1100-Convert_2.5.0.7_Setup.zip
deleted file mode 100644
index c2fc97e..0000000
Binary files a/bin/TPS1100-Convert_2.5.0.7_Setup.zip and /dev/null differ