Changeset 304d082 in sasview for src/sas/qtgui/Plotting

Timestamp:

Oct 31, 2017 10:00:59 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

6280464

Parents:

0849aec

Message:

More functionality conversion

Location:

src/sas/qtgui/Plotting

Files:

• LinearFit.py (modified) (2 diffs)
• Plotter.py (modified) (3 diffs)
• Plotter2D.py (modified) (2 diffs)
• PlotterBase.py (modified) (2 diffs)
• rangeSlider.py (modified) (4 diffs)

src/sas/qtgui/Plotting/LinearFit.py

@@ -19 +19 @@
 
 class LinearFit(QtWidgets.QDialog, Ui_LinearFitUI):
+    updatePlot = QtCore.pyqtSignal(tuple)
     def __init__(self, parent=None,
                  data=None,
@@ -178 +179 @@
         self.txtChi2.setText(formatNumber(self.Chivalue))
 
-        #self.parent.updatePlot.emit((tempx, tempy))
-        self.parent.emit(QtCore.SIGNAL('updatePlot'), (tempx, tempy))
+        self.updatePlot.emit((tempx, tempy))
 
     def origData(self):

src/sas/qtgui/Plotting/Plotter.py

@@ -21 +21 @@
     1D Plot widget for use with a QDialog
     """
-    updatePlot = QtCore.pyqtSignal(tuple)
     def __init__(self, parent=None, manager=None, quickplot=False):
         super(PlotterWidget, self).__init__(parent, manager=manager, quickplot=quickplot)
@@ -41 +40 @@
         self.fit_result.symbol = 13
         self.fit_result.name = "Fit"
-
-        # Add a slot for receiving update signal from LinearFit
-        # NEW style signals
-        self.updatePlot.connect(self.onFitDisplay)
-        # OLD style signals
-        # QtCore.QObject.connect(self, QtCore.SIGNAL('updatePlot'), self.onFitDisplay)
 
     @property
@@ -365 +358 @@
                     xlabel=self.xLogLabel,
                     ylabel=self.yLogLabel)
+        fit_dialog.updatePlot.connect(self.onFitDisplay)
         if fit_dialog.exec_() == QtWidgets.QDialog.Accepted:
             return

src/sas/qtgui/Plotting/Plotter2D.py

@@ -243 +243 @@
         self.slicer_widget.close_signal.connect(slicer_closed)
         # Add the plot to the workspace
-        self.manager.parent.workspace().addWindow(self.slicer_widget)
+        self.manager.parent.workspace().addSubWindow(self.slicer_widget)
 
         self.slicer_widget.show()
@@ -344 +344 @@
         self.boxwidget = BoxSum(self, model=self.box_sum_model)
         # Add the plot to the workspace
-        self.manager.parent.workspace().addWindow(self.boxwidget)
+        self.manager.parent.workspace().addSubWindow(self.boxwidget)
         self.boxwidget.show()
 

src/sas/qtgui/Plotting/PlotterBase.py

@@ -317 +317 @@
         Copy MPL widget area to buffer
         """
-        bmp = QtGui.QApplication.clipboard()
+        bmp = QtWidgets.QApplication.clipboard()
         pixmap = QtGui.QPixmap.grabWidget(self.canvas)
         bmp.setPixmap(pixmap)
@@ -374 +374 @@
         # Move the slider all the way up, if present
         vertical_scroll_bar = self.txt_widget.verticalScrollBar()
-        vertical_scroll_bar.triggerAction(QtGui.QScrollBar.SliderToMinimum)
+        vertical_scroll_bar.triggerAction(QtWidgets.QScrollBar.SliderToMinimum)
 
     def onSavePoints(self, plot_data):

src/sas/qtgui/Plotting/rangeSlider.py

@@ -89 +89 @@
 
         painter = QtGui.QPainter(self)
-        style = QtGui.QApplication.style() 
+        style = QtWidgets.QApplication.style()
 
         for i, value in enumerate([self._low, self._high]):
@@ -173 +173 @@
         event.accept()
         
-        style = QtGui.QApplication.style()
+        style = QtWidgets.QApplication.style()
         button = event.button()
         
@@ -264 +264 @@
             self.setHighValue( new_pos )
 
-        if self.hasTracking():
-            self.emit(QtCore.SIGNAL('sliderMoved(int)'), new_pos)
-
             
     def __pick(self, pt):
@@ -278 +275 @@
         opt = QtWidgets.QStyleOptionSlider()
         self.initStyleOption(opt)
-        style = QtGui.QApplication.style()
+        style = QtWidgets.QApplication.style()
         
         gr = style.subControlRect(style.CC_Slider, opt, style.SC_SliderGroove, self)