Changeset 83eb5208 in sasview for src/sas/qtgui/MainWindow


Ignore:
Timestamp:
Apr 19, 2017 1:58:36 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:
cd2cc745
Parents:
6c8fb2c
Message:

Putting files in more ordered fashion

Location:
src/sas/qtgui/MainWindow
Files:
3 added
18 moved

Legend:

Unmodified
Added
Removed

  • src/sas/qtgui/MainWindow/AboutBox.py

    r31c5b58 r83eb5208  
    33 
    44import sas.sasview 
    5 import sas.qtgui.LocalConfig as LocalConfig 
    6 import sas.qtgui.GuiUtils as GuiUtils 
     5import sas.qtgui.Utilities.LocalConfig as LocalConfig 
     6import sas.qtgui.Utilities.GuiUtils as GuiUtils 
    77 
    88from UI.AboutUI import Ui_AboutUI 

  • src/sas/qtgui/MainWindow/DataExplorer.py

    r1970780 r83eb5208  
    1818from sas.sasgui.guiframe.dataFitting import Data2D 
    1919 
    20 import sas.qtgui.GuiUtils as GuiUtils 
    21 import sas.qtgui.PlotHelper as PlotHelper 
    22 from sas.qtgui.Plotter import Plotter 
    23 from sas.qtgui.Plotter2D import Plotter2D 
    24 from sas.qtgui.DroppableDataLoadWidget import DroppableDataLoadWidget 
    25 from sas.qtgui.MaskEditor import MaskEditor 
    26  
    27 import Perspectives 
     20import sas.qtgui.Utilities.GuiUtils as GuiUtils 
     21import sas.qtgui.Plotting.PlotHelper as PlotHelper 
     22from sas.qtgui.Plotting.Plotter import Plotter 
     23from sas.qtgui.Plotting.Plotter2D import Plotter2D 
     24from sas.qtgui.MainWindow.DroppableDataLoadWidget import DroppableDataLoadWidget 
     25from sas.qtgui.Plotting.MaskEditor import MaskEditor 
     26 
     27import sas.qtgui.Perspectives as Perspectives 
    2828 
    2929class DataExplorerWindow(DroppableDataLoadWidget): 

  • src/sas/qtgui/MainWindow/DroppableDataLoadWidget.py

    r31c5b58 r83eb5208  
    33 
    44# UI 
    5 from sas.qtgui.UI.DataExplorerUI import Ui_DataLoadWidget 
     5from sas.qtgui.MainWindow.UI.DataExplorerUI import Ui_DataLoadWidget 
    66 
    77class DroppableDataLoadWidget(QtGui.QTabWidget, Ui_DataLoadWidget): 

  • src/sas/qtgui/MainWindow/GuiManager.py

    r6c8fb2c r83eb5208  
    1515from sas.sasgui.guiframe.data_manager import DataManager 
    1616from sas.sasgui.guiframe.proxy import Connection 
    17 from sas.qtgui.SasviewLogger import XStream 
    18 import sas.qtgui.LocalConfig as LocalConfig 
    19 import sas.qtgui.GuiUtils as GuiUtils 
    20 from sas.qtgui.UI.AcknowledgementsUI import Ui_Acknowledgements 
    21 from sas.qtgui.AboutBox import AboutBox 
    22 from sas.qtgui.IPythonWidget import IPythonWidget 
    23 from sas.qtgui.WelcomePanel import WelcomePanel 
    24  
    25 from sas.qtgui.SldPanel import SldPanel 
    26 from sas.qtgui.DensityPanel import DensityPanel 
    27 from sas.qtgui.KiessigPanel import KiessigPanel 
    28 from sas.qtgui.SlitSizeCalculator import SlitSizeCalculator 
     17from sas.qtgui.Utilities.SasviewLogger import XStream 
     18from sas.qtgui.Utilities.IPythonWidget import IPythonWidget 
     19import sas.qtgui.Utilities.LocalConfig as LocalConfig 
     20import sas.qtgui.Utilities.GuiUtils as GuiUtils 
     21 
     22from sas.qtgui.MainWindow.UI.AcknowledgementsUI import Ui_Acknowledgements 
     23from sas.qtgui.MainWindow.AboutBox import AboutBox 
     24from sas.qtgui.MainWindow.WelcomePanel import WelcomePanel 
     25 
     26from sas.qtgui.Calculators.SldPanel import SldPanel 
     27from sas.qtgui.Calculators.DensityPanel import DensityPanel 
     28from sas.qtgui.Calculators.KiessigPanel import KiessigPanel 
     29from sas.qtgui.Calculators.SlitSizeCalculator import SlitSizeCalculator 
    2930 
    3031# Perspectives 
    31 import Perspectives 
     32import sas.qtgui.Perspectives as Perspectives 
    3233from sas.qtgui.Perspectives.Fitting.FittingPerspective import FittingWindow 
    33 from sas.qtgui.DataExplorer import DataExplorerWindow 
     34from sas.qtgui.MainWindow.DataExplorer import DataExplorerWindow 
    3435 
    3536class Acknowledgements(QtGui.QDialog, Ui_Acknowledgements): 

  • src/sas/qtgui/MainWindow/MainWindow.py

    r6fd4e36 r83eb5208  
    77 
    88# Initialize logging 
    9 import SasviewLogger 
     9import sas.qtgui.Utilities.SasviewLogger 
    1010 
    1111class MainSasViewWindow(QtGui.QMainWindow, Ui_MainWindow): 

  • src/sas/qtgui/MainWindow/UI/AboutUI.ui

    re207c3f r83eb5208  
    2121     </property> 
    2222     <property name="pixmap"> 
    23       <pixmap resource="../images/images.qrc">:/about/angles_flat.png</pixmap> 
     23      <pixmap>:/about/angles_flat.png</pixmap> 
    2424     </property> 
    2525    </widget> 
    … …  
    4747       </property> 
    4848       <property name="icon"> 
    49         <iconset resource="../images/images.qrc"> 
     49        <iconset> 
    5050         <normaloff>:/about/utlogo.gif</normaloff>:/about/utlogo.gif</iconset> 
    5151       </property> 
    … …  
    6464       </property> 
    6565       <property name="icon"> 
    66         <iconset resource="../images/images.qrc"> 
     66        <iconset> 
    6767         <normaloff>:/about/umd_logo.png</normaloff>:/about/umd_logo.png</iconset> 
    6868       </property> 
    … …  
    8181       </property> 
    8282       <property name="icon"> 
    83         <iconset resource="../images/images.qrc"> 
     83        <iconset> 
    8484         <normaloff>:/about/nist_logo.png</normaloff>:/about/nist_logo.png</iconset> 
    8585       </property> 
    … …  
    9898       </property> 
    9999       <property name="icon"> 
    100         <iconset resource="../images/images.qrc"> 
     100        <iconset> 
    101101         <normaloff>:/about/sns_logo.png</normaloff>:/about/sns_logo.png</iconset> 
    102102       </property> 
    … …  
    115115       </property> 
    116116       <property name="icon"> 
    117         <iconset resource="../images/images.qrc"> 
     117        <iconset> 
    118118         <normaloff>:/about/isis_logo.png</normaloff>:/about/isis_logo.png</iconset> 
    119119       </property> 
    … …  
    132132       </property> 
    133133       <property name="icon"> 
    134         <iconset resource="../images/images.qrc"> 
     134        <iconset> 
    135135         <normaloff>:/about/ess_logo.png</normaloff>:/about/ess_logo.png</iconset> 
    136136       </property> 
    … …  
    149149       </property> 
    150150       <property name="icon"> 
    151         <iconset resource="../images/images.qrc"> 
     151        <iconset> 
    152152         <normaloff>:/about/ill_logo.png</normaloff>:/about/ill_logo.png</iconset> 
    153153       </property> 
    … …  
    166166       </property> 
    167167       <property name="icon"> 
    168         <iconset resource="../images/images.qrc"> 
     168        <iconset> 
    169169         <normaloff>:/about/ansto_logo.png</normaloff>:/about/ansto_logo.png</iconset> 
    170170       </property> 
    … …  
    244244 </widget> 
    245245 <resources> 
     246  <include location="../../UI/main_resources.qrc"/> 
    246247  <include location="../images/images.qrc"/> 
    247248 </resources> 

  • src/sas/qtgui/MainWindow/UI/DataExplorerUI.ui

    r71361f0 r83eb5208  
    2121  </property> 
    2222  <property name="windowIcon"> 
    23    <iconset resource="main_resources.qrc"> 
     23   <iconset resource="../../UI/main_resources.qrc"> 
    2424    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 
    2525  </property> 
    … …  
    7070           </property> 
    7171           <property name="icon"> 
    72             <iconset resource="main_resources.qrc"> 
     72            <iconset resource="../../UI/main_resources.qrc"> 
    7373             <normaloff>:/res/down-grey.png</normaloff>:/res/down-grey.png</iconset> 
    7474           </property> 
    … …  
    183183           </property> 
    184184           <property name="icon"> 
    185             <iconset resource="main_resources.qrc"> 
     185            <iconset resource="../../UI/main_resources.qrc"> 
    186186             <normaloff>:/res/right-grey.png</normaloff>:/res/right-grey.png</iconset> 
    187187           </property> 
    … …  
    483483 </widget> 
    484484 <resources> 
    485   <include location="main_resources.qrc"/> 
     485  <include location="../../UI/main_resources.qrc"/> 
    486486 </resources> 
    487487 <connections/> 

  • src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

    r363fbfa r83eb5208  
    1515  </property> 
    1616  <property name="windowIcon"> 
    17    <iconset resource="main_resources.qrc"> 
     17   <iconset resource="../../UI/main_resources.qrc"> 
    1818    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 
    1919  </property> 
    … …  
    2525     <y>0</y> 
    2626     <width>915</width> 
    27      <height>25</height> 
     27     <height>21</height> 
    2828    </rect> 
    2929   </property> 
    … …  
    180180  <action name="actionReset"> 
    181181   <property name="icon"> 
    182     <iconset resource="main_resources.qrc"> 
     182    <iconset resource="../../UI/main_resources.qrc"> 
    183183     <normaloff>:/res/reset.png</normaloff>:/res/reset.png</iconset> 
    184184   </property> 
    … …  
    192192  <action name="actionSave"> 
    193193   <property name="icon"> 
    194     <iconset resource="main_resources.qrc"> 
     194    <iconset resource="../../UI/main_resources.qrc"> 
    195195     <normaloff>:/res/save.png</normaloff>:/res/save.png</iconset> 
    196196   </property> 
    … …  
    204204  <action name="actionReport"> 
    205205   <property name="icon"> 
    206     <iconset resource="main_resources.qrc"> 
     206    <iconset resource="../../UI/main_resources.qrc"> 
    207207     <normaloff>:/res/report.png</normaloff>:/res/report.png</iconset> 
    208208   </property> 
    … …  
    216216  <action name="actionUndo"> 
    217217   <property name="icon"> 
    218     <iconset resource="main_resources.qrc"> 
     218    <iconset resource="../../UI/main_resources.qrc"> 
    219219     <normaloff>:/res/undo.png</normaloff> 
    220220     <normalon>res/undo.png</normalon>:/res/undo.png</iconset> 
    … …  
    226226  <action name="actionRedo"> 
    227227   <property name="icon"> 
    228     <iconset resource="main_resources.qrc"> 
     228    <iconset resource="../../UI/main_resources.qrc"> 
    229229     <normaloff>:/res/redo.png</normaloff>:/res/redo.png</iconset> 
    230230   </property> 
    … …  
    238238  <action name="actionCopy"> 
    239239   <property name="icon"> 
    240     <iconset resource="main_resources.qrc"> 
     240    <iconset resource="../../UI/main_resources.qrc"> 
    241241     <normaloff>:/res/copy.png</normaloff>:/res/copy.png</iconset> 
    242242   </property> 
    … …  
    250250  <action name="actionPaste"> 
    251251   <property name="icon"> 
    252     <iconset resource="main_resources.qrc"> 
     252    <iconset resource="../../UI/main_resources.qrc"> 
    253253     <normaloff>:/res/paste.png</normaloff>:/res/paste.png</iconset> 
    254254   </property> 
    … …  
    265265   </property> 
    266266   <property name="icon"> 
    267     <iconset resource="main_resources.qrc"> 
     267    <iconset resource="../../UI/main_resources.qrc"> 
    268268     <normaloff>:/res/bookmark.png</normaloff>:/res/bookmark.png</iconset> 
    269269   </property> 
    … …  
    498498 </widget> 
    499499 <resources> 
    500   <include location="main_resources.qrc"/> 
     500  <include location="../../UI/main_resources.qrc"/> 
    501501 </resources> 
    502502 <connections/> 

  • src/sas/qtgui/MainWindow/UI/TabbedFileLoadUI.ui

    r481ff26 r83eb5208  
    1515  </property> 
    1616  <property name="windowIcon"> 
    17    <iconset resource="main_resources.qrc"> 
     17   <iconset resource="../../UI/main_resources.qrc"> 
    1818    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 
    1919  </property> 
    … …  
    348348 </widget> 
    349349 <resources> 
    350   <include location="main_resources.qrc"/> 
     350  <include location="../../UI/main_resources.qrc"/> 
    351351 </resources> 
    352352 <connections/> 

  • src/sas/qtgui/MainWindow/UI/WelcomePanelUI.ui

    rb27c681 r83eb5208  
    2121     </property> 
    2222     <property name="pixmap"> 
    23       <pixmap resource="main_resources.qrc">:/res/SVwelcome.png</pixmap> 
     23      <pixmap resource="../../UI/main_resources.qrc">:/res/SVwelcome.png</pixmap> 
    2424     </property> 
    2525     <property name="alignment"> 
    … …  
    8080 </widget> 
    8181 <resources> 
     82  <include location="../../UI/main_resources.qrc"/> 
    8283  <include location="main_resources.qrc"/> 
    8384 </resources> 

  • src/sas/qtgui/MainWindow/UnitTesting/AboutBoxTest.py

    r31c5b58 r83eb5208  
    1212 
    1313# Local 
    14 from AboutBox import AboutBox 
    15 import sas.qtgui.LocalConfig as LocalConfig 
     14from sas.qtgui.MainWindow.AboutBox import AboutBox 
     15import sas.qtgui.Utilities.LocalConfig as LocalConfig 
    1616 
    1717app = QApplication(sys.argv) 

  • src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py

    r2155824 r83eb5208  
    1717from sas.sasgui.guiframe.data_manager import DataManager 
    1818 
    19 from DataExplorer import DataExplorerWindow 
    20 from GuiManager import GuiManager 
    21 from sas.qtgui.GuiUtils import * 
     19from sas.qtgui.MainWindow.DataExplorer import DataExplorerWindow 
     20from sas.qtgui.MainWindow.GuiManager import GuiManager 
     21from sas.qtgui.Utilities.GuiUtils import * 
    2222from UnitTesting.TestUtils import QtSignalSpy 
    23 from sas.qtgui.Plotter import Plotter 
    24 from sas.qtgui.Plotter2D import Plotter2D 
    25 import sas.qtgui.PlotHelper as PlotHelper 
     23from sas.qtgui.Plotting.Plotter import Plotter 
     24from sas.qtgui.Plotting.Plotter2D import Plotter2D 
     25import sas.qtgui.Plotting.PlotHelper as PlotHelper 
    2626 
    2727app = QApplication(sys.argv) 
    … …  
    574574        self.assertTrue(self.form.cmdAppend.isEnabled()) 
    575575 
    576     @patch('sas.qtgui.GuiUtils.plotsFromCheckedItems') 
     576    @patch('sas.qtgui.Utilities.GuiUtils.plotsFromCheckedItems') 
    577577    def testAppendPlot(self, test_patch): 
    578578        """ 

  • src/sas/qtgui/MainWindow/UnitTesting/DroppableDataLoadWidgetTest.py

    r31c5b58 r83eb5208  
    99import path_prepare 
    1010 
    11 from DroppableDataLoadWidget import DroppableDataLoadWidget 
    12 from GuiUtils import * 
    13 from UnitTesting.TestUtils import QtSignalSpy 
     11from sas.qtgui.MainWindow.DroppableDataLoadWidget import DroppableDataLoadWidget 
     12from sas.qtgui.Utilities.GuiUtils import * 
     13from sas.qtgui.UnitTesting.TestUtils import QtSignalSpy 
    1414 
    1515app = QApplication(sys.argv) 

  • src/sas/qtgui/MainWindow/UnitTesting/GuiManagerTest.py

    r2155824 r83eb5208  
    1515 
    1616# Local 
    17 from sas.qtgui.DataExplorer import DataExplorerWindow 
    18 from sas.qtgui.AboutBox import AboutBox 
    19 from sas.qtgui.WelcomePanel import WelcomePanel 
    20 from sas.qtgui.IPythonWidget import IPythonWidget 
    21  
    22 from GuiManager import Acknowledgements, GuiManager 
    23 from MainWindow import MainSasViewWindow 
    24 from UnitTesting.TestUtils import QtSignalSpy 
     17from sas.qtgui.MainWindow.DataExplorer import DataExplorerWindow 
     18from sas.qtgui.MainWindow.AboutBox import AboutBox 
     19from sas.qtgui.MainWindow.WelcomePanel import WelcomePanel 
     20from sas.qtgui.Utilities.IPythonWidget import IPythonWidget 
     21 
     22from sas.qtgui.MainWindow.GuiManager import Acknowledgements, GuiManager 
     23from sas.qtgui.MainWindow.MainWindow import MainSasViewWindow 
     24from sas.qtgui.UnitTesting.TestUtils import QtSignalSpy 
    2525 
    2626app = QApplication(sys.argv) 

  • src/sas/qtgui/MainWindow/UnitTesting/MainWindowTest.py

    r31c5b58 r83eb5208  
    1111 
    1212# Local 
    13 from MainWindow import MainSasViewWindow 
    14 from MainWindow import SplashScreen 
     13from sas.qtgui.MainWindow.MainWindow import MainSasViewWindow 
     14from sas.qtgui.MainWindow.MainWindow import SplashScreen 
    1515 
    1616app = QtGui.QApplication(sys.argv) 

  • src/sas/qtgui/MainWindow/UnitTesting/WelcomePanelTest.py

    radf81b8 r83eb5208  
    88 
    99# Local 
    10 from WelcomePanel import WelcomePanel 
     10from sas.qtgui.MainWindow.WelcomePanel import WelcomePanel 
    1111 
    1212app = QtGui.QApplication(sys.argv) 

  • src/sas/qtgui/MainWindow/WelcomePanel.py

    r31c5b58 r83eb5208  
    77 
    88import sas.sasview 
    9 import sas.qtgui.LocalConfig as LocalConfig 
     9import sas.qtgui.Utilities.LocalConfig as LocalConfig 
    1010 
    11 from sas.qtgui.UI.WelcomePanelUI import Ui_WelcomePanelUI 
     11from sas.qtgui.MainWindow.UI.WelcomePanelUI import Ui_WelcomePanelUI 
    1212 
    1313class WelcomePanel(QtGui.QDialog, Ui_WelcomePanelUI): 
Note: See TracChangeset for help on using the changeset viewer.