Merge pull request #2009 from pijyoi/fix_imageview_roi
unhide ImageView roi curves
This commit is contained in:
commit
fd6985565c
|
@ -152,7 +152,6 @@ class ImageView(QtGui.QWidget):
|
||||||
self.view.addItem(self.normRoi)
|
self.view.addItem(self.normRoi)
|
||||||
self.normRoi.hide()
|
self.normRoi.hide()
|
||||||
self.roiCurves = []
|
self.roiCurves = []
|
||||||
self.roiCurve = self.ui.roiPlot.plot()
|
|
||||||
self.timeLine = InfiniteLine(0, movable=True)
|
self.timeLine = InfiniteLine(0, movable=True)
|
||||||
if getConfigOption('background')=='w':
|
if getConfigOption('background')=='w':
|
||||||
self.timeLine.setPen((20, 80,80, 200))
|
self.timeLine.setPen((20, 80,80, 200))
|
||||||
|
@ -567,12 +566,12 @@ class ImageView(QtGui.QWidget):
|
||||||
if self.ui.roiBtn.isChecked():
|
if self.ui.roiBtn.isChecked():
|
||||||
showRoiPlot = True
|
showRoiPlot = True
|
||||||
self.roi.show()
|
self.roi.show()
|
||||||
#self.ui.roiPlot.show()
|
|
||||||
self.ui.roiPlot.setMouseEnabled(True, True)
|
self.ui.roiPlot.setMouseEnabled(True, True)
|
||||||
self.ui.splitter.setSizes([int(self.height()*0.6), int(self.height()*0.4)])
|
self.ui.splitter.setSizes([int(self.height()*0.6), int(self.height()*0.4)])
|
||||||
self.ui.splitter.handle(1).setEnabled(True)
|
self.ui.splitter.handle(1).setEnabled(True)
|
||||||
self.roiCurve.show()
|
|
||||||
self.roiChanged()
|
self.roiChanged()
|
||||||
|
for c in self.roiCurves:
|
||||||
|
c.show()
|
||||||
self.ui.roiPlot.showAxis('left')
|
self.ui.roiPlot.showAxis('left')
|
||||||
else:
|
else:
|
||||||
self.roi.hide()
|
self.roi.hide()
|
||||||
|
@ -588,13 +587,11 @@ class ImageView(QtGui.QWidget):
|
||||||
self.ui.roiPlot.setXRange(mn, mx, padding=0.01)
|
self.ui.roiPlot.setXRange(mn, mx, padding=0.01)
|
||||||
self.timeLine.show()
|
self.timeLine.show()
|
||||||
self.timeLine.setBounds([mn, mx])
|
self.timeLine.setBounds([mn, mx])
|
||||||
self.ui.roiPlot.show()
|
|
||||||
if not self.ui.roiBtn.isChecked():
|
if not self.ui.roiBtn.isChecked():
|
||||||
self.ui.splitter.setSizes([self.height()-35, 35])
|
self.ui.splitter.setSizes([self.height()-35, 35])
|
||||||
self.ui.splitter.handle(1).setEnabled(False)
|
self.ui.splitter.handle(1).setEnabled(False)
|
||||||
else:
|
else:
|
||||||
self.timeLine.hide()
|
self.timeLine.hide()
|
||||||
#self.ui.roiPlot.hide()
|
|
||||||
|
|
||||||
self.ui.roiPlot.setVisible(showRoiPlot)
|
self.ui.roiPlot.setVisible(showRoiPlot)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue