Skip to content

Commit

Permalink
cosmetics for QuickView
Browse files Browse the repository at this point in the history
  • Loading branch information
@paulmueller
paulmueller committed Oct 7, 2019
1 parent fb2beaf commit 26ff0c6
Show file tree
Hide file tree
Showing 3 changed files with 203 additions and 74 deletions.
1 change: 1 addition & 0 deletions shapeout2/gui/main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

# global plotting configuration parameters
pg.setConfigOption("background", None)
pg.setConfigOption("foreground", "k")
pg.setConfigOption("antialias", False)
pg.setConfigOption("imageAxisOrder", "row-major")

Expand Down
5 changes: 4 additions & 1 deletion shapeout2/gui/quick_view.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ def __init__(self, *args, **kwargs):
# disable keyboard shortcuts
vim.keyPressEvent = lambda _: None
vim.keyReleaseEvent = lambda _: None
# Defaults for trace plot
self.graphicsView_trace.setBackground('w')
# Set individual plots
kw0 = dict(x=np.arange(10), y=np.arange(10))
self.trace_plots = {
Expand All @@ -93,7 +95,6 @@ def __init__(self, *args, **kwargs):
"fl2_median": pg.PlotDataItem(pen="#BF8A00", **kw0), # orange
"fl3_median": pg.PlotDataItem(pen="#BF0C00", **kw0), # red
}

for key in self.trace_plots:
self.graphicsView_trace.addItem(self.trace_plots[key])
self.trace_plots[key].hide()
Expand Down Expand Up @@ -271,6 +272,8 @@ def show_event(self, event):
self.trace_plots[key].show()
else:
self.trace_plots[key].hide()
self.graphicsView_trace.setXRange(0, tracey.size, padding=0)
self.graphicsView_trace.setLimits(xMin=0, xMax=tracey.size)
self.groupBox_trace.show()
else:
self.groupBox_trace.hide()
Expand Down
271 changes: 198 additions & 73 deletions shapeout2/gui/quick_view.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>1096</width>
<width>1195</width>
<height>847</height>
</rect>
</property>
Expand All @@ -15,13 +15,49 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="RTDCScatterWidget" name="widget_scatter" native="true">
<property name="minimumSize">
<size>
<width>400</width>
<height>300</height>
</size>
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>2</number>
</property>
<property name="midLineWidth">
<number>1</number>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="RTDCScatterWidget" name="widget_scatter" native="true">
<property name="minimumSize">
<size>
<width>400</width>
<height>300</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">background-color:#FFFFFF</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
Expand Down Expand Up @@ -93,6 +129,18 @@
<item>
<widget class="QWidget" name="widget_settings" native="true">
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_7">
<property name="text">
Expand Down Expand Up @@ -266,6 +314,18 @@
<item>
<widget class="QWidget" name="widget_event" native="true">
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_8">
<property name="text">
Expand Down Expand Up @@ -299,88 +359,153 @@
<property name="title">
<string>Brightfield image</string>
</property>
<property name="flat">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout_3">
<property name="topMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="checkBox_contour">
<property name="text">
<string>Show contour</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="checkBox_zoom_roi">
<property name="text">
<string>Zoom to ROI</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="checkBox_auto_contrast">
<property name="text">
<string>Auto contrast</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="ImageView" name="imageView_image">
<property name="minimumSize">
<size>
<width>300</width>
<height>200</height>
</size>
<widget class="QWidget" name="widget_2" native="true">
<property name="styleSheet">
<string notr="true">background-color:#FFFFFF</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<layout class="QGridLayout" name="gridLayout_3">
<property name="topMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="checkBox_contour">
<property name="text">
<string>Show contour</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="checkBox_zoom_roi">
<property name="text">
<string>Zoom to ROI</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="checkBox_auto_contrast">
<property name="text">
<string>Auto contrast</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="ImageView" name="imageView_image">
<property name="minimumSize">
<size>
<width>300</width>
<height>200</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_trace">
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="title">
<string>Fluorescence traces</string>
</property>
<property name="flat">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout_4">
<property name="topMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="checkBox_raw_trace">
<property name="text">
<string>Show raw data</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="PlotWidget" name="graphicsView_trace">
<property name="minimumSize">
<size>
<width>0</width>
<height>200</height>
</size>
<widget class="QWidget" name="widget" native="true">
<property name="styleSheet">
<string notr="true">background-color:#FFFFFF</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<item>
<widget class="QCheckBox" name="checkBox_raw_trace">
<property name="text">
<string>Show raw data</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="PlotWidget" name="graphicsView_trace">
<property name="minimumSize">
<size>
<width>0</width>
<height>200</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
Expand Down

0 comments on commit 26ff0c6

Please sign in to comment.