diff --git a/App.config b/App.config index f08123f..7d4fc9f 100644 --- a/App.config +++ b/App.config @@ -11,7 +11,7 @@ - C:\ + Pika @@ -28,6 +28,45 @@ + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 80 + + + 90 + + + 91 + + + 99 + + + 1 + + + 2 + + + + diff --git a/Form1.Designer.vb b/Form1.Designer.vb index 18c5352..b141ab2 100644 --- a/Form1.Designer.vb +++ b/Form1.Designer.vb @@ -33,23 +33,19 @@ Partial Class Form1 Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() Me.tsbFileName = New System.Windows.Forms.ToolStripTextBox() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() - Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() - Me.tsbDecimale = New System.Windows.Forms.ToolStripComboBox() - Me.ToolStripLabel2 = New System.Windows.Forms.ToolStripLabel() - Me.tsbStolpci = New System.Windows.Forms.ToolStripComboBox() - Me.ToolStripLabel3 = New System.Windows.Forms.ToolStripLabel() - Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() Me.tsbOpenFile = New System.Windows.Forms.ToolStripButton() - Me.TsbOdpriXYZ = New System.Windows.Forms.ToolStripButton() + Me.ToolStripButtonPripravi = New System.Windows.Forms.ToolStripButton() + Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.LabelDatoteka = New System.Windows.Forms.ToolStripLabel() Me.ButtonUrediDat = New System.Windows.Forms.ToolStripButton() Me.tsbConvert = New System.Windows.Forms.ToolStripButton() Me.tsbPointsOnly = New System.Windows.Forms.ToolStripButton() Me.tsbHelp = 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.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() + Me.OpenFileDialogTocke = New System.Windows.Forms.OpenFileDialog() Me.StatusStrip1.SuspendLayout() Me.ToolStrip1.SuspendLayout() Me.SuspendLayout() @@ -60,13 +56,13 @@ Partial Class Form1 Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.RichTextBox1.BackColor = System.Drawing.Color.Ivory - Me.RichTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.RichTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle 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.Location = New System.Drawing.Point(9, 47) + Me.RichTextBox1.Margin = New System.Windows.Forms.Padding(0, 0, 0, 1) Me.RichTextBox1.Name = "RichTextBox1" Me.RichTextBox1.ReadOnly = True - Me.RichTextBox1.Size = New System.Drawing.Size(1233, 680) + Me.RichTextBox1.Size = New System.Drawing.Size(1233, 671) Me.RichTextBox1.TabIndex = 1 Me.RichTextBox1.Text = resources.GetString("RichTextBox1.Text") Me.RichTextBox1.WordWrap = False @@ -114,7 +110,7 @@ Partial Class Form1 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 29) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 37) ' 'tsbFileName ' @@ -125,97 +121,50 @@ Partial Class Form1 Me.tsbFileName.Name = "tsbFileName" Me.tsbFileName.ReadOnly = True Me.tsbFileName.Size = New System.Drawing.Size(200, 25) - Me.tsbFileName.Text = "Odpri datoteko..." ' 'ToolStrip1 ' Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden - Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(22, 22) - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbOpenFile, Me.TsbOdpriXYZ, Me.ToolStripSeparator2, Me.LabelDatoteka, Me.tsbFileName, Me.ButtonUrediDat, Me.ToolStripSeparator1, Me.tsbConvert, Me.tsbPointsOnly, Me.tsbHelp, Me.ToolStripSeparator4, Me.tsbSaveAs, Me.ToolStripButtonNast, Me.ToolStripSeparator3, Me.tsbDecimale, Me.ToolStripLabel2, Me.tsbStolpci, Me.ToolStripLabel3, Me.ToolStripSeparator5}) + Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(30, 30) + Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButtonPripravi, Me.ToolStripSeparator2, Me.tsbOpenFile, Me.LabelDatoteka, Me.tsbFileName, Me.ButtonUrediDat, Me.ToolStripSeparator1, Me.tsbConvert, Me.tsbPointsOnly, Me.tsbHelp, Me.ToolStripSeparator4, Me.tsbSaveAs, Me.ToolStripButtonNast, Me.ToolStripSeparator3}) Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) Me.ToolStrip1.Name = "ToolStrip1" Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(10, 5, 10, 5) - Me.ToolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System - Me.ToolStrip1.Size = New System.Drawing.Size(1251, 39) + Me.ToolStrip1.Size = New System.Drawing.Size(1251, 47) Me.ToolStrip1.TabIndex = 0 Me.ToolStrip1.Text = "ToolStrip1" ' - 'ToolStripSeparator2 - ' - Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 29) - ' - 'ToolStripSeparator4 - ' - Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(6, 29) - ' - 'ToolStripSeparator3 - ' - Me.ToolStripSeparator3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 29) - ' - 'tsbDecimale - ' - Me.tsbDecimale.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.tsbDecimale.DropDownWidth = 50 - Me.tsbDecimale.Items.AddRange(New Object() {"Pika", "Vejica"}) - Me.tsbDecimale.Name = "tsbDecimale" - Me.tsbDecimale.Size = New System.Drawing.Size(75, 29) - ' - 'ToolStripLabel2 - ' - Me.ToolStripLabel2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripLabel2.Name = "ToolStripLabel2" - Me.ToolStripLabel2.Size = New System.Drawing.Size(30, 26) - Me.ToolStripLabel2.Text = "Dec." - ' - 'tsbStolpci - ' - Me.tsbStolpci.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.tsbStolpci.Items.AddRange(New Object() {"Presledek", "Tabulator"}) - Me.tsbStolpci.Name = "tsbStolpci" - Me.tsbStolpci.Size = New System.Drawing.Size(100, 29) - ' - 'ToolStripLabel3 - ' - Me.ToolStripLabel3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripLabel3.Name = "ToolStripLabel3" - Me.ToolStripLabel3.Size = New System.Drawing.Size(43, 26) - Me.ToolStripLabel3.Text = "Stolpci" - ' - 'ToolStripSeparator5 - ' - Me.ToolStripSeparator5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(6, 29) - ' 'tsbOpenFile ' Me.tsbOpenFile.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_opened_folder_50 Me.tsbOpenFile.ImageTransparentColor = System.Drawing.Color.Magenta Me.tsbOpenFile.Name = "tsbOpenFile" - Me.tsbOpenFile.Size = New System.Drawing.Size(63, 26) - Me.tsbOpenFile.Text = "Odpri" + Me.tsbOpenFile.Size = New System.Drawing.Size(91, 34) + Me.tsbOpenFile.Text = "Odpri GSI" Me.tsbOpenFile.ToolTipText = "Izberi GSI datoteko..." ' - 'TsbOdpriXYZ + 'ToolStripButtonPripravi ' - Me.TsbOdpriXYZ.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_send_file_50 - Me.TsbOdpriXYZ.ImageTransparentColor = System.Drawing.Color.Magenta - Me.TsbOdpriXYZ.Name = "TsbOdpriXYZ" - Me.TsbOdpriXYZ.Size = New System.Drawing.Size(62, 26) - Me.TsbOdpriXYZ.Text = "Uvozi" - Me.TsbOdpriXYZ.ToolTipText = "Uvozi iz KOO ali TXT datoteke..." + 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..." + ' + 'ToolStripSeparator2 + ' + Me.ToolStripSeparator2.Name = "ToolStripSeparator2" + Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 37) ' 'LabelDatoteka ' Me.LabelDatoteka.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.LabelDatoteka.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_question_mark_48 + Me.LabelDatoteka.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_window_50 Me.LabelDatoteka.Name = "LabelDatoteka" - Me.LabelDatoteka.Size = New System.Drawing.Size(22, 26) + Me.LabelDatoteka.Size = New System.Drawing.Size(30, 34) Me.LabelDatoteka.Text = "Datoteka" + Me.LabelDatoteka.ToolTipText = "Ni datoteke" ' 'ButtonUrediDat ' @@ -223,9 +172,9 @@ Partial Class Form1 Me.ButtonUrediDat.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_edit_50 Me.ButtonUrediDat.ImageTransparentColor = System.Drawing.Color.Magenta Me.ButtonUrediDat.Name = "ButtonUrediDat" - Me.ButtonUrediDat.Size = New System.Drawing.Size(61, 26) + Me.ButtonUrediDat.Size = New System.Drawing.Size(69, 34) Me.ButtonUrediDat.Text = "Uredi" - Me.ButtonUrediDat.ToolTipText = "Uredi GSI" + Me.ButtonUrediDat.ToolTipText = "Uredi podatke GSI datoteke..." ' 'tsbConvert ' @@ -234,7 +183,7 @@ Partial Class Form1 Me.tsbConvert.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_land_surveying_48 Me.tsbConvert.ImageTransparentColor = System.Drawing.Color.Magenta Me.tsbConvert.Name = "tsbConvert" - Me.tsbConvert.Size = New System.Drawing.Size(73, 26) + Me.tsbConvert.Size = New System.Drawing.Size(81, 34) Me.tsbConvert.Text = "Meritve" Me.tsbConvert.ToolTipText = "Izvozi zapisnik meritev." ' @@ -245,7 +194,7 @@ Partial Class Form1 Me.tsbPointsOnly.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_connection_status_on_48 Me.tsbPointsOnly.ImageTransparentColor = System.Drawing.Color.Magenta Me.tsbPointsOnly.Name = "tsbPointsOnly" - Me.tsbPointsOnly.Size = New System.Drawing.Size(64, 26) + Me.tsbPointsOnly.Size = New System.Drawing.Size(72, 34) Me.tsbPointsOnly.Text = "Točke" Me.tsbPointsOnly.ToolTipText = "Izvozi koordinate točk." ' @@ -255,10 +204,15 @@ Partial Class Form1 Me.tsbHelp.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_info_50 Me.tsbHelp.ImageTransparentColor = System.Drawing.Color.Magenta Me.tsbHelp.Name = "tsbHelp" - Me.tsbHelp.Size = New System.Drawing.Size(54, 26) + Me.tsbHelp.Size = New System.Drawing.Size(62, 34) Me.tsbHelp.Text = "Info" Me.tsbHelp.ToolTipText = "O programu..." ' + 'ToolStripSeparator4 + ' + Me.ToolStripSeparator4.Name = "ToolStripSeparator4" + Me.ToolStripSeparator4.Size = New System.Drawing.Size(6, 37) + ' 'tsbSaveAs ' Me.tsbSaveAs.Enabled = False @@ -266,7 +220,7 @@ Partial Class Form1 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(85, 26) + Me.tsbSaveAs.Size = New System.Drawing.Size(93, 34) Me.tsbSaveAs.Text = "Shrani ..." ' 'ToolStripButtonNast @@ -275,10 +229,20 @@ Partial Class Form1 Me.ToolStripButtonNast.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_tools_50 Me.ToolStripButtonNast.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButtonNast.Name = "ToolStripButtonNast" - Me.ToolStripButtonNast.Size = New System.Drawing.Size(88, 26) + Me.ToolStripButtonNast.Size = New System.Drawing.Size(96, 34) 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|*.*" + ' 'Form1 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -312,8 +276,6 @@ Partial Class Form1 Friend WithEvents tsbSaveAs As ToolStripButton Friend WithEvents ToolStrip1 As ToolStrip Friend WithEvents ToolStripSeparator3 As ToolStripSeparator - Friend WithEvents ToolStripLabel2 As ToolStripLabel - Friend WithEvents tsbDecimale As ToolStripComboBox Friend WithEvents ToolStripStatusLabel1 As ToolStripStatusLabel Friend WithEvents ToolStripStatusLabel2 As ToolStripStatusLabel Friend WithEvents tsbPointsOnly As ToolStripButton @@ -322,10 +284,8 @@ Partial Class Form1 Friend WithEvents ButtonUrediDat As ToolStripButton Friend WithEvents ToolStripSeparator2 As ToolStripSeparator Friend WithEvents LabelDatoteka As ToolStripLabel - Friend WithEvents ToolStripSeparator5 As ToolStripSeparator - Friend WithEvents tsbStolpci As ToolStripComboBox - Friend WithEvents ToolStripLabel3 As ToolStripLabel Friend WithEvents ToolStripProgressBar1 As ToolStripProgressBar Friend WithEvents ToolStripButtonNast As ToolStripButton - Friend WithEvents TsbOdpriXYZ As ToolStripButton + Friend WithEvents ToolStripButtonPripravi As ToolStripButton + Friend WithEvents OpenFileDialogTocke As OpenFileDialog End Class diff --git a/Form1.resx b/Form1.resx index 09040a1..32d0ccc 100644 --- a/Form1.resx +++ b/Form1.resx @@ -148,6 +148,9 @@ Lokacija zapisnika = 17, 17 + + 519, 17 + diff --git a/Form1.vb b/Form1.vb index 7aa7a91..4a0505d 100644 --- a/Form1.vb +++ b/Form1.vb @@ -10,9 +10,14 @@ Public Class Form1 My.Settings.Save() End If My.Forms.Form1.Text = My.Application.Info.Title + " " + My.Application.Info.Version.Major.ToString + "." + My.Application.Info.Version.Minor.ToString + "." + My.Application.Info.Version.Build.ToString + "." + My.Application.Info.Version.Revision.ToString - tsbDecimale.Text = My.Settings.DecimalnoLocilo - tsbStolpci.SelectedIndex = My.Settings.Stolpci RichTextBox1.AppendText(My.Settings.DatLogfile.ToString) + + If My.Settings.Pisava = "" Then + My.Settings.Pisava = RichTextBox1.Font.Name + My.Settings.PisavaVelikost = RichTextBox1.Font.Size + My.Settings.Save() + End If + RichTextBox1.Font = New Font(My.Settings.Pisava, My.Settings.PisavaVelikost) End Sub Public streamLines As Integer = 0 @@ -21,6 +26,7 @@ Public Class Form1 If OpenFileDialog1.ShowDialog = DialogResult.OK Then RichTextBox1.Clear() ToolStripProgressBar1.Value = 0 + streamLines = 0 Dim streamReader As StreamReader = New StreamReader(OpenFileDialog1.FileName) Do Until streamReader.EndOfStream RichTextBox1.AppendText(streamReader.ReadLine + vbCrLf) @@ -31,8 +37,7 @@ Public Class Form1 streamReader.Dispose() My.Settings.Datoteka = OpenFileDialog1.SafeFileName - My.Settings.ZadnjaMapa = OpenFileDialog1.FileName - My.Settings.Stolpci = tsbStolpci.SelectedIndex + My.Settings.ZadnjaMapa = Path.GetDirectoryName(OpenFileDialog1.FileName) tsbFileName.Text = My.Settings.Datoteka ToolStripStatusLabel1.Text = My.Settings.ZadnjaMapa tsbSaveAs.Text = "Shrani ..." @@ -58,20 +63,20 @@ Public Class Form1 ToolStripStatusLabel1.Text = "Procesiranje..." RichTextBox1.Clear() RichTextBox1.BackColor = SystemColors.Info - RichTextBox1.AppendText("TPS 1100 Zapisnik" + vbCrLf + "++++++++++++++++++++++++++++++++" + vbCrLf) + RichTextBox1.AppendText("TPS 1100 Zapisnik" + vbCrLf + "++++++++++++++++++++++" + vbCrLf) ToolStripProgressBar1.Maximum = streamLines ' prepare StreamReader Dim streamReader As StreamReader = New StreamReader(OpenFileDialog1.FileName) Dim i As Integer = 0 Dim PodatkiStojisce As Boolean = False Dim dataStolpci As String = "" - If tsbStolpci.SelectedIndex = 0 Then + If My.Settings.Stolpci = 0 Then dataStolpci = " " - ElseIf tsbStolpci.SelectedIndex = 1 Then + ElseIf My.Settings.Stolpci = 1 Then dataStolpci = vbTab End If - My.Settings.Stolpci = tsbStolpci.SelectedIndex - My.Settings.Save() + Dim dataKoda As String = "" + ' loop untill end of stream Do Until streamReader.EndOfStream ' Read and Split each line to separate it into fields @@ -82,12 +87,12 @@ Public Class Form1 ' Check if it's a new station setup If Microsoft.VisualBasic.Left(line(1), 2) = "25" Then RichTextBox1.AppendText(vbCrLf + "Station:" + vbCrLf + "****************" + vbCrLf) - RichTextBox1.AppendText("PtID" + dataStolpci + "HzCor" + dataStolpci + "StnE" + dataStolpci + "StnN" + dataStolpci + "StnH" + dataStolpci + "ReflHt" + dataStolpci + "InstHt" + vbCrLf) + RichTextBox1.AppendText("PtID" + dataStolpci + "HzCor" + dataStolpci + "StnE" + dataStolpci + "StnN" + dataStolpci + "StnH" + dataStolpci + "RefHt" + dataStolpci + "InstHt" + vbCrLf) End If If Microsoft.VisualBasic.Left(line(1), 2) = "84" Then RichTextBox1.AppendText(vbCrLf + "Station:" + vbCrLf + "****************" + vbCrLf) - RichTextBox1.AppendText("PtID" + dataStolpci + "StnE" + dataStolpci + "StnN" + dataStolpci + "StnH" + dataStolpci + "ReflHt" + dataStolpci + "InstHt" + vbCrLf) + RichTextBox1.AppendText("PtID" + dataStolpci + "StnE" + dataStolpci + "StnN" + dataStolpci + "StnH" + dataStolpci + "RefHt" + dataStolpci + "InstHt" + vbCrLf) End If ' Seaparate word index and data For Each readLine As String In line @@ -134,38 +139,46 @@ Public Class Form1 data = dataStolpci + "Offset= " + Format(numData, "0.000") ElseIf wordIndex = "41" Then ' Code 'numData = data - 'data = "Code= " + numData.ToString + dataKoda = Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c) If My.Settings.KodeUporabnik = "Da" Then - If data = "+0000000000000010" Then - data = vbCrLf + "Setup: Quick Set" + vbCrLf + "=============================" + vbCrLf + "Hz" + dataStolpci + "V" + dataStolpci + "SD" + If dataKoda = My.Settings.KodaQuickSet Then + data = vbCrLf + "Setup: Quick Set" + vbCrLf + "======================" + vbCrLf + "Hz" + dataStolpci + "V" + dataStolpci + "SD" PodatkiStojisce = True End If - If data = "+0000000000000020" Then - data = vbCrLf + "Setup: Set Hz" + vbCrLf + "=============================" + vbCrLf + "PtID" + dataStolpci + "HZ" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "ReflHt" + dataStolpci + "PrCon" + dataStolpci + "HtDif" + dataStolpci + "PtCode" + If dataKoda = My.Settings.KodaSetAzi Then + data = vbCrLf + "Setup: Set Hz" + vbCrLf + "======================" + vbCrLf + "PtID" + dataStolpci + "HZ" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "RefHt" + dataStolpci + "PrCons" + dataStolpci + "HtDif" + dataStolpci + "PtCode" PodatkiStojisce = True End If - If data = "+0000000000000030" Then - data = vbCrLf + "Setup: Resection" + vbCrLf + "=============================" + vbCrLf + "PtID" + dataStolpci + "HZ" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "ReflHt" + dataStolpci + "PrCon" + dataStolpci + "HtDif" + dataStolpci + "PtCode" + If dataKoda = My.Settings.KodaResection Then + data = vbCrLf + "Setup: Resection" + vbCrLf + "======================" + vbCrLf + "PtID" + dataStolpci + "HZ" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "RefHt" + dataStolpci + "PrCons" + dataStolpci + "HtDif" + dataStolpci + "PtCode" PodatkiStojisce = True End If - If data = "+0000000000000040" Then - data = vbCrLf + "Setup: Free Station" + vbCrLf + "=============================" + vbCrLf + "PtID" + dataStolpci + "HZ" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "ReflHt" + dataStolpci + "PrCon" + dataStolpci + "HtDif" + dataStolpci + "PtCode" + If dataKoda = My.Settings.KodaFreeStation Then + data = vbCrLf + "Setup: Free Station" + vbCrLf + "======================" + vbCrLf + "PtID" + dataStolpci + "HZ" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "RefHt" + dataStolpci + "PrCons" + dataStolpci + "HtDif" + dataStolpci + "PtCode" PodatkiStojisce = True End If - If data = "+0000000000000050" Then - data = vbCrLf + "Setup: Orientation & Ht. transfer" + vbCrLf + "=============================" + vbCrLf + "PtID" + dataStolpci + "HZ" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "ReflHt" + dataStolpci + "PrCon" + dataStolpci + "HtDif" + dataStolpci + "PtCode" + If dataKoda = My.Settings.KodaOriHtTrans Then + data = vbCrLf + "Setup: Orientation & Ht. transfer" + vbCrLf + "======================" + vbCrLf + "PtID" + dataStolpci + "HZ" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "RefHt" + dataStolpci + "PrCons" + dataStolpci + "HtDif" + dataStolpci + "PtCode" PodatkiStojisce = True End If - If data = "+0000000000000090" Then - 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" + 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" PodatkiStojisce = False End If - If data = "+0000000000000099" Then + 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" + 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 data = vbCrLf + "Imported/User-Entered:" + vbCrLf + "----------------------" + vbCrLf + "PtID" + dataStolpci + "E" + dataStolpci + "N" + dataStolpci + "H" PodatkiStojisce = False End If - If data = "+00000000STA_OFFS" Then - data = "Offsets: " + vbCrLf + If dataKoda = "STA_OFFS" Then + data = "Offsets:" + vbCrLf PodatkiStojisce = False End If End If @@ -181,7 +194,7 @@ Public Class Form1 data = dataStolpci + "Info6= " + Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c) ElseIf wordIndex = "58" Then ' Prism constant numData = data / 10000 - data = dataStolpci + numData.ToString + data = dataStolpci + Format(numData, "0.0000") ElseIf wordIndex = "71" Then ' Point Code dataTmp = Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c) If dataTmp = "" Then @@ -227,7 +240,7 @@ Public Class Form1 numData = 0 data = "" End If - If tsbDecimale.Text = "Pika" Then + If My.Settings.DecimalnoLocilo = "Pika" Then If wordIndex IsNot "11" Then data = data.ToString.Replace(",", ".") End If @@ -239,22 +252,21 @@ Public Class Form1 RichTextBox1.AppendText(vbCrLf) i = i + 1 Loop + streamReader.Close() ToolStripStatusLabel1.Text = "Prebrano: " + i.ToString + "/" + ToolStripProgressBar1.Maximum.ToString + " vrstic" SaveFileDialog1.Filter = "Zapisnik meritve|*.mer|Text file|*.txt|All files|*.*" - streamReader.Close() tsbSaveAs.Enabled = True tsbSaveAs.Text = "Shrani Zapisnik" End Sub Private Sub tsbPointsOnly_Click(sender As Object, e As EventArgs) Handles tsbPointsOnly.Click Dim dataStolpci As String = "" - If tsbStolpci.SelectedIndex = 0 Then + If My.Settings.Stolpci = 0 Then dataStolpci = " " - ElseIf tsbStolpci.SelectedIndex = 1 Then + ElseIf My.Settings.Stolpci = 1 Then dataStolpci = vbTab End If - My.Settings.Stolpci = tsbStolpci.SelectedIndex - My.Settings.Save() + RichTextBox1.Clear() RichTextBox1.BackColor = SystemColors.Info Dim measuredPoints As Integer = 0 @@ -273,7 +285,10 @@ Public Class Form1 dataKoda = 0 End If ToolStripProgressBar1.Value = i - If Microsoft.VisualBasic.Left(line(1), 2) = "25" Then + 'If Microsoft.VisualBasic.Left(line(1), 2) = "81" Then + ' measuredPoints = 1 + 'Else + If Microsoft.VisualBasic.Left(line(1), 2) = "25" Or Microsoft.VisualBasic.Left(line(1), 2) = "84" Then measuredPoints = 2 End If ' Seaparate word index and data @@ -284,23 +299,19 @@ Public Class Form1 Else ' wordindex is always 6 characters long and is read fron left to right Dim wordIndex As String - wordIndex = Microsoft.VisualBasic.Left(readLine, 2) - ' data is always 17 characters long and is read from right to left and has a +/- sign in first place Dim data As String Dim numData As Double + wordIndex = Microsoft.VisualBasic.Left(readLine, 2) data = Microsoft.VisualBasic.Right(readLine, 17) If wordIndex = "41" Then - If data = "+00000000STA_OFFS" Then - data = "90" - End If - numData = data - If numData = 90 Then + Dim dataInfo As String = Microsoft.VisualBasic.Right(readLine, 16).TrimStart("0"c) + If dataInfo = My.Settings.KodaMeas Or dataInfo = My.Settings.KodaMeasOri Or dataInfo = My.Settings.KodaStake Then measuredPoints = 1 - ElseIf numData < 90 Then - measuredPoints = 0 - Else + ElseIf dataInfo = My.Settings.KodaUserImport Then measuredPoints = 2 + Else + measuredPoints = 0 End If End If If wordIndex = "71" And measuredPoints >= 1 Then ' Point Code @@ -310,7 +321,6 @@ Public Class Form1 Else RichTextBox1.AppendText(dataStolpci + data) End If - End If If wordIndex = "11" And measuredPoints >= 1 Then data = Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c) @@ -319,21 +329,21 @@ Public Class Form1 ElseIf wordIndex = "81" And measuredPoints >= 1 Then ' Target Easting numData = data / 1000 data = Format(numData, "0.000") - If tsbDecimale.Text = "Pika" Then + If My.Settings.DecimalnoLocilo = "Pika" Then data = data.ToString.Replace(",", ".") End If RichTextBox1.AppendText(dataStolpci + data) ElseIf wordIndex = "82" And measuredPoints >= 1 Then ' Target Northing numData = data / 1000 data = Format(numData, "0.000") - If tsbDecimale.Text = "Pika" Then + If My.Settings.DecimalnoLocilo = "Pika" Then data = data.ToString.Replace(",", ".") End If RichTextBox1.AppendText(dataStolpci + data) ElseIf wordIndex = "83" And measuredPoints >= 1 Then ' Target Height numData = data / 1000 data = Format(numData, "0.000") - If tsbDecimale.Text = "Pika" Then + If My.Settings.DecimalnoLocilo = "Pika" Then data = data.ToString.Replace(",", ".") End If If measuredPoints = 2 Then @@ -341,24 +351,24 @@ Public Class Form1 Else RichTextBox1.AppendText(dataStolpci + data + dataStolpci + "MEAS") End If - ElseIf wordIndex = "84" And measuredPoints = 2 Then ' Station Easting + ElseIf wordIndex = "84" And measuredPoints >= 1 Then ' Station Easting numData = data / 1000 data = Format(numData, "0.000") - If tsbDecimale.Text = "Pika" Then + If My.Settings.DecimalnoLocilo = "Pika" Then data = data.ToString.Replace(",", ".") End If RichTextBox1.AppendText(dataStolpci + data) - ElseIf wordIndex = "85" And measuredPoints = 2 Then ' Station Northing + ElseIf wordIndex = "85" And measuredPoints >= 1 Then ' Station Northing numData = data / 1000 data = Format(numData, "0.000") - If tsbDecimale.Text = "Pika" Then + If My.Settings.DecimalnoLocilo = "Pika" Then data = data.ToString.Replace(",", ".") End If RichTextBox1.AppendText(dataStolpci + data) - ElseIf wordIndex = "86" And measuredPoints = 2 Then ' Station Height + ElseIf wordIndex = "86" And measuredPoints >= 1 Then ' Station Height numData = data / 1000 data = Format(numData, "0.000") - If tsbDecimale.Text = "Pika" Then + If My.Settings.DecimalnoLocilo = "Pika" Then data = data.ToString.Replace(",", ".") End If RichTextBox1.AppendText(dataStolpci + data + dataStolpci + "STA") @@ -375,7 +385,7 @@ Public Class Form1 ToolStripProgressBar1.Value = lin Loop ToolStripStatusLabel1.Text = "Prebrano točk: " + i.ToString - SaveFileDialog1.Filter = "KOO datoteka|*.koo|Text file (Tab)|*.txt|All files|*.*" + SaveFileDialog1.Filter = "KOO|*.koo|TXT|*.txt|All files|*.*" streamReader.Close() tsbSaveAs.Enabled = True tsbSaveAs.Text = "Shrani Točke" @@ -383,23 +393,20 @@ Public Class Form1 Private Sub tsbSaveAs_Click(sender As Object, e As EventArgs) Handles tsbSaveAs.Click SaveFileDialog1.FileName = Path.GetFileNameWithoutExtension(OpenFileDialog1.FileName) + SaveFileDialog1.InitialDirectory = My.Settings.MapaShrani If SaveFileDialog1.ShowDialog = DialogResult.OK Then RichTextBox1.SaveFile(SaveFileDialog1.FileName, RichTextBoxStreamType.PlainText) - ToolStripStatusLabel1.Text = "Shranjeno: " + SaveFileDialog1.FileName.ToString - RichTextBox1.BackColor = SystemColors.ControlLightLight My.Computer.FileSystem.WriteAllText(DatotekaLogfile, System.DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss") + " | " + OpenFileDialog1.FileName.ToString + " -> " + SaveFileDialog1.FileName.ToString + vbCrLf, True) + My.Settings.MapaShrani = Path.GetDirectoryName(SaveFileDialog1.FileName) + My.Settings.Save() + ToolStripStatusLabel1.Text = "Datoteka shranjena >>> " + SaveFileDialog1.FileName.ToString + RichTextBox1.BackColor = SystemColors.ControlLightLight End If End Sub Private Sub tsbHelp_Click(sender As Object, e As EventArgs) Handles tsbHelp.Click ' MessageBox.Show("Za konvertiranje GSI datoteke najprej izberi datoteko, ki jo želiš konvertirati z ukazom 'Open File'. Nato izberi metodo konverzije (Poročilo, Merjene točke, Vse točke). Po končani knverziji shrani novo datoteko z ukazom 'Save As...'","Kratka navodila") SplashScreen1.ShowDialog() - - End Sub - - Private Sub ToolStripComboBox2_Click(sender As Object, e As EventArgs) Handles MyBase.FormClosing - My.Settings.DecimalnoLocilo = tsbDecimale.Text - My.Settings.Save() End Sub Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ButtonUrediDat.Click @@ -410,4 +417,35 @@ Public Class Form1 FormNastavitve.ShowDialog() End Sub + Private Sub ToolStripButtonPripravi_Click(sender As Object, e As EventArgs) Handles ToolStripButtonPripravi.Click + If OpenFileDialogTocke.ShowDialog = DialogResult.OK Then + RichTextBox1.Clear() + Dim streamReader As StreamReader = New StreamReader(OpenFileDialogTocke.FileName) + Do Until streamReader.EndOfStream + streamLines = streamLines + 1 + Dim readLine As String = streamReader.ReadLine().Replace(" ", vbTab) + readLine = readLine.Replace(";", vbTab) + readLine = readLine.Replace(".", ",") + Dim line() As String = readLine.Split(vbTab) + Dim podPtId As String = "*11" + Format(streamLines, "0000") + "+" + line(0).PadLeft(16, "0") + " " + Dim izrE As Double = line(1) * 1000 + Dim podE As String = "81..00+" + Format(izrE, "#0000000000000000") + " " + Dim izrN As Double = line(2) * 1000 + Dim podN As String = "82..00+" + Format(izrN, "#0000000000000000") + " " + Dim izrH As Double = line(3) * 1000 + Dim podH As String = "83..00+" + Format(izrH, "#0000000000000000") + " " + ' Dim podE As String = "81..00+" + izrE2.PadLeft(16, "0") + " " + RichTextBox1.AppendText(podPtId + podE + podN + podH + vbCrLf) + Loop + ToolStripProgressBar1.Maximum = streamLines + streamReader.Close() + streamReader.Dispose() + ToolStripStatusLabel1.Text = "Prebrano: " + streamLines.ToString + "/" + ToolStripProgressBar1.Maximum.ToString + " vrstic" + SaveFileDialog1.Filter = "GSI datoteka|*.GSI" + SaveFileDialog1.FileName = Path.GetFileNameWithoutExtension(OpenFileDialogTocke.FileName) + tsbSaveAs.Enabled = True + tsbSaveAs.Text = "Shrani GSI" + End If + End Sub + End Class diff --git a/Form2.Designer.vb b/Form2.Designer.vb index 2f0888e..e00e515 100644 --- a/Form2.Designer.vb +++ b/Form2.Designer.vb @@ -48,10 +48,11 @@ Partial Class Form2 ' 'RichTextBoxEdit ' + Me.RichTextBoxEdit.BackColor = System.Drawing.Color.Ivory Me.RichTextBoxEdit.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.RichTextBoxEdit.DetectUrls = False Me.RichTextBoxEdit.EnableAutoDragDrop = True - Me.RichTextBoxEdit.Font = New System.Drawing.Font("Courier New", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.RichTextBoxEdit.Font = New System.Drawing.Font("Courier New", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.RichTextBoxEdit.Location = New System.Drawing.Point(12, 35) Me.RichTextBoxEdit.Name = "RichTextBoxEdit" Me.RichTextBoxEdit.Size = New System.Drawing.Size(1160, 551) diff --git a/Form2.vb b/Form2.vb index d643c0f..3efdbfd 100644 --- a/Form2.vb +++ b/Form2.vb @@ -14,7 +14,7 @@ Public Class Form2 RichTextBoxEdit.Clear() ' prepare StreamReader - Dim streamReader As StreamReader = New StreamReader(My.Settings.ZadnjaMapa) + Dim streamReader As StreamReader = New StreamReader(My.Settings.ZadnjaMapa + "\" + My.Settings.Datoteka) Dim i As Integer = 0 ' loop untill end of stream @@ -24,7 +24,7 @@ Public Class Form2 RichTextBoxEdit.AppendText(line + vbCrLf) i = i + 1 Loop - ToolStripStatusLabel1.Text = "Prebrano: " + i.ToString + " | Datoteka: " + My.Settings.ZadnjaMapa + ToolStripStatusLabel1.Text = "Prebrano: " + i.ToString + " | Datoteka: " + My.Settings.ZadnjaMapa + "\" + My.Settings.Datoteka DatotekaSpemembe = False BtnShraniF2.Enabled = False streamReader.Close() @@ -63,7 +63,7 @@ Public Class Form2 Private Sub BtnShraniF2_Click(sender As Object, e As EventArgs) Handles BtnShraniF2.Click ' SaveFileDialog2.FileName = My.Settings.ZadnjaMapa ' If SaveFileDialog2.ShowDialog = DialogResult.OK Then - RichTextBoxEdit.SaveFile(My.Settings.ZadnjaMapa, RichTextBoxStreamType.PlainText) + RichTextBoxEdit.SaveFile(My.Settings.ZadnjaMapa + "\" + My.Settings.Datoteka, RichTextBoxStreamType.PlainText) ToolStripStatusLabel1.Text = "Shranjeno: " + SaveFileDialog2.FileName.ToString BtnShraniF2.Enabled = False DatotekaSpemembe = False @@ -113,4 +113,5 @@ Public Class Form2 Private Sub ToolStripButton3_Click(sender As Object, e As EventArgs) Handles ToolStripButton3.Click Me.Close() End Sub + End Class \ No newline at end of file diff --git a/FormNastavitve.Designer.vb b/FormNastavitve.Designer.vb index cb4ab56..e5a4a21 100644 --- a/FormNastavitve.Designer.vb +++ b/FormNastavitve.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class FormNastavitve Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,12 +20,9 @@ Partial Class FormNastavitve 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FormNastavitve)) - Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() - Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() - Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton() Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel() Me.RadioButton1 = New System.Windows.Forms.RadioButton() @@ -39,74 +36,86 @@ Partial Class FormNastavitve Me.ButtonOdpriLog = New System.Windows.Forms.Button() Me.OpenFileDialogLog = New System.Windows.Forms.OpenFileDialog() Me.SaveFileDialogLog = New System.Windows.Forms.SaveFileDialog() - Me.ToolStrip1.SuspendLayout() + Me.TableLayoutPanel3 = New System.Windows.Forms.TableLayoutPanel() + Me.Label15 = New System.Windows.Forms.Label() + Me.Label14 = New System.Windows.Forms.Label() + Me.Label13 = New System.Windows.Forms.Label() + Me.Label12 = New System.Windows.Forms.Label() + Me.TextBoxStojInfo = New System.Windows.Forms.TextBox() + Me.TextBoxStoj = New System.Windows.Forms.TextBox() + Me.TextBoxMeasOri = New System.Windows.Forms.TextBox() + Me.TextBoxQuickSet = New System.Windows.Forms.TextBox() + Me.Label9 = New System.Windows.Forms.Label() + Me.TextBoxSetAzi = New System.Windows.Forms.TextBox() + Me.TextBoxRes = New System.Windows.Forms.TextBox() + Me.TextBoxFree = New System.Windows.Forms.TextBox() + Me.TextBoxOriHt = New System.Windows.Forms.TextBox() + Me.Label8 = New System.Windows.Forms.Label() + Me.TextBoxImport = New System.Windows.Forms.TextBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.Label2 = New System.Windows.Forms.Label() + 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() + Me.Label11 = New System.Windows.Forms.Label() + Me.GroupBox4 = New System.Windows.Forms.GroupBox() + Me.LabelFontInfo = New System.Windows.Forms.Label() + Me.ButtonFont = New System.Windows.Forms.Button() + Me.FontDialog1 = New System.Windows.Forms.FontDialog() + Me.SaveFileDialogNast = New System.Windows.Forms.SaveFileDialog() + Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() + Me.DatotekaToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.IzvoziKodeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.UvoziKodeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() + Me.ZapriToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GroupBox1.SuspendLayout() Me.TableLayoutPanel1.SuspendLayout() Me.GroupBox2.SuspendLayout() Me.TableLayoutPanel2.SuspendLayout() Me.GroupBox3.SuspendLayout() + Me.TableLayoutPanel3.SuspendLayout() + Me.GroupBox4.SuspendLayout() + Me.MenuStrip1.SuspendLayout() Me.SuspendLayout() ' - 'ToolStrip1 - ' - Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton1, Me.ToolStripButton2}) - Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) - Me.ToolStrip1.Name = "ToolStrip1" - Me.ToolStrip1.Size = New System.Drawing.Size(309, 25) - Me.ToolStrip1.TabIndex = 1 - Me.ToolStrip1.Text = "ToolStrip1" - ' - 'ToolStripButton1 - ' - Me.ToolStripButton1.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_save_as_50 - Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta - Me.ToolStripButton1.Name = "ToolStripButton1" - Me.ToolStripButton1.Size = New System.Drawing.Size(60, 22) - Me.ToolStripButton1.Text = "Shrani" - ' - 'ToolStripButton2 - ' - Me.ToolStripButton2.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_50 - Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta - Me.ToolStripButton2.Name = "ToolStripButton2" - Me.ToolStripButton2.Size = New System.Drawing.Size(54, 22) - Me.ToolStripButton2.Text = "Zapri" - ' 'GroupBox1 ' Me.GroupBox1.Controls.Add(Me.TableLayoutPanel1) Me.GroupBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GroupBox1.Location = New System.Drawing.Point(12, 28) + Me.GroupBox1.Location = New System.Drawing.Point(257, 27) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(285, 66) - Me.GroupBox1.TabIndex = 2 + Me.GroupBox1.Size = New System.Drawing.Size(285, 87) + Me.GroupBox1.TabIndex = 0 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Ločilo med podatki" ' 'TableLayoutPanel1 ' - Me.TableLayoutPanel1.ColumnCount = 2 - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) + Me.TableLayoutPanel1.ColumnCount = 1 Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) Me.TableLayoutPanel1.Controls.Add(Me.RadioButton1, 0, 0) - Me.TableLayoutPanel1.Controls.Add(Me.RadioButton2, 1, 0) + Me.TableLayoutPanel1.Controls.Add(Me.RadioButton2, 0, 1) Me.TableLayoutPanel1.Location = New System.Drawing.Point(7, 22) Me.TableLayoutPanel1.Name = "TableLayoutPanel1" - Me.TableLayoutPanel1.RowCount = 1 - Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.Size = New System.Drawing.Size(272, 32) + Me.TableLayoutPanel1.RowCount = 2 + Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle()) + Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle()) + Me.TableLayoutPanel1.Size = New System.Drawing.Size(272, 59) Me.TableLayoutPanel1.TabIndex = 3 ' 'RadioButton1 ' - Me.RadioButton1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.RadioButton1.AutoSize = True Me.RadioButton1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.RadioButton1.Location = New System.Drawing.Point(3, 3) Me.RadioButton1.Name = "RadioButton1" - Me.RadioButton1.Size = New System.Drawing.Size(80, 26) + Me.RadioButton1.Size = New System.Drawing.Size(80, 19) Me.RadioButton1.TabIndex = 0 Me.RadioButton1.TabStop = True Me.RadioButton1.Text = "Presledek" @@ -115,14 +124,12 @@ Partial Class FormNastavitve ' 'RadioButton2 ' - Me.RadioButton2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.RadioButton2.AutoSize = True Me.RadioButton2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.RadioButton2.Location = New System.Drawing.Point(139, 3) + Me.RadioButton2.Location = New System.Drawing.Point(3, 28) Me.RadioButton2.Name = "RadioButton2" - Me.RadioButton2.Size = New System.Drawing.Size(77, 26) - Me.RadioButton2.TabIndex = 2 + Me.RadioButton2.Size = New System.Drawing.Size(77, 19) + Me.RadioButton2.TabIndex = 1 Me.RadioButton2.TabStop = True Me.RadioButton2.Text = "Tabulator" Me.RadioButton2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -132,36 +139,34 @@ Partial Class FormNastavitve ' Me.GroupBox2.Controls.Add(Me.TableLayoutPanel2) Me.GroupBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GroupBox2.Location = New System.Drawing.Point(12, 100) + Me.GroupBox2.Location = New System.Drawing.Point(257, 120) Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(285, 66) - Me.GroupBox2.TabIndex = 3 + Me.GroupBox2.Size = New System.Drawing.Size(285, 87) + Me.GroupBox2.TabIndex = 1 Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "Decimalno ločilo" ' 'TableLayoutPanel2 ' - Me.TableLayoutPanel2.ColumnCount = 2 - Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) + Me.TableLayoutPanel2.ColumnCount = 1 + Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) Me.TableLayoutPanel2.Controls.Add(Me.RadioButton3, 0, 0) - Me.TableLayoutPanel2.Controls.Add(Me.RadioButton4, 1, 0) + Me.TableLayoutPanel2.Controls.Add(Me.RadioButton4, 0, 1) Me.TableLayoutPanel2.Location = New System.Drawing.Point(7, 22) Me.TableLayoutPanel2.Name = "TableLayoutPanel2" - Me.TableLayoutPanel2.RowCount = 1 - Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel2.Size = New System.Drawing.Size(272, 32) + Me.TableLayoutPanel2.RowCount = 2 + Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle()) + Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle()) + Me.TableLayoutPanel2.Size = New System.Drawing.Size(272, 59) Me.TableLayoutPanel2.TabIndex = 3 ' 'RadioButton3 ' - Me.RadioButton3.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.RadioButton3.AutoSize = True Me.RadioButton3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.RadioButton3.Location = New System.Drawing.Point(3, 3) Me.RadioButton3.Name = "RadioButton3" - Me.RadioButton3.Size = New System.Drawing.Size(49, 26) + Me.RadioButton3.Size = New System.Drawing.Size(49, 19) Me.RadioButton3.TabIndex = 0 Me.RadioButton3.TabStop = True Me.RadioButton3.Text = "Pika" @@ -170,14 +175,12 @@ Partial Class FormNastavitve ' 'RadioButton4 ' - Me.RadioButton4.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.RadioButton4.AutoSize = True Me.RadioButton4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.RadioButton4.Location = New System.Drawing.Point(139, 3) + Me.RadioButton4.Location = New System.Drawing.Point(3, 28) Me.RadioButton4.Name = "RadioButton4" - Me.RadioButton4.Size = New System.Drawing.Size(58, 26) - Me.RadioButton4.TabIndex = 2 + Me.RadioButton4.Size = New System.Drawing.Size(58, 19) + Me.RadioButton4.TabIndex = 1 Me.RadioButton4.TabStop = True Me.RadioButton4.Text = "Vejica" Me.RadioButton4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -188,31 +191,33 @@ Partial Class FormNastavitve Me.GroupBox3.Controls.Add(Me.TextBoxLog) Me.GroupBox3.Controls.Add(Me.ButtonOdpriLog) Me.GroupBox3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GroupBox3.Location = New System.Drawing.Point(19, 173) + Me.GroupBox3.Location = New System.Drawing.Point(257, 296) Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(278, 97) - Me.GroupBox3.TabIndex = 4 + Me.GroupBox3.Size = New System.Drawing.Size(285, 56) + Me.GroupBox3.TabIndex = 3 Me.GroupBox3.TabStop = False Me.GroupBox3.Text = "Zapisnik obdelave podatkov" ' 'TextBoxLog ' Me.TextBoxLog.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.TextBoxLog.Location = New System.Drawing.Point(6, 21) + Me.TextBoxLog.Location = New System.Drawing.Point(6, 28) Me.TextBoxLog.Name = "TextBoxLog" - Me.TextBoxLog.Size = New System.Drawing.Size(231, 22) - Me.TextBoxLog.TabIndex = 1 + Me.TextBoxLog.Size = New System.Drawing.Size(235, 22) + Me.TextBoxLog.TabIndex = 0 ' 'ButtonOdpriLog ' - Me.ButtonOdpriLog.BackgroundImage = Global.TPS1100_Convert.My.Resources.Resources.icons8_browse_folder_50_2 + Me.ButtonOdpriLog.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.ButtonOdpriLog.AutoSize = True Me.ButtonOdpriLog.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.ButtonOdpriLog.FlatStyle = System.Windows.Forms.FlatStyle.Popup Me.ButtonOdpriLog.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.ButtonOdpriLog.Location = New System.Drawing.Point(244, 21) + Me.ButtonOdpriLog.Location = New System.Drawing.Point(253, 25) Me.ButtonOdpriLog.Name = "ButtonOdpriLog" - Me.ButtonOdpriLog.Size = New System.Drawing.Size(28, 22) - Me.ButtonOdpriLog.TabIndex = 0 + Me.ButtonOdpriLog.Size = New System.Drawing.Size(26, 26) + Me.ButtonOdpriLog.TabIndex = 1 + Me.ButtonOdpriLog.Text = "..." + Me.ButtonOdpriLog.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText Me.ButtonOdpriLog.UseVisualStyleBackColor = True ' 'OpenFileDialogLog @@ -228,16 +233,485 @@ Partial Class FormNastavitve Me.SaveFileDialogLog.FileName = "tps1100_log.txt" Me.SaveFileDialogLog.Filter = "Text File|*.txt" ' + 'TableLayoutPanel3 + ' + Me.TableLayoutPanel3.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.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.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.Location = New System.Drawing.Point(12, 27) + Me.TableLayoutPanel3.Name = "TableLayoutPanel3" + Me.TableLayoutPanel3.RowCount = 14 + 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!)) + 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!)) + 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!)) + 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!)) + 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, 402) + Me.TableLayoutPanel3.TabIndex = 0 + ' + 'Label15 + ' + Me.Label15.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + 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.Name = "Label15" + Me.Label15.Size = New System.Drawing.Size(39, 30) + Me.Label15.TabIndex = 22 + Me.Label15.Text = "Koda" + Me.Label15.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'Label14 + ' + Me.Label14.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label14.AutoSize = True + Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label14.Location = New System.Drawing.Point(3, 0) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(39, 30) + Me.Label14.TabIndex = 21 + Me.Label14.Text = "Koda" + Me.Label14.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'Label13 + ' + Me.Label13.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label13.AutoSize = True + Me.Label13.Location = New System.Drawing.Point(78, 60) + Me.Label13.Name = "Label13" + Me.Label13.Size = New System.Drawing.Size(88, 30) + Me.Label13.TabIndex = 5 + Me.Label13.Text = "Info Temp/Pritisk" + Me.Label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'Label12 + ' + Me.Label12.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + 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.TabIndex = 5 + Me.Label12.Text = "Stojišče" + Me.Label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'TextBoxStojInfo + ' + Me.TextBoxStojInfo.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.TextBoxStojInfo.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.TextBoxStojInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBoxStojInfo.Location = New System.Drawing.Point(3, 63) + Me.TextBoxStojInfo.Name = "TextBoxStojInfo" + Me.TextBoxStojInfo.Size = New System.Drawing.Size(69, 22) + Me.TextBoxStojInfo.TabIndex = 5 + Me.TextBoxStojInfo.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'TextBoxStoj + ' + Me.TextBoxStoj.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.TextBoxStoj.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.TextBoxStoj.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBoxStoj.Location = New System.Drawing.Point(3, 33) + Me.TextBoxStoj.Name = "TextBoxStoj" + Me.TextBoxStoj.Size = New System.Drawing.Size(69, 22) + Me.TextBoxStoj.TabIndex = 4 + Me.TextBoxStoj.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'TextBoxMeasOri + ' + Me.TextBoxMeasOri.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.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.Name = "TextBoxMeasOri" + Me.TextBoxMeasOri.Size = New System.Drawing.Size(69, 22) + Me.TextBoxMeasOri.TabIndex = 12 + Me.TextBoxMeasOri.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'TextBoxQuickSet + ' + Me.TextBoxQuickSet.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.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.Name = "TextBoxQuickSet" + Me.TextBoxQuickSet.Size = New System.Drawing.Size(69, 22) + Me.TextBoxQuickSet.TabIndex = 6 + Me.TextBoxQuickSet.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Label9 + ' + 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.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(58, 30) + Me.Label9.TabIndex = 16 + Me.Label9.Text = "Orientation" + Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'TextBoxSetAzi + ' + Me.TextBoxSetAzi.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.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.Name = "TextBoxSetAzi" + Me.TextBoxSetAzi.Size = New System.Drawing.Size(69, 22) + Me.TextBoxSetAzi.TabIndex = 7 + Me.TextBoxSetAzi.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'TextBoxRes + ' + Me.TextBoxRes.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.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.Name = "TextBoxRes" + Me.TextBoxRes.Size = New System.Drawing.Size(69, 22) + Me.TextBoxRes.TabIndex = 8 + Me.TextBoxRes.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'TextBoxFree + ' + Me.TextBoxFree.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.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.Name = "TextBoxFree" + Me.TextBoxFree.Size = New System.Drawing.Size(69, 22) + Me.TextBoxFree.TabIndex = 9 + Me.TextBoxFree.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'TextBoxOriHt + ' + Me.TextBoxOriHt.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.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.Name = "TextBoxOriHt" + Me.TextBoxOriHt.Size = New System.Drawing.Size(69, 22) + Me.TextBoxOriHt.TabIndex = 10 + Me.TextBoxOriHt.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Label8 + ' + Me.Label8.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label8.AutoSize = True + Me.Label8.Location = New System.Drawing.Point(78, 360) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(120, 30) + Me.Label8.TabIndex = 7 + Me.Label8.Text = "Imported / User-entered" + Me.Label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'TextBoxImport + ' + Me.TextBoxImport.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.TextBoxImport.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.TextBoxImport.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBoxImport.Location = New System.Drawing.Point(3, 363) + Me.TextBoxImport.Name = "TextBoxImport" + Me.TextBoxImport.Size = New System.Drawing.Size(69, 22) + Me.TextBoxImport.TabIndex = 14 + Me.TextBoxImport.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Label1 + ' + 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.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(54, 30) + Me.Label1.TabIndex = 0 + Me.Label1.Text = "Quick Set" + Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'Label2 + ' + 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.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(63, 30) + Me.Label2.TabIndex = 1 + Me.Label2.Text = "Set Azimuth" + Me.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'Label3 + ' + 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.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(55, 30) + Me.Label3.TabIndex = 2 + Me.Label3.Text = "Resection" + Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'Label4 + ' + 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.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(64, 30) + Me.Label4.TabIndex = 3 + Me.Label4.Text = "Free Station" + Me.Label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'Label5 + ' + 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.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) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + 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.Name = "TextBoxMeas" + Me.TextBoxMeas.Size = New System.Drawing.Size(69, 22) + Me.TextBoxMeas.TabIndex = 11 + Me.TextBoxMeas.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Label6 + ' + 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.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(54, 30) + Me.Label6.TabIndex = 5 + Me.Label6.Text = "Measured" + Me.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'Label10 + ' + Me.Label10.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label10.AutoSize = True + Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label10.Location = New System.Drawing.Point(78, 0) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(63, 30) + Me.Label10.TabIndex = 20 + Me.Label10.Text = "Stojišče" + Me.Label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'Label11 + ' + Me.Label11.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + 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.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(58, 30) + Me.Label11.TabIndex = 19 + Me.Label11.Text = "Meritve" + Me.Label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'GroupBox4 + ' + Me.GroupBox4.Controls.Add(Me.LabelFontInfo) + Me.GroupBox4.Controls.Add(Me.ButtonFont) + Me.GroupBox4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.GroupBox4.Location = New System.Drawing.Point(257, 213) + Me.GroupBox4.Name = "GroupBox4" + Me.GroupBox4.Size = New System.Drawing.Size(285, 77) + Me.GroupBox4.TabIndex = 4 + Me.GroupBox4.TabStop = False + Me.GroupBox4.Text = "Prikaz Izpisa" + ' + 'LabelFontInfo + ' + Me.LabelFontInfo.AutoSize = True + Me.LabelFontInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LabelFontInfo.Location = New System.Drawing.Point(6, 23) + Me.LabelFontInfo.Name = "LabelFontInfo" + Me.LabelFontInfo.Size = New System.Drawing.Size(55, 16) + Me.LabelFontInfo.TabIndex = 1 + Me.LabelFontInfo.Text = "Label16" + ' + 'ButtonFont + ' + Me.ButtonFont.Location = New System.Drawing.Point(171, 41) + Me.ButtonFont.Name = "ButtonFont" + Me.ButtonFont.Size = New System.Drawing.Size(100, 30) + Me.ButtonFont.TabIndex = 0 + Me.ButtonFont.Text = "Izberi pisavo" + Me.ButtonFont.UseVisualStyleBackColor = True + ' + 'FontDialog1 + ' + Me.FontDialog1.ShowEffects = False + ' + 'SaveFileDialogNast + ' + Me.SaveFileDialogNast.DefaultExt = "Config|*.cfg" + Me.SaveFileDialogNast.FileName = "tps1100_nastavitve.cfg" + Me.SaveFileDialogNast.Filter = "Config|*.cfg" + ' + 'MenuStrip1 + ' + Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DatotekaToolStripMenuItem}) + Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) + Me.MenuStrip1.Name = "MenuStrip1" + Me.MenuStrip1.Size = New System.Drawing.Size(554, 24) + Me.MenuStrip1.TabIndex = 7 + Me.MenuStrip1.Text = "MenuStrip1" + ' + 'DatotekaToolStripMenuItem + ' + Me.DatotekaToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.IzvoziKodeToolStripMenuItem, Me.UvoziKodeToolStripMenuItem, Me.ToolStripSeparator1, Me.ZapriToolStripMenuItem}) + Me.DatotekaToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_save_as_50 + Me.DatotekaToolStripMenuItem.Name = "DatotekaToolStripMenuItem" + Me.DatotekaToolStripMenuItem.Size = New System.Drawing.Size(82, 20) + Me.DatotekaToolStripMenuItem.Text = "&Datoteka" + ' + 'IzvoziKodeToolStripMenuItem + ' + Me.IzvoziKodeToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_move_to_folder_50 + Me.IzvoziKodeToolStripMenuItem.Name = "IzvoziKodeToolStripMenuItem" + Me.IzvoziKodeToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.IzvoziKodeToolStripMenuItem.Text = "&Izvozi Kode" + ' + 'UvoziKodeToolStripMenuItem + ' + Me.UvoziKodeToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_send_file_50 + Me.UvoziKodeToolStripMenuItem.Name = "UvoziKodeToolStripMenuItem" + Me.UvoziKodeToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.UvoziKodeToolStripMenuItem.Text = "&Uvozi Kode" + ' + 'ToolStripSeparator1 + ' + Me.ToolStripSeparator1.Name = "ToolStripSeparator1" + Me.ToolStripSeparator1.Size = New System.Drawing.Size(177, 6) + ' + 'ZapriToolStripMenuItem + ' + Me.ZapriToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_50 + Me.ZapriToolStripMenuItem.Name = "ZapriToolStripMenuItem" + Me.ZapriToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ZapriToolStripMenuItem.Text = "&Zapri" + ' 'FormNastavitve ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(309, 282) + Me.ClientSize = New System.Drawing.Size(554, 441) + Me.Controls.Add(Me.GroupBox4) + Me.Controls.Add(Me.TableLayoutPanel3) Me.Controls.Add(Me.GroupBox3) Me.Controls.Add(Me.GroupBox2) Me.Controls.Add(Me.GroupBox1) - Me.Controls.Add(Me.ToolStrip1) + Me.Controls.Add(Me.MenuStrip1) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.MainMenuStrip = Me.MenuStrip1 Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "FormNastavitve" @@ -245,8 +719,6 @@ Partial Class FormNastavitve Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Nastavitve" Me.TopMost = True - Me.ToolStrip1.ResumeLayout(False) - Me.ToolStrip1.PerformLayout() Me.GroupBox1.ResumeLayout(False) Me.TableLayoutPanel1.ResumeLayout(False) Me.TableLayoutPanel1.PerformLayout() @@ -255,17 +727,18 @@ Partial Class FormNastavitve Me.TableLayoutPanel2.PerformLayout() Me.GroupBox3.ResumeLayout(False) Me.GroupBox3.PerformLayout() + Me.TableLayoutPanel3.ResumeLayout(False) + Me.TableLayoutPanel3.PerformLayout() + Me.GroupBox4.ResumeLayout(False) + Me.GroupBox4.PerformLayout() + Me.MenuStrip1.ResumeLayout(False) + Me.MenuStrip1.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() End Sub - - Friend WithEvents ToolStrip1 As ToolStrip Friend WithEvents GroupBox1 As GroupBox - Friend WithEvents RadioButton1 As RadioButton Friend WithEvents RadioButton2 As RadioButton - Friend WithEvents ToolStripButton1 As ToolStripButton - Friend WithEvents ToolStripButton2 As ToolStripButton Friend WithEvents TableLayoutPanel1 As TableLayoutPanel Friend WithEvents GroupBox2 As GroupBox Friend WithEvents TableLayoutPanel2 As TableLayoutPanel @@ -276,4 +749,43 @@ Partial Class FormNastavitve Friend WithEvents ButtonOdpriLog As Button Friend WithEvents OpenFileDialogLog As OpenFileDialog Friend WithEvents SaveFileDialogLog As SaveFileDialog + Friend WithEvents RadioButton1 As RadioButton + Friend WithEvents TableLayoutPanel3 As TableLayoutPanel + Friend WithEvents Label1 As Label + Friend WithEvents Label2 As Label + Friend WithEvents Label3 As Label + 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 + Friend WithEvents TextBoxRes As TextBox + 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 + Friend WithEvents Label11 As Label + Friend WithEvents Label10 As Label + Friend WithEvents Label13 As Label + Friend WithEvents Label12 As Label + Friend WithEvents TextBoxStojInfo As TextBox + Friend WithEvents TextBoxStoj As TextBox + Friend WithEvents Label14 As Label + Friend WithEvents Label15 As Label + Friend WithEvents GroupBox4 As GroupBox + Friend WithEvents LabelFontInfo As Label + Friend WithEvents ButtonFont As Button + Friend WithEvents FontDialog1 As FontDialog + Friend WithEvents SaveFileDialogNast As SaveFileDialog + Friend WithEvents MenuStrip1 As MenuStrip + Friend WithEvents DatotekaToolStripMenuItem As ToolStripMenuItem + Friend WithEvents IzvoziKodeToolStripMenuItem As ToolStripMenuItem + Friend WithEvents UvoziKodeToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolStripSeparator1 As ToolStripSeparator + Friend WithEvents ZapriToolStripMenuItem As ToolStripMenuItem End Class diff --git a/FormNastavitve.resx b/FormNastavitve.resx index 35af132..0bd3964 100644 --- a/FormNastavitve.resx +++ b/FormNastavitve.resx @@ -117,15 +117,21 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - 123, 17 278, 17 + + 428, 17 + + + 546, 17 + + + 700, 17 + diff --git a/FormNastavitve.vb b/FormNastavitve.vb index 2b997fb..9e5f9a1 100644 --- a/FormNastavitve.vb +++ b/FormNastavitve.vb @@ -14,6 +14,20 @@ End If TextBoxLog.Text = My.Settings.DatLogfile.ToString + TextBoxStoj.Text = My.Settings.KodaStojisce.ToString + TextBoxStojInfo.Text = My.Settings.KodaStojisceInfo.ToString + TextBoxQuickSet.Text = My.Settings.KodaQuickSet.ToString + TextBoxSetAzi.Text = My.Settings.KodaSetAzi.ToString + TextBoxRes.Text = My.Settings.KodaResection.ToString + TextBoxFree.Text = My.Settings.KodaFreeStation.ToString + 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 + + LabelFontInfo.Text = My.Settings.Pisava + " / " + My.Settings.PisavaVelikost.ToString + End Sub Private Sub FormNastavitve_Closing(sender As Object, e As EventArgs) Handles MyBase.Closing @@ -33,35 +47,24 @@ My.Settings.DecimalnoLocilo = "Vejica" End If + My.Settings.DatLogfile = TextBoxLog.Text + My.Settings.KodaStojisce = TextBoxStoj.Text + My.Settings.KodaStojisceInfo = TextBoxStojInfo.Text + My.Settings.KodaQuickSet = TextBoxQuickSet.Text + My.Settings.KodaSetAzi = TextBoxSetAzi.Text + My.Settings.KodaResection = TextBoxRes.Text + My.Settings.KodaFreeStation = TextBoxFree.Text + 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.Save() - Form1.tsbDecimale.Text = My.Settings.DecimalnoLocilo - Form1.tsbStolpci.SelectedIndex = My.Settings.Stolpci Form1.DatotekaLogfile = My.Settings.DatLogfile + Form1.RichTextBox1.Font = New Font(My.Settings.Pisava, My.Settings.PisavaVelikost) End Sub - Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click - - If RadioButton1.Checked = True Then - My.Settings.Stolpci = 0 - End If - - If RadioButton2.Checked = True Then - My.Settings.Stolpci = 1 - End If - - If RadioButton3.Checked = True Then - My.Settings.DecimalnoLocilo = "Pika" - End If - - If RadioButton4.Checked = True Then - My.Settings.DecimalnoLocilo = "Vejica" - End If - - My.Settings.DatLogfile = SaveFileDialogLog.FileName.ToString - My.Settings.Save() - - End Sub - Private Sub ButtonOdpriLog_Click(sender As Object, e As EventArgs) Handles ButtonOdpriLog.Click If SaveFileDialogLog.ShowDialog = DialogResult.OK Then TextBoxLog.Text = SaveFileDialogLog.FileName.ToString @@ -69,7 +72,38 @@ End If End Sub - Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click + Private Sub ButtonFont_Click(sender As Object, e As EventArgs) Handles ButtonFont.Click + Dim fontdia1 = FontDialog1.Font.Name = My.Settings.Pisava + Dim fontdia2 = FontDialog1.Font.Size = My.Settings.PisavaVelikost + + If FontDialog1.ShowDialog = DialogResult.OK Then + My.Settings.Pisava = FontDialog1.Font.Name + My.Settings.PisavaVelikost = FontDialog1.Font.Size + LabelFontInfo.Text = My.Settings.Pisava + " / " + My.Settings.PisavaVelikost.ToString + End If + End Sub + + Private Sub IzvoziKodeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles IzvoziKodeToolStripMenuItem.Click + Dim dataNast As String = "" + + dataNast = dataNast + "KodaStojisce = " + My.Settings.KodaStojisce + vbCrLf + dataNast = dataNast + "KodaStojisceInfo = " + My.Settings.KodaStojisceInfo + vbCrLf + dataNast = dataNast + "KodaQuickSet = " + My.Settings.KodaQuickSet + vbCrLf + dataNast = dataNast + "KodaSetAzi = " + My.Settings.KodaSetAzi + vbCrLf + dataNast = dataNast + "KodaResection = " + My.Settings.KodaResection + vbCrLf + dataNast = dataNast + "KodaFreeStation = " + My.Settings.KodaFreeStation + vbCrLf + 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 + My.Computer.FileSystem.WriteAllText(SaveFileDialogNast.FileName, dataNast, False) + End If + End Sub + + Private Sub ZapriToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZapriToolStripMenuItem.Click Me.Close() End Sub diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index bbc768d..7af2ac0 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/My Project/Data/GSI_DataCodes.cfg b/My Project/Data/GSI_DataCodes.cfg new file mode 100644 index 0000000..37c8bfb --- /dev/null +++ b/My Project/Data/GSI_DataCodes.cfg @@ -0,0 +1,67 @@ +[WORD_INDEX] +11 = Pointnumber +12 = Serial number +13 = Instrument type +19 = Time +21 = Horizontal Angle +22 = Vertical Angle +25 = Horizontal Angle Correction +31 = Slope distance +32 = Horizontal distance +33 = Height difference +41 = Code-Block ID +42 = Information 1 +43 = Information 2 +44 = Information 3 +45 = Information 4 +46 = Information 5 +47 = Information 6 +48 = Information 7 +49 = Information 8 +51 = PPM/mm +58 = Prism constant +59 = PPM +71 = Remark 1 +72 = Remark 2 +73 = Remark 3 +74 = Remark 4 +75 = Remark 5 +76 = Remark 6 +77 = Remark 7 +78 = Remark 8 +79 = Remark 9 +81 = Easting +82 = Northing +83 = Elevation +84 = St. Easting +85 = St. Northing +86 = St. Height +87 = Reflector height +88 = Instrument height + +[AUTOMATIC_INDEX_INFORMATION] +# POS : 4 +0 = Automatic index OFF +1 = Automatic index OPERATING +3 = Automatic index OPERATING + +[INPUT_MODE] +# POS : 5 +0 = Original measured values transferred from the instrument +1 = Manual input from keyboard +2 = Measured value, Hz-Correction ON +3 = Measured value, Hz-Correction OFF +4 = Result of special function + +[UNITS] +# POS : 6 +0 = Meter # (last digit: 1mm / 0.000m) +1 = Feet # (last digit: 1/1000ft / 0.000ft) +2 = 400 gon +3 = 360° decimal # (DDD.DDDDD) +4 = 360° sexagesimal # (DDD.MMSSS) +5 = 6400 mil +6 = Meter # (last digit: 1/10mm) +7 = Feet # (last digit: 1/10‘000ft) +8 = Meter # (last digit: 1/100mm) + diff --git a/My Project/Data/GSI_DataCodes.ini b/My Project/Data/GSI_DataCodes.ini new file mode 100644 index 0000000..c2f91b2 --- /dev/null +++ b/My Project/Data/GSI_DataCodes.ini @@ -0,0 +1,139 @@ +[WORD_INDEX] +11 = Pointnumber # 11 / block: 11....+00000H66 +# PtNo=“H66“ +12 = Serial number # 12 / block: 12....+00640054 +# S.No. “640054” +13 = Instrument type # 13; 13....+00TCR305 +# Instr. “TCR305” +19 = Time # 19 / block: 19....+02081029 +# [MM.DD.hh.mm] +21 = Horizontal Angle # 21 / block: 21.102+17920860 +# Hz „179.086“ gon +22 = Vertical Angle # 22 / block: 22.102+07567500 +# V: „75.675“ gon +25 = Horizontal Angle Delta Azimuth # 22 / block: 22.102+07567500 +# V: „75.675“ gon +31 = Slope distance # 31; e-g. 31..00+00003387 +# Sdist: „3.387“ m +32 = Horizontal distance # 32 / block: 32..00+00003198 +# Hdist: „3.198“ m +33 = Height difference # 33 / block: 33..00+00001119 +# Hdiff: „1.119“ m +41 = Code-Block ID # 41 / block: 41....+00000013 +# Code: „13“ m +42 = Information 1 # 42 / block: 42....+000TREES +# Info1: „TREES“ +43 = Information 2 # 43 / block: 43....+000004.5 +# Info2: „4.5“ +44 = Information 3 # 44 / block: 44....+00CAT.02 +# Info3: „CAT.02“ +45 = Information 4 # 45 / block: 45....+000000NN +# Info4: „NN“ +46 = Information 5 # 46 / block: 46....+000000NN +# Info5: „NN“ +47 = Information 6 # 47 / block: 47....+000000NN +# Info6: „NN“ +48 = Information 7 # 48 / block: 48....+000000NN +# Info7: „NN“ +49 = Information 8 # 49 / block: 49....+000000NN +# Info8: „NN“ +51 = PPM/mm # 51 / block: 51..1.+0000+034 +# “0”ppm; “34”mm +58 = Prism constant # 58 / block: 58..16+00000020 +# Prism „2“ mm +59 = PPM # 59 / block: 59..16+02200000 +# PPM „220“ +71 = Remark 1 +# (or Attribute 1) +# 71 / block: 71....+0000REM1 +# “REM1” +72 = Remark 2 +# (or Attribute 2) +# 72 / block: 72....+0000REM2 +# “REM2” +73 = Remark 3 +# (or Attribute 3) +# 73 / block: 73....+0000REM3 +# “REM3” +74 = Remark 4 +# (or Attribute 4) +# 74 / block: 74....+0000REM4 +# “REM4” +75 = Remark 5 +# (or Attribute 5) +# 75 / block: 75....+0000REM5 +# “REM5” +76 = Remark 6 +# (or Attribute 6) +# 76 / block: 76....+0000REM6 +# “REM6” +77 = Remark 7 +# (or Attribute 7) +# 77 / block: 77....+0000REM7 +# “REM7” +78 = Remark 8 # (or Attribute 8) +# 78 / block: 78....+0000REM8 +# “REM8” +79 = Remark 9 +# (or Attribute 9) +# 79 / block: 79....+0000REM9 +# “REM9” +81 = Easting +# (E) +# 81 / block: 81..00+01999507 +# E: “1999.507”m +82 = Northing +# (N) +# 82 / block: 82..00+00213159 +# N: “2139.159”m +83 = Elevation +# (H) +# 83 / block: 83..00-00032881 +# H: “32.881”m +84 = St. Easting +# (E0) +# 84 / block: 84..11+00393700 +# E: “393.700”m +85 = St. Northing +# (N0) +# 85 / block: 85..11+06561220 +# N: “6561.220”m +86 = St. Height +# (H0) +# 86 / block: 86..11+00065618 +# H: “65.618”m +87 = Reflector height +# (hr) +# 87 / block: 87..11+00001700 +# hr: “1.700” m +88 = Instrument height +# (hi) +# 88 / block: 88..11+00001550 +# hi: “1.550” m + +[AUTOMATIC_INDEX_INFORMATION] +# POS : 4 +0 = Automatic index OFF +1 = Automatic index OPERATING +3 = Automatic index OPERATING + +[INPUT_MODE] +# POS : 5 +0 = Original measured values transferred from the instrument +1 = Manual input from keyboard +2 = Measured value, Hz-Correction ON +3 = Measured value, Hz-Correction OFF +4 = Result of special function + +[UNITS] +# POS : 6 +0 = Meter # (last digit: 1mm / 0.000m) +1 = Feet # (last digit: 1/1000ft / 0.000ft) +2 = 400 gon +3 = 360° decimal # (DDD.DDDDD) +4 = 360° sexagesimal # (DDD.MMSSS) +5 = 6400 mil +6 = Meter # (last digit: 1/10mm) +7 = Feet # (last digit: 1/10‘000ft) +8 = Meter # (last digit: 1/100mm) + diff --git a/My Project/Data/GSI_UserCodes.ini b/My Project/Data/GSI_UserCodes.ini new file mode 100644 index 0000000..6b330bf --- /dev/null +++ b/My Project/Data/GSI_UserCodes.ini @@ -0,0 +1,8 @@ +[CODE] +10 = Quick Set +20 = Set Azimuth +30 = Resection +40 = Free Station +90 = Measured Data +99 = Imported Data + diff --git a/My Project/Icons/icons8-check-file-50.png b/My Project/Icons/icons8-check-file-50.png new file mode 100644 index 0000000..a6ec917 Binary files /dev/null and b/My Project/Icons/icons8-check-file-50.png differ diff --git a/My Project/README.md b/My Project/README.md deleted file mode 100644 index d39d486..0000000 --- a/My Project/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# TPS1100-Convert - -Program za pretvorbo GSI datotek. VB.NET \ No newline at end of file diff --git a/My Project/Resources.Designer.vb b/My Project/Resources.Designer.vb index df545e6..56203b4 100644 --- a/My Project/Resources.Designer.vb +++ b/My Project/Resources.Designer.vb @@ -60,6 +60,357 @@ Namespace My.Resources End Set End Property + ''' + ''' Looks up a localized string similar to Point number. + ''' + Friend ReadOnly Property _11() As String + Get + Return ResourceManager.GetString("11", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Serial number. + ''' + Friend ReadOnly Property _12() As String + Get + Return ResourceManager.GetString("12", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Instrument type. + ''' + Friend ReadOnly Property _13() As String + Get + Return ResourceManager.GetString("13", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Time. + ''' + Friend ReadOnly Property _19() As String + Get + Return ResourceManager.GetString("19", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Horizontal Angle. + ''' + Friend ReadOnly Property _21() As String + Get + Return ResourceManager.GetString("21", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Vertical Angle. + ''' + Friend ReadOnly Property _22() As String + Get + Return ResourceManager.GetString("22", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Horizontal Angle Correction. + ''' + Friend ReadOnly Property _25() As String + Get + Return ResourceManager.GetString("25", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Slope distance. + ''' + Friend ReadOnly Property _31() As String + Get + Return ResourceManager.GetString("31", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Horizontal distance. + ''' + Friend ReadOnly Property _32() As String + Get + Return ResourceManager.GetString("32", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Height difference. + ''' + Friend ReadOnly Property _33() As String + Get + Return ResourceManager.GetString("33", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Code-Block ID. + ''' + Friend ReadOnly Property _41() As String + Get + Return ResourceManager.GetString("41", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Information 1. + ''' + Friend ReadOnly Property _42() As String + Get + Return ResourceManager.GetString("42", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Information 2. + ''' + Friend ReadOnly Property _43() As String + Get + Return ResourceManager.GetString("43", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Information 3. + ''' + Friend ReadOnly Property _44() As String + Get + Return ResourceManager.GetString("44", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Information 4. + ''' + Friend ReadOnly Property _45() As String + Get + Return ResourceManager.GetString("45", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Information 5. + ''' + Friend ReadOnly Property _46() As String + Get + Return ResourceManager.GetString("46", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Information 6. + ''' + Friend ReadOnly Property _47() As String + Get + Return ResourceManager.GetString("47", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Information 7. + ''' + Friend ReadOnly Property _48() As String + Get + Return ResourceManager.GetString("48", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Information 8. + ''' + Friend ReadOnly Property _49() As String + Get + Return ResourceManager.GetString("49", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to PPM/mm. + ''' + Friend ReadOnly Property _51() As String + Get + Return ResourceManager.GetString("51", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Prism constant. + ''' + Friend ReadOnly Property _58() As String + Get + Return ResourceManager.GetString("58", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to PPM. + ''' + Friend ReadOnly Property _59() As String + Get + Return ResourceManager.GetString("59", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Remark 1. + ''' + Friend ReadOnly Property _71() As String + Get + Return ResourceManager.GetString("71", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Remark 2. + ''' + Friend ReadOnly Property _72() As String + Get + Return ResourceManager.GetString("72", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Remark 3. + ''' + Friend ReadOnly Property _73() As String + Get + Return ResourceManager.GetString("73", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Remark 4. + ''' + Friend ReadOnly Property _74() As String + Get + Return ResourceManager.GetString("74", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Remark 5. + ''' + Friend ReadOnly Property _75() As String + Get + Return ResourceManager.GetString("75", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Remark 6. + ''' + Friend ReadOnly Property _76() As String + Get + Return ResourceManager.GetString("76", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Remark 7. + ''' + Friend ReadOnly Property _77() As String + Get + Return ResourceManager.GetString("77", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Remark 8. + ''' + Friend ReadOnly Property _78() As String + Get + Return ResourceManager.GetString("78", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Remark 9. + ''' + Friend ReadOnly Property _79() As String + Get + Return ResourceManager.GetString("79", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Easting. + ''' + Friend ReadOnly Property _81() As String + Get + Return ResourceManager.GetString("81", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Northing. + ''' + Friend ReadOnly Property _82() As String + Get + Return ResourceManager.GetString("82", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Elevation. + ''' + Friend ReadOnly Property _83() As String + Get + Return ResourceManager.GetString("83", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to St. Easting. + ''' + Friend ReadOnly Property _84() As String + Get + Return ResourceManager.GetString("84", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to St. Northing. + ''' + Friend ReadOnly Property _85() As String + Get + Return ResourceManager.GetString("85", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to St. Height. + ''' + Friend ReadOnly Property _86() As String + Get + Return ResourceManager.GetString("86", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Reflector height. + ''' + Friend ReadOnly Property _87() As String + Get + Return ResourceManager.GetString("87", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Instrument height. + ''' + Friend ReadOnly Property _88() As String + Get + Return ResourceManager.GetString("88", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' @@ -120,6 +471,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property icons8_check_file_50() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("icons8-check-file-50", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' @@ -391,12 +752,25 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized resource of type System.Byte[]. + ''' Looks up a localized string similar to # TPS1100-Convert + ''' + '''!["logo"](https://multibox.nohost.me/gitea/boris/TPS1100-Convert/raw/branch/main/My%20Project/Icons/TPS1100CNVRT_logo.png) + ''' + '''Program za pretvorbo GSI datotek v obliko primerno za branje. + ''' + '''Enostavna priprava in izvoz podatkov meritev v različnih oblikah... + ''' + '''- Zapisnik Meritev (podatki meritev kot so Hz, V, SD, HD,...) + '''- Koordinate Točk (seznam točk v obliki E, N, Ht, koda in klasifikacija) + ''' + '''Program uporablja kodiranje za prepoznavo posameznih elementov meritev. + ''' + '''<br> + '''Aplikacij [rest of string was truncated]";. ''' - Friend ReadOnly Property README() As Byte() + Friend ReadOnly Property README() As String Get - Dim obj As Object = ResourceManager.GetObject("README", resourceCulture) - Return CType(obj,Byte()) + Return ResourceManager.GetString("README", resourceCulture) End Get End Property diff --git a/My Project/Resources.resx b/My Project/Resources.resx index bb6c66f..bfad749 100644 --- a/My Project/Resources.resx +++ b/My Project/Resources.resx @@ -117,122 +117,242 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Remark 8 + - - Icons\icons8-move-to-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\Save-as-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-clear-symbol-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\Fine-Print-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-cancel-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-ok-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\TPS1100CNVRT_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\Circled-Right-2-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-info-squared-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-open-end-wrench-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Icons\icons8-design-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Icons\icons8-add-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-save-as-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-close-window-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\TPS1100CNVRT.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-close-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-support-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Remark 7 Icons\icons8-send-file-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Icons\icons8-add-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Prism constant Icons\icons8-info-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Icons\icons8-drawing-compass-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Information 8 - - Icons\icons8-folder-50-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Vertical Angle - - Icons\icons8-opened-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Instrument type - - Icons\icons8-browse-folder-50-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-edit-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-add-new-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-done-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-land-surveying-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-undo-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-no-entry-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-tools-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-information-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Icons\icons8-advance-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\README.md;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Icons\icons8-unavailable-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Information 6 Icons\ModernXP-41-Settings-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Icons\icons8-connection-status-on-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Remark 3 + + + Icons\icons8-done-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Icons\icons8-unavailable-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Icons\icons8-folder-50-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + St. Northing + + + Icons\TPS1100CNVRT_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Remark 6 + + + Time + + + Icons\icons8-close-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Slope distance + + + PPM/mm + + + Information 4 + + + Icons\icons8-browse-folder-50-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Elevation + + + Icons\icons8-ok-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Icons\Circled-Right-2-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Icons\icons8-open-end-wrench-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Northing + + + Serial number + + + Icons\icons8-close-window-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Icons\icons8-cancel-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Icons\Fine-Print-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Remark 1 + + + PPM + + + St. Height + + + Icons\icons8-information-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Information 2 + + + Icons\icons8-clear-symbol-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Icons\icons8-support-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Horizontal Angle Correction + + + Remark 9 + + + Icons\Save-as-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Remark 4 + + + Icons\icons8-tools-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Icons\icons8-drawing-compass-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Icons\icons8-do-not-disturb-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Information 3 + + + Icons\icons8-land-surveying-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Remark 2 + + + Point number + + + Icons\icons8-info-squared-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Icons\icons8-move-to-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Icons\icons8-undo-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Icons\TPS1100CNVRT.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Height difference + + + Instrument height + Icons\icons8-question-mark-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Icons\icons8-opened-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Icons\icons8-no-entry-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Icons\icons8-save-as-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Icons\icons8-add-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\README.md;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + Easting + + + Icons\icons8-connection-status-on-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Information 7 + + + Horizontal Angle + + + Icons\icons8-advance-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Information 5 + + + Remark 5 + + + Reflector height + + + Icons\icons8-add-new-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Icons\icons8-add-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Horizontal distance + + + Icons\icons8-edit-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Code-Block ID + + + St. Easting + + + Information 1 + + + Icons\icons8-check-file-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/My Project/Settings.Designer.vb b/My Project/Settings.Designer.vb index af962b3..a51c9b4 100644 --- a/My Project/Settings.Designer.vb +++ b/My Project/Settings.Designer.vb @@ -56,7 +56,7 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("")> _ Public Property ZadnjaMapa() As String Get Return CType(Me("ZadnjaMapa"),String) @@ -129,6 +129,173 @@ Namespace My Me("DatLogfile") = value End Set End Property + + _ + Public Property MapaShrani() As String + Get + Return CType(Me("MapaShrani"),String) + End Get + Set + Me("MapaShrani") = value + End Set + End Property + + _ + Public Property KodaQuickSet() As String + Get + Return CType(Me("KodaQuickSet"),String) + End Get + Set + Me("KodaQuickSet") = value + End Set + End Property + + _ + Public Property KodaSetAzi() As String + Get + Return CType(Me("KodaSetAzi"),String) + End Get + Set + Me("KodaSetAzi") = value + End Set + End Property + + _ + Public Property KodaResection() As String + Get + Return CType(Me("KodaResection"),String) + End Get + Set + Me("KodaResection") = value + End Set + End Property + + _ + Public Property KodaFreeStation() As String + Get + Return CType(Me("KodaFreeStation"),String) + End Get + Set + Me("KodaFreeStation") = value + End Set + End Property + + _ + Public Property KodaOriHtTrans() As String + Get + Return CType(Me("KodaOriHtTrans"),String) + End Get + Set + Me("KodaOriHtTrans") = value + End Set + End Property + + _ + Public Property KodaMeasOri() As String + Get + Return CType(Me("KodaMeasOri"),String) + End Get + Set + Me("KodaMeasOri") = value + End Set + End Property + + _ + Public Property KodaMeas() As String + Get + Return CType(Me("KodaMeas"),String) + End Get + Set + Me("KodaMeas") = value + End Set + End Property + + _ + Public Property KodaStake() As String + Get + Return CType(Me("KodaStake"),String) + End Get + Set + Me("KodaStake") = value + End Set + End Property + + _ + Public Property KodaUserImport() As String + Get + Return CType(Me("KodaUserImport"),String) + End Get + Set + Me("KodaUserImport") = value + End Set + End Property + + _ + Public Property KodaStojisce() As String + Get + Return CType(Me("KodaStojisce"),String) + End Get + Set + Me("KodaStojisce") = value + End Set + End Property + + _ + Public Property KodaStojisceInfo() As String + Get + Return CType(Me("KodaStojisceInfo"),String) + End Get + Set + Me("KodaStojisceInfo") = value + End Set + End Property + + _ + Public Property Pisava() As String + Get + Return CType(Me("Pisava"),String) + End Get + Set + Me("Pisava") = value + End Set + End Property + + _ + Public Property PisavaVelikost() As Integer + Get + Return CType(Me("PisavaVelikost"),Integer) + End Get + Set + Me("PisavaVelikost") = value + End Set + End Property End Class End Namespace diff --git a/My Project/Settings.settings b/My Project/Settings.settings index c279a2a..2dd8b19 100644 --- a/My Project/Settings.settings +++ b/My Project/Settings.settings @@ -3,7 +3,7 @@ - C:\ + Pika @@ -20,5 +20,47 @@ + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 80 + + + 90 + + + 91 + + + 99 + + + 1 + + + 2 + + + + + + + \ No newline at end of file diff --git a/Podatki/GSI_DataCodes.txt b/Podatki/GSI_DataCodes.txt new file mode 100644 index 0000000..4536c97 --- /dev/null +++ b/Podatki/GSI_DataCodes.txt @@ -0,0 +1,39 @@ +11 Pointnumber +12 Serial number +13 Instrument type +19 Time +21 Horizontal Angle +22 Vertical Angle +25 Horizontal Angle Correction +31 Slope distance +32 Horizontal distance +33 Height difference +41 Code-Block ID +42 Information 1 +43 Information 2 +44 Information 3 +45 Information 4 +46 Information 5 +47 Information 6 +48 Information 7 +49 Information 8 +51 PPM/mm +58 Prism constant +59 PPM +71 Remark 1 +72 Remark 2 +73 Remark 3 +74 Remark 4 +75 Remark 5 +76 Remark 6 +77 Remark 7 +78 Remark 8 +79 Remark 9 +81 Easting +82 Northing +83 Elevation +84 St. Easting +85 St. Northing +86 St. Height +87 Reflector height +88 Instrument height diff --git a/Podatki/GSI_code.txt b/Podatki/GSI_code.txt new file mode 100644 index 0000000..7c84dc6 --- /dev/null +++ b/Podatki/GSI_code.txt @@ -0,0 +1,11 @@ +Quick Set=10 +Set Azimuth=20 +Resection=30 +Free Station=40 +Ori and Ht Transfer=50 +Orientation=80 +Measure=90 +Stakeout=91 +Imported=99 +Stojisce=1 +StojisceInfo=2 diff --git a/Podatki/TEST.GSI b/Podatki/TEST.GSI new file mode 100644 index 0000000..479992a --- /dev/null +++ b/Podatki/TEST.GSI @@ -0,0 +1,50 @@ +*410000+0000000000000099 +*110001+00000000000GS001 81..00+0000000465423089 82..00+0000000110526243 83..00+0000000000301586 +*110002+00000000000GS002 81..00+0000000465437688 82..00+0000000110547569 83..00+0000000000302107 +*110003+00000000000GS003 81..00+0000000465472908 82..00+0000000110527226 83..00+0000000000302945 +*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 +*410010+0000000000000090 +*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 +*110011+0000000000000001 21.324+0000000011254090 22.324+0000000008815450 31..00+0000000000032800 32..10+0000000000032785 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000001205 81..00+0000000465474729 82..00+0000000110533795 83..00+0000000000303558 71....+0000000000000000 +*110012+0000000000000002 21.324+0000000011144520 22.324+0000000008850390 31..00+0000000000020325 32..10+0000000000020321 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000620 81..00+0000000465463403 82..00+0000000110539024 83..00+0000000000302973 71....+0000000000000000 +*110013+0000000000000003 21.324+0000000010859200 22.324+0000000008922510 31..00+0000000000011668 32..10+0000000000011667 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000336 81..00+0000000465455561 82..00+0000000110542757 83..00+0000000000302689 71....+0000000000000000 +*110014+0000000000000004 21.324+0000000007358330 22.324+0000000009603030 31..00+0000000000001983 32..10+0000000000001972 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000001 81..00+0000000465446424 82..00+0000000110547098 83..00+0000000000302354 71....+0000000000000000 +*110015+0000000000000005 21.324+0000000005042460 22.324+0000000010727030 31..00+0000000000004476 32..10+0000000000004270 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000000168 81..00+0000000465447834 82..00+0000000110549258 83..00+0000000000302521 71....+0000000000000000 +*110016+0000000000000006 21.324+0000000003846420 22.324+0000000010921450 31..00+0000000000004204 32..10+0000000000003966 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000000116 81..00+0000000465447013 82..00+0000000110549645 83..00+0000000000302470 71....+0000000000000000 +*110017+0000000000000007 21.324+0000000003747460 22.324+0000000010758590 31..00+0000000000004468 32..10+0000000000004249 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000000131 81..00+0000000465447133 82..00+0000000110549911 83..00+0000000000302484 71....+0000000000000000 +*110018+0000000000000008 21.324+0000000033802160 22.324+0000000010150570 31..00+0000000000006199 32..10+0000000000006067 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000000237 81..00+0000000465442260 82..00+0000000110552180 83..00+0000000000302590 71....+0000000000000000 +*110019+0000000000000009 21.324+0000000029836160 22.324+0000000010648530 31..00+0000000000005488 32..10+0000000000005254 87..10+0000000000000000 58..16+0000000000000344 33..10-0000000000000078 81..00+0000000465439917 82..00+0000000110549069 83..00+0000000000302276 71....+0000000000000000 +*110020+0000000000000010 21.324+0000000028230220 22.324+0000000009248440 31..00+0000000000010785 32..10+0000000000010772 87..10+0000000000001300 58..16+0000000000000175 33..10-0000000000000319 81..00+0000000465434013 82..00+0000000110548886 83..00+0000000000302034 71....+0000000000000000 +*110021+0000000000000011 21.324+0000000005208020 22.324+0000000009428210 31..00+0000000000004313 32..10+0000000000004300 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000001174 81..00+0000000465447924 82..00+0000000110549193 83..00+0000000000303527 71....+0000000000000000 +*110022+0000000000000012 21.324+0000000005044450 22.324+0000000008137520 31..00+0000000000004677 32..10+0000000000004627 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000891 81..00+0000000465448112 82..00+0000000110549481 83..00+0000000000303244 71....+0000000000000000 +*110023+0000000000000013 21.324+0000000004322420 22.324+0000000007933420 31..00+0000000000011597 32..10+0000000000011405 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000002311 81..00+0000000465452362 82..00+0000000110554843 83..00+0000000000304664 71....+0000000000000000 +*110024+0000000000000014 21.324+0000000004213390 22.324+0000000008007010 31..00+0000000000015065 32..10+0000000000014842 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000002796 81..00+0000000465454504 82..00+0000000110557544 83..00+0000000000305149 71....+0000000000000000 +*110025+0000000000000015 21.324+0000000003346460 22.324+0000000008111590 31..00+0000000000017167 32..10+0000000000016965 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000002836 81..00+0000000465453962 82..00+0000000110560654 83..00+0000000000305190 71....+0000000000000000 +*110026+0000000000000016 21.324+0000000001534560 22.324+0000000008200030 31..00+0000000000027304 32..10+0000000000027038 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000004010 81..00+0000000465451792 82..00+0000000110572598 83..00+0000000000306363 71....+0000000000000000 +*110027+0000000000000017 21.324+0000000001558300 22.324+0000000008036540 31..00+0000000000028384 32..10+0000000000028004 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000004838 81..00+0000000465452236 82..00+0000000110573476 83..00+0000000000307192 71....+0000000000000000 +*110028+0000000000000018 21.324+0000000001428410 22.324+0000000008121540 31..00+0000000000028412 32..10+0000000000028090 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000004476 81..00+0000000465451552 82..00+0000000110573751 83..00+0000000000306829 71....+0000000000000000 +*110029+0000000000000019 21.324+0000000003416460 22.324+0000000008238380 31..00+0000000000027992 32..10+0000000000027761 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000003794 81..00+0000000465460165 82..00+0000000110569493 83..00+0000000000306147 71....+0000000000000000 +*110030+0000000000000020 21.324+0000000004217270 22.324+0000000007814330 31..00+0000000000024595 32..10+0000000000024079 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000006522 81..00+0000000465460732 82..00+0000000110564366 83..00+0000000000308875 71....+0000000000000000 +*110031+0000000000000021 21.324+0000000005331040 22.324+0000000007125310 31..00+0000000000015239 32..10+0000000000014445 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000006364 81..00+0000000465456144 82..00+0000000110555142 83..00+0000000000308718 71....+0000000000000000 +*110032+0000000000000022 21.324+0000000008053160 22.324+0000000007227170 31..00+0000000000023186 32..10+0000000000022107 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000008500 81..00+0000000465466357 82..00+0000000110550055 83..00+0000000000310853 71....+0000000000000000 +*110033+0000000000000023 21.324+0000000001902580 22.324+0000000007724330 31..00+0000000000039212 32..10+0000000000038269 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000010058 81..00+0000000465457019 82..00+0000000110582726 83..00+0000000000312411 71....+0000000000000000 +*110034+0000000000000024 21.324+0000000003810480 22.324+0000000007832240 31..00+0000000000043712 32..10+0000000000042840 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000010195 81..00+0000000465471010 82..00+0000000110580229 83..00+0000000000312548 71....+0000000000000000 +*110035+0000000000000031 21.324+0000000034458570 22.324+0000000009054050 31..00+0000000000005359 32..10+0000000000005358 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000001426 81..00+0000000465443141 82..00+0000000110551729 83..00+0000000000303779 71....+0000000000000000 +*110036+0000000000000032 21.324+0000000029233050 22.324+0000000009558110 31..00+0000000000004488 32..10+0000000000004464 87..10+0000000000001300 58..16+0000000000000175 33..10-0000000000000257 81..00+0000000465440407 82..00+0000000110548265 83..00+0000000000302097 71....+0000000000000000 +*110037+0000000000000033 21.324+0000000027506040 22.324+0000000009425520 31..00+0000000000006362 32..10+0000000000006343 87..10+0000000000001300 58..16+0000000000000175 33..10-0000000000000282 81..00+0000000465438211 82..00+0000000110547118 83..00+0000000000302072 71....+0000000000000000 +*110038+0000000000000034 21.324+0000000027631400 22.324+0000000009349170 31..00+0000000000010047 32..10+0000000000010024 87..10+0000000000001300 58..16+0000000000000175 33..10-0000000000000460 81..00+0000000465434570 82..00+0000000110547693 83..00+0000000000301894 71....+0000000000000000 +*110039+0000000000000035 21.324+0000000027424370 22.324+0000000009425240 31..00+0000000000007978 32..10+0000000000007954 87..10+0000000000001300 58..16+0000000000000175 33..10-0000000000000405 81..00+0000000465436599 82..00+0000000110547165 83..00+0000000000301948 71....+0000000000000000 +*110040+0000000000000036 21.324+0000000027337580 22.324+0000000009552300 31..00+0000000000005445 32..10+0000000000005416 87..10+0000000000001300 58..16+0000000000000175 33..10-0000000000000347 81..00+0000000465439124 82..00+0000000110546897 83..00+0000000000302006 71....+0000000000000000 +*110041+0000000000000037 21.324+0000000026954060 22.324+0000000009916340 31..00+0000000000002914 32..10+0000000000002876 87..10+0000000000001300 58..16+0000000000000175 33..10-0000000000000260 81..00+0000000465441653 82..00+0000000110546549 83..00+0000000000302094 71....+0000000000000000 +*110042+0000000000000038 21.324+0000000013027410 22.324+0000000009545570 31..00+0000000000002638 32..10+0000000000002625 87..10+0000000000001300 58..16+0000000000000175 33..10-0000000000000055 81..00+0000000465446526 82..00+0000000110544850 83..00+0000000000302298 71....+0000000000000000 +*110043+0000000000000039 21.324+0000000011808360 22.324+0000000009002460 31..00+0000000000011703 32..10+0000000000011703 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000201 81..00+0000000465454849 82..00+0000000110541033 83..00+0000000000302554 71....+0000000000000000 +*110044+0000000000000040 21.324+0000000011708390 22.324+0000000008931290 31..00+0000000000017790 32..10+0000000000017789 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000358 81..00+0000000465460359 82..00+0000000110538438 83..00+0000000000302711 71....+0000000000000000 +*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 diff --git a/Podatki/TEST.txt b/Podatki/TEST.txt new file mode 100644 index 0000000..27545db --- /dev/null +++ b/Podatki/TEST.txt @@ -0,0 +1,3 @@ +GS001 465423.089 110526.243 301.586 +GS002 465437.688 110547.569 302.107 +GS003 465472.908 110527.226 302.945 diff --git a/Podatki/TPS1100.crf b/Podatki/TPS1100.crf new file mode 100644 index 0000000..9ea478f Binary files /dev/null and b/Podatki/TPS1100.crf differ diff --git a/Resources/Data/TEST.GSI b/Resources/Data/TEST.GSI new file mode 100644 index 0000000..479992a --- /dev/null +++ b/Resources/Data/TEST.GSI @@ -0,0 +1,50 @@ +*410000+0000000000000099 +*110001+00000000000GS001 81..00+0000000465423089 82..00+0000000110526243 83..00+0000000000301586 +*110002+00000000000GS002 81..00+0000000465437688 82..00+0000000110547569 83..00+0000000000302107 +*110003+00000000000GS003 81..00+0000000465472908 82..00+0000000110527226 83..00+0000000000302945 +*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 +*410010+0000000000000090 +*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 +*110011+0000000000000001 21.324+0000000011254090 22.324+0000000008815450 31..00+0000000000032800 32..10+0000000000032785 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000001205 81..00+0000000465474729 82..00+0000000110533795 83..00+0000000000303558 71....+0000000000000000 +*110012+0000000000000002 21.324+0000000011144520 22.324+0000000008850390 31..00+0000000000020325 32..10+0000000000020321 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000620 81..00+0000000465463403 82..00+0000000110539024 83..00+0000000000302973 71....+0000000000000000 +*110013+0000000000000003 21.324+0000000010859200 22.324+0000000008922510 31..00+0000000000011668 32..10+0000000000011667 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000336 81..00+0000000465455561 82..00+0000000110542757 83..00+0000000000302689 71....+0000000000000000 +*110014+0000000000000004 21.324+0000000007358330 22.324+0000000009603030 31..00+0000000000001983 32..10+0000000000001972 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000001 81..00+0000000465446424 82..00+0000000110547098 83..00+0000000000302354 71....+0000000000000000 +*110015+0000000000000005 21.324+0000000005042460 22.324+0000000010727030 31..00+0000000000004476 32..10+0000000000004270 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000000168 81..00+0000000465447834 82..00+0000000110549258 83..00+0000000000302521 71....+0000000000000000 +*110016+0000000000000006 21.324+0000000003846420 22.324+0000000010921450 31..00+0000000000004204 32..10+0000000000003966 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000000116 81..00+0000000465447013 82..00+0000000110549645 83..00+0000000000302470 71....+0000000000000000 +*110017+0000000000000007 21.324+0000000003747460 22.324+0000000010758590 31..00+0000000000004468 32..10+0000000000004249 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000000131 81..00+0000000465447133 82..00+0000000110549911 83..00+0000000000302484 71....+0000000000000000 +*110018+0000000000000008 21.324+0000000033802160 22.324+0000000010150570 31..00+0000000000006199 32..10+0000000000006067 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000000237 81..00+0000000465442260 82..00+0000000110552180 83..00+0000000000302590 71....+0000000000000000 +*110019+0000000000000009 21.324+0000000029836160 22.324+0000000010648530 31..00+0000000000005488 32..10+0000000000005254 87..10+0000000000000000 58..16+0000000000000344 33..10-0000000000000078 81..00+0000000465439917 82..00+0000000110549069 83..00+0000000000302276 71....+0000000000000000 +*110020+0000000000000010 21.324+0000000028230220 22.324+0000000009248440 31..00+0000000000010785 32..10+0000000000010772 87..10+0000000000001300 58..16+0000000000000175 33..10-0000000000000319 81..00+0000000465434013 82..00+0000000110548886 83..00+0000000000302034 71....+0000000000000000 +*110021+0000000000000011 21.324+0000000005208020 22.324+0000000009428210 31..00+0000000000004313 32..10+0000000000004300 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000001174 81..00+0000000465447924 82..00+0000000110549193 83..00+0000000000303527 71....+0000000000000000 +*110022+0000000000000012 21.324+0000000005044450 22.324+0000000008137520 31..00+0000000000004677 32..10+0000000000004627 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000891 81..00+0000000465448112 82..00+0000000110549481 83..00+0000000000303244 71....+0000000000000000 +*110023+0000000000000013 21.324+0000000004322420 22.324+0000000007933420 31..00+0000000000011597 32..10+0000000000011405 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000002311 81..00+0000000465452362 82..00+0000000110554843 83..00+0000000000304664 71....+0000000000000000 +*110024+0000000000000014 21.324+0000000004213390 22.324+0000000008007010 31..00+0000000000015065 32..10+0000000000014842 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000002796 81..00+0000000465454504 82..00+0000000110557544 83..00+0000000000305149 71....+0000000000000000 +*110025+0000000000000015 21.324+0000000003346460 22.324+0000000008111590 31..00+0000000000017167 32..10+0000000000016965 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000002836 81..00+0000000465453962 82..00+0000000110560654 83..00+0000000000305190 71....+0000000000000000 +*110026+0000000000000016 21.324+0000000001534560 22.324+0000000008200030 31..00+0000000000027304 32..10+0000000000027038 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000004010 81..00+0000000465451792 82..00+0000000110572598 83..00+0000000000306363 71....+0000000000000000 +*110027+0000000000000017 21.324+0000000001558300 22.324+0000000008036540 31..00+0000000000028384 32..10+0000000000028004 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000004838 81..00+0000000465452236 82..00+0000000110573476 83..00+0000000000307192 71....+0000000000000000 +*110028+0000000000000018 21.324+0000000001428410 22.324+0000000008121540 31..00+0000000000028412 32..10+0000000000028090 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000004476 81..00+0000000465451552 82..00+0000000110573751 83..00+0000000000306829 71....+0000000000000000 +*110029+0000000000000019 21.324+0000000003416460 22.324+0000000008238380 31..00+0000000000027992 32..10+0000000000027761 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000003794 81..00+0000000465460165 82..00+0000000110569493 83..00+0000000000306147 71....+0000000000000000 +*110030+0000000000000020 21.324+0000000004217270 22.324+0000000007814330 31..00+0000000000024595 32..10+0000000000024079 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000006522 81..00+0000000465460732 82..00+0000000110564366 83..00+0000000000308875 71....+0000000000000000 +*110031+0000000000000021 21.324+0000000005331040 22.324+0000000007125310 31..00+0000000000015239 32..10+0000000000014445 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000006364 81..00+0000000465456144 82..00+0000000110555142 83..00+0000000000308718 71....+0000000000000000 +*110032+0000000000000022 21.324+0000000008053160 22.324+0000000007227170 31..00+0000000000023186 32..10+0000000000022107 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000008500 81..00+0000000465466357 82..00+0000000110550055 83..00+0000000000310853 71....+0000000000000000 +*110033+0000000000000023 21.324+0000000001902580 22.324+0000000007724330 31..00+0000000000039212 32..10+0000000000038269 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000010058 81..00+0000000465457019 82..00+0000000110582726 83..00+0000000000312411 71....+0000000000000000 +*110034+0000000000000024 21.324+0000000003810480 22.324+0000000007832240 31..00+0000000000043712 32..10+0000000000042840 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000010195 81..00+0000000465471010 82..00+0000000110580229 83..00+0000000000312548 71....+0000000000000000 +*110035+0000000000000031 21.324+0000000034458570 22.324+0000000009054050 31..00+0000000000005359 32..10+0000000000005358 87..10+0000000000000000 58..16+0000000000000344 33..10+0000000000001426 81..00+0000000465443141 82..00+0000000110551729 83..00+0000000000303779 71....+0000000000000000 +*110036+0000000000000032 21.324+0000000029233050 22.324+0000000009558110 31..00+0000000000004488 32..10+0000000000004464 87..10+0000000000001300 58..16+0000000000000175 33..10-0000000000000257 81..00+0000000465440407 82..00+0000000110548265 83..00+0000000000302097 71....+0000000000000000 +*110037+0000000000000033 21.324+0000000027506040 22.324+0000000009425520 31..00+0000000000006362 32..10+0000000000006343 87..10+0000000000001300 58..16+0000000000000175 33..10-0000000000000282 81..00+0000000465438211 82..00+0000000110547118 83..00+0000000000302072 71....+0000000000000000 +*110038+0000000000000034 21.324+0000000027631400 22.324+0000000009349170 31..00+0000000000010047 32..10+0000000000010024 87..10+0000000000001300 58..16+0000000000000175 33..10-0000000000000460 81..00+0000000465434570 82..00+0000000110547693 83..00+0000000000301894 71....+0000000000000000 +*110039+0000000000000035 21.324+0000000027424370 22.324+0000000009425240 31..00+0000000000007978 32..10+0000000000007954 87..10+0000000000001300 58..16+0000000000000175 33..10-0000000000000405 81..00+0000000465436599 82..00+0000000110547165 83..00+0000000000301948 71....+0000000000000000 +*110040+0000000000000036 21.324+0000000027337580 22.324+0000000009552300 31..00+0000000000005445 32..10+0000000000005416 87..10+0000000000001300 58..16+0000000000000175 33..10-0000000000000347 81..00+0000000465439124 82..00+0000000110546897 83..00+0000000000302006 71....+0000000000000000 +*110041+0000000000000037 21.324+0000000026954060 22.324+0000000009916340 31..00+0000000000002914 32..10+0000000000002876 87..10+0000000000001300 58..16+0000000000000175 33..10-0000000000000260 81..00+0000000465441653 82..00+0000000110546549 83..00+0000000000302094 71....+0000000000000000 +*110042+0000000000000038 21.324+0000000013027410 22.324+0000000009545570 31..00+0000000000002638 32..10+0000000000002625 87..10+0000000000001300 58..16+0000000000000175 33..10-0000000000000055 81..00+0000000465446526 82..00+0000000110544850 83..00+0000000000302298 71....+0000000000000000 +*110043+0000000000000039 21.324+0000000011808360 22.324+0000000009002460 31..00+0000000000011703 32..10+0000000000011703 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000201 81..00+0000000465454849 82..00+0000000110541033 83..00+0000000000302554 71....+0000000000000000 +*110044+0000000000000040 21.324+0000000011708390 22.324+0000000008931290 31..00+0000000000017790 32..10+0000000000017789 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000358 81..00+0000000465460359 82..00+0000000110538438 83..00+0000000000302711 71....+0000000000000000 +*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 diff --git a/Resources/Data/TEST.txt b/Resources/Data/TEST.txt new file mode 100644 index 0000000..27545db --- /dev/null +++ b/Resources/Data/TEST.txt @@ -0,0 +1,3 @@ +GS001 465423.089 110526.243 301.586 +GS002 465437.688 110547.569 302.107 +GS003 465472.908 110527.226 302.945 diff --git a/Resources/Data/TPS1100.crf b/Resources/Data/TPS1100.crf new file mode 100644 index 0000000..9ea478f Binary files /dev/null and b/Resources/Data/TPS1100.crf differ diff --git a/Settings.vb b/Settings.vb new file mode 100644 index 0000000..94ac0c7 --- /dev/null +++ b/Settings.vb @@ -0,0 +1,11 @@ + +Namespace My + + 'This class allows you to handle specific events on the settings class: + ' The SettingChanging event is raised before a setting's value is changed. + ' The PropertyChanged event is raised after a setting's value is changed. + ' The SettingsLoaded event is raised after the setting values are loaded. + ' The SettingsSaving event is raised before the setting values are saved. + Partial Friend NotInheritable Class MySettings + End Class +End Namespace diff --git a/TPS1100 Convert.vbproj b/TPS1100 Convert.vbproj index 68b4ac1..bceb9b7 100644 --- a/TPS1100 Convert.vbproj +++ b/TPS1100 Convert.vbproj @@ -32,8 +32,8 @@ true publish.html true - 9 - 2.5.0.%2a + 1 + 2.6.0.%2a false true true @@ -156,6 +156,7 @@ Settings.settings True + SplashScreen1.vb @@ -198,6 +199,10 @@ + + PreserveNewest + + @@ -271,6 +276,10 @@ + + + + @@ -293,6 +302,9 @@ + + +