diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fbb3f3..3233f80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,35 @@ -# TPS1100 Convert - Change log +# TPS1100 Convert: Zapisnik Razvoja Zapisnik razvoja programa TPS1100 Convert. --- -## Verzija - 2.7.0.0 +## v2.7.0.0 (2024/06/20) -Datum: 2024/06/15 +### Novo -- Novo: Priprava GEO datoteke za preračun v Geo programu -- Dodano izpisovanje kode točke za orientacije v seznamu točk -- Sprememnjena vidnost polj za vnost stojišča in temp/pritiska v urejevalniku GSI datotek +- Priprava GEO datoteke za obdelavo meritev v programu GeoPro/GeoX +- Dodano izpisovanje klasifikacije točk uporabljenih za orientacijo (Seznamu točk) +- Dodane kode za ročni vnos podatkov: + - (koda: 1) stojišče + - (koda: 2) temperatura in zračni pritisk pritisk + - (koda: 3) orientacije + +### Spremembe + +- Dodana vrstica z meniji Datoteka in Program +- Posodobljen vmesnik v glavnem oknu aplikacije +- Funkcije Info, Navodila in Nastavitve so prestavljene v vrstico z meniji +- Sprememnjen način prikazovanja polj za ročni vnos podatkov za stojišče, temp./pritisk in orientacijo (Urejevalnik GSI datotek) - Odstranjena koda za "StakeOut" (ni uporabna) +### V Delu + +- Delo na dokumentaciji: + - Navodila za uporabo programa + - Kodiranje podatkov (uporaba in opis kod) +- Delo na funkcijah za uvoz in izvoz kodiranja podatkov v nastavitvah (Uvoz še ni aktiven) + --- ## Verzija - 2.6.x diff --git a/Form1.Designer.vb b/Form1.Designer.vb index de2fb9b..f8e115f 100644 --- a/Form1.Designer.vb +++ b/Form1.Designer.vb @@ -33,23 +33,33 @@ 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.ToolStripButtonPripravi = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() - Me.tsbOpenFile = New System.Windows.Forms.ToolStripButton() - Me.ButtonUrediDat = New System.Windows.Forms.ToolStripButton() Me.LabelDatoteka = New System.Windows.Forms.ToolStripLabel() + Me.tsbOpenFile = New System.Windows.Forms.ToolStripButton() + Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() + 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.ToolStripButtonGeo = New System.Windows.Forms.ToolStripButton() Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() Me.tsbSaveAs = New System.Windows.Forms.ToolStripButton() - Me.ToolStripButtonNavodila = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripButtonNast = New System.Windows.Forms.ToolStripButton() + Me.ToolStripButtonPripravi = New System.Windows.Forms.ToolStripButton() Me.OpenFileDialogTocke = New System.Windows.Forms.OpenFileDialog() + Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() + Me.MenuToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.OdpriGSIToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator() + Me.PripraviGSIToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.InfoOAplikacijiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.DatotekaToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.OdpriGSIToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.PripraviGSIToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.ShraniToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.IzhodToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() + Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.StatusStrip1.SuspendLayout() Me.ToolStrip1.SuspendLayout() + Me.MenuStrip1.SuspendLayout() Me.SuspendLayout() ' 'RichTextBox1 @@ -61,11 +71,11 @@ Partial Class Form1 Me.RichTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None Me.RichTextBox1.Cursor = System.Windows.Forms.Cursors.IBeam Me.RichTextBox1.Font = New System.Drawing.Font("Courier New", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(238, Byte)) - Me.RichTextBox1.Location = New System.Drawing.Point(9, 47) + Me.RichTextBox1.Location = New System.Drawing.Point(9, 71) 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, 671) + Me.RichTextBox1.Size = New System.Drawing.Size(1233, 647) Me.RichTextBox1.TabIndex = 1 Me.RichTextBox1.Text = resources.GetString("RichTextBox1.Text") Me.RichTextBox1.WordWrap = False @@ -129,27 +139,22 @@ Partial Class Form1 ' Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(30, 30) - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButtonPripravi, Me.ToolStripSeparator2, Me.tsbOpenFile, Me.ButtonUrediDat, Me.tsbFileName, Me.LabelDatoteka, Me.ToolStripSeparator1, Me.tsbConvert, Me.tsbPointsOnly, Me.tsbHelp, Me.ToolStripButtonGeo, Me.ToolStripSeparator4, Me.tsbSaveAs, Me.ToolStripButtonNavodila, Me.ToolStripSeparator3, Me.ToolStripButtonNast}) - Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) + Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LabelDatoteka, Me.tsbFileName, Me.tsbOpenFile, Me.ToolStripButtonPripravi, Me.ToolStripSeparator5, Me.ButtonUrediDat, Me.ToolStripSeparator1, Me.tsbConvert, Me.tsbPointsOnly, Me.ToolStripButtonGeo, Me.ToolStripSeparator4, Me.tsbSaveAs}) + Me.ToolStrip1.Location = New System.Drawing.Point(0, 24) Me.ToolStrip1.Name = "ToolStrip1" Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(10, 5, 10, 5) Me.ToolStrip1.Size = New System.Drawing.Size(1251, 47) Me.ToolStrip1.TabIndex = 0 Me.ToolStrip1.Text = "ToolStrip1" ' - 'ToolStripButtonPripravi + 'LabelDatoteka ' - 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) + Me.LabelDatoteka.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.LabelDatoteka.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_window_50 + Me.LabelDatoteka.Name = "LabelDatoteka" + Me.LabelDatoteka.Size = New System.Drawing.Size(30, 34) + Me.LabelDatoteka.Text = "Datoteka" + Me.LabelDatoteka.ToolTipText = "Ni datoteke" ' 'tsbOpenFile ' @@ -160,6 +165,11 @@ Partial Class Form1 Me.tsbOpenFile.Text = "Odpri GSI" Me.tsbOpenFile.ToolTipText = "Izberi GSI datoteko..." ' + 'ToolStripSeparator5 + ' + Me.ToolStripSeparator5.Name = "ToolStripSeparator5" + Me.ToolStripSeparator5.Size = New System.Drawing.Size(6, 37) + ' 'ButtonUrediDat ' Me.ButtonUrediDat.Enabled = False @@ -170,15 +180,6 @@ Partial Class Form1 Me.ButtonUrediDat.Text = "Uredi" Me.ButtonUrediDat.ToolTipText = "Uredi podatke GSI datoteke..." ' - 'LabelDatoteka - ' - Me.LabelDatoteka.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.LabelDatoteka.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_window_50 - Me.LabelDatoteka.Name = "LabelDatoteka" - Me.LabelDatoteka.Size = New System.Drawing.Size(30, 34) - Me.LabelDatoteka.Text = "Datoteka" - Me.LabelDatoteka.ToolTipText = "Ni datoteke" - ' 'tsbConvert ' Me.tsbConvert.Enabled = False @@ -201,16 +202,6 @@ Partial Class Form1 Me.tsbPointsOnly.Text = "Točke" Me.tsbPointsOnly.ToolTipText = "Izvozi koordinate točk." ' - 'tsbHelp - ' - Me.tsbHelp.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - 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(62, 34) - Me.tsbHelp.Text = "Info" - Me.tsbHelp.ToolTipText = "O programu..." - ' 'ToolStripButtonGeo ' Me.ToolStripButtonGeo.Enabled = False @@ -235,36 +226,108 @@ Partial Class Form1 Me.tsbSaveAs.Size = New System.Drawing.Size(93, 34) Me.tsbSaveAs.Text = "Shrani ..." ' - 'ToolStripButtonNavodila + 'ToolStripButtonPripravi ' - Me.ToolStripButtonNavodila.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripButtonNavodila.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_question_mark_48 - Me.ToolStripButtonNavodila.ImageTransparentColor = System.Drawing.Color.Magenta - Me.ToolStripButtonNavodila.Name = "ToolStripButtonNavodila" - Me.ToolStripButtonNavodila.Size = New System.Drawing.Size(88, 34) - Me.ToolStripButtonNavodila.Text = "Navodila" - Me.ToolStripButtonNavodila.ToolTipText = "Odpri PDF z navodili..." - ' - 'ToolStripSeparator3 - ' - Me.ToolStripSeparator3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 37) - ' - 'ToolStripButtonNast - ' - Me.ToolStripButtonNast.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - 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(96, 34) - Me.ToolStripButtonNast.Text = "Nastavitve" - Me.ToolStripButtonNast.ToolTipText = "Odpri Nastavitve..." + Me.ToolStripButtonPripravi.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_send_file_50 + Me.ToolStripButtonPripravi.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButtonPripravi.Name = "ToolStripButtonPripravi" + Me.ToolStripButtonPripravi.Size = New System.Drawing.Size(101, 34) + Me.ToolStripButtonPripravi.Text = "Pripravi GSI" + Me.ToolStripButtonPripravi.ToolTipText = "Pripravi GSI iz datoteke z točkami..." ' 'OpenFileDialogTocke ' Me.OpenFileDialogTocke.Filter = "Datoteke točk|*.koo;*.txt|All files|*.*" ' + 'MenuStrip1 + ' + Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DatotekaToolStripMenuItem, Me.MenuToolStripMenuItem}) + Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) + Me.MenuStrip1.Name = "MenuStrip1" + Me.MenuStrip1.Size = New System.Drawing.Size(1251, 24) + Me.MenuStrip1.TabIndex = 3 + Me.MenuStrip1.Text = "MenuStrip1" + ' + 'MenuToolStripMenuItem + ' + Me.MenuToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OdpriGSIToolStripMenuItem, Me.ToolStripSeparator6, Me.PripraviGSIToolStripMenuItem, Me.InfoOAplikacijiToolStripMenuItem}) + Me.MenuToolStripMenuItem.Name = "MenuToolStripMenuItem" + Me.MenuToolStripMenuItem.Size = New System.Drawing.Size(65, 20) + Me.MenuToolStripMenuItem.Text = "Program" + Me.MenuToolStripMenuItem.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage + ' + 'OdpriGSIToolStripMenuItem + ' + Me.OdpriGSIToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_tools_50 + Me.OdpriGSIToolStripMenuItem.Name = "OdpriGSIToolStripMenuItem" + Me.OdpriGSIToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.OdpriGSIToolStripMenuItem.Text = "Nastavitve" + ' + 'ToolStripSeparator6 + ' + Me.ToolStripSeparator6.Name = "ToolStripSeparator6" + Me.ToolStripSeparator6.Size = New System.Drawing.Size(151, 6) + ' + 'PripraviGSIToolStripMenuItem + ' + Me.PripraviGSIToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_question_mark_48 + Me.PripraviGSIToolStripMenuItem.Name = "PripraviGSIToolStripMenuItem" + Me.PripraviGSIToolStripMenuItem.Size = New System.Drawing.Size(154, 22) + Me.PripraviGSIToolStripMenuItem.Text = "Navodila" + ' + 'InfoOAplikacijiToolStripMenuItem + ' + Me.InfoOAplikacijiToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_information_50 + Me.InfoOAplikacijiToolStripMenuItem.Name = "InfoOAplikacijiToolStripMenuItem" + Me.InfoOAplikacijiToolStripMenuItem.Size = New System.Drawing.Size(154, 22) + Me.InfoOAplikacijiToolStripMenuItem.Text = "Info o aplikaciji" + ' + 'DatotekaToolStripMenuItem + ' + Me.DatotekaToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OdpriGSIToolStripMenuItem1, Me.PripraviGSIToolStripMenuItem1, Me.ToolStripSeparator3, Me.ShraniToolStripMenuItem, Me.ToolStripSeparator2, Me.IzhodToolStripMenuItem}) + Me.DatotekaToolStripMenuItem.Name = "DatotekaToolStripMenuItem" + Me.DatotekaToolStripMenuItem.Size = New System.Drawing.Size(66, 20) + Me.DatotekaToolStripMenuItem.Text = "&Datoteka" + ' + 'OdpriGSIToolStripMenuItem1 + ' + Me.OdpriGSIToolStripMenuItem1.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_opened_folder_50 + Me.OdpriGSIToolStripMenuItem1.Name = "OdpriGSIToolStripMenuItem1" + Me.OdpriGSIToolStripMenuItem1.Size = New System.Drawing.Size(180, 22) + Me.OdpriGSIToolStripMenuItem1.Text = "&Odpri GSI" + ' + 'PripraviGSIToolStripMenuItem1 + ' + Me.PripraviGSIToolStripMenuItem1.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_send_file_50 + Me.PripraviGSIToolStripMenuItem1.Name = "PripraviGSIToolStripMenuItem1" + Me.PripraviGSIToolStripMenuItem1.Size = New System.Drawing.Size(180, 22) + Me.PripraviGSIToolStripMenuItem1.Text = "&Pripravi GSI" + ' + 'ShraniToolStripMenuItem + ' + Me.ShraniToolStripMenuItem.Enabled = False + Me.ShraniToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_save_as_50 + Me.ShraniToolStripMenuItem.Name = "ShraniToolStripMenuItem" + Me.ShraniToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ShraniToolStripMenuItem.Text = "&Shrani..." + ' + 'IzhodToolStripMenuItem + ' + Me.IzhodToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_50 + Me.IzhodToolStripMenuItem.Name = "IzhodToolStripMenuItem" + Me.IzhodToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.IzhodToolStripMenuItem.Text = "I&zhod" + ' + 'ToolStripSeparator2 + ' + Me.ToolStripSeparator2.Name = "ToolStripSeparator2" + Me.ToolStripSeparator2.Size = New System.Drawing.Size(177, 6) + ' + 'ToolStripSeparator3 + ' + Me.ToolStripSeparator3.Name = "ToolStripSeparator3" + Me.ToolStripSeparator3.Size = New System.Drawing.Size(177, 6) + ' 'Form1 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -273,8 +336,10 @@ Partial Class Form1 Me.Controls.Add(Me.StatusStrip1) Me.Controls.Add(Me.RichTextBox1) Me.Controls.Add(Me.ToolStrip1) + Me.Controls.Add(Me.MenuStrip1) Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(238, Byte)) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.MainMenuStrip = Me.MenuStrip1 Me.MinimumSize = New System.Drawing.Size(1000, 480) Me.Name = "Form1" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen @@ -283,6 +348,8 @@ Partial Class Form1 Me.StatusStrip1.PerformLayout() Me.ToolStrip1.ResumeLayout(False) Me.ToolStrip1.PerformLayout() + Me.MenuStrip1.ResumeLayout(False) + Me.MenuStrip1.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -297,19 +364,28 @@ Partial Class Form1 Friend WithEvents tsbConvert As ToolStripButton Friend WithEvents tsbSaveAs As ToolStripButton Friend WithEvents ToolStrip1 As ToolStrip - Friend WithEvents ToolStripSeparator3 As ToolStripSeparator Friend WithEvents ToolStripStatusLabel1 As ToolStripStatusLabel Friend WithEvents ToolStripStatusLabel2 As ToolStripStatusLabel Friend WithEvents tsbPointsOnly As ToolStripButton - Friend WithEvents tsbHelp As ToolStripButton Friend WithEvents ToolStripSeparator4 As ToolStripSeparator Friend WithEvents ButtonUrediDat As ToolStripButton - Friend WithEvents ToolStripSeparator2 As ToolStripSeparator Friend WithEvents LabelDatoteka As ToolStripLabel Friend WithEvents ToolStripProgressBar1 As ToolStripProgressBar - Friend WithEvents ToolStripButtonNast As ToolStripButton Friend WithEvents ToolStripButtonPripravi As ToolStripButton Friend WithEvents OpenFileDialogTocke As OpenFileDialog Friend WithEvents ToolStripButtonGeo As ToolStripButton - Friend WithEvents ToolStripButtonNavodila As ToolStripButton + Friend WithEvents ToolStripSeparator5 As ToolStripSeparator + Friend WithEvents MenuStrip1 As MenuStrip + Friend WithEvents MenuToolStripMenuItem As ToolStripMenuItem + Friend WithEvents OdpriGSIToolStripMenuItem As ToolStripMenuItem + Friend WithEvents PripraviGSIToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolStripSeparator6 As ToolStripSeparator + Friend WithEvents InfoOAplikacijiToolStripMenuItem As ToolStripMenuItem + Friend WithEvents DatotekaToolStripMenuItem As ToolStripMenuItem + Friend WithEvents OdpriGSIToolStripMenuItem1 As ToolStripMenuItem + Friend WithEvents PripraviGSIToolStripMenuItem1 As ToolStripMenuItem + Friend WithEvents ToolStripSeparator3 As ToolStripSeparator + Friend WithEvents ShraniToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolStripSeparator2 As ToolStripSeparator + Friend WithEvents IzhodToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Form1.resx b/Form1.resx index c4739e4..91f6579 100644 --- a/Form1.resx +++ b/Form1.resx @@ -155,6 +155,9 @@ Lokacija zapisnika = 519, 17 + + 684, 17 + diff --git a/Form1.vb b/Form1.vb index 9db7406..7953ba7 100644 --- a/Form1.vb +++ b/Form1.vb @@ -2,7 +2,6 @@ Imports System.Runtime.InteropServices.ComTypes Public Class Form1 - Public DatotekaLogfile As String = My.Settings.DatLogfile Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load If DatotekaLogfile = "" Then @@ -21,8 +20,7 @@ Public Class Form1 RichTextBox1.Font = New Font(My.Settings.Pisava, My.Settings.PisavaVelikost) End Sub - Public streamLines As Integer = 0 - Private Sub tsbOpenFile_Click(sender As Object, e As EventArgs) Handles tsbOpenFile.Click + Public Sub OdpriDatotekoGsi() OpenFileDialog1.ReadOnlyChecked = False If OpenFileDialog1.ShowDialog = DialogResult.OK Then RichTextBox1.Clear() @@ -43,6 +41,7 @@ Public Class Form1 ToolStripStatusLabel1.Text = My.Settings.ZadnjaMapa tsbSaveAs.Text = "Shrani ..." tsbSaveAs.Enabled = False + ShraniToolStripMenuItem.Enabled = False tsbConvert.Enabled = True tsbPointsOnly.Enabled = True ToolStripButtonGeo.Enabled = True @@ -55,12 +54,61 @@ Public Class Form1 RichTextBox1.Clear() tsbSaveAs.Text = "Shrani ..." tsbSaveAs.Enabled = False + ShraniToolStripMenuItem.Enabled = False tsbConvert.Enabled = False tsbPointsOnly.Enabled = False End If OpenFileDialog1.Dispose() End Sub + Public Sub PripraviDatotekoGsi() + 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 + ShraniToolStripMenuItem.Enabled = True + tsbSaveAs.Text = "Shrani GSI" + End If + End Sub + + Public Sub ShraniDatoteko() + SaveFileDialog1.FileName = Path.GetFileNameWithoutExtension(OpenFileDialog1.FileName) + SaveFileDialog1.InitialDirectory = My.Settings.MapaShrani + If SaveFileDialog1.ShowDialog = DialogResult.OK Then + RichTextBox1.SaveFile(SaveFileDialog1.FileName, RichTextBoxStreamType.PlainText) + 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 + ShraniToolStripMenuItem.Enabled = False + End If + End Sub + + Public streamLines As Integer = 0 + Private Sub tsbConvert_Click(sender As Object, e As EventArgs) Handles tsbConvert.Click ToolStripStatusLabel1.Text = "Procesiranje..." RichTextBox1.Clear() @@ -288,6 +336,7 @@ Public Class Form1 ToolStripStatusLabel1.Text = "Prebrano: " + i.ToString + "/" + ToolStripProgressBar1.Maximum.ToString + " vrstic" SaveFileDialog1.Filter = "Zapisnik meritve|*.mer|Text file|*.txt|All files|*.*" tsbSaveAs.Enabled = True + ShraniToolStripMenuItem.Enabled = True tsbSaveAs.Text = "Shrani Zapisnik" End Sub @@ -424,66 +473,10 @@ Public Class Form1 SaveFileDialog1.Filter = "KOO|*.koo|TXT|*.txt|All files|*.*" streamReader.Close() tsbSaveAs.Enabled = True + ShraniToolStripMenuItem.Enabled = True tsbSaveAs.Text = "Shrani Točke" End Sub - 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) - 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 ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ButtonUrediDat.Click - Form2.ShowDialog() - End Sub - - Private Sub ToolStripButtonNast_Click(sender As Object, e As EventArgs) Handles ToolStripButtonNast.Click - 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 - ' Priprava GEO datoteke Private Sub ToolStripButtonGeo_Click(sender As Object, e As EventArgs) Handles ToolStripButtonGeo.Click RichTextBox1.Clear() @@ -527,7 +520,10 @@ Public Class Form1 Dim numPress As Double numPress = infoPress * 0.750062 infoPress = Format(numPress, "0.00").ToString - izpisText = infoTemp + " " + infoPress + vbCrLf + If measuredPoints = 0 Then + izpisText = infoTemp + " " + infoPress + vbCrLf + End If + measuredPoints = 0 End If @@ -543,7 +539,7 @@ Public Class Form1 End If If dataKoda = My.Settings.KodaUserImport Then - measuredPoints = 0 + measuredPoints = 1 End If If dataKoda = My.Settings.KodaMeasOri Then @@ -656,10 +652,61 @@ Public Class Form1 SaveFileDialog1.Filter = "GEO datoteka|*.GEO" SaveFileDialog1.FileName = Path.GetFileNameWithoutExtension(OpenFileDialogTocke.FileName) tsbSaveAs.Enabled = True + ShraniToolStripMenuItem.Enabled = True tsbSaveAs.Text = "Shrani GEO" End Sub - Private Sub ToolStripButtonNavodila_Click(sender As Object, e As EventArgs) Handles ToolStripButtonNavodila.Click + Private Sub InfoOAplikacijiToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles InfoOAplikacijiToolStripMenuItem.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 PripraviGSIToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PripraviGSIToolStripMenuItem.Click Process.Start("Navodila.pdf") End Sub + + Private Sub OdpriGSIToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OdpriGSIToolStripMenuItem.Click + FormNastavitve.ShowDialog() + End Sub + + Private Sub OdpriGSIToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles OdpriGSIToolStripMenuItem1.Click + OdpriDatotekoGsi() + + End Sub + Private Sub tsbOpenFile_Click(sender As Object, e As EventArgs) Handles tsbOpenFile.Click + OdpriDatotekoGsi() + + End Sub + Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ButtonUrediDat.Click + Form2.ShowDialog() + End Sub + + Private Sub ToolStripButtonNast_Click(sender As Object, e As EventArgs) + FormNastavitve.ShowDialog() + End Sub + + Private Sub ToolStripButtonPripravi_Click(sender As Object, e As EventArgs) Handles ToolStripButtonPripravi.Click + PripraviDatotekoGsi() + + End Sub + + Private Sub PripraviGSIToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles PripraviGSIToolStripMenuItem1.Click + PripraviDatotekoGsi() + + End Sub + Private Sub tsbSaveAs_Click(sender As Object, e As EventArgs) Handles tsbSaveAs.Click + ShraniDatoteko() + + End Sub + + Private Sub ShraniToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ShraniToolStripMenuItem.Click + ShraniDatoteko() + + End Sub + + Private Sub IzhodToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles IzhodToolStripMenuItem.Click + Me.Close() + Application.Exit() + + End Sub End Class diff --git a/Form2.Designer.vb b/Form2.Designer.vb index 82636b9..d3c8639 100644 --- a/Form2.Designer.vb +++ b/Form2.Designer.vb @@ -142,7 +142,6 @@ Partial Class Form2 ' 'ToolStripTextBox1 ' - Me.ToolStripTextBox1.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripTextBox1.Name = "ToolStripTextBox1" Me.ToolStripTextBox1.Size = New System.Drawing.Size(90, 27) Me.ToolStripTextBox1.Text = "NAME" @@ -158,7 +157,6 @@ Partial Class Form2 ' 'ToolStripTextBox2 ' - Me.ToolStripTextBox2.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripTextBox2.Name = "ToolStripTextBox2" Me.ToolStripTextBox2.Size = New System.Drawing.Size(60, 27) Me.ToolStripTextBox2.Text = "0.000" @@ -174,7 +172,6 @@ Partial Class Form2 ' 'ToolStripTextBox5 ' - Me.ToolStripTextBox5.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripTextBox5.Name = "ToolStripTextBox5" Me.ToolStripTextBox5.Size = New System.Drawing.Size(70, 27) Me.ToolStripTextBox5.Text = "0.0000" @@ -190,7 +187,6 @@ Partial Class Form2 ' 'ToolStripTextBox3 ' - Me.ToolStripTextBox3.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripTextBox3.Name = "ToolStripTextBox3" Me.ToolStripTextBox3.Size = New System.Drawing.Size(50, 27) Me.ToolStripTextBox3.Text = "20.0" @@ -206,7 +202,6 @@ Partial Class Form2 ' 'ToolStripTextBox4 ' - Me.ToolStripTextBox4.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripTextBox4.Name = "ToolStripTextBox4" Me.ToolStripTextBox4.Size = New System.Drawing.Size(60, 27) Me.ToolStripTextBox4.Text = "1013" diff --git a/FormNastavitve.Designer.vb b/FormNastavitve.Designer.vb index 4895ad8..35f619f 100644 --- a/FormNastavitve.Designer.vb +++ b/FormNastavitve.Designer.vb @@ -37,30 +37,32 @@ Partial Class FormNastavitve Me.OpenFileDialogLog = New System.Windows.Forms.OpenFileDialog() Me.SaveFileDialogLog = New System.Windows.Forms.SaveFileDialog() Me.TableLayoutPanel3 = New System.Windows.Forms.TableLayoutPanel() - Me.Label15 = New System.Windows.Forms.Label() + Me.Label7 = New System.Windows.Forms.Label() + Me.TextBoxOriHz = New System.Windows.Forms.TextBox() 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.TextBoxMeas = New System.Windows.Forms.TextBox() - Me.Label6 = New System.Windows.Forms.Label() Me.Label10 = New System.Windows.Forms.Label() + Me.TextBoxImport = New System.Windows.Forms.TextBox() + Me.Label8 = New System.Windows.Forms.Label() + Me.TextBoxMeas = New System.Windows.Forms.TextBox() + Me.TextBoxMeasOri = New System.Windows.Forms.TextBox() + Me.Label6 = New System.Windows.Forms.Label() + Me.Label9 = New System.Windows.Forms.Label() + Me.Label15 = New System.Windows.Forms.Label() Me.Label11 = New System.Windows.Forms.Label() + Me.TextBoxOriHt = New System.Windows.Forms.TextBox() + Me.TextBoxFree = New System.Windows.Forms.TextBox() + Me.TextBoxRes = New System.Windows.Forms.TextBox() + Me.TextBoxSetAzi = New System.Windows.Forms.TextBox() + Me.TextBoxQuickSet = New System.Windows.Forms.TextBox() + Me.Label5 = New System.Windows.Forms.Label() + Me.Label4 = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.Label2 = New System.Windows.Forms.Label() + Me.Label1 = New System.Windows.Forms.Label() + Me.TextBoxStoj = New System.Windows.Forms.TextBox() + Me.TextBoxStojInfo = New System.Windows.Forms.TextBox() + Me.Label13 = 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() @@ -73,8 +75,6 @@ Partial Class FormNastavitve Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() Me.ZapriToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ButtonShraniZapri = New System.Windows.Forms.Button() - Me.TextBoxOriHz = New System.Windows.Forms.TextBox() - Me.Label7 = New System.Windows.Forms.Label() Me.GroupBox1.SuspendLayout() Me.TableLayoutPanel1.SuspendLayout() Me.GroupBox2.SuspendLayout() @@ -288,18 +288,30 @@ Partial Class FormNastavitve Me.TableLayoutPanel3.Size = New System.Drawing.Size(239, 390) Me.TableLayoutPanel3.TabIndex = 0 ' - 'Label15 + 'Label7 ' - Me.Label15.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + 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.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, 270) - 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 + Me.Label7.AutoSize = True + Me.Label7.Location = New System.Drawing.Point(78, 90) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(79, 30) + Me.Label7.TabIndex = 9 + Me.Label7.Text = "Orientacija (Hz)" + Me.Label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'TextBoxOriHz + ' + Me.TextBoxOriHz.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.TextBoxOriHz.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.TextBoxOriHz.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBoxOriHz.Location = New System.Drawing.Point(3, 93) + Me.TextBoxOriHz.Name = "TextBoxOriHz" + Me.TextBoxOriHz.Size = New System.Drawing.Size(69, 22) + Me.TextBoxOriHz.TabIndex = 9 + Me.TextBoxOriHz.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'Label14 ' @@ -314,18 +326,6 @@ Partial Class FormNastavitve 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) _ @@ -338,232 +338,6 @@ Partial Class FormNastavitve 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, 303) - 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, 123) - 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, 300) - 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, 153) - 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, 183) - 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, 213) - 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, 243) - 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, 120) - 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, 150) - 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, 180) - 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, 210) - 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, 240) - Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(103, 30) - Me.Label5.TabIndex = 4 - Me.Label5.Text = "Ori. and Ht. Transfer" - Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - ' - '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, 333) - 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, 330) - 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) _ @@ -577,6 +351,94 @@ Partial Class FormNastavitve Me.Label10.Text = "Stojišče" Me.Label10.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 + ' + '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 + ' + '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, 333) + 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 + ' + '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, 303) + 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 + ' + '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, 330) + 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 + ' + '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, 300) + 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 + ' + '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, 270) + 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 + ' 'Label11 ' Me.Label11.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ @@ -590,6 +452,169 @@ Partial Class FormNastavitve Me.Label11.Text = "Meritve" Me.Label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' + '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, 243) + 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 + ' + '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, 213) + 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 + ' + '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, 183) + 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 + ' + '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, 153) + 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 + ' + '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, 123) + 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 + ' + '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, 240) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(103, 30) + Me.Label5.TabIndex = 4 + Me.Label5.Text = "Ori. and Ht. Transfer" + Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + '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, 210) + 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 + ' + '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, 180) + 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 + ' + '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, 150) + 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 + ' + '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, 120) + 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 + ' + '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 + ' + '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 + ' + '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 + ' 'GroupBox4 ' Me.GroupBox4.Controls.Add(Me.LabelFontInfo) @@ -688,31 +713,6 @@ Partial Class FormNastavitve Me.ButtonShraniZapri.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.ButtonShraniZapri.UseVisualStyleBackColor = True ' - 'TextBoxOriHz - ' - Me.TextBoxOriHz.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TextBoxOriHz.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.TextBoxOriHz.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.TextBoxOriHz.Location = New System.Drawing.Point(3, 93) - Me.TextBoxOriHz.Name = "TextBoxOriHz" - Me.TextBoxOriHz.Size = New System.Drawing.Size(69, 22) - Me.TextBoxOriHz.TabIndex = 9 - Me.TextBoxOriHz.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'Label7 - ' - Me.Label7.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(78, 90) - Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(79, 30) - Me.Label7.TabIndex = 9 - Me.Label7.Text = "Orientacija (Hz)" - Me.Label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - ' 'FormNastavitve ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/My Project/Icons/icons8-apps-tab-50.png b/My Project/Icons/icons8-apps-tab-50.png new file mode 100644 index 0000000..281d088 Binary files /dev/null and b/My Project/Icons/icons8-apps-tab-50.png differ diff --git a/My Project/Icons/icons8-checklist-48.png b/My Project/Icons/icons8-checklist-48.png new file mode 100644 index 0000000..b69aa1a Binary files /dev/null and b/My Project/Icons/icons8-checklist-48.png differ diff --git a/My Project/Icons/icons8-compare-50.png b/My Project/Icons/icons8-compare-50.png new file mode 100644 index 0000000..9774844 Binary files /dev/null and b/My Project/Icons/icons8-compare-50.png differ diff --git a/My Project/Icons/icons8-error-48.png b/My Project/Icons/icons8-error-48.png new file mode 100644 index 0000000..2baa822 Binary files /dev/null and b/My Project/Icons/icons8-error-48.png differ diff --git a/My Project/Icons/icons8-file-path-50.png b/My Project/Icons/icons8-file-path-50.png new file mode 100644 index 0000000..b31089e Binary files /dev/null and b/My Project/Icons/icons8-file-path-50.png differ diff --git a/My Project/Icons/icons8-list-50.png b/My Project/Icons/icons8-list-50.png new file mode 100644 index 0000000..536412b Binary files /dev/null and b/My Project/Icons/icons8-list-50.png differ diff --git a/My Project/Icons/icons8-menu-50.png b/My Project/Icons/icons8-menu-50.png new file mode 100644 index 0000000..28dab74 Binary files /dev/null and b/My Project/Icons/icons8-menu-50.png differ diff --git a/My Project/Icons/icons8-mesh-48.png b/My Project/Icons/icons8-mesh-48.png new file mode 100644 index 0000000..3c8a242 Binary files /dev/null and b/My Project/Icons/icons8-mesh-48.png differ diff --git a/My Project/Icons/icons8-rename-50.png b/My Project/Icons/icons8-rename-50.png new file mode 100644 index 0000000..6f522db Binary files /dev/null and b/My Project/Icons/icons8-rename-50.png differ diff --git a/My Project/Resources.Designer.vb b/My Project/Resources.Designer.vb index 56203b4..cbc947f 100644 --- a/My Project/Resources.Designer.vb +++ b/My Project/Resources.Designer.vb @@ -621,6 +621,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property icons8_menu_50() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("icons8-menu-50", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' @@ -752,7 +762,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to # TPS1100-Convert + ''' 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) ''' @@ -762,11 +772,9 @@ Namespace My.Resources ''' '''- Zapisnik Meritev (podatki meritev kot so Hz, V, SD, HD,...) '''- Koordinate Točk (seznam točk v obliki E, N, Ht, koda in klasifikacija) + '''- Priprava GSI datoteke iz seznama točk (Uvoz TXT/KOO/... datotek) ''' - '''Program uporablja kodiranje za prepoznavo posameznih elementov meritev. - ''' - '''<br> - '''Aplikacij [rest of string was truncated]";. + '''Program uporablja kodi [rest of string was truncated]";. ''' Friend ReadOnly Property README() As String Get diff --git a/My Project/Resources.resx b/My Project/Resources.resx index bfad749..70262bb 100644 --- a/My Project/Resources.resx +++ b/My Project/Resources.resx @@ -130,6 +130,9 @@ Icons\icons8-send-file-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Information 7 + Prism constant @@ -163,30 +166,21 @@ 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-do-not-disturb-50.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 - - - Slope distance + + Icons\icons8-opened-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a 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 @@ -202,14 +196,11 @@ 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-add-new-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 @@ -217,8 +208,8 @@ Icons\Fine-Print-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Remark 1 + + St. Northing PPM @@ -232,21 +223,27 @@ Information 2 + + Icons\icons8-close-50.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\icons8-edit-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 + + Code-Block ID + Remark 4 @@ -256,9 +253,6 @@ 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 @@ -274,8 +268,8 @@ 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-check-file-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 @@ -289,11 +283,14 @@ Instrument height + + Information 1 + 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 + + Time Icons\icons8-no-entry-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -313,11 +310,14 @@ Icons\icons8-connection-status-on-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Information 7 + + Northing - - Horizontal Angle + + Remark 1 + + + Information 4 Icons\icons8-advance-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -331,8 +331,8 @@ Reflector height - - Icons\icons8-add-new-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-add-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -340,19 +340,22 @@ Horizontal distance - - Icons\icons8-edit-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Slope distance - - Code-Block ID + + Horizontal Angle Correction + + + Horizontal Angle St. Easting - - Information 1 + + Icons\icons8-close-window-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Icons\icons8-check-file-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Icons\icons8-menu-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/img/screen1.png b/My Project/img/screen1.png index 724c539..0a74f00 100644 Binary files a/My Project/img/screen1.png and b/My Project/img/screen1.png differ diff --git a/My Project/img/screen2.png b/My Project/img/screen2.png index efcc369..b4a380b 100644 Binary files a/My Project/img/screen2.png and b/My Project/img/screen2.png differ diff --git a/My Project/img/screen2a.png b/My Project/img/screen2a.png new file mode 100644 index 0000000..e6a7433 Binary files /dev/null and b/My Project/img/screen2a.png differ diff --git a/My Project/img/screen2b.png b/My Project/img/screen2b.png new file mode 100644 index 0000000..30453ca Binary files /dev/null and b/My Project/img/screen2b.png differ diff --git a/My Project/img/screen3.png b/My Project/img/screen3.png index fa2d777..b9d6713 100644 Binary files a/My Project/img/screen3.png and b/My Project/img/screen3.png differ diff --git a/My Project/img/screen4.png b/My Project/img/screen4.png index de5d570..b338bbe 100644 Binary files a/My Project/img/screen4.png and b/My Project/img/screen4.png differ diff --git a/Podatki/TEST.GSI b/Podatki/TEST.GSI index 6035f3b..4b5531a 100644 --- a/Podatki/TEST.GSI +++ b/Podatki/TEST.GSI @@ -2,6 +2,7 @@ *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 +*410000+0000000000000002 71....+0000000000000021 72....+0000000000001018 *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 diff --git a/README.md b/README.md index 5d90329..a5923c4 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Enostavna priprava in izvoz podatkov meritev v različnih oblikah... - Koordinate Točk (seznam točk v obliki E, N, Ht, koda in klasifikacija) - Priprava GSI datoteke iz seznama točk (Uvoz TXT/KOO/... datotek) -Program uporablja kodiranje za prepoznavo posameznih elementov meritev. +Program uporablja kodiranje podatkov za prepoznavo posameznih elementov meritev.
Aplikacija je še v razvoju, zato so nekatere možnosti omejene.
@@ -41,5 +41,7 @@ Programski jezik: VB.NET !["slika1"](https://multibox.nohost.me/gitea/boris/TPS1100-Convert/raw/branch/main/My%20Project/img/screen1.png) !["slika2"](https://multibox.nohost.me/gitea/boris/TPS1100-Convert/raw/branch/main/My%20Project/img/screen2.png) +!["slika2a"](https://multibox.nohost.me/gitea/boris/TPS1100-Convert/raw/branch/main/My%20Project/img/screen2a.png) +!["slika2b"](https://multibox.nohost.me/gitea/boris/TPS1100-Convert/raw/branch/main/My%20Project/img/screen2b.png) !["slika3"](https://multibox.nohost.me/gitea/boris/TPS1100-Convert/raw/branch/main/My%20Project/img/screen3.png) !["slika3"](https://multibox.nohost.me/gitea/boris/TPS1100-Convert/raw/branch/main/My%20Project/img/screen4.png) diff --git a/SplashScreen1.Designer.vb b/SplashScreen1.Designer.vb index 6c5b5c2..4d26e03 100644 --- a/SplashScreen1.Designer.vb +++ b/SplashScreen1.Designer.vb @@ -32,12 +32,13 @@ Partial Class SplashScreen1 Me.Version = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.Copyright = New System.Windows.Forms.Label() - Me.Button1 = New System.Windows.Forms.Button() Me.LinkLabel1 = New System.Windows.Forms.LinkLabel() Me.LabelCompany = New System.Windows.Forms.Label() - Me.ApplicationTitle = New System.Windows.Forms.Label() + Me.Button1 = New System.Windows.Forms.Button() Me.LinkLabel2 = New System.Windows.Forms.LinkLabel() Me.PictureBox1 = New System.Windows.Forms.PictureBox() + Me.ApplicationTitle = New System.Windows.Forms.Label() + Me.LinkLabel3 = New System.Windows.Forms.LinkLabel() Me.MainLayoutPanel.SuspendLayout() Me.DetailsLayoutPanel.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -69,6 +70,7 @@ Partial Class SplashScreen1 Me.DetailsLayoutPanel.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 156.0!)) Me.DetailsLayoutPanel.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 143.0!)) Me.DetailsLayoutPanel.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 142.0!)) + Me.DetailsLayoutPanel.Controls.Add(Me.LinkLabel3, 1, 4) Me.DetailsLayoutPanel.Controls.Add(Me.Version, 0, 0) Me.DetailsLayoutPanel.Controls.Add(Me.Label1, 0, 1) Me.DetailsLayoutPanel.Controls.Add(Me.Copyright, 0, 4) @@ -124,16 +126,6 @@ Partial Class SplashScreen1 Me.Copyright.TabIndex = 2 Me.Copyright.Text = "Copyright" ' - 'Button1 - ' - Me.Button1.Anchor = System.Windows.Forms.AnchorStyles.None - Me.Button1.Location = New System.Drawing.Point(190, 146) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(75, 25) - Me.Button1.TabIndex = 2 - Me.Button1.Text = "OK" - Me.Button1.UseVisualStyleBackColor = True - ' 'LinkLabel1 ' Me.LinkLabel1.Anchor = System.Windows.Forms.AnchorStyles.Left @@ -157,17 +149,15 @@ Partial Class SplashScreen1 Me.LabelCompany.TabIndex = 3 Me.LabelCompany.Text = "Company" ' - 'ApplicationTitle + 'Button1 ' - Me.ApplicationTitle.Anchor = System.Windows.Forms.AnchorStyles.None - Me.ApplicationTitle.BackColor = System.Drawing.Color.Transparent - Me.ApplicationTitle.Font = New System.Drawing.Font("Gill Sans MT Condensed", 24.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ApplicationTitle.Location = New System.Drawing.Point(117, 24) - Me.ApplicationTitle.Name = "ApplicationTitle" - Me.ApplicationTitle.Size = New System.Drawing.Size(270, 59) - Me.ApplicationTitle.TabIndex = 0 - Me.ApplicationTitle.Text = "TPS1100 Convert" - Me.ApplicationTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.Button1.Anchor = System.Windows.Forms.AnchorStyles.None + Me.Button1.Location = New System.Drawing.Point(190, 146) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(75, 25) + Me.Button1.TabIndex = 2 + Me.Button1.Text = "OK" + Me.Button1.UseVisualStyleBackColor = True ' 'LinkLabel2 ' @@ -191,6 +181,30 @@ Partial Class SplashScreen1 Me.PictureBox1.TabIndex = 3 Me.PictureBox1.TabStop = False ' + 'ApplicationTitle + ' + Me.ApplicationTitle.Anchor = System.Windows.Forms.AnchorStyles.None + Me.ApplicationTitle.BackColor = System.Drawing.Color.Transparent + Me.ApplicationTitle.Font = New System.Drawing.Font("Gill Sans MT Condensed", 24.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ApplicationTitle.Location = New System.Drawing.Point(117, 24) + Me.ApplicationTitle.Name = "ApplicationTitle" + Me.ApplicationTitle.Size = New System.Drawing.Size(270, 59) + Me.ApplicationTitle.TabIndex = 0 + Me.ApplicationTitle.Text = "TPS1100 Convert" + Me.ApplicationTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + ' + 'LinkLabel3 + ' + Me.LinkLabel3.Anchor = System.Windows.Forms.AnchorStyles.Left + Me.LinkLabel3.AutoSize = True + Me.LinkLabel3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LinkLabel3.Location = New System.Drawing.Point(159, 126) + Me.LinkLabel3.Name = "LinkLabel3" + Me.LinkLabel3.Size = New System.Drawing.Size(117, 13) + Me.LinkLabel3.TabIndex = 7 + Me.LinkLabel3.TabStop = True + Me.LinkLabel3.Text = "Zgodovina Razvoja" + ' 'SplashScreen1 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -218,4 +232,5 @@ Partial Class SplashScreen1 Friend WithEvents LinkLabel1 As LinkLabel Friend WithEvents PictureBox1 As PictureBox Friend WithEvents LinkLabel2 As LinkLabel + Friend WithEvents LinkLabel3 As LinkLabel End Class diff --git a/SplashScreen1.vb b/SplashScreen1.vb index 1bf5522..b3dbb11 100644 --- a/SplashScreen1.vb +++ b/SplashScreen1.vb @@ -48,4 +48,8 @@ Public NotInheritable Class SplashScreen1 Dim webAddress2 As String = "https://multibox.nohost.me/gitea/boris/TPS1100-Convert" Process.Start(webAddress2) End Sub + + Private Sub LinkLabel3_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel3.LinkClicked + Process.Start("CHANGELOG.md") + End Sub End Class diff --git a/TPS1100 Convert.vbproj b/TPS1100 Convert.vbproj index 1050e46..ce1cb2d 100644 --- a/TPS1100 Convert.vbproj +++ b/TPS1100 Convert.vbproj @@ -203,7 +203,9 @@ - + + Always + MyApplicationCodeGenerator @@ -309,6 +311,7 @@ Always + diff --git a/bin/Release/TPS1100 Convert.application b/bin/Release/TPS1100 Convert.application index 02f3668..7112a22 100644 --- a/bin/Release/TPS1100 Convert.application +++ b/bin/Release/TPS1100 Convert.application @@ -14,7 +14,7 @@ - 0tN4ZgC92KW6BqEWZIv7JJgNNn1f1VSlto9T/qFVl64= + 6inyc06EaaiiQbENLu4O26A0+UreBmMRXBr2zOBZ+Oo= diff --git a/bin/Release/TPS1100 Convert.exe b/bin/Release/TPS1100 Convert.exe index 21abe1a..3b6953c 100644 Binary files a/bin/Release/TPS1100 Convert.exe and b/bin/Release/TPS1100 Convert.exe differ diff --git a/bin/Release/TPS1100 Convert.exe.manifest b/bin/Release/TPS1100 Convert.exe.manifest index 1408de7..f301322 100644 --- a/bin/Release/TPS1100 Convert.exe.manifest +++ b/bin/Release/TPS1100 Convert.exe.manifest @@ -43,14 +43,14 @@ - + - LionUoY5pimdkx9/3g3ZZ1mEk0X+34QC9qSJHHTbh2E= + Ck+Hsj11hMK8XQwT0taSkNmh9irYI8LWuZWYNSXLE/M= diff --git a/bin/Release/app.publish/TPS1100 Convert.exe b/bin/Release/app.publish/TPS1100 Convert.exe index 21abe1a..3b6953c 100644 Binary files a/bin/Release/app.publish/TPS1100 Convert.exe and b/bin/Release/app.publish/TPS1100 Convert.exe differ