boris/TPS1100-Convert
boris/TPS1100-Convert
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Popravki za 2.7.0.0

Browse Source
This commit is contained in:
Boris Bilc 2024-06-22 01:26:51 +02:00
parent 24ee0d5b5f
commit 7994cf1972
17 changed files with 237 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
Form1.Designer.vb generated
View File

@ -35,6 +35,7 @@ Partial Class Form1
Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
Me.LabelDatoteka = New System.Windows.Forms.ToolStripLabel() Me.LabelDatoteka = New System.Windows.Forms.ToolStripLabel()
Me.tsbOpenFile = New System.Windows.Forms.ToolStripButton() Me.tsbOpenFile = New System.Windows.Forms.ToolStripButton()
Me.ToolStripButtonPripravi = New System.Windows.Forms.ToolStripButton()
Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator()
Me.ButtonUrediDat = New System.Windows.Forms.ToolStripButton() Me.ButtonUrediDat = New System.Windows.Forms.ToolStripButton()
Me.tsbConvert = New System.Windows.Forms.ToolStripButton() Me.tsbConvert = New System.Windows.Forms.ToolStripButton()
@ -42,21 +43,20 @@ Partial Class Form1
Me.ToolStripButtonGeo = New System.Windows.Forms.ToolStripButton() Me.ToolStripButtonGeo = New System.Windows.Forms.ToolStripButton()
Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
Me.tsbSaveAs = New System.Windows.Forms.ToolStripButton() Me.tsbSaveAs = New System.Windows.Forms.ToolStripButton()
Me.ToolStripButtonPripravi = New System.Windows.Forms.ToolStripButton()
Me.OpenFileDialogTocke = New System.Windows.Forms.OpenFileDialog() Me.OpenFileDialogTocke = New System.Windows.Forms.OpenFileDialog()
Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
Me.DatotekaToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.OdpriGSIToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.PripraviGSIToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
Me.ShraniToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
Me.IzhodToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.MenuToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MenuToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.OdpriGSIToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.OdpriGSIToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator()
Me.PripraviGSIToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PripraviGSIToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.InfoOAplikacijiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.InfoOAplikacijiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.DatotekaToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.OdpriGSIToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.PripraviGSIToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.ShraniToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.IzhodToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
Me.StatusStrip1.SuspendLayout() Me.StatusStrip1.SuspendLayout()
Me.ToolStrip1.SuspendLayout() Me.ToolStrip1.SuspendLayout()
Me.MenuStrip1.SuspendLayout() Me.MenuStrip1.SuspendLayout()
@ -165,6 +165,15 @@ Partial Class Form1
Me.tsbOpenFile.Text = "Odpri GSI" Me.tsbOpenFile.Text = "Odpri GSI"
Me.tsbOpenFile.ToolTipText = "Izberi GSI datoteko..." Me.tsbOpenFile.ToolTipText = "Izberi GSI datoteko..."
' '
'ToolStripButtonPripravi
'
Me.ToolStripButtonPripravi.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_send_file_50
Me.ToolStripButtonPripravi.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripButtonPripravi.Name = "ToolStripButtonPripravi"
Me.ToolStripButtonPripravi.Size = New System.Drawing.Size(101, 34)
Me.ToolStripButtonPripravi.Text = "Pripravi GSI"
Me.ToolStripButtonPripravi.ToolTipText = "Pripravi GSI iz datoteke z točkami..."
'
'ToolStripSeparator5 'ToolStripSeparator5
' '
Me.ToolStripSeparator5.Name = "ToolStripSeparator5" Me.ToolStripSeparator5.Name = "ToolStripSeparator5"
@ -187,8 +196,8 @@ Partial Class Form1
Me.tsbConvert.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_land_surveying_48 Me.tsbConvert.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_land_surveying_48
Me.tsbConvert.ImageTransparentColor = System.Drawing.Color.Magenta Me.tsbConvert.ImageTransparentColor = System.Drawing.Color.Magenta
Me.tsbConvert.Name = "tsbConvert" Me.tsbConvert.Name = "tsbConvert"
Me.tsbConvert.Size = New System.Drawing.Size(81, 34) Me.tsbConvert.Size = New System.Drawing.Size(128, 34)
Me.tsbConvert.Text = "Meritve" Me.tsbConvert.Text = "Zapisnik Meritve"
Me.tsbConvert.ToolTipText = "Izvozi zapisnik meritev." Me.tsbConvert.ToolTipText = "Izvozi zapisnik meritev."
' '
'tsbPointsOnly 'tsbPointsOnly
@ -198,8 +207,8 @@ Partial Class Form1
Me.tsbPointsOnly.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_connection_status_on_48 Me.tsbPointsOnly.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_connection_status_on_48
Me.tsbPointsOnly.ImageTransparentColor = System.Drawing.Color.Magenta Me.tsbPointsOnly.ImageTransparentColor = System.Drawing.Color.Magenta
Me.tsbPointsOnly.Name = "tsbPointsOnly" Me.tsbPointsOnly.Name = "tsbPointsOnly"
Me.tsbPointsOnly.Size = New System.Drawing.Size(72, 34) Me.tsbPointsOnly.Size = New System.Drawing.Size(112, 34)
Me.tsbPointsOnly.Text = "Točke" Me.tsbPointsOnly.Text = "Seznam Točk"
Me.tsbPointsOnly.ToolTipText = "Izvozi koordinate točk." Me.tsbPointsOnly.ToolTipText = "Izvozi koordinate točk."
' '
'ToolStripButtonGeo 'ToolStripButtonGeo
@ -208,8 +217,8 @@ Partial Class Form1
Me.ToolStripButtonGeo.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_drawing_compass_48 Me.ToolStripButtonGeo.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_drawing_compass_48
Me.ToolStripButtonGeo.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButtonGeo.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripButtonGeo.Name = "ToolStripButtonGeo" Me.ToolStripButtonGeo.Name = "ToolStripButtonGeo"
Me.ToolStripButtonGeo.Size = New System.Drawing.Size(64, 34) Me.ToolStripButtonGeo.Size = New System.Drawing.Size(103, 34)
Me.ToolStripButtonGeo.Text = "GEO" Me.ToolStripButtonGeo.Text = "GEO Skripta"
' '
'ToolStripSeparator4 'ToolStripSeparator4
' '
@ -226,15 +235,6 @@ Partial Class Form1
Me.tsbSaveAs.Size = New System.Drawing.Size(93, 34) Me.tsbSaveAs.Size = New System.Drawing.Size(93, 34)
Me.tsbSaveAs.Text = "Shrani ..." Me.tsbSaveAs.Text = "Shrani ..."
' '
'ToolStripButtonPripravi
'
Me.ToolStripButtonPripravi.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_send_file_50
Me.ToolStripButtonPripravi.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripButtonPripravi.Name = "ToolStripButtonPripravi"
Me.ToolStripButtonPripravi.Size = New System.Drawing.Size(101, 34)
Me.ToolStripButtonPripravi.Text = "Pripravi GSI"
Me.ToolStripButtonPripravi.ToolTipText = "Pripravi GSI iz datoteke z točkami..."
'
'OpenFileDialogTocke 'OpenFileDialogTocke
' '
Me.OpenFileDialogTocke.Filter = "Datoteke točk|*.koo;*.txt|All files|*.*" Me.OpenFileDialogTocke.Filter = "Datoteke točk|*.koo;*.txt|All files|*.*"
@ -248,19 +248,66 @@ Partial Class Form1
Me.MenuStrip1.TabIndex = 3 Me.MenuStrip1.TabIndex = 3
Me.MenuStrip1.Text = "MenuStrip1" Me.MenuStrip1.Text = "MenuStrip1"
' '
'DatotekaToolStripMenuItem
'
Me.DatotekaToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OdpriGSIToolStripMenuItem1, Me.PripraviGSIToolStripMenuItem1, Me.ToolStripSeparator3, Me.ShraniToolStripMenuItem, Me.ToolStripSeparator2, Me.IzhodToolStripMenuItem})
Me.DatotekaToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_program_50
Me.DatotekaToolStripMenuItem.Name = "DatotekaToolStripMenuItem"
Me.DatotekaToolStripMenuItem.Size = New System.Drawing.Size(82, 20)
Me.DatotekaToolStripMenuItem.Text = "&Datoteka"
'
'OdpriGSIToolStripMenuItem1
'
Me.OdpriGSIToolStripMenuItem1.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_opened_folder_50
Me.OdpriGSIToolStripMenuItem1.Name = "OdpriGSIToolStripMenuItem1"
Me.OdpriGSIToolStripMenuItem1.Size = New System.Drawing.Size(180, 22)
Me.OdpriGSIToolStripMenuItem1.Text = "&Odpri GSI"
'
'PripraviGSIToolStripMenuItem1
'
Me.PripraviGSIToolStripMenuItem1.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_send_file_50
Me.PripraviGSIToolStripMenuItem1.Name = "PripraviGSIToolStripMenuItem1"
Me.PripraviGSIToolStripMenuItem1.Size = New System.Drawing.Size(180, 22)
Me.PripraviGSIToolStripMenuItem1.Text = "&Pripravi GSI"
'
'ToolStripSeparator3
'
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
Me.ToolStripSeparator3.Size = New System.Drawing.Size(177, 6)
'
'ShraniToolStripMenuItem
'
Me.ShraniToolStripMenuItem.Enabled = False
Me.ShraniToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_save_as_50
Me.ShraniToolStripMenuItem.Name = "ShraniToolStripMenuItem"
Me.ShraniToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
Me.ShraniToolStripMenuItem.Text = "&Shrani..."
'
'ToolStripSeparator2
'
Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
Me.ToolStripSeparator2.Size = New System.Drawing.Size(177, 6)
'
'IzhodToolStripMenuItem
'
Me.IzhodToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_50
Me.IzhodToolStripMenuItem.Name = "IzhodToolStripMenuItem"
Me.IzhodToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
Me.IzhodToolStripMenuItem.Text = "I&zhod"
'
'MenuToolStripMenuItem 'MenuToolStripMenuItem
' '
Me.MenuToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OdpriGSIToolStripMenuItem, Me.ToolStripSeparator6, Me.PripraviGSIToolStripMenuItem, Me.InfoOAplikacijiToolStripMenuItem}) Me.MenuToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OdpriGSIToolStripMenuItem, Me.ToolStripSeparator6, Me.PripraviGSIToolStripMenuItem, Me.InfoOAplikacijiToolStripMenuItem})
Me.MenuToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_menu_50
Me.MenuToolStripMenuItem.Name = "MenuToolStripMenuItem" Me.MenuToolStripMenuItem.Name = "MenuToolStripMenuItem"
Me.MenuToolStripMenuItem.Size = New System.Drawing.Size(65, 20) Me.MenuToolStripMenuItem.Size = New System.Drawing.Size(81, 20)
Me.MenuToolStripMenuItem.Text = "Program" Me.MenuToolStripMenuItem.Text = "Program"
Me.MenuToolStripMenuItem.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage
' '
'OdpriGSIToolStripMenuItem 'OdpriGSIToolStripMenuItem
' '
Me.OdpriGSIToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_tools_50 Me.OdpriGSIToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_open_end_wrench_50
Me.OdpriGSIToolStripMenuItem.Name = "OdpriGSIToolStripMenuItem" Me.OdpriGSIToolStripMenuItem.Name = "OdpriGSIToolStripMenuItem"
Me.OdpriGSIToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.OdpriGSIToolStripMenuItem.Size = New System.Drawing.Size(154, 22)
Me.OdpriGSIToolStripMenuItem.Text = "Nastavitve" Me.OdpriGSIToolStripMenuItem.Text = "Nastavitve"
' '
'ToolStripSeparator6 'ToolStripSeparator6
@ -282,52 +329,6 @@ Partial Class Form1
Me.InfoOAplikacijiToolStripMenuItem.Size = New System.Drawing.Size(154, 22) Me.InfoOAplikacijiToolStripMenuItem.Size = New System.Drawing.Size(154, 22)
Me.InfoOAplikacijiToolStripMenuItem.Text = "Info o aplikaciji" Me.InfoOAplikacijiToolStripMenuItem.Text = "Info o aplikaciji"
' '
'DatotekaToolStripMenuItem
'
Me.DatotekaToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OdpriGSIToolStripMenuItem1, Me.PripraviGSIToolStripMenuItem1, Me.ToolStripSeparator3, Me.ShraniToolStripMenuItem, Me.ToolStripSeparator2, Me.IzhodToolStripMenuItem})
Me.DatotekaToolStripMenuItem.Name = "DatotekaToolStripMenuItem"
Me.DatotekaToolStripMenuItem.Size = New System.Drawing.Size(66, 20)
Me.DatotekaToolStripMenuItem.Text = "&Datoteka"
'
'OdpriGSIToolStripMenuItem1
'
Me.OdpriGSIToolStripMenuItem1.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_opened_folder_50
Me.OdpriGSIToolStripMenuItem1.Name = "OdpriGSIToolStripMenuItem1"
Me.OdpriGSIToolStripMenuItem1.Size = New System.Drawing.Size(180, 22)
Me.OdpriGSIToolStripMenuItem1.Text = "&Odpri GSI"
'
'PripraviGSIToolStripMenuItem1
'
Me.PripraviGSIToolStripMenuItem1.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_send_file_50
Me.PripraviGSIToolStripMenuItem1.Name = "PripraviGSIToolStripMenuItem1"
Me.PripraviGSIToolStripMenuItem1.Size = New System.Drawing.Size(180, 22)
Me.PripraviGSIToolStripMenuItem1.Text = "&Pripravi GSI"
'
'ShraniToolStripMenuItem
'
Me.ShraniToolStripMenuItem.Enabled = False
Me.ShraniToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_save_as_50
Me.ShraniToolStripMenuItem.Name = "ShraniToolStripMenuItem"
Me.ShraniToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
Me.ShraniToolStripMenuItem.Text = "&Shrani..."
'
'IzhodToolStripMenuItem
'
Me.IzhodToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_50
Me.IzhodToolStripMenuItem.Name = "IzhodToolStripMenuItem"
Me.IzhodToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
Me.IzhodToolStripMenuItem.Text = "I&zhod"
'
'ToolStripSeparator2
'
Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
Me.ToolStripSeparator2.Size = New System.Drawing.Size(177, 6)
'
'ToolStripSeparator3
'
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
Me.ToolStripSeparator3.Size = New System.Drawing.Size(177, 6)
'
'Form1 'Form1
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

18
Form1.vb
View File

@ -212,27 +212,27 @@ Public Class Form1
PodatkiStojisce = True PodatkiStojisce = True
End If End If
If dataKoda = My.Settings.KodaMeasOri Then If dataKoda = My.Settings.KodaMeasOri Then
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" data = vbCrLf + "Meritve Orientacije" + 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 PodatkiStojisce = False
End If End If
If dataKoda = My.Settings.KodaMeas Then If dataKoda = My.Settings.KodaMeas Then
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" 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 PodatkiStojisce = False
End If End If
If dataKoda = My.Settings.KodaUserImport Then If dataKoda = My.Settings.KodaUserImport Then
data = vbCrLf + "Imported/User-Entered:" + vbCrLf + "----------------------" + vbCrLf + "PtID" + dataStolpci + "E" + dataStolpci + "N" + dataStolpci + "H" data = vbCrLf + "Uvoz/Ročni vnos" + vbCrLf + "----------------------" + vbCrLf + "PtID" + dataStolpci + "E" + dataStolpci + "N" + dataStolpci + "H"
PodatkiStojisce = False PodatkiStojisce = False
End If End If
If dataKoda = My.Settings.KodaStojisce Then If dataKoda = My.Settings.KodaStojisce Then
data = vbCrLf + "Stojišče Info:" + vbCrLf + "----------------------" + vbCrLf + "StID" + dataStolpci + "InstHt" + vbCrLf data = vbCrLf + "Stojišče Info" + vbCrLf + "----------------------" + vbCrLf + "StID" + dataStolpci + "InstHt" + vbCrLf
PodatkiStojisce = False PodatkiStojisce = False
End If End If
If dataKoda = My.Settings.KodaStojisceInfo Then If dataKoda = My.Settings.KodaStojisceInfo Then
data = vbCrLf + "Temp./Pritisk:" + vbCrLf + "----------------------" + vbCrLf + "Temp" + dataStolpci + "Pritisk" + vbCrLf data = vbCrLf + "Temp./Pritisk" + vbCrLf + "----------------------" + vbCrLf + "Temp" + dataStolpci + "Pritisk" + vbCrLf
PodatkiStojisce = False PodatkiStojisce = False
End If End If
If dataKoda = My.Settings.KodaStojisceOri Then If dataKoda = My.Settings.KodaStojisceOri Then
data = vbCrLf + "Orientacija:" + vbCrLf + "----------------------" + vbCrLf + "OrID" + dataStolpci + "Hz" + vbCrLf data = vbCrLf + "Orientacija Info" + vbCrLf + "----------------------" + vbCrLf + "OrID" + dataStolpci + "Hz" + vbCrLf
PodatkiStojisce = False PodatkiStojisce = False
End If End If
If dataKoda = "STA_OFFS" Then If dataKoda = "STA_OFFS" Then
@ -520,9 +520,9 @@ Public Class Form1
Dim numPress As Double Dim numPress As Double
numPress = infoPress * 0.750062 numPress = infoPress * 0.750062
infoPress = Format(numPress, "0.00").ToString infoPress = Format(numPress, "0.00").ToString
If measuredPoints = 0 Then 'If measuredPoints = 0 Then
izpisText = infoTemp + " " + infoPress + vbCrLf ' izpisText = infoTemp + " " + infoPress + vbCrLf
End If 'End If
measuredPoints = 0 measuredPoints = 0
End If End If

46
FormNastavitve.Designer.vb generated
View File

@ -34,7 +34,7 @@ Partial Class FormNastavitve
Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.GroupBox3 = New System.Windows.Forms.GroupBox()
Me.TextBoxLog = New System.Windows.Forms.TextBox() Me.TextBoxLog = New System.Windows.Forms.TextBox()
Me.ButtonOdpriLog = New System.Windows.Forms.Button() Me.ButtonOdpriLog = New System.Windows.Forms.Button()
Me.OpenFileDialogLog = New System.Windows.Forms.OpenFileDialog() Me.OpenFileDialogNast = New System.Windows.Forms.OpenFileDialog()
Me.SaveFileDialogLog = New System.Windows.Forms.SaveFileDialog() Me.SaveFileDialogLog = New System.Windows.Forms.SaveFileDialog()
Me.TableLayoutPanel3 = New System.Windows.Forms.TableLayoutPanel() Me.TableLayoutPanel3 = New System.Windows.Forms.TableLayoutPanel()
Me.Label7 = New System.Windows.Forms.Label() Me.Label7 = New System.Windows.Forms.Label()
@ -221,12 +221,12 @@ Partial Class FormNastavitve
Me.ButtonOdpriLog.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText Me.ButtonOdpriLog.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
Me.ButtonOdpriLog.UseVisualStyleBackColor = True Me.ButtonOdpriLog.UseVisualStyleBackColor = True
' '
'OpenFileDialogLog 'OpenFileDialogNast
' '
Me.OpenFileDialogLog.CheckFileExists = False Me.OpenFileDialogNast.CheckFileExists = False
Me.OpenFileDialogLog.DefaultExt = "Text File|*.txt" Me.OpenFileDialogNast.DefaultExt = "CFG File|*.cfg"
Me.OpenFileDialogLog.FileName = "tps1100_log.txt" Me.OpenFileDialogNast.FileName = "tps1100_log.txt"
Me.OpenFileDialogLog.Filter = "Text File|*.txt" Me.OpenFileDialogNast.Filter = "CFG File|*.cfg"
' '
'SaveFileDialogLog 'SaveFileDialogLog
' '
@ -371,9 +371,9 @@ Partial Class FormNastavitve
Me.Label8.AutoSize = True Me.Label8.AutoSize = True
Me.Label8.Location = New System.Drawing.Point(78, 360) Me.Label8.Location = New System.Drawing.Point(78, 360)
Me.Label8.Name = "Label8" Me.Label8.Name = "Label8"
Me.Label8.Size = New System.Drawing.Size(120, 30) Me.Label8.Size = New System.Drawing.Size(128, 30)
Me.Label8.TabIndex = 7 Me.Label8.TabIndex = 7
Me.Label8.Text = "Imported / User-entered" Me.Label8.Text = "Točke: Uvoz/Ročni vnos"
Me.Label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
' '
'TextBoxMeas 'TextBoxMeas
@ -409,9 +409,9 @@ Partial Class FormNastavitve
Me.Label6.AutoSize = True Me.Label6.AutoSize = True
Me.Label6.Location = New System.Drawing.Point(78, 330) Me.Label6.Location = New System.Drawing.Point(78, 330)
Me.Label6.Name = "Label6" Me.Label6.Name = "Label6"
Me.Label6.Size = New System.Drawing.Size(54, 30) Me.Label6.Size = New System.Drawing.Size(45, 30)
Me.Label6.TabIndex = 5 Me.Label6.TabIndex = 5
Me.Label6.Text = "Measured" Me.Label6.Text = "Merjeno"
Me.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
' '
'Label9 'Label9
@ -421,9 +421,9 @@ Partial Class FormNastavitve
Me.Label9.AutoSize = True Me.Label9.AutoSize = True
Me.Label9.Location = New System.Drawing.Point(78, 300) Me.Label9.Location = New System.Drawing.Point(78, 300)
Me.Label9.Name = "Label9" Me.Label9.Name = "Label9"
Me.Label9.Size = New System.Drawing.Size(58, 30) Me.Label9.Size = New System.Drawing.Size(57, 30)
Me.Label9.TabIndex = 16 Me.Label9.TabIndex = 16
Me.Label9.Text = "Orientation" Me.Label9.Text = "Orientacije"
Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
' '
'Label15 'Label15
@ -652,9 +652,9 @@ Partial Class FormNastavitve
' '
'SaveFileDialogNast 'SaveFileDialogNast
' '
Me.SaveFileDialogNast.DefaultExt = "Config|*.cfg" Me.SaveFileDialogNast.DefaultExt = "CFG File|*.cfg"
Me.SaveFileDialogNast.FileName = "tps1100_nastavitve.cfg" Me.SaveFileDialogNast.FileName = "tps1100_kode.cfg"
Me.SaveFileDialogNast.Filter = "Config|*.cfg" Me.SaveFileDialogNast.Filter = "CFG File|*.cfg"
' '
'MenuStrip1 'MenuStrip1
' '
@ -675,28 +675,28 @@ Partial Class FormNastavitve
' '
'IzvoziKodeToolStripMenuItem 'IzvoziKodeToolStripMenuItem
' '
Me.IzvoziKodeToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_move_to_folder_50 Me.IzvoziKodeToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_save_as_50
Me.IzvoziKodeToolStripMenuItem.Name = "IzvoziKodeToolStripMenuItem" Me.IzvoziKodeToolStripMenuItem.Name = "IzvoziKodeToolStripMenuItem"
Me.IzvoziKodeToolStripMenuItem.Size = New System.Drawing.Size(133, 22) Me.IzvoziKodeToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
Me.IzvoziKodeToolStripMenuItem.Text = "&Izvozi Kode" Me.IzvoziKodeToolStripMenuItem.Text = "&Shrani Kode"
' '
'UvoziKodeToolStripMenuItem 'UvoziKodeToolStripMenuItem
' '
Me.UvoziKodeToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_send_file_50 Me.UvoziKodeToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_opened_folder_50
Me.UvoziKodeToolStripMenuItem.Name = "UvoziKodeToolStripMenuItem" Me.UvoziKodeToolStripMenuItem.Name = "UvoziKodeToolStripMenuItem"
Me.UvoziKodeToolStripMenuItem.Size = New System.Drawing.Size(133, 22) Me.UvoziKodeToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
Me.UvoziKodeToolStripMenuItem.Text = "&Uvozi Kode" Me.UvoziKodeToolStripMenuItem.Text = "&Uvozi Kode"
' '
'ToolStripSeparator1 'ToolStripSeparator1
' '
Me.ToolStripSeparator1.Name = "ToolStripSeparator1" Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
Me.ToolStripSeparator1.Size = New System.Drawing.Size(130, 6) Me.ToolStripSeparator1.Size = New System.Drawing.Size(177, 6)
' '
'ZapriToolStripMenuItem 'ZapriToolStripMenuItem
' '
Me.ZapriToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_50 Me.ZapriToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_50
Me.ZapriToolStripMenuItem.Name = "ZapriToolStripMenuItem" Me.ZapriToolStripMenuItem.Name = "ZapriToolStripMenuItem"
Me.ZapriToolStripMenuItem.Size = New System.Drawing.Size(133, 22) Me.ZapriToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
Me.ZapriToolStripMenuItem.Text = "&Zapri" Me.ZapriToolStripMenuItem.Text = "&Zapri"
' '
'ButtonShraniZapri 'ButtonShraniZapri
@ -762,7 +762,7 @@ Partial Class FormNastavitve
Friend WithEvents GroupBox3 As GroupBox Friend WithEvents GroupBox3 As GroupBox
Friend WithEvents TextBoxLog As TextBox Friend WithEvents TextBoxLog As TextBox
Friend WithEvents ButtonOdpriLog As Button Friend WithEvents ButtonOdpriLog As Button
Friend WithEvents OpenFileDialogLog As OpenFileDialog Friend WithEvents OpenFileDialogNast As OpenFileDialog
Friend WithEvents SaveFileDialogLog As SaveFileDialog Friend WithEvents SaveFileDialogLog As SaveFileDialog
Friend WithEvents RadioButton1 As RadioButton Friend WithEvents RadioButton1 As RadioButton
Friend WithEvents TableLayoutPanel3 As TableLayoutPanel Friend WithEvents TableLayoutPanel3 As TableLayoutPanel

