more measurements

Karto/assignment3/KTZ004_2019_03_ats.py

@@ -2,6 +2,15 @@
 
 from measure import *
 
+def xy(xy):
+    return "X= %.3f\nY= %.3f" % xy
+
+def off1(x, y):
+    return x - (XT3 - XT1), y - (YT3 - YT1)
+
+def off2(x, y):
+    return x - (XT3 - XT2), y - (YT3 - YT2)
+
 print("""Uzduotis Nr.
 KTZ004_2019_03
 Braize (Pavarde_Vardas):
@@ -118,77 +127,64 @@ Kampas Nr.2K-9
 =============== Ismatuota brezinyje ================
 === Tasku koordinates (0.001 tikslumu) ===
 Tasko Nr.2 koordinates
-X= *******
-Y= *******
+""" + xy(off1(Dec('17074.0250'), Dec('26806.2717'))) + """
 Tasko Nr.3 koordinates
-X= *******
-Y= *******
+""" + xy(off1(Dec('17006.4258'), Dec('26772.0343'))) + """
 Tasko Nr.4 koordinates
-X= *******
-Y= *******
+""" + xy(off1(Dec('16956.1218 '), Dec('26726.2096'))) + """
 Tasko Nr.5 koordinates
-X= *******
-Y= *******
+""" + xy(off1(Dec('16956.1218'), Dec('26726.2096'))) + """
 Tasko Nr.6 koordinates
-X= *******
-Y= *******
+""" + xy(off1(Dec('16871.1565'), Dec('26843.3373'))) + """
 Tasko Nr.7 koordinates
-X= *******
-Y= *******
+""" + xy(off1(Dec('16813.9395'), Dec('26687.3606'))) + """
 Tasko Nr.8 koordinates
-X= *******
-Y= *******
+""" + xy(off1(Dec('16847.6364'), Dec('26625.3292'))) + """
 Tasko Nr.9 koordinates
-X= *******
-Y= *******
+""" + xy(off1(Dec('16894.8971'), Dec('26640.4640'))) + """
 Tasko Nr.10 koordinates
-X= *******
-Y= *******
+""" + xy(off1(Dec('16981.5918'), Dec('26616.2192'))) + """
 Tasko Nr.11 koordinates
-X= *******
-Y= *******
+""" + xy(off1(Dec('16927.2194'), Dec('26586.8697'))) + """
 Tasko Nr.12 koordinates
-X= *******
-Y= *******
+""" + xy(off1(Dec('26516.2159'), Dec('16904.4338'))) + """
 Tasko Nr.13 koordinates
-X= *******
-Y= *******
+""" + xy(off1(Dec('16992.5045'), Dec('26428.8250'))) + """
 Tasko Nr.14 koordinates
-X= *******
-Y= *******
+""" + xy(off1(Dec('16974.8617'), Dec('26526.1478'))) + """
 Tasko Nr.16 koordinates
-X= *******
-Y= *******
+X= 17396.566
+Y= 25075.488
 Tasko Nr.17 koordinates
-X= *******
-Y= *******
+X= 17511.871
+Y= 25113.316
 Tasko Nr.18 koordinates
-X= *******
-Y= *******
+X= 17395.410
+Y= 25257.699
 Tasko Nr.19 koordinates
-X= *******
-Y= *******
+X= 17409.142
+Y= 25139.508
 Tasko Nr.20 koordinates
-X= *******
-Y= *******
+X= 17325.356
+Y= 25176.612
 Tasko Nr.21 koordinates
-X= *******
-Y= *******
+X= 17267.614 
+Y= 25298.138
 Tasko Nr.22 koordinates
-X= *******
-Y= *******
+X= 17185.820
+Y= 25341.223
 Tasko Nr.23 koordinates
-X= *******
-Y= *******
+X= 17092.249
+Y= 25277.651
 Tasko Nr.24 koordinates
-X= *******
-Y= *******
+X= 17172.022
+Y= 25258.361
 Tasko Nr. T1 koordinates
-X= *******
-Y= *******
+X= %.3f""" % XT1 + """
+Y= %.3f""" % YT1 + """
 Tasko Nr. T2 koordinates
-X= *******
-Y= *******
+X= %.3f""" % XT2 + """
+Y= %.3f""" % YT2 + """
 === Atstumas tarp tasku 1-7 (0.001 tikslumu) ===
 *******
 === Atstumas tarp tasku 4-10 (0.001 tikslumu) ===

Karto/assignment3/measure.py

@@ -105,6 +105,7 @@ K2K7  = rp(Deg.guess('69.4792556').frac + R)
 K2K8  = rp(Deg.guess('130-50-06.1').frac + L)
 K2K9  = vs(Deg.guess('84-08-54.3').frac + K)
 
+
 H1 = 4.82
 SK1 = 41.08
 A1 = H1 * cos(SK1 * pi / 180)
@@ -115,8 +116,8 @@ A2 = H2 * cos(SK2 * pi / 180)
 
 if __name__ == '__main__':
     print("""Poslinkis to T3:
-    T1(X,Y): %7.3f,%7.3f""" % (XT3-XT1, YT3-YT1) + """
-    T2(X,Y): %7.3f,%7.3f""" % (XT3-XT2, YT3-YT2) + """
+    T1(X,Y): %7.3f,%7.3f""" % offsetT1 + """
+    T2(X,Y): %7.3f,%7.3f""" % offsetT2 + """
     """)
 
     print("""Sklypu pradiniu tasku (1 ir 15) koordinates: