Fixed Editting
Got rid of code from when we had our own spline object that was causing errors.
Change-Id: I20b18ed5af2e542046315234b52471faf3df79c7
diff --git a/frc971/control_loops/python/path_edit.py b/frc971/control_loops/python/path_edit.py
index 9edbb47..52bd8d1 100644
--- a/frc971/control_loops/python/path_edit.py
+++ b/frc971/control_loops/python/path_edit.py
@@ -144,7 +144,6 @@
self.selected_points = []
self.splines = []
- self.spline = []
self.reinit_extents()
self.inStart = None
@@ -204,8 +203,6 @@
self.startSet = True
else:
self.inEnd = [self.index_of_edit, self.findDistance()]
- self.spline[self.spline_edit].addConstraint(
- self.inStart, self.inEnd, self.inConstraint, self.inValue)
self.startSet = False
self.mode = Mode.kEditing
self.spline_edit = -1
@@ -237,7 +234,7 @@
set_color(cr, palette["GREY"])
cr.paint()
#Scale the field to fit within drawing area
- cr.scale(0.5,0.5)
+ cr.scale(0.5, 0.5)
# Draw a extents rectangle
set_color(cr, palette["WHITE"])
@@ -277,14 +274,6 @@
cr.fill()
y = 0
- for x, i in enumerate(self.spline):
- for j in i.constraints:
- cr.move_to(-650, -y * 10 + 320)
- set_color(cr, palette["BLACK"])
- display_text(
- cr, str("Spline " + str(x) + ": " + str(j.toString())),
- 0.5, 0.5, 2, 2)
- y += 1
# update all the things
@@ -489,9 +478,6 @@
self.splines[spline_edit][1] = f * 2 + e * -1
self.splines[spline_edit][2] = d + f * 4 + e * -4
- self.spline[spline_edit].point = self.splines[spline_edit]
- self.spline[spline_edit].math()
-
if not self.spline_edit == 0:
spline_edit = self.spline_edit - 1
a = self.splines[self.spline_edit][0]
@@ -501,11 +487,6 @@
self.splines[spline_edit][4] = a * 2 + b * -1
self.splines[spline_edit][3] = c + a * 4 + b * -4
- self.spline[spline_edit].point = self.splines[spline_edit]
- self.spline[spline_edit].math()
-
- self.spline[self.spline_edit].edit(self.index_of_edit,
- [self.x, self.y])
self.index_of_edit = -1
self.spline_edit = -1
else:
@@ -641,4 +622,4 @@
window = GridWindow()
-basic_window.RunApp()
+basic_window.RunApp()
\ No newline at end of file