2
FormNastavitve.resx
View File

@ -117,7 +117,7 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="OpenFileDialogLog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="OpenFileDialogNast.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>123, 17</value> <value>123, 17</value>
</metadata> </metadata>
<metadata name="SaveFileDialogLog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="SaveFileDialogLog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

65
FormNastavitve.vb
View File

@ -1,4 +1,6 @@
Public Class FormNastavitve Imports System.IO
Public Class FormNastavitve
Private Sub FormNastavitve_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub FormNastavitve_Load(sender As Object, e As EventArgs) Handles MyBase.Load
If My.Settings.Stolpci = 0 Then If My.Settings.Stolpci = 0 Then
@ -110,9 +112,70 @@
Private Sub UvoziKodeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles UvoziKodeToolStripMenuItem.Click Private Sub UvoziKodeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles UvoziKodeToolStripMenuItem.Click
' TODO: Uvoz nastavitev iz datototeke ' TODO: Uvoz nastavitev iz datototeke
If OpenFileDialogNast.ShowDialog = DialogResult.OK Then
Dim streamReader As StreamReader = New StreamReader(OpenFileDialogNast.FileName)
Do Until streamReader.EndOfStream
' Read and Split each line to separate it into fields
Dim line() As String = streamReader.ReadLine().Split("=")
Dim kodaIme As String
Dim kodaVal As String
kodaIme = Replace(line(0), " ", "")
kodaVal = Replace(line(1), " ", "")
If kodaIme = "KodaStojisce" Then
My.Settings.KodaStojisce = kodaVal
TextBoxStoj.Text = kodaVal.ToString
End If
If kodaIme = "KodaStojisceInfo" Then
My.Settings.KodaStojisceInfo = kodaVal
TextBoxStojInfo.Text = kodaVal.ToString
End If
If kodaIme = "KodaStojisceOri" Then
My.Settings.KodaStojisceOri = kodaVal
TextBoxOriHz.Text = kodaVal.ToString
End If
If kodaIme = "KodaQuickSet" Then
My.Settings.KodaQuickSet = kodaVal
TextBoxQuickSet.Text = kodaVal.ToString
End If
If kodaIme = "KodaSetAzi" Then
My.Settings.KodaSetAzi = kodaVal
TextBoxSetAzi.Text = kodaVal.ToString
End If
If kodaIme = "KodaResection" Then
My.Settings.KodaResection = kodaVal
TextBoxRes.Text = kodaVal.ToString
End If
If kodaIme = "KodaFreeStation" Then
My.Settings.KodaFreeStation = kodaVal
TextBoxFree.Text = kodaVal.ToString
End If
If kodaIme = "KodaOriHtTrans" Then
My.Settings.KodaOriHtTrans = kodaVal
TextBoxOriHt.Text = kodaVal.ToString
End If
If kodaIme = "KodaMeasOri" Then
My.Settings.KodaMeasOri = kodaVal
TextBoxMeasOri.Text = kodaVal.ToString
End If
If kodaIme = "KodaMeas" Then
My.Settings.KodaMeas = kodaVal
TextBoxMeas.Text = kodaVal.ToString
End If
If kodaIme = "KodaUserImport" Then
My.Settings.KodaUserImport = kodaVal
TextBoxImport.Text = kodaVal.ToString
End If
Loop
streamReader.Close()
streamReader.Dispose()
My.Settings.Save()
End If
End Sub End Sub
Private Sub ButtonShraniZapri_Click(sender As Object, e As EventArgs) Handles ButtonShraniZapri.Click Private Sub ButtonShraniZapri_Click(sender As Object, e As EventArgs) Handles ButtonShraniZapri.Click
Me.Close() Me.Close()
End Sub End Sub
End Class End Class

10
My Project/Resources.Designer.vb generated
View File

@ -681,6 +681,16 @@ Namespace My.Resources
End Get End Get
End Property End Property
'''<summary>
''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property icons8_program_50() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("icons8-program-50", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary> '''<summary>
''' Looks up a localized resource of type System.Drawing.Bitmap. ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary> '''</summary>

77
My Project/Resources.resx
View File

@ -130,9 +130,6 @@
<data name="icons8-send-file-50" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8-send-file-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-send-file-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\icons8-send-file-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="48" xml:space="preserve">
<value>Information 7</value>
</data>
<data name="58" xml:space="preserve"> <data name="58" xml:space="preserve">
<value>Prism constant</value> <value>Prism constant</value>
</data> </data>
@ -154,8 +151,8 @@
<data name="ModernXP_41_Settings_icon" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="ModernXP_41_Settings_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\ModernXP-41-Settings-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\ModernXP-41-Settings-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="73" xml:space="preserve"> <data name="icons8_add_folder_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Remark 3</value> <value>Icons\icons8-add-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_done_50" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_done_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-done-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\icons8-done-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -172,11 +169,14 @@
<data name="76" xml:space="preserve"> <data name="76" xml:space="preserve">
<value>Remark 6</value> <value>Remark 6</value>
</data> </data>
<data name="19" xml:space="preserve">
<value>Time</value>
</data>
<data name="icons8_do_not_disturb_50" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_do_not_disturb_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-do-not-disturb-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\icons8-do-not-disturb-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_opened_folder_50" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="75" xml:space="preserve">
<value>Icons\icons8-opened-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Remark 5</value>
</data> </data>
<data name="51" xml:space="preserve"> <data name="51" xml:space="preserve">
<value>PPM/mm</value> <value>PPM/mm</value>
@ -196,11 +196,17 @@
<data name="icons8_open_end_wrench_50" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_open_end_wrench_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-open-end-wrench-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\icons8-open-end-wrench-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="82" xml:space="preserve">
<value>Northing</value>
</data>
<data name="12" xml:space="preserve"> <data name="12" xml:space="preserve">
<value>Serial number</value> <value>Serial number</value>
</data> </data>
<data name="icons8_add_new_50" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="73" xml:space="preserve">
<value>Icons\icons8-add-new-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Remark 3</value>
</data>
<data name="icons8_close_window_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-close-window-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_cancel_50" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_cancel_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-cancel-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\icons8-cancel-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -229,21 +235,18 @@
<data name="icons8_clear_symbol_50" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_clear_symbol_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-clear-symbol-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\icons8-clear-symbol-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_edit_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-edit-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8-support-50" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8-support-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-support-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\icons8-support-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="25" xml:space="preserve">
<value>Horizontal Angle Correction</value>
</data>
<data name="79" xml:space="preserve"> <data name="79" xml:space="preserve">
<value>Remark 9</value> <value>Remark 9</value>
</data> </data>
<data name="Save_as_24" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="Save_as_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\Save-as-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\Save-as-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="41" xml:space="preserve">
<value>Code-Block ID</value>
</data>
<data name="74" xml:space="preserve"> <data name="74" xml:space="preserve">
<value>Remark 4</value> <value>Remark 4</value>
</data> </data>
@ -253,6 +256,9 @@
<data name="icons8_drawing_compass_48" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_drawing_compass_48" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-drawing-compass-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\icons8-drawing-compass-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8-menu-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-menu-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="44" xml:space="preserve"> <data name="44" xml:space="preserve">
<value>Information 3</value> <value>Information 3</value>
</data> </data>
@ -265,6 +271,9 @@
<data name="11" xml:space="preserve"> <data name="11" xml:space="preserve">
<value>Point number</value> <value>Point number</value>
</data> </data>
<data name="31" xml:space="preserve">
<value>Slope distance</value>
</data>
<data name="icons8_info_squared_50" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_info_squared_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-info-squared-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\icons8-info-squared-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
@ -283,14 +292,11 @@
<data name="88" xml:space="preserve"> <data name="88" xml:space="preserve">
<value>Instrument height</value> <value>Instrument height</value>
</data> </data>
<data name="42" xml:space="preserve">
<value>Information 1</value>
</data>
<data name="icons8-question-mark-48" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8-question-mark-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-question-mark-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\icons8-question-mark-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="19" xml:space="preserve"> <data name="icons8_opened_folder_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Time</value> <value>Icons\icons8-opened-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_no_entry_50" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_no_entry_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-no-entry-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\icons8-no-entry-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -298,8 +304,8 @@
<data name="icons8_save_as_50" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_save_as_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-save-as-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\icons8-save-as-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8_add_folder_50" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8-move-to-folder-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-add-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\icons8-move-to-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="README" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="README" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\README.md;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value> <value>..\README.md;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
@ -310,8 +316,8 @@
<data name="icons8_connection_status_on_48" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_connection_status_on_48" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-connection-status-on-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\icons8-connection-status-on-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="82" xml:space="preserve"> <data name="48" xml:space="preserve">
<value>Northing</value> <value>Information 7</value>
</data> </data>
<data name="71" xml:space="preserve"> <data name="71" xml:space="preserve">
<value>Remark 1</value> <value>Remark 1</value>
@ -325,14 +331,11 @@
<data name="46" xml:space="preserve"> <data name="46" xml:space="preserve">
<value>Information 5</value> <value>Information 5</value>
</data> </data>
<data name="75" xml:space="preserve">
<value>Remark 5</value>
</data>
<data name="87" xml:space="preserve"> <data name="87" xml:space="preserve">
<value>Reflector height</value> <value>Reflector height</value>
</data> </data>
<data name="icons8-move-to-folder-50" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8_add_new_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-move-to-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\icons8-add-new-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8-add-folder-50" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8-add-folder-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-add-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\icons8-add-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -340,11 +343,11 @@
<data name="32" xml:space="preserve"> <data name="32" xml:space="preserve">
<value>Horizontal distance</value> <value>Horizontal distance</value>
</data> </data>
<data name="31" xml:space="preserve"> <data name="icons8_edit_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Slope distance</value> <value>Icons\icons8-edit-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="25" xml:space="preserve"> <data name="41" xml:space="preserve">
<value>Horizontal Angle Correction</value> <value>Code-Block ID</value>
</data> </data>
<data name="21" xml:space="preserve"> <data name="21" xml:space="preserve">
<value>Horizontal Angle</value> <value>Horizontal Angle</value>
@ -352,10 +355,10 @@
<data name="84" xml:space="preserve"> <data name="84" xml:space="preserve">
<value>St. Easting</value> <value>St. Easting</value>
</data> </data>
<data name="icons8_close_window_50" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="42" xml:space="preserve">
<value>Icons\icons8-close-window-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Information 1</value>
</data> </data>
<data name="icons8-menu-50" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8-program-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Icons\icons8-menu-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>Icons\icons8-program-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
</root> </root>

