diff --git a/Karto/assignment3/KTZ004_2019_03_ats.py b/Karto/assignment3/KTZ004_2019_03_ats.py index 13b4025..cca0579 100755 --- a/Karto/assignment3/KTZ004_2019_03_ats.py +++ b/Karto/assignment3/KTZ004_2019_03_ats.py @@ -104,17 +104,17 @@ Kampas Nr.2K-9 2K-9(L) = %.7f""" % K2K9 + """ 2K-9(L-M-S) = %s""" % Deg.from_1(K2K9) + """ === Iskasos Nr.1 gylis H1 (0.00 tikslumu) (duotas)=== -******* +%.2f""" % H1 + """ === Iskasos Nr.1 slaito polinkio kampas SK1 (0.01 tikslumu) (duotas)=== -******* +%.2f""" % SK1 + """ === Apskaiciuotas atstumas iki slaito papedes A1 (0.00 tikslumu)=== -******* +%.2f""" % A1 + """ === Iskasos Nr.2 gylis H2 (0.00 tikslumu) (duotas)=== -******* +%.2f""" % H2 + """ === Iskasos Nr.2 slaito polinkio kampas SK2 (0.01 tikslumu) (duotas)=== -******* +%.2f""" % SK2 + """ === Apskaiciuotas atstumas iki slaito papedes A2 (0.00 tikslumu)=== -******* +%.2f""" % A2 + """ =============== Ismatuota brezinyje ================ === Tasku koordinates (0.001 tikslumu) === Tasko Nr.2 koordinates diff --git a/Karto/assignment3/KTZ004_2019_03_brez.dwg b/Karto/assignment3/KTZ004_2019_03_brez.dwg index be14a63..5a145cf 100644 Binary files a/Karto/assignment3/KTZ004_2019_03_brez.dwg and b/Karto/assignment3/KTZ004_2019_03_brez.dwg differ diff --git a/Karto/assignment3/measure.py b/Karto/assignment3/measure.py index c71fa61..ab1bccd 100755 --- a/Karto/assignment3/measure.py +++ b/Karto/assignment3/measure.py @@ -2,6 +2,8 @@ from decimal import Decimal as Dec from deg import Deg +from math import cos, pi + def fmt(deg): if deg > 180: deg -= 360 @@ -103,6 +105,14 @@ 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) + +H2 = 20.38 +SK2 = 17.69 +A2 = H2 * cos(SK2 * pi / 180) + if __name__ == '__main__': print("""Poslinkis to T3: T1(X,Y): %7.3f,%7.3f""" % (XT3-XT1, YT3-YT1) + """