Merge pull request #28 from David-Cai-CJ/master

Wider t0 shift allowed. Robust image autorange and histogram.

Author: David-Cai-CJ

iris/gui/control_bar.py

@@ -254,7 +254,7 @@ def __init__(self, **kwargs):
         # Time-zero shift control
         # QDoubleSpinbox does not have a slot that sets the value without notifying everybody
         self.time_zero_shift_widget = QtWidgets.QDoubleSpinBox(parent=self)
-        self.time_zero_shift_widget.setRange(-1000, 1000)
+        self.time_zero_shift_widget.setRange(-2000, 2000)
         self.time_zero_shift_widget.setDecimals(3)
         self.time_zero_shift_widget.setSingleStep(0.5)
         self.time_zero_shift_widget.setSuffix(" ps")

iris/gui/data_viewer.py

@@ -66,6 +66,9 @@ def __init__(self, *args, **kwargs):
         self.layout.addWidget(self.time_series_widget)
         self.setLayout(self.layout)
 
+        self.histogram = self.image_viewer.getHistogramWidget()
+
+
     @QtCore.pyqtSlot()
     def update_timeseries_rect(self):
         rect = self.timeseries_rect_region.parentBounds().toRect()
@@ -142,10 +145,18 @@ def display(self, image, autocontrast=False):
         if image is None:
             self.image_viewer.clear()
             return
-
         self.image_viewer.setImage(
-            image, autoLevels=autocontrast, autoRange=autocontrast
+            image, autoLevels=False, autoRange=False, autoHistogramRange=False
         )
+
+        if autocontrast:
+            low = np.quantile(image, 0.01)
+            high = np.quantile(image, 0.98)
+
+            self.image_viewer.setLevels(low, high)
+            self.histogram.setHistogramRange(low*.8, high*1.2)
+            self.histogram.setLevels(low, high)
+
         self.update_timeseries_rect()
 
     @QtCore.pyqtSlot(object, object)