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: 0e1f75ec49ba
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: 11bfe33dd44f
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 16, 2016

  1. scanwidget: rewrite, pending drawing area (3de1505)

    @jordens
    jordens committed Mar 16, 2016
    Copy the full SHA
    d858ad4 View commit details

  2. scanwidget: lmb axis drag (9e6203c)

    @jordens
    jordens committed Mar 16, 2016
    Copy the full SHA
    67db5f7 View commit details

  3. scanwidget: painting (3237d2b)

    @jordens
    jordens committed Mar 16, 2016
    Copy the full SHA
    11bfe33 View commit details
Showing with 198 additions and 360 deletions.
  1. +7 −9 artiq/gui/entries.py
  2. +191 −351 artiq/gui/scanwidget.py
16 changes: 7 additions & 9 deletions artiq/gui/entries.py
View file
Original file line number Diff line number Diff line change
@@ -158,8 +158,6 @@ def apply_properties(spinbox):
scanner.setMinimumSize(150, 0)
scanner.setSizePolicy(QtWidgets.QSizePolicy(
QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed))
disable_scroll_wheel(scanner.axis)
disable_scroll_wheel(scanner.slider)
self.addWidget(scanner, 0, 0, -1, 1)

self.min = ScientificSpinBox()
@@ -191,17 +189,17 @@ def update_max(value):

def update_npoints(value):
state["npoints"] = value
scanner.setNumPoints(value)
scanner.setNum(value)

scanner.sigStartMoved.connect(self.min.setValue)
scanner.sigNumChanged.connect(self.npoints.setValue)
scanner.sigStopMoved.connect(self.max.setValue)
scanner.startChanged.connect(self.min.setValue)
scanner.numChanged.connect(self.npoints.setValue)
scanner.stopChanged.connect(self.max.setValue)
self.min.valueChanged.connect(update_min)
self.npoints.valueChanged.connect(update_npoints)
self.max.valueChanged.connect(update_max)
self.min.setValue(state["min"]/scale)
self.npoints.setValue(state["npoints"])
self.max.setValue(state["max"]/scale)
scanner.setStart(state["min"]/scale)
scanner.setNum(state["npoints"])
scanner.setStop(state["max"]/scale)
apply_properties(self.min)
apply_properties(self.max)

Loading