Splines gui
Change-Id: Ic625138c1a9f39833c15542149fdeb11301b8c95
diff --git a/frc971/control_loops/python/basic_window.py b/frc971/control_loops/python/basic_window.py
index 7a34b3a..78324a3 100644
--- a/frc971/control_loops/python/basic_window.py
+++ b/frc971/control_loops/python/basic_window.py
@@ -4,7 +4,6 @@
from gi.repository import GLib
from gi.repository import Gdk
from gi.repository import GdkX11
-from color import Color, palette
import cairo
identity = cairo.Matrix()
@@ -46,31 +45,13 @@
# Create a GTK+ widget on which we will draw using Cairo
class BaseWindow(Gtk.DrawingArea):
- def method_connect(self, event, cb):
- def handler(obj, *args):
- cb(*args)
-
- self.window.connect(event, handler)
# Draw in response to an expose-event
def __init__(self):
super(BaseWindow, self).__init__()
- self.window = Gtk.Window()
- self.window.set_title("DrawingArea")
- self.window.connect("destroy", quit_main_loop)
- self.window.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)
- self.method_connect("key-press-event", self.do_key_press)
- self.method_connect("button-press-event",
- self._do_button_press_internal)
- self.method_connect("configure-event", self._do_configure)
+ #self.window.connect("destroy", quit_main_loop)
- self.set_size_request(640, 400)
- self.window.add(self)
- self.window.show_all()
+ self.set_size_request(640, 600)
self.center = (0, 0)
self.shape = (640, 400)
self.needs_redraw = False
@@ -100,29 +81,3 @@
# Handle the expose-event by drawing
def handle_draw(self, cr):
pass
-
- def do_key_press(self, event):
- pass
-
- def _do_button_press_internal(self, event):
- o_x = event.x
- o_y = event.y
- x = event.x - self.window_shape[0] / 2
- y = self.window_shape[1] / 2 - event.y
- scale = self.get_current_scale()
- event.x = x / scale + self.center[0]
- event.y = y / scale + self.center[1]
- self.do_button_press(event)
- event.x = o_x
- event.y = o_y
-
- def do_button_press(self, event):
- pass
-
- def _do_configure(self, event):
- self.window_shape = (event.width, event.height)
-
- def redraw(self):
- if not self.needs_redraw:
- self.needs_redraw = True
- self.window.queue_draw()