Changeset a95260d in sasview for src/sas/qtgui


Ignore:
Timestamp:
Jul 10, 2016 12:41:19 PM (8 years ago)
Author:
Piotr Rozyczko <piotr.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:
8cb6cd6
Parents:
0cd8612
Message:

Minor fixes

Location:
src/sas/qtgui
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/MainWindow.py

    r0cd8612 ra95260d  
    1 import sys 
    2  
    3 from PyQt4 import QtGui 
    4  
    51# UNLESS EXEPTIONALLY REQUIRED TRY TO AVOID IMPORTING ANY MODULES HERE 
    62# ESPECIALLY ANYTHING IN SAS, SASMODELS NAMESPACE 
     3from PyQt4 import QtGui 
    74 
    85# Local UI 
     
    1613    def __init__(self, reactor, parent=None): 
    1714        super(MainSasViewWindow, self).__init__(parent) 
    18          
     15 
    1916        # define workspace for dialogs. 
    2017        self.workspace = QtGui.QWorkspace(self) 
     
    2825        self.guiManager.quitApplication() 
    2926 
    30          
     27 
    3128def SplashScreen(): 
    3229    """ 
  • src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

    r0cd8612 ra95260d  
    302302            variant_item = QtCore.QVariant(high_out_data) 
    303303            # This needs to run in the main thread 
    304             reactor.callFromThread(updateModelItem, self._model_item, variant_item, title) 
     304            reactor.callFromThread(GuiUtils.updateModelItem, self._model_item, variant_item, title) 
    305305 
    306306        item = QtGui.QStandardItem(str(float('%.5g'% volume_fraction))) 
  • src/sas/qtgui/Plotter.py

    r1042dba ra95260d  
    1 import sys 
    21from PyQt4 import QtGui 
    32 
    4 # Replace the qt4agg calls below with qt5 equivalent. 
     3# TODO: Replace the qt4agg calls below with qt5 equivalent. 
    54# Requires some code modifications. 
    65# https://www.boxcontrol.net/embedding-matplotlib-plot-on-pyqt5-gui.html 
     
    98from matplotlib.backends.backend_qt4agg import NavigationToolbar2QT as NavigationToolbar 
    109import matplotlib.pyplot as plt 
    11  
    12 import random 
    1310 
    1411class Plotter(QtGui.QDialog): 
  • src/sas/qtgui/UnitTesting/SasviewLoggerTest.py

    r0cd8612 ra95260d  
    44 
    55from PyQt4.QtGui import * 
    6 from PyQt4.QtTest import QTest 
    76from PyQt4.QtCore import * 
    87 
     
    2726 
    2827 
    29     def test_stdout(self): 
     28    def testQtHandler(self): 
    3029        """ 
    3130        Test redirection of all levels of logging 
Note: See TracChangeset for help on using the changeset viewer.