boris/tps1100-convert
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

ver. 2.5.0.7

Browse Source
This commit is contained in:
Boris Bilc
2024-06-11 03:16:44 +02:00
parent 10f051ba7a
commit cc1e797316
13 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Form1.Designer.vb generated
View File

@ -44,10 +44,10 @@ Partial Class Form1
Me.tsbSaveAs = New System.Windows.Forms.ToolStripButton()
Me.ToolStripButtonNast = New System.Windows.Forms.ToolStripButton()
Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
Me.tsbDecimale = New System.Windows.Forms.ToolStripComboBox()
Me.ToolStripLabel2 = New System.Windows.Forms.ToolStripLabel()
Me.ToolStripComboBox1 = New System.Windows.Forms.ToolStripComboBox()
Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel()
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()
@ -61,7 +61,7 @@ Partial Class Form1
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.RichTextBox1.BackColor = System.Drawing.SystemColors.ControlLightLight
Me.RichTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.RichTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None
Me.RichTextBox1.Font = New System.Drawing.Font("Courier New", 9.75!, 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)
@ -69,7 +69,7 @@ Partial Class Form1
Me.RichTextBox1.ReadOnly = True
Me.RichTextBox1.Size = New System.Drawing.Size(1233, 680)
Me.RichTextBox1.TabIndex = 1
Me.RichTextBox1.Text = ""
Me.RichTextBox1.Text = resources.GetString("RichTextBox1.Text")
Me.RichTextBox1.WordWrap = False
'
'StatusStrip1
@ -235,21 +235,6 @@ Partial Class Form1
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(63, 26)
Me.ToolStripLabel2.Text = "Decimalna"
'
'ToolStripComboBox1
'
Me.ToolStripComboBox1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
@ -267,6 +252,21 @@ Partial Class Form1
Me.ToolStripLabel1.Size = New System.Drawing.Size(34, 26)
Me.ToolStripLabel1.Text = "Kode"
'
'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(63, 26)
Me.ToolStripLabel2.Text = "Decimalna"
'
'tsbStolpci
'
Me.tsbStolpci.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right

10
Form1.resx
View File

@ -117,6 +117,16 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="RichTextBox1.Text" xml:space="preserve">
<value>1. Odpri GSI datoteko
2. Preveri podatke in po potrebi uredi datoteko (gumb "Uredi").
3A. Za pripravo Zapisnika Meritev klikni gumb "Meritve".
3B. Za pripravo seznama koordinat točk klikni gumb "Točke".
4. Shrani podatke z klikom na gumb "Shrani...".
Za pregled obdelav podatkov si poglej datoteko zapisnika.
Lokacija zapisnika = </value>
</data>
<metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>124, 17</value>
</metadata>

2
Form1.vb
View File

@ -12,6 +12,7 @@ Public Class Form1
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)
End Sub
Public streamLines As Integer = 0
@ -385,4 +386,5 @@ Public Class Form1
Private Sub ToolStripButtonNast_Click(sender As Object, e As EventArgs) Handles ToolStripButtonNast.Click
FormNastavitve.ShowDialog()
End Sub
End Class

2
Form2.Designer.vb generated
View File

@ -173,7 +173,7 @@ Partial Class Form2
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.Name = "Form2"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
Me.Text = "TPS1100 Convert: Settings"
Me.Text = "TPS1100 Convert - Urejanje"
Me.ToolStrip1.ResumeLayout(False)
Me.ToolStrip1.PerformLayout()
Me.StatusStrip1.ResumeLayout(False)

4
My Project/AssemblyInfo.vb
View File

@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.5.0.6")>
<Assembly: AssemblyFileVersion("2.5.0.6")>
<Assembly: AssemblyVersion("2.5.0.7")>
<Assembly: AssemblyFileVersion("2.5.0.7")>
<Assembly: NeutralResourcesLanguage("sl-SI")>

2
TPS1100 Convert.vbproj
View File

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

6
bin/Release/TPS1100 Convert.application
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<assemblyIdentity name="TPS1100 Convert.application" version="2.5.0.6" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
<assemblyIdentity name="TPS1100 Convert.application" version="2.5.0.7" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
<description asmv2:publisher="2B geoinformatika d.o.o." asmv2:product="TPS1100 Convert" xmlns="urn:schemas-microsoft-com:asm.v1" />
<deployment install="true" mapFileExtensions="true" co.v1:createDesktopShortcut="true" />
<compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
@ -8,13 +8,13 @@
</compatibleFrameworks>
<dependency>
<dependentAssembly dependencyType="install" codebase="TPS1100 Convert.exe.manifest" size="5098">
<assemblyIdentity name="TPS1100 Convert.exe" version="2.5.0.6" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" type="win32" />
<assemblyIdentity name="TPS1100 Convert.exe" version="2.5.0.7" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" type="win32" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>SK67vZm5DI6i6PYvGuc4Im/6D3UVI7mcgYD0YKOBAts=</dsig:DigestValue>
<dsig:DigestValue>hKO2v4E5pqGxlyP3tr8AhpJb2l9VocXFXTWKBLLuzXo=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

BIN
bin/Release/TPS1100 Convert.exe
View File

Binary file not shown.

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

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<asmv1:assemblyIdentity name="TPS1100 Convert.exe" version="2.5.0.6" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" type="win32" />
<asmv1:assemblyIdentity name="TPS1100 Convert.exe" version="2.5.0.7" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" type="win32" />
<description asmv2:iconFile="TPS1100CNVRT.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
<application />
<entryPoint>
<assemblyIdentity name="TPS1100 Convert" version="2.5.0.6" language="neutral" processorArchitecture="msil" />
<assemblyIdentity name="TPS1100 Convert" version="2.5.0.7" language="neutral" processorArchitecture="msil" />
<commandLine file="TPS1100 Convert.exe" parameters="" />
</entryPoint>
<trustInfo>
@ -43,14 +43,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TPS1100 Convert.exe" size="837120">
<assemblyIdentity name="TPS1100 Convert" version="2.5.0.6" language="neutral" processorArchitecture="msil" />
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TPS1100 Convert.exe" size="837632">
<assemblyIdentity name="TPS1100 Convert" version="2.5.0.7" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>YaYx/umhtP3dosqmePwTTr4rn3T4h1kY2oXPDdfvmx4=</dsig:DigestValue>
<dsig:DigestValue>/7A+F4wCXnaKGKwhzcQpcEfcMlOy58SYt48u+ilAmJc=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

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

Binary file not shown.

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

Binary file not shown.

BIN
bin/TPS1100-Convert_2.5.0.7_Portable.zip Normal file
View File

Binary file not shown.

BIN
bin/TPS1100-Convert_2.5.0.6_Setup.zip → bin/TPS1100-Convert_2.5.0.7_Setup.zip
View File

Binary file not shown.