Remove some unused code in the spline GUI
This also fixes a thing where the GUI used to pop up a second window
after being killed once.
Change-Id: Iebb28d2a4b92b24080947fe4e33fdf3f97a3a926
diff --git a/frc971/control_loops/python/path_edit.py b/frc971/control_loops/python/path_edit.py
index 0d1b263..d04089b 100755
--- a/frc971/control_loops/python/path_edit.py
+++ b/frc971/control_loops/python/path_edit.py
@@ -393,97 +393,7 @@
self.held_x = self.x
def do_button_press(self, event):
- print("button press activated")
# Be consistent with the scaling in the drawing_area
self.x = event.x * 2
self.y = event.y * 2
self.button_press_action()
-
-
-class GridWindow(Gtk.Window):
- def method_connect(self, event, cb):
- def handler(obj, *args):
- cb(*args)
-
- print("Method_connect ran")
- self.connect(event, handler)
-
- def mouse_move(self, event):
- #Changes event.x and event.y to be relative to the center.
- x = event.x - self.drawing_area.window_shape[0] / 2
- y = self.drawing_area.window_shape[1] / 2 - event.y
- scale = self.drawing_area.get_current_scale()
- event.x = x / scale + self.drawing_area.center[0]
- event.y = y / scale + self.drawing_area.center[1]
- self.drawing_area.mouse_move(event)
- self.queue_draw()
-
- def button_press(self, event):
- print("button press activated")
- o_x = event.x
- o_y = event.y
- x = event.x - self.drawing_area.window_shape[0] / 2
- y = self.drawing_area.window_shape[1] / 2 - event.y
- scale = 2 * self.drawing_area.get_current_scale()
- event.x = x / scale + self.drawing_area.center[0]
- event.y = y / scale + self.drawing_area.center[1]
- self.drawing_area.do_button_press(event)
- event.x = o_x
- event.y = o_y
-
- def key_press(self, event):
- print("key press activated")
- self.drawing_area.do_key_press(event, self.file_name_box.get_text())
- self.queue_draw()
-
- def configure(self, event):
- print("configure activated")
- self.drawing_area.window_shape = (event.width, event.height)
-
- def __init__(self):
- Gtk.Window.__init__(self)
-
- self.set_default_size(1.5 * SCREEN_SIZE, SCREEN_SIZE)
-
- flowBox = Gtk.FlowBox()
- flowBox.set_valign(Gtk.Align.START)
- flowBox.set_selection_mode(Gtk.SelectionMode.NONE)
-
- flowBox.set_valign(Gtk.Align.START)
-
- self.add(flowBox)
-
- container = Gtk.Fixed()
- flowBox.add(container)
-
- self.eventBox = Gtk.EventBox()
- container.add(self.eventBox)
-
- self.eventBox.set_events(Gdk.EventMask.BUTTON_PRESS_MASK
- | Gdk.EventMask.BUTTON_RELEASE_MASK
- | Gdk.EventMask.POINTER_MOTION_MASK
- | Gdk.EventMask.SCROLL_MASK
- | Gdk.EventMask.KEY_PRESS_MASK)
-
- #add the graph box
- self.drawing_area = GTK_Widget()
- self.eventBox.add(self.drawing_area)
-
- self.method_connect("key-release-event", self.key_press)
- self.method_connect("button-release-event", self.button_press)
- self.method_connect("configure-event", self.configure)
- self.method_connect("motion_notify_event", self.mouse_move)
-
- self.file_name_box = Gtk.Entry()
- self.file_name_box.set_size_request(200, 40)
-
- self.file_name_box.set_text("File")
- self.file_name_box.set_editable(True)
-
- container.put(self.file_name_box, 0, 0)
-
- self.show_all()
-
-
-window = GridWindow()
-RunApp()
diff --git a/frc971/control_loops/python/spline_graph.py b/frc971/control_loops/python/spline_graph.py
index 2fd7964..94ee683 100755
--- a/frc971/control_loops/python/spline_graph.py
+++ b/frc971/control_loops/python/spline_graph.py
@@ -11,11 +11,10 @@
def handler(obj, *args):
cb(*args)
- print("Method_connect ran")
self.connect(event, handler)
def mouse_move(self, event):
- #Changes event.x and event.y to be relative to the center.
+ # Changes event.x and event.y to be relative to the center.
x = event.x - self.drawing_area.window_shape[0] / 2
y = self.drawing_area.window_shape[1] / 2 - event.y
scale = self.drawing_area.get_current_scale()
@@ -25,25 +24,22 @@
self.queue_draw()
def button_press(self, event):
- print("button press activated")
- o_x = event.x
- o_y = event.y
+ original_x = event.x
+ original_y = event.y
x = event.x - self.drawing_area.window_shape[0] / 2
y = self.drawing_area.window_shape[1] / 2 - event.y
scale = 2 * self.drawing_area.get_current_scale()
event.x = x / scale + self.drawing_area.center[0]
event.y = y / scale + self.drawing_area.center[1]
self.drawing_area.do_button_press(event)
- event.x = o_x
- event.y = o_y
+ event.x = original_x
+ event.y = original_y
def key_press(self, event):
- print("key press activated")
self.drawing_area.do_key_press(event, self.file_name_box.get_text())
self.queue_draw()
def configure(self, event):
- print("configure activated")
self.drawing_area.window_shape = (event.width, event.height)
# handle submitting a constraint
@@ -88,7 +84,7 @@
self.file_name_box = Gtk.Entry()
self.file_name_box.set_size_request(200, 40)
- self.file_name_box.set_text("File")
+ self.file_name_box.set_text("output_file_name.json")
self.file_name_box.set_editable(True)
container.put(self.file_name_box, 0, 0)