Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6b283d78d3dc
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d85c08878c34
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 29, 2014

  1. Copy the full SHA
    a363ad4 View commit details
  2. Copy the full SHA
    d85c088 View commit details
Showing with 8 additions and 3 deletions.
  1. +8 −3 frontend/artiq_gui.py
11 changes: 8 additions & 3 deletions frontend/artiq_gui.py
Original file line number Diff line number Diff line change
@@ -66,11 +66,14 @@ def __setitem__(self, prid, x):
else:
del self.periodic_store[i]
del self.order[i]
ord_el = (x[0], prid)
j = len(self.order)
for i, o in enumerate(self.order):
if o > (x[0], prid):
if o > ord_el:
j = i
break
self.periodic_store.insert(i, self._convert(prid, x))
self.order.insert(i, (x[0], prid))
self.periodic_store.insert(j, self._convert(prid, x))
self.order.insert(j, ord_el)

def __delitem__(self, key):
i = self._find_index(key)
@@ -82,8 +85,10 @@ class SchedulerWindow(Gtk.Window):
def __init__(self):
Gtk.Window.__init__(self, title="Scheduler")
self.set_border_width(10)
self.set_default_size(730, 520)

vpane = Gtk.VPaned()
vpane.set_position(220)
self.add(vpane)

self.queue_store = Gtk.ListStore(int, str, str, str, str)