Add a new spline button to the Spline UI
Change-Id: I43f96aa5e90127964bcb81b7df5a5e90009a3683
Signed-off-by: Nathan Leong <100028864@mvla.net>
diff --git a/frc971/control_loops/python/path_edit.py b/frc971/control_loops/python/path_edit.py
index b66a668..7c742c8 100755
--- a/frc971/control_loops/python/path_edit.py
+++ b/frc971/control_loops/python/path_edit.py
@@ -375,16 +375,24 @@
keyval = Gdk.keyval_to_lower(event.keyval)
if keyval == Gdk.KEY_z and event.state & Gdk.ModifierType.CONTROL_MASK:
self.undo()
- # TODO: This should be a button
+
if keyval == Gdk.KEY_p:
- self.mode = Mode.kPlacing
- # F0 = A1
- # B1 = 2F0 - E0
- # C1= d0 + 4F0 - 4E0
- multispline = self.active_multispline
- multispline.extrapolate()
- self.queue_draw()
+ self.new_spline()
elif keyval == Gdk.KEY_m:
+ self.new_multispline()
+
+ def new_spline(self):
+ self.mode = Mode.kPlacing
+ # F0 = A1
+ # B1 = 2F0 - E0
+ # C1= d0 + 4F0 - 4E0
+ multispline = self.active_multispline
+ if len(multispline.getSplines()) != 0:
+ multispline.extrapolate(multispline.getSplines()[-1])
+ self.queue_draw()
+
+ def new_multispline(self):
+ if len(self.active_multispline.getSplines()) != 0:
self.mode = Mode.kPlacing
self.active_multispline_index += 1
self.multisplines.insert(self.active_multispline_index,
@@ -392,7 +400,7 @@
prev_multispline = self.multisplines[self.active_multispline_index
- 1]
- if prev_multispline:
+ if len(prev_multispline.getSplines()) != 0:
self.active_multispline.extrapolate(
prev_multispline.getSplines()[-1])
self.queue_draw()
diff --git a/frc971/control_loops/python/spline_graph.py b/frc971/control_loops/python/spline_graph.py
index b7bc5ab..dc64dfa 100755
--- a/frc971/control_loops/python/spline_graph.py
+++ b/frc971/control_loops/python/spline_graph.py
@@ -43,6 +43,12 @@
def undo_func(self, *args):
self.field.undo()
+ def new_spline_clicked(self, *args):
+ self.field.new_spline()
+
+ def new_multispline_clicked(self, *args):
+ self.field.new_multispline()
+
def long_changed(self, button):
value = self.long_input.get_value()
self.field.active_multispline.setConstraint(
@@ -84,7 +90,7 @@
self.method_connect("key-release-event", self.field.do_key_press_event)
self.file_name_box = Gtk.Entry()
- self.file_name_box.set_size_request(200, 40)
+ self.file_name_box.set_size_request(50, 40)
self.file_name_box.set_text(FIELD.field_id + ".json")
self.file_name_box.set_editable(True)
@@ -139,20 +145,29 @@
self.field.active_multispline.getConstraint("VOLTAGE"))
self.output_json = Gtk.Button.new_with_label("Export")
- self.output_json.set_size_request(100, 40)
+ self.output_json.set_size_request(50, 40)
self.output_json.connect("clicked", self.output_json_clicked)
self.input_json = Gtk.Button.new_with_label("Import")
- self.input_json.set_size_request(100, 40)
+ self.input_json.set_size_request(50, 40)
self.input_json.connect("clicked", self.input_json_clicked)
self.clear = Gtk.Button.new_with_label("Clear")
- self.clear.set_size_request(100, 40)
+ self.clear.set_size_request(50, 40)
self.clear.connect("clicked", self.clear_clicked)
self.undo = Gtk.Button.new_with_label("Undo (Ctrl + Z)")
- self.undo.set_size_request(100, 40)
+ self.undo.set_size_request(50, 40)
self.undo.connect("clicked", self.undo_func)
+
+ self.new_spline = Gtk.Button.new_with_label("Add Spline")
+ self.new_spline.set_size_request(50, 40)
+ self.new_spline.connect("clicked", self.new_spline_clicked)
+
+ self.new_multispline = Gtk.Button.new_with_label("Add Multispline")
+ self.new_multispline.set_size_request(50, 40)
+ self.new_multispline.connect("clicked", self.new_multispline_clicked)
+
#Dropdown feature
self.label = Gtk.Label()
self.label.set_text("Change Field:")
@@ -189,12 +204,14 @@
container.attach(limitControls, 5, 1, 1, 1)
jsonControls = Gtk.FlowBox()
- jsonControls.set_min_children_per_line(5)
+ jsonControls.set_min_children_per_line(7)
jsonControls.add(self.file_name_box)
jsonControls.add(self.output_json)
jsonControls.add(self.input_json)
jsonControls.add(self.clear)
jsonControls.add(self.undo)
+ jsonControls.add(self.new_spline)
+ jsonControls.add(self.new_multispline)
container.attach(jsonControls, 1, 0, 1, 1)
container.attach(self.label, 4, 0, 1, 1)