Skip to content

Commit

Permalink
Update GUI: Quick view (#134)
Browse files Browse the repository at this point in the history
* QuickView window does not resize everytime anymore

* Update CHANGELOG

* fix jumping toolbuttons for polygon filter view

* Introduce QSplitter in QuickView window

* Increase minimum size of some widgets in QV

* enh: add horizontal sizers so UI widget do not visually flow apart

* ref: turn quickview controls into a stacked widget

Co-authored-by: Paul Müller <dev@craban.de>
  • Loading branch information
B-Hartmann and paulmueller committed Dec 5, 2022
1 parent 4d6e81a commit e1d714a
Show file tree
Hide file tree
Showing 3 changed files with 881 additions and 803 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
2.11.11
- enh: strip http(s):// from DCOR server string in settings
- enh: improve GUI of QuickView (#133, #43)
2.11.10
- fix: detect chaged files on disk when reloading metadata
- setup: bump dclab from 0.46.4 to 0.47.0 (new bg_med feature
Expand Down
33 changes: 13 additions & 20 deletions shapeout2/gui/quick_view/qv_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,6 @@ def _set_initial_ui(self):
# Initially, only show the info about how QuickView works
self.widget_tool.setEnabled(False)
self.widget_scatter.hide()
# Hide settings/events by default
self.widget_event.hide()
self.widget_settings.hide()
self.widget_poly.hide()
# show the how-to label
self.label_howto.show()
# hide the no events label
Expand Down Expand Up @@ -474,20 +470,25 @@ def on_tool(self, collapse=False):
pass
else:
# keep everything as-is but update the sizes
show_event = self.widget_event.isVisible()
show_settings = self.widget_settings.isVisible()
show_poly = self.widget_poly.isVisible()
show_event = self.stackedWidget.currentWidget() is self.page_event
show_settings = self.stackedWidget.currentWidget() \
is self.page_settings
show_poly = self.stackedWidget.currentWidget() is self.page_poly

# toolbutton checked
self.toolButton_event.setChecked(show_event)
self.toolButton_poly.setChecked(show_poly)
self.toolButton_settings.setChecked(show_settings)

# widget visibility
self.widget_event.setVisible(show_event)
# stack widget visibility
if show_event:
self.stackedWidget.setCurrentWidget(self.page_event)
elif show_settings:
self.stackedWidget.setCurrentWidget(self.page_settings)
elif show_poly:
self.stackedWidget.setCurrentWidget(self.page_poly)

self.widget_scatter.select.setVisible(show_event) # point in scatter
self.widget_poly.setVisible(show_poly)
self.widget_settings.setVisible(show_settings)

if show_event:
# update event plot (maybe axes changed)
Expand All @@ -498,16 +499,8 @@ def on_tool(self, collapse=False):

if not show_poly:
self.on_poly_done()
# set size

self.update()
ws = self.sizeHint()
mdiwin = self.parent()
geom = mdiwin.geometry()
geom.setWidth(ws.width())
geom.setHeight(ws.height())
mdiwin.setGeometry(geom)
mdiwin.adjustSize()
mdiwin.update()

@show_wait_cursor
@QtCore.pyqtSlot()
Expand Down

0 comments on commit e1d714a

Please sign in to comment.