Skip to content

Commit 20f909f

Browse files
zvezdochiotzvezdochiot
committed
3.2.0: fix GON output to calculation results
1 parent 228a43e commit 20f909f

File tree

13 files changed

+48
-45
lines changed

13 files changed

+48
-45
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ See the [doc](./doc) folder for various reStructuredText files, the [wiki](https
3030

3131
## Installation
3232

33-
Installation binaries for latest stabile version (3.1.3):
33+
Installation binaries for latest stabile version (3.2.0):
3434

35-
* [Debian/Ubuntu](http://digikom.hu/download/geoeasy_3.1.3.deb)
36-
* [Windows](http://digikom.hu/download/Gizi313Setup.exe)
37-
* [Windows portable (zip)](http://digikom.hu/download/GeoEasy313.zip)
35+
* [Debian/Ubuntu](http://digikom.hu/download/geoeasy_3.2.0.deb)
36+
* [Windows](http://digikom.hu/download/Gizi320Setup.exe)
37+
* [Windows portable (zip)](http://digikom.hu/download/GeoEasy320.zip)
3838

3939
Users can select source or [beta binary or older releases](http://digikom.hu/english/geo_easy_e.html). Linux, OSX and Windows operating
4040
systems are supported. See the [installation guide](doc/install.rst).

‎src/calcgeo.tcl‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ proc Orientation {geo lineno {flag 0}} {
171171
if {$e > [Rad2Sec $PI]} { set e [expr {$e - [Rad2Sec $PI2]}] }
172172
if {$e < "-[Rad2Sec $PI]"} { set e [expr {$e + [Rad2Sec $PI2]} ]}
173173
set E [expr {$e / 206264.8 * [lindex $items 4]}]
174-
GeoLog1 [format "%-10s %-10s %s %s %s %8.${decimals}f %4d %4d %8.${decimals}f"\
174+
GeoLog1 [format "%-10s %-10s %11s %11s %11s %8.${decimals}f %4d %4d %8.${decimals}f"\
175175
[lindex $items 1] \
176176
[string range [GetPCode [lindex $items 1] 1] 0 9]\
177177
[ANG [lindex $items 5]] [ANG [lindex $items 6]] \
@@ -183,7 +183,7 @@ proc Orientation {geo lineno {flag 0}} {
183183
warning 0 OK
184184
}
185185
}
186-
GeoLog1 [format "%-47s %s" $geoCodes(101) [ANG $z]]
186+
GeoLog1 [format "%-46s%11s" $geoCodes(101) [ANG $z]]
187187
}
188188
return $z
189189
} else {
@@ -525,12 +525,12 @@ proc GeoSec {pn {w ""}} {
525525
GeoLog1
526526
GeoLog $geoEasyMsg(menuPopupSec)
527527
GeoLog1 $geoEasyMsg(head1Sec)
528-
GeoLog1 [format "%-10s %-10s %12.${decimals}f %12.${decimals}f %s" \
528+
GeoLog1 [format "%-10s %-10s %12.${decimals}f %12.${decimals}f %11s" \
529529
[lindex $arec 2] \
530530
[string range [GetPCode [lindex $arec 2] 1] 0 9] \
531531
[GetVal {38} $aco] [GetVal {37} $aco] \
532532
[ANG [lindex $arec 3]]]
533-
GeoLog1 [format "%-10s %-10s %12.${decimals}f %12.${decimals}f %s" \
533+
GeoLog1 [format "%-10s %-10s %12.${decimals}f %12.${decimals}f %11s" \
534534
[lindex $brec 2] \
535535
[string range [GetPCode [lindex $brec 2] 1] 0 9] \
536536
[GetVal {38} $bco] [GetVal {37} $bco] \
@@ -673,15 +673,15 @@ proc GeoRes {pn {w ""}} {
673673
GeoLog1
674674
GeoLog $geoEasyMsg(menuPopupRes)
675675
GeoLog1 $geoEasyMsg(head1Res)
676-
GeoLog1 [format "%-10s %-10s %12.${decimals}f %12.${decimals}f %s %s" \
676+
GeoLog1 [format "%-10s %-10s %12.${decimals}f %12.${decimals}f %11s %11s" \
677677
[lindex $arec 2] [string range [GetPCode [lindex $arec 2] 1] 0 9] \
678678
[GetVal 38 $aco] [GetVal 37 $aco] \
679679
[ANG [lindex $arec 3]] [ANG $alpha]]
680-
GeoLog1 [format "%-10s %-10s %12.${decimals}f %12.${decimals}f %s %s" \
680+
GeoLog1 [format "%-10s %-10s %12.${decimals}f %12.${decimals}f %11s %11s" \
681681
[lindex $brec 2] [string range [GetPCode [lindex $brec 2] 1] 0 9] \
682682
[GetVal 38 $bco] [GetVal 37 $bco] \
683683
[ANG [lindex $brec 3]] [ANG $beta]]
684-
GeoLog1 [format "%-10s %-10s %12.${decimals}f %12.${decimals}f %s" \
684+
GeoLog1 [format "%-10s %-10s %12.${decimals}f %12.${decimals}f %11s" \
685685
[lindex $crec 2] [string range [GetPCode [lindex $crec 2] 1] 0 9] \
686686
[GetVal 38 $cco] [GetVal 37 $cco] \
687687
[ANG [lindex $crec 3]]]
@@ -1558,10 +1558,10 @@ proc GeoBearingDistance {pn {w ""}} {
15581558
set geoRes($w) [format "%s-%s: %s %.${decimals}f" $pn $pn1 [ANG $b] $d]
15591559
}
15601560
if {$d3d == ""} {
1561-
GeoLog1 [format "%-10s %-10s %s %8.${decimals}f" \
1561+
GeoLog1 [format "%-10s %-10s %11s %8.${decimals}f" \
15621562
$pn $pn1 [ANG $b] $d]
15631563
} else {
1564-
GeoLog1 [format "%-10s %-10s %s %8.${decimals}f %8.${decimals}f %s" \
1564+
GeoLog1 [format "%-10s %-10s %11s %8.${decimals}f %8.${decimals}f %s" \
15651565
$pn $pn1 [ANG $b] $d $d3d [ANG $za]]
15661566
}
15671567
}
@@ -1614,7 +1614,7 @@ proc GeoAngle {pn {w ""}} {
16141614
set si_b [expr {sin($b)}]
16151615
set co_b [expr {cos($b)}]
16161616
# output reference
1617-
GeoLog1 [format "%-10s %s %8.${decimals}f" \
1617+
GeoLog1 [format "%-10s %11s %8.${decimals}f" \
16181618
$pn1 [ANG $b] $d]
16191619

16201620
# remove reference point from list
@@ -1665,7 +1665,7 @@ proc GeoAngle {pn {w ""}} {
16651665
set geoRes($w) [format "%s-%s: %s %.${decimals}f" \
16661666
$pn $pn1 [ANG $b] $d]
16671667
}
1668-
GeoLog1 [format "%-10s %s %8.${decimals}f %s %s \
1668+
GeoLog1 [format "%-10s %s %8.${decimals}f %11s %11s \
16691669
%12.${decimals}f %12.${decimals}f" \
16701670
$pn1 [ANG $b] $d [ANG $alfa] [ANG $alfa0] $abc $ord]
16711671
set _temp_geo($i) [list "5 $pn1" "7 $alfa0" "11 $d"]
@@ -1755,13 +1755,13 @@ proc LineLine {pn1 pn2 pn3 pn4} {
17551755
GeoLog1
17561756
GeoLog $geoEasyMsg(menuCalLine)
17571757
GeoLog1 $geoEasyMsg(head1Sec)
1758-
GeoLog1 [format "%-10s %-10s %12.${decimals}f %12.${decimals}f %s" \
1758+
GeoLog1 [format "%-10s %-10s %12.${decimals}f %12.${decimals}f %11s" \
17591759
[GetVal {5} $pn1coo] [GetVal {4} $pn1coo] \
17601760
[GetVal {38} $pn1coo] [GetVal {37} $pn1coo] [ANG $b12]]
17611761
GeoLog1 [format "%-10s %-10s %12.${decimals}f %12.${decimals}f" \
17621762
[GetVal {5} $pn2coo] [GetVal {4} $pn2coo] \
17631763
[GetVal {38} $pn2coo] [GetVal {37} $pn2coo]]
1764-
GeoLog1 [format "%-10s %-10s %12.${decimals}f %12.${decimals}f %s" \
1764+
GeoLog1 [format "%-10s %-10s %12.${decimals}f %12.${decimals}f %11s" \
17651765
[GetVal {5} $pn3coo] [GetVal {4} $pn3coo] \
17661766
[GetVal {38} $pn3coo] [GetVal {37} $pn3coo] [ANG $b34]]
17671767
GeoLog1 [format "%-10s %-10s %12.${decimals}f %12.${decimals}f" \

‎src/geo_easy.tcl‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,10 @@ proc GeoEasy {top} {
150150
set w ""
151151
# get the language of the operating system
152152
if {$tcl_platform(platform) != "unix"} {
153-
set ww ""
153+
set ww "0000"
154154
catch {set ww [string toupper [registry get HKEY_LOCAL_MACHINE\\SYSTEM\\CONTROLSET001\\control\\nls\\language InstallLanguage]]}
155-
if {[lsearch -exact [array names langCodes] $ww] > -1} {
155+
# search for language groups only
156+
if {[lsearch -regexp [array names langCodes] "[string range $ww 2 3]$"] > -1} {
156157
set w $langCodes($ww)
157158
} else {
158159
set w eng
@@ -300,7 +301,7 @@ proc GeoEasy {top} {
300301
regsub "\}$" $name "" name
301302
switch -glob -- $name {
302303
*.geo {
303-
MenuLoad $top $name
304+
MenuLoad $top [file normalize $name]
304305
}
305306
*.gpr { GeoProjLoad $top $name }
306307
*.msk -

‎src/geodimet.tcl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ proc Geodimeter {fn fa} {
7878
if {[llength $hz] > 1} {
7979
foreach h $hz {
8080
set coll [expr {$w - $h}]
81-
GeoLog1 [format "%-10s %10s kollimacio" \
81+
GeoLog1 [format "%-10s %11s kollimacio" \
8282
[string range $pno 0 9] [ANG $coll]]
8383
if {[expr {abs($coll)}] > [expr {$maxColl / $RO}]} {
8484
GeoLog1 "$geoEasyMsg(faces) $geoEasyMsg(error): $pno $geoCodes(7)"
@@ -93,7 +93,7 @@ proc Geodimeter {fn fa} {
9393
if {[llength $v] > 1} {
9494
foreach h $v {
9595
set ind [expr {$w - $h}]
96-
GeoLog1 [format "%-10s %10s index" \
96+
GeoLog1 [format "%-10s %11s index" \
9797
[string range $pno 0 9] [ANG $ind]]
9898
if {[expr {abs($ind)}] > [expr {$maxIndex / $RO}]} {
9999
# too large error > 6'
@@ -223,7 +223,7 @@ proc Geodimeter {fn fa} {
223223
if {[llength $hz] > 1} {
224224
foreach h $hz {
225225
set coll [expr {$w - $h}]
226-
GeoLog1 [format "%-10s %10s kollimacio" \
226+
GeoLog1 [format "%-10s %11s kollimacio" \
227227
[string range $pno 0 9] [ANG $coll]]
228228
if {[expr {abs($coll)}] > [expr {$maxColl / $RO}]} {
229229
GeoLog1 "$geoEasyMsg(faces) $geoEasyMsg(error): $pno $geoCodes(7)"
@@ -238,7 +238,7 @@ proc Geodimeter {fn fa} {
238238
if {[llength $v] > 1} {
239239
foreach h $v {
240240
set ind [expr {$w - $h}]
241-
GeoLog1 [format "%-10s %10s index" \
241+
GeoLog1 [format "%-10s %11s index" \
242242
[string range $pno 0 9] [ANG $ind]]
243243
if {[expr {abs($ind)}] > [expr {$maxIndex / $RO}]} {
244244
# too large error > 6'

‎src/i18n/geo_easy.cze‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ set geoEasyMsg(head1Ele) "Číslo bodu Kód Výška Vzdálen
850850
set geoEasyMsg(head1Det) " Orientováno Zhorizontováno"
851851
set geoEasyMsg(head2Det) "Číslo bodu Kód Y X H Stanovisko směr vzdálenost"
852852
set geoEasyMsg(head1Ori) "Číslo bodu Kód Směr Směr Orientační směr Vzdálenost e\" e\"max X(m)"
853-
set geoEasyMsg(head1Dis) "Číslo bodu Číslo bodu Směrník Vzdálenost Sklon dis Zenitový úhel"
853+
set geoEasyMsg(head1Dis) "Číslo bodu Číslo bodu Směrník Vzdálenost Sklon dis Zenitový úhel"
854854
set geoEasyMsg(head1Angle) "Číslo bodu Směrník Vzdálenost Úhel Úhel z prvního Local X Local Y"
855855
# transformation
856856
set geoEasyMsg(head1Tran) "Číslo bodu y x Y X dY dX vzdálenost"

‎src/i18n/geo_easy.eng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ set geoEasyMsg(head1Ele) "Point num Code Height Distance"
850850
set geoEasyMsg(head1Det) " Oriented Horizontal"
851851
set geoEasyMsg(head2Det) "Point num Code E N H Station direction distance"
852852
set geoEasyMsg(head1Ori) "Point num Code Direction Bearing Orient ang Distance e\" e\"max E(m)"
853-
set geoEasyMsg(head1Dis) "Point num Point num Bearing Distance Slope dis Zenith angle"
853+
set geoEasyMsg(head1Dis) "Point num Point num Bearing Distance Slope dis Zenith angle"
854854
set geoEasyMsg(head1Angle) "Point num Bearing Distance Angle Angle from 1st Local E Local N"
855855
# transformation
856856
set geoEasyMsg(head1Tran) "Point num e n E N dE dN dist"

‎src/i18n/geo_easy.es‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ set geoEasyMsg(head1Ele) "Punto n\u00FAm C\u00F3digo Height Dis
852852
set geoEasyMsg(head1Det) " Oriented Horizontal"
853853
set geoEasyMsg(head2Det) "Punto n\u00FAm C\u00F3digo E N H Estaci\u00F3n direcci\u00F3n distancia"
854854
set geoEasyMsg(head1Ori) "Punto n\u00FAm C\u00F3digo Direcci\u00F3n Bearing Orient ang Distancia e\" e\"max E(m)"
855-
set geoEasyMsg(head1Dis) "Punto n\u00FAm Punto n\u00FAm Bearing Distancia Pendiente dis Zenith \u00E1ngulo"
855+
set geoEasyMsg(head1Dis) "Punto n\u00FAm Punto n\u00FAm Bearing Distancia Pendiente dis Zenith \u00E1ngulo"
856856
set geoEasyMsg(head1Angle) "Punto n\u00FAm Bearing Distancia \u00C1ngulo \u00C1ngulo from 1st Local E Local N"
857857
# transformation
858858
set geoEasyMsg(head1Tran) "Punto n\u00FAm e n E N dE dN dist"

‎src/i18n/geo_easy.ger‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ set geoEasyMsg(head1Ele) "Punktnr. Punktcode Z Strecke"
851851
set geoEasyMsg(head1Det) " orientierte Horizontal-"
852852
set geoEasyMsg(head2Det) "Punktnr. Punktcode Y X M Standpunkt Richtungen distanz"
853853
set geoEasyMsg(head1Ori) "Punktnr. Punktcode Hz-Winkel Azimut Orientierung Strecke e\" e\"max E(m)"
854-
set geoEasyMsg(head1Dis) "Punktnr. Punktnr. Azimut Strecke Schrägdist Zenitwinkel"
854+
set geoEasyMsg(head1Dis) "Punktnr. Punktnr. Azimut Strecke Schrägdist Zenitwinkel"
855855
set geoEasyMsg(head1Angle) "Punktnr. Azimut Strecke Brechwinkel auf Null Absz. Ord."
856856
# transformation
857857
set geoEasyMsg(head1Tran) "Punktnr. y x Y X dY dX dt"

‎src/i18n/geo_easy.hun‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ set geoEasyMsg(head1Ele) "Pontszám Pontkód M Távolság"
863863
set geoEasyMsg(head1Det) " Tájékozott Vízszintes"
864864
set geoEasyMsg(head2Det) "Pontszám Pontkód Y X M Álláspont irányérték távolság"
865865
set geoEasyMsg(head1Ori) "Pontszám Pontkód Irányérték Irányszög Táj.szög Távolság e\" e\"max E(m)"
866-
set geoEasyMsg(head1Dis) "Pontszám Pontszám Irányszög Távolság Ferde táv Zenit sz."
866+
set geoEasyMsg(head1Dis) "Pontszám Pontszám Irányszög Távolság Ferde táv Zenit sz."
867867
set geoEasyMsg(head1Angle) "Pontszám Irányszög Távolság Törésszög 0-ra forg. Absz. Ord."
868868
# transformation
869869
set geoEasyMsg(head1Tran) "Pontszám y x Y X dY dX dt"

‎src/i18n/geo_easy.rus‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ set geoEasyMsg(head1Ele) "Point num Code Height Distance"
851851
set geoEasyMsg(head1Det) " Oriented Horizontal"
852852
set geoEasyMsg(head2Det) "Point num Code E N H Station direction distance"
853853
set geoEasyMsg(head1Ori) "Point num Code Direction Bearing Orient ang Distance e\" e\"max E(m)"
854-
set geoEasyMsg(head1Dis) "Point num Point num Bearing Distance Slope dis Zenith angle"
854+
set geoEasyMsg(head1Dis) "Point num Point num Bearing Distance Slope dis Zenith angle"
855855
set geoEasyMsg(head1Angle) "Point num Bearing Distance Angle Angle from 1st Local E Local N"
856856
# transformation
857857
set geoEasyMsg(head1Tran) "Point num e n E N dE dN dist"

0 commit comments

Comments
 (0)