This commit is contained in:
Boris Bilc 2024-06-11 06:28:09 +02:00
parent e0daa61595
commit edc7efa0c9
11 changed files with 24 additions and 230 deletions

7
Form1.Designer.vb generated
View File

@ -59,9 +59,9 @@ Partial Class Form1
Me.RichTextBox1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.RichTextBox1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption
Me.RichTextBox1.BackColor = System.Drawing.Color.Ivory
Me.RichTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None
Me.RichTextBox1.Font = New System.Drawing.Font("Courier New", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(238, Byte))
Me.RichTextBox1.Font = New System.Drawing.Font("Courier New", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(238, Byte))
Me.RichTextBox1.Location = New System.Drawing.Point(9, 39)
Me.RichTextBox1.Margin = New System.Windows.Forms.Padding(0)
Me.RichTextBox1.Name = "RichTextBox1"
@ -262,10 +262,11 @@ Partial Class Form1
'tsbSaveAs
'
Me.tsbSaveAs.Enabled = False
Me.tsbSaveAs.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.tsbSaveAs.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_save_as_50
Me.tsbSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
Me.tsbSaveAs.Name = "tsbSaveAs"
Me.tsbSaveAs.Size = New System.Drawing.Size(78, 26)
Me.tsbSaveAs.Size = New System.Drawing.Size(85, 26)
Me.tsbSaveAs.Text = "Shrani ..."
'
'ToolStripButtonNast

View File

@ -118,7 +118,7 @@
<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>Pretvorba is GSI v Zapisnik Meritev ali Seznam Točk...
<value>GSI v Zapisnik Meritev ali Seznam Točk...
1. Odpri GSI datoteko.
2. Preveri podatke in po potrebi uredi datoteko (gumb "Uredi").
@ -126,7 +126,7 @@
3B. Za pripravo seznama koordinat točk klikni gumb "Točke".
4. Shrani podatke z klikom na gumb "Shrani...".
Pretvorba iz KOO/TXT v GSI datoteko...
Uvozi KOO/TXT in pripravi GSI datoteko...
A. Uvozi datoteko z koordinatami točk z klikom na "Uvozi".
Zapis: Pt E N H (Med podatki je presledek ali tabulator)

View File

@ -137,7 +137,7 @@ Public Class Form1
'data = "Code= " + numData.ToString
If My.Settings.KodeUporabnik = "Da" Then
If data = "+0000000000000010" Then
data = vbCrLf + "Setup: Quick Set" + vbCrLf + "============================="
data = vbCrLf + "Setup: Quick Set" + vbCrLf + "=============================" + vbCrLf + "Hz" + dataStolpci + "V" + dataStolpci + "SD"
PodatkiStojisce = True
End If
If data = "+0000000000000020" Then
@ -157,7 +157,7 @@ Public Class Form1
PodatkiStojisce = True
End If
If data = "+0000000000000090" Then
data = vbCrLf + "Measured:" + vbCrLf + "----------------------" + vbCrLf + "PtID" + dataStolpci + "HZ" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "ReflHt" + dataStolpci + "PrCon" + dataStolpci + "HtDif" + dataStolpci + "E" + dataStolpci + "N" + dataStolpci + "H" + dataStolpci + "PtCode"
data = vbCrLf + "Measured:" + vbCrLf + "----------------------" + vbCrLf + "PtID" + dataStolpci + "Azi" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "ReflHt" + dataStolpci + "PrCon" + dataStolpci + "HtDif" + dataStolpci + "E" + dataStolpci + "N" + dataStolpci + "H" + dataStolpci + "PtCode"
PodatkiStojisce = False
End If
If data = "+0000000000000099" Then
@ -189,6 +189,13 @@ Public Class Form1
Else
data = dataStolpci + dataTmp
End If
ElseIf wordIndex = "79" Then ' Point Code
dataTmp = Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
If dataTmp = "" Then
data = ""
Else
data = dataStolpci + dataTmp
End If
ElseIf wordIndex = "81" And PodatkiStojisce = False Then ' Target Easting
numData = data / 1000
data = dataStolpci + Format(numData, "0.000")

View File

@ -46,7 +46,8 @@
<DefineDebug>true</DefineDebug>
<DefineTrace>true</DefineTrace>
<OutputPath>bin\Debug\</OutputPath>
<DocumentationFile>TPS1100 Convert.xml</DocumentationFile>
<DocumentationFile>
</DocumentationFile>
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@ -56,7 +57,8 @@
<DefineTrace>true</DefineTrace>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DocumentationFile>TPS1100 Convert.xml</DocumentationFile>
<DocumentationFile>
</DocumentationFile>
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
</PropertyGroup>
<PropertyGroup>

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.8" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
<assemblyIdentity name="TPS1100 Convert.application" version="2.5.0.9" 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.8" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" type="win32" />
<assemblyIdentity name="TPS1100 Convert.exe" version="2.5.0.9" 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>BtmlQm9KiHooPuy/gx0Bj4ILkS0F70Jmzr4w79qOwpk=</dsig:DigestValue>
<dsig:DigestValue>idoYJglS+nGZHbmd7/Py+LjeKZVeG8zBtQ3SbEH+rLo=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

Binary file not shown.

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: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.8" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" type="win32" />
<asmv1:assemblyIdentity name="TPS1100 Convert.exe" version="2.5.0.9" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" type="win32" />
<description asmv2:iconFile="TPS1100CNVRT.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
<application />
<entryPoint>
@ -50,7 +50,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>v6Xjj3LP9Hy7w/iSjGiCtVHIosjuOv/FZPygHSAEVO8=</dsig:DigestValue>
<dsig:DigestValue>OlzHJEc9SK+xbs6bsc6XVsgxiWywGQfasrgGgQ4hEzM=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

View File

@ -1,216 +0,0 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>
TPS1100 Convert
</name>
</assembly>
<members>
<member name="T:TPS1100_Convert.My.Resources.Resources">
<summary>
A strongly-typed resource class, for looking up localized strings, etc.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.ResourceManager">
<summary>
Returns the cached ResourceManager instance used by this class.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.Culture">
<summary>
Overrides the current thread's CurrentUICulture property for all
resource lookups using this strongly typed resource class.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.Circled_Right_2_24">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.Fine_Print_24">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_add_new_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_advance_48">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_browse_folder_50_2">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_cancel_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_clear_symbol_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_close_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_close_window_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_connection_status_on_48">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_design_48">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_do_not_disturb_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_done_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_drawing_compass_48">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_edit_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_folder_50_2">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_info_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_info_squared_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_information_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_land_surveying_48">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_move_to_folder_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_no_entry_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_ok_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_open_end_wrench_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_opened_folder_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_question_mark_48">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_save_as_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_send_file_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_support_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_tools_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_unavailable_50">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_undo_48">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.ModernXP_41_Settings_icon">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.README">
<summary>
Looks up a localized resource of type System.Byte[].
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.Save_as_24">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.TPS1100CNVRT">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.Resources.Resources.TPS1100CNVRT_logo">
<summary>
Looks up a localized resource of type System.Drawing.Bitmap.
</summary>
</member>
<member name="P:TPS1100_Convert.My.MySettings.DecimalnoLocilo">
<summary>
Znak za decimalno ločilo
</summary>
</member>
</members>
</doc>