From e9843384cb2abdf453f9d81303bde1ff3801b8a6 Mon Sep 17 00:00:00 2001
From: Ed Venator <evenator@gmail.com>
Date: Tue, 1 Aug 2017 21:12:11 -0500
Subject: [PATCH] Minor cleanup in calculate_perspective

---
 bin/calculate_perspective |  28 +++++++++++++++++-----------
 projector.p               | Bin 343 -> 343 bytes
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/bin/calculate_perspective b/bin/calculate_perspective
index 9127c7d976..7559dd433b 100755
--- a/bin/calculate_perspective
+++ b/bin/calculate_perspective
@@ -1,4 +1,5 @@
 #! /usr/bin/env python
+"""A script to calculate the perspective projector and save it to a Python pickle"""
 
 import cv2
 from lanelines.processors import GroundProjector
@@ -9,11 +10,9 @@ import os
 import pickle
 import textwrap
 
-'''
-Script to generate the perspective projector and save it to a Python pickle.
-'''
 
 def prompt_coordinates(prompt):
+    """Prompt the user for a comma-separated coordinate pair and enforce correctness."""
     while True:
         string_coords = input(prompt)
         split_string_coords = string_coords.split(',')
@@ -28,6 +27,7 @@ def prompt_coordinates(prompt):
         return coords
 
 def prompt_float(prompt):
+    """Prompt the user for a floating point value and enforce correctness."""
     while True:
         string_val = input(prompt)
         try:
@@ -38,6 +38,7 @@ def prompt_float(prompt):
         return val
 
 def prompt_y_n(question):
+    """Prompt the user for a yes or no answer."""
     answer = input(question).lower().strip()
     while True:
         if answer in ['y', 'yes']:
@@ -65,21 +66,26 @@ def main():
                                   "far right marker as two comma-separated numbers: ")
     img_pts = np.float32([far_left, near_left, near_right, far_right])
     
-    offset = prompt_float("How many meters should the top-down image show on either side of the lane? ")
+    offset = prompt_float("How many meters should the top-down image show on "\
+                          "either side of the lane? ")
 
-    top_offset = prompt_float("How many meters should the top-down image extend past the far lane markers? ")
+    top_offset = prompt_float("How many meters should the top-down image "\
+                              "extend past the far lane markers? ")
     
-    bottom_offset = prompt_float("How many meters should the top-down image extend before the close lane markers? ")
+    bottom_offset = prompt_float("How many meters should the top-down image "\
+                                 "extend before the close lane markers? ")
     
     lane_width = prompt_float("In meters, how wide is the lane? ")
     
-    line_length = prompt_float("In meters, how long is it between the near and far lane markers? ")
+    line_length = prompt_float("In meters, how long is it between the near and "\
+                               "far lane markers? ")
     
-    px_m = prompt_float("In pixels per meter, what should the resolution of the top-down image be? ")
+    px_m = prompt_float("In pixels per meter, what should the resolution of "\
+                        "the top-down image be? ")
 
     # Calculate the points' positions on the ground in meters
     obj_pts = [(offset, top_offset),                           # Far left
-               (offset, top_offset + line_length),             # Near Left
+               (offset, top_offset + line_length),             # Near left
                (offset+lane_width, top_offset + line_length),  # Near right
                (offset+lane_width, top_offset)]                # Far right
 
@@ -103,7 +109,7 @@ def main():
     print("Output shape (pixels): {}".format(output_shape))
 
     # Draw results
-    if prompt_y_n("Would you like to preview the results? (y/n)"):
+    if prompt_y_n("Would you like to preview the results? (y/n) "):
         filename = input("Enter the path to the image file: ")
         img = cv2.imread(filename)
 
@@ -117,7 +123,7 @@ def main():
         plt.show()
 
     # Save results
-    if prompt_y_n("Save the results?"):
+    if prompt_y_n("Save the results? (y/n) "):
         out_path = input("Path to save the results (*.p)")
         if not out_path[-2:] == ".p":
             out_path = out_path + ".p"
diff --git a/projector.p b/projector.p
index 7dfed6bbf4cd5398824303eddef30634af8e7b8a..ce3b35b4362c276675586493a46a931c59cb3068 100644
GIT binary patch
delta 213
zcmcc4be(B}u?i0Z14Dd%X-Pq8Nqli;Rcax#FAJOR2j#XxmIx-0TtFe~#4y!*w&c9h
z+=5E3yp+VEqQpwBLUwP4)<O<v#-u{d_Cl_pLT(LjMsH?s=C(o}sM3^@%7Rp`LSC>r
zX%>Zi-VEN1?S=e7g#sGh%n^)0(`^a`{rvpA{sRG+@Mb6}6iVuJ_Gq8tP%&Ze<NZJ0
uwKs|!{j-1KFH2?Nl0uQB2yT$0ic*X7b4p7x^YaQt-5oN4LO@WOqz3>4nnsKO

delta 213
zcmcc4be(B}u`)LU14DdKYH@x}X-Q^&ULmu)LncrN2qKt(M0`LY%fxWide-E;(%gbd
zuDq1QqN2n~u0l3%hSoxMXU3#Lj`l*%ph7MUZ$@usZ|1f_Zm80flFEWqu0kHLIcXM!
zyxt7njO~SdL52Jp-pmn<K+|ms1^oQ{y#50LnDAyODHKfVboOYU;!rVR@8kVH-nBQ1
v9R0I@;%`e8p^`%3qzE36qw-5j3Q9}ji!-ZI3q^cc*nB@Iw-t((Cg}kHua8EK