BIN
NAVODILA.docx
View File

Binary file not shown.

BIN
Navodila.pdf
View File

Binary file not shown.

2
Podatki/TEST.GSI
View File

@ -2,7 +2,7 @@
*110001+00000000000GS001 81..00+0000000465423089 82..00+0000000110526243 83..00+0000000000301586 *110001+00000000000GS001 81..00+0000000465423089 82..00+0000000110526243 83..00+0000000000301586
*110002+00000000000GS002 81..00+0000000465437688 82..00+0000000110547569 83..00+0000000000302107 *110002+00000000000GS002 81..00+0000000465437688 82..00+0000000110547569 83..00+0000000000302107
*110003+00000000000GS003 81..00+0000000465472908 82..00+0000000110527226 83..00+0000000000302945 *110003+00000000000GS003 81..00+0000000465472908 82..00+0000000110527226 83..00+0000000000302945
*410000+0000000000000002 71....+0000000000000021 72....+0000000000001018 *410000+0000000000000002 71....+0000000000000021 72....+0000000000001015
*410010+0000000000000040 *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 *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 *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

1
TPS1100 Convert.vbproj
View File

@ -312,6 +312,7 @@
</AdditionalFiles> </AdditionalFiles>
<None Include="My Project\Icons\icons8-check-file-50.png" /> <None Include="My Project\Icons\icons8-check-file-50.png" />
<None Include="My Project\Icons\icons8-menu-50.png" /> <None Include="My Project\Icons\icons8-menu-50.png" />
<None Include="My Project\Icons\icons8-program-50.png" />
<Content Include="Podatki\TEST.txt" /> <Content Include="Podatki\TEST.txt" />
<Content Include="TPS1100CNVRT.ico" /> <Content Include="TPS1100CNVRT.ico" />
</ItemGroup> </ItemGroup>

2
bin/Release/TPS1100 Convert.application
View File

@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms> </dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>6inyc06EaaiiQbENLu4O26A0+UreBmMRXBr2zOBZ+Oo=</dsig:DigestValue> <dsig:DigestValue>/DkdR56COHObj9giV2E0l61IAzO+md9Pky9OL5Q23Wo=</dsig:DigestValue>
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>

BIN
bin/Release/TPS1100 Convert.exe
View File

Binary file not shown.

4
bin/Release/TPS1100 Convert.exe.manifest
View File

@ -43,14 +43,14 @@
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
<dependency> <dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TPS1100 Convert.exe" size="1234944"> <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TPS1100 Convert.exe" size="1237504">
<assemblyIdentity name="TPS1100 Convert" version="2.7.0.0" language="neutral" processorArchitecture="msil" /> <assemblyIdentity name="TPS1100 Convert" version="2.7.0.0" language="neutral" processorArchitecture="msil" />
<hash> <hash>
<dsig:Transforms> <dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms> </dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>Ck+Hsj11hMK8XQwT0taSkNmh9irYI8LWuZWYNSXLE/M=</dsig:DigestValue> <dsig:DigestValue>7ul3Fat4JHehkb1CL+AbZculEufU9xDq2Y/gl1LZi88=</dsig:DigestValue>
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>

BIN
bin/Release/app.publish/TPS1100 Convert.exe
View File

Binary file not shown.

BIN
bin/TPS1100-Convert_2.7.0.0_Portable.zip
View File

Binary file not shown.

11
tps1100_nastavitve.cfg Normal file
View File

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