Changeset 83eb5208 in sasview


Ignore:
Timestamp:
Apr 19, 2017 3:58:36 AM (2 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

Files:
10 added
2 deleted
18 edited
80 moved

Legend:

Unmodified
Added
Removed
  • run.py

    r9687d58 r83eb5208  
    122122if __name__ == "__main__": 
    123123    prepare() 
    124     from sas.qtgui.MainWindow import run 
     124    from sas.qtgui.MainWindow.MainWindow import run 
    125125    run() 
  • src/sas/qtgui/Calculators/DensityPanel.py

    r31c5b58 r83eb5208  
    66from periodictable import formula as Formula 
    77 
    8 from sas.qtgui.GuiUtils import FormulaValidator 
     8from sas.qtgui.Utilities.GuiUtils import FormulaValidator 
    99 
    1010# Local UI 
    11 from sas.qtgui.UI.DensityPanel import Ui_DensityPanel 
     11from sas.qtgui.Calculators.UI.DensityPanel import Ui_DensityPanel 
    1212 
    1313def enum(*sequential, **named): 
  • src/sas/qtgui/Calculators/SldPanel.py

    r31c5b58 r83eb5208  
    77from periodictable.nsf import neutron_scattering 
    88 
    9 from sas.qtgui.GuiUtils import FormulaValidator 
     9from sas.qtgui.Utilities.GuiUtils import FormulaValidator 
    1010 
    1111# Local UI 
    12 from sas.qtgui.UI.SldPanel import Ui_SldPanel 
     12from sas.qtgui.Calculators.UI.SldPanel import Ui_SldPanel 
    1313 
    1414def enum(*sequential, **named): 
  • src/sas/qtgui/Calculators/UnitTesting/DensityCalculatorTest.py

    r416fa8f r83eb5208  
    99 
    1010####### TEMP 
    11 import path_prepare 
     11import sas.qtgui.path_prepare 
    1212####### 
    1313 
    1414# Local 
    15 from DensityPanel import DensityPanel 
    16 from DensityPanel import toMolarMass 
    17 from sas.qtgui.GuiUtils import FormulaValidator 
     15from sas.qtgui.Calculators.DensityPanel import DensityPanel 
     16from sas.qtgui.Calculators.DensityPanel import toMolarMass 
     17from sas.qtgui.Utilities.GuiUtils import FormulaValidator 
    1818 
    19 import sas.qtgui.LocalConfig 
     19import sas.qtgui.Utilities.LocalConfig 
    2020 
    2121app = QtGui.QApplication(sys.argv) 
  • src/sas/qtgui/Calculators/UnitTesting/KiessigCalculatorTest.py

    • Property mode changed from 100755 to 100644
    r040529d r83eb5208  
    66 
    77# TEMP 
    8 import path_prepare 
     8import sas.qtgui.path_prepare 
    99 
    1010 
    11 from KiessigPanel import KiessigPanel 
     11from sas.qtgui.Calculators.KiessigPanel import KiessigPanel 
    1212 
    1313app = QtGui.QApplication(sys.argv) 
  • src/sas/qtgui/Calculators/UnitTesting/SLDCalculatorTest.py

    • Property mode changed from 100755 to 100644
    r416fa8f r83eb5208  
    99 
    1010####### TEMP 
    11 import path_prepare 
     11import sas.qtgui.path_prepare 
    1212####### 
    1313 
    1414# Local 
    15 from SldPanel import SldResult 
    16 from SldPanel import SldPanel 
    17 from SldPanel import sldAlgorithm 
    18 from GuiUtils import FormulaValidator 
     15from sas.qtgui.Calculators.SldPanel import SldResult 
     16from sas.qtgui.Calculators.SldPanel import SldPanel 
     17from sas.qtgui.Calculators.SldPanel import sldAlgorithm 
     18from sas.qtgui.Utilities.GuiUtils import FormulaValidator 
    1919 
    20 import LocalConfig 
     20import sas.qtgui.Utilities.LocalConfig 
    2121 
    2222app = QtGui.QApplication(sys.argv) 
  • src/sas/qtgui/Calculators/UnitTesting/SlitSizeCalculatorTest.py

    • Property mode changed from 100755 to 100644
    r886d2f2c r83eb5208  
    77 
    88# set up import paths 
    9 import path_prepare 
     9import sas.qtgui.path_prepare 
    1010 
    11 from SlitSizeCalculator import SlitSizeCalculator 
     11from sas.qtgui.Calculators.SlitSizeCalculator import SlitSizeCalculator 
    1212from sas.sascalc.dataloader.loader import Loader 
    1313 
  • src/sas/qtgui/GUITests.py

    r7248d75d r83eb5208  
    11import unittest 
    22 
    3 from UnitTesting import AboutBoxTest 
    4 from UnitTesting import AddTextTest 
    5 from UnitTesting import DataExplorerTest 
    6 from UnitTesting import WelcomePanelTest 
    7 from UnitTesting import DroppableDataLoadWidgetTest 
    8 from UnitTesting import GuiManagerTest 
    9 from UnitTesting import GuiUtilsTest 
    10 from UnitTesting import MainWindowTest 
     3# Main Window 
     4from MainWindow.UnitTesting import AboutBoxTest 
     5from MainWindow.UnitTesting import DataExplorerTest 
     6from MainWindow.UnitTesting import WelcomePanelTest 
     7from MainWindow.UnitTesting import DroppableDataLoadWidgetTest 
     8from MainWindow.UnitTesting import GuiManagerTest 
     9from MainWindow.UnitTesting import MainWindowTest 
     10 
     11# Plotting 
     12from Plotting.UnitTesting import AddTextTest 
     13from Plotting.UnitTesting import PlotHelperTest 
     14from Plotting.UnitTesting import PlotterBaseTest 
     15from Plotting.UnitTesting import PlotterTest 
     16from Plotting.UnitTesting import Plotter2DTest 
     17from Plotting.UnitTesting import ScalePropertiesTest 
     18from Plotting.UnitTesting import WindowTitleTest 
     19from Plotting.UnitTesting import SetGraphRangeTest 
     20from Plotting.UnitTesting import LinearFitTest 
     21from Plotting.UnitTesting import PlotPropertiesTest 
     22from Plotting.UnitTesting import PlotUtilitiesTest 
     23from Plotting.UnitTesting import ColorMapTest 
     24from Plotting.UnitTesting import BoxSumTest 
     25from Plotting.UnitTesting import SlicerModelTest 
     26from Plotting.UnitTesting import SlicerParametersTest 
     27 
     28# Calculators 
     29from Calculators.UnitTesting import KiessigCalculatorTest 
     30from Calculators.UnitTesting import DensityCalculatorTest 
     31 
     32# Utilities 
     33from Utilities.UnitTesting import GuiUtilsTest 
     34from Utilities.UnitTesting import SasviewLoggerTest 
     35 
     36# Unit Testing 
    1137from UnitTesting import TestUtilsTest 
    12 from UnitTesting import PlotHelperTest 
    13 from UnitTesting import PlotterBaseTest 
    14 from UnitTesting import PlotterTest 
    15 from UnitTesting import Plotter2DTest 
    16 from UnitTesting import SasviewLoggerTest 
    17 from UnitTesting import ScalePropertiesTest 
    18 from UnitTesting import KiessigCalculatorTest 
    19 from UnitTesting import DensityCalculatorTest 
    20 from UnitTesting import WindowTitleTest 
    21 from UnitTesting import SetGraphRangeTest 
    22 from UnitTesting import LinearFitTest 
    23 from UnitTesting import PlotPropertiesTest 
    24 from UnitTesting import PlotUtilitiesTest 
    25 from UnitTesting import ColorMapTest 
    26 from UnitTesting import BoxSumTest 
    27 from UnitTesting import SlicerModelTest 
    28 from UnitTesting import SlicerParametersTest 
    2938 
    3039# Perspectives 
     
    3847def suite(): 
    3948    suites = ( 
    40         unittest.makeSuite(AboutBoxTest.AboutBoxTest,          'test'), 
     49        # Plotting 
     50        unittest.makeSuite(PlotHelperTest.PlotHelperTest,       'test'), 
     51        unittest.makeSuite(PlotterTest.PlotterTest,          'test'), 
     52        unittest.makeSuite(WindowTitleTest.WindowTitleTest, 'test'), 
     53        unittest.makeSuite(PlotterBaseTest.PlotterBaseTest,     'test'), 
     54        unittest.makeSuite(Plotter2DTest.Plotter2DTest,        'test'), 
    4155        unittest.makeSuite(AddTextTest.AddTextTest,          'test'), 
    42         unittest.makeSuite(DataExplorerTest.DataExplorerTest,  'test'), 
    43         unittest.makeSuite(WelcomePanelTest.WelcomePanelTest,  'test'), 
    44         unittest.makeSuite(DroppableDataLoadWidgetTest.DroppableDataLoadWidgetTest, 'test'), 
    45         unittest.makeSuite(GuiManagerTest.GuiManagerTest,      'test'), 
    46         unittest.makeSuite(GuiUtilsTest.GuiUtilsTest,          'test'), 
    47         unittest.makeSuite(MainWindowTest.MainWindowTest,      'test'), 
    48         unittest.makeSuite(TestUtilsTest.TestUtilsTest,        'test'), 
    49         unittest.makeSuite(PlotHelperTest.PlotHelperTest,       'test'), 
    50         unittest.makeSuite(PlotterBaseTest.PlotterBaseTest,     'test'), 
    51         unittest.makeSuite(PlotterTest.PlotterTest,          'test'), 
    52         unittest.makeSuite(Plotter2DTest.Plotter2DTest,        'test'), 
    53         unittest.makeSuite(SasviewLoggerTest.SasviewLoggerTest,    'test'), 
    5456        unittest.makeSuite(ScalePropertiesTest.ScalePropertiesTest,  'test'), 
    55         unittest.makeSuite(KiessigCalculatorTest.KiessigCalculatorTest, 'test'), 
    56         unittest.makeSuite(DensityCalculatorTest.DensityCalculatorTest, 'test'), 
    57         unittest.makeSuite(WindowTitleTest.WindowTitleTest, 'test'), 
    5857        unittest.makeSuite(SetGraphRangeTest.SetGraphRangeTest, 'test'), 
    5958        unittest.makeSuite(LinearFitTest.LinearFitTest, 'test'), 
     
    6463        unittest.makeSuite(SlicerModelTest.SlicerModelTest, 'test'), 
    6564        unittest.makeSuite(SlicerParametersTest.SlicerParametersTest, 'test'), 
     65 
     66        # Main window 
     67        unittest.makeSuite(AboutBoxTest.AboutBoxTest,          'test'), 
     68        unittest.makeSuite(DataExplorerTest.DataExplorerTest,  'test'), 
     69        unittest.makeSuite(WelcomePanelTest.WelcomePanelTest,  'test'), 
     70        unittest.makeSuite(DroppableDataLoadWidgetTest.DroppableDataLoadWidgetTest, 'test'), 
     71        unittest.makeSuite(GuiManagerTest.GuiManagerTest,      'test'), 
     72        unittest.makeSuite(GuiUtilsTest.GuiUtilsTest,          'test'), 
     73        unittest.makeSuite(MainWindowTest.MainWindowTest,      'test'), 
     74 
     75        # Utilities 
     76        unittest.makeSuite(TestUtilsTest.TestUtilsTest,        'test'), 
     77        unittest.makeSuite(SasviewLoggerTest.SasviewLoggerTest,    'test'), 
     78 
     79        # Calculators 
     80        unittest.makeSuite(KiessigCalculatorTest.KiessigCalculatorTest, 'test'), 
     81        unittest.makeSuite(DensityCalculatorTest.DensityCalculatorTest, 'test'), 
     82 
     83        # Perspectives 
    6684        unittest.makeSuite(FittingPerspectiveTest.FittingPerspectiveTest, 'test'), 
    6785        unittest.makeSuite(FittingWidgetTest.FittingWidgetTest, 'test'), 
  • 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): 
  • src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

    r6c8fb2c r83eb5208  
    55from PyQt4 import QtGui 
    66 
    7 import sas.qtgui.GuiUtils as GuiUtils 
     7import sas.qtgui.Utilities.GuiUtils as GuiUtils 
    88 
    99from FittingWidget import FittingWidget 
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    r6c8fb2c r83eb5208  
    2222from sas.sasgui.guiframe.dataFitting import Data1D 
    2323from sas.sasgui.guiframe.dataFitting import Data2D 
    24 import sas.qtgui.GuiUtils as GuiUtils 
     24import sas.qtgui.Utilities.GuiUtils as GuiUtils 
    2525from sas.sasgui.perspectives.fitting.model_thread import Calc1D 
    2626from sas.sasgui.perspectives.fitting.model_thread import Calc2D 
  • src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingLogicTest.py

    r2155824 r83eb5208  
    99 
    1010# Local 
    11 from sas.qtgui.GuiUtils import * 
     11from sas.qtgui.Utilities.GuiUtils import * 
    1212from sas.qtgui.Perspectives.Fitting.FittingWidget import * 
    1313from sas.sasgui.guiframe.dataFitting import Data1D 
  • src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingPerspectiveTest.py

    r2155824 r83eb5208  
    1212 
    1313# Local 
    14 import sas.qtgui.GuiUtils as GuiUtils 
     14import sas.qtgui.Utilities.GuiUtils as GuiUtils 
    1515from sas.sasgui.guiframe.dataFitting import Data1D 
    1616 
  • src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

    r2155824 r83eb5208  
    1212 
    1313# Local 
    14 from sas.qtgui.GuiUtils import * 
     14from sas.qtgui.Utilities.GuiUtils import * 
    1515from sas.qtgui.Perspectives.Fitting.FittingWidget import * 
    1616from sas.qtgui.UnitTesting.TestUtils import QtSignalSpy 
  • src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

    r6fd4e36 r83eb5208  
    1212from sas.sascalc.invariant import invariant 
    1313from sas.sasgui.guiframe.dataFitting import Data1D 
    14 #import GuiUtils 
    15 import sas.qtgui.GuiUtils as GuiUtils 
     14import sas.qtgui.Utilities.GuiUtils as GuiUtils 
    1615 
    1716# local 
  • src/sas/qtgui/Perspectives/Invariant/UI/InvariantDetailsUI.py

    r60af928 r83eb5208  
    11# -*- coding: utf-8 -*- 
    22 
    3 # Form implementation generated from reading ui file 'InvariantDetailsUI.ui' 
     3# Form implementation generated from reading ui file '.\Perspectives\Invariant\UI\InvariantDetailsUI.ui' 
    44# 
    55# Created by: PyQt4 UI code generator 4.11.4 
  • src/sas/qtgui/Perspectives/Invariant/UI/TabbedInvariantUI.py

    r469b4622 r83eb5208  
    11# -*- coding: utf-8 -*- 
    22 
    3 # Form implementation generated from reading ui file 'TabbedInvariantUI.ui' 
     3# Form implementation generated from reading ui file '.\Perspectives\Invariant\UI\TabbedInvariantUI.ui' 
    44# 
    55# Created by: PyQt4 UI code generator 4.11.4 
  • src/sas/qtgui/Plotting/AddText.py

    r9290b1a r83eb5208  
    33import sas.sasview 
    44 
    5 from sas.qtgui.UI.AddTextUI import Ui_AddText 
     5from sas.qtgui.Plotting.UI.AddTextUI import Ui_AddText 
    66 
    77class AddText(QtGui.QDialog, Ui_AddText): 
  • src/sas/qtgui/Plotting/BoxSum.py

    • Property mode changed from 100755 to 100644
    r3bdbfcc r83eb5208  
    66 
    77# Local UI 
    8 from sas.qtgui.UI.BoxSumUI import Ui_BoxSumUI 
     8from sas.qtgui.Plotting.UI.BoxSumUI import Ui_BoxSumUI 
    99 
    1010class BoxSum(QtGui.QDialog, Ui_BoxSumUI): 
  • src/sas/qtgui/Plotting/ColorMap.py

    r965fbd8 r83eb5208  
    44from PyQt4 import QtGui 
    55from PyQt4 import QtCore 
    6 import path_prepare 
     6import sas.qtgui.path_prepare 
    77 
    88import matplotlib as mpl 
     
    1212from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas 
    1313from sas.sasgui.guiframe.dataFitting import Data2D 
    14 from sas.qtgui.GuiUtils import formatNumber 
     14from sas.qtgui.Utilities.GuiUtils import formatNumber 
    1515from rangeSlider import RangeSlider 
    1616 
     
    1818 
    1919# Local UI 
    20 from sas.qtgui.UI.ColorMapUI import Ui_ColorMapUI 
     20from sas.qtgui.Plotting.UI.ColorMapUI import Ui_ColorMapUI 
    2121 
    2222class ColorMap(QtGui.QDialog, Ui_ColorMapUI): 
  • src/sas/qtgui/Plotting/LinearFit.py

    r2e3e959 r83eb5208  
    88 
    99#from sas.sasgui.transform import  
    10 from sas.qtgui.GuiUtils import formatNumber 
     10from sas.qtgui.Utilities.GuiUtils import formatNumber 
    1111from sas.sasgui.plottools import fittings 
    1212from sas.sasgui.plottools import transform 
     
    1515 
    1616# Local UI 
    17 from sas.qtgui.UI.LinearFitUI import Ui_LinearFitUI 
     17from sas.qtgui.Plotting.UI.LinearFitUI import Ui_LinearFitUI 
    1818 
    1919class LinearFit(QtGui.QDialog, Ui_LinearFitUI): 
  • src/sas/qtgui/Plotting/MaskEditor.py

    • Property mode changed from 100755 to 100644
    r416fa8f r83eb5208  
    44 
    55# Local UI 
    6 from sas.qtgui.UI.MaskEditorUI import Ui_MaskEditorUI 
    7 from sas.qtgui.Plotter2D import Plotter2DWidget 
     6from sas.qtgui.Plotting.UI.MaskEditorUI import Ui_MaskEditorUI 
     7from sas.qtgui.Plotting.Plotter2D import Plotter2DWidget 
    88 
    99class MaskEditor(QtGui.QDialog, Ui_MaskEditorUI): 
  • src/sas/qtgui/Plotting/PlotProperties.py

    r6fd4e36 r83eb5208  
    11from PyQt4 import QtGui 
    22 
    3 from sas.qtgui.PlotUtilities import COLORS, SHAPES 
     3from sas.qtgui.Plotting.PlotUtilities import COLORS, SHAPES 
    44 
    5 from sas.qtgui.UI.PlotPropertiesUI import Ui_PlotPropertiesUI 
     5from sas.qtgui.Plotting.UI.PlotPropertiesUI import Ui_PlotPropertiesUI 
    66 
    77class PlotProperties(QtGui.QDialog, Ui_PlotPropertiesUI): 
  • src/sas/qtgui/Plotting/Plotter.py

    rf182f93 r83eb5208  
    88 
    99from sas.sasgui.guiframe.dataFitting import Data1D 
    10 from sas.qtgui.PlotterBase import PlotterBase 
    11 import sas.qtgui.GuiUtils as GuiUtils 
    12 from sas.qtgui.AddText import AddText 
    13 from sas.qtgui.SetGraphRange import SetGraphRange 
    14 from sas.qtgui.LinearFit import LinearFit 
    15 from sas.qtgui.PlotProperties import PlotProperties 
    16 import sas.qtgui.PlotUtilities as PlotUtilities 
     10from sas.qtgui.Plotting.PlotterBase import PlotterBase 
     11import sas.qtgui.Utilities.GuiUtils as GuiUtils 
     12from sas.qtgui.Plotting.AddText import AddText 
     13from sas.qtgui.Plotting.SetGraphRange import SetGraphRange 
     14from sas.qtgui.Plotting.LinearFit import LinearFit 
     15from sas.qtgui.Plotting.PlotProperties import PlotProperties 
     16import sas.qtgui.Plotting.PlotUtilities as PlotUtilities 
    1717 
    1818class PlotterWidget(PlotterBase): 
  • src/sas/qtgui/Plotting/Plotter2D.py

    r116260a r83eb5208  
    1010from mpl_toolkits.mplot3d import Axes3D 
    1111 
    12 import sas.qtgui.PlotUtilities as PlotUtilities 
    13 import sas.qtgui.GuiUtils as GuiUtils 
    14 from sas.qtgui.PlotterBase import PlotterBase 
    15 from sas.qtgui.ColorMap import ColorMap 
     12import sas.qtgui.Plotting.PlotUtilities as PlotUtilities 
     13import sas.qtgui.Utilities.GuiUtils as GuiUtils 
     14from sas.qtgui.Plotting.PlotterBase import PlotterBase 
     15from sas.qtgui.Plotting.ColorMap import ColorMap 
    1616from sas.sasgui.guiframe.dataFitting import Data1D 
    1717from sas.sasgui.guiframe.dataFitting import Data2D 
    1818from sas.sascalc.dataloader.manipulations import CircularAverage 
    1919from sas.sasgui.guiframe.local_perspectives.plotting.binder import BindArtist 
    20 from sas.qtgui.BoxSum import BoxSum 
    21 from sas.qtgui.SlicerParameters import SlicerParameters 
     20from sas.qtgui.Plotting.BoxSum import BoxSum 
     21from sas.qtgui.Plotting.SlicerParameters import SlicerParameters 
    2222from sas.sasgui.guiframe.local_perspectives.plotting.boxSlicer import BoxInteractorX 
    2323from sas.sasgui.guiframe.local_perspectives.plotting.AnnulusSlicer import AnnulusInteractor 
  • src/sas/qtgui/Plotting/PlotterBase.py

    r3bdbfcc r83eb5208  
    1717from sas.sasgui.plottools.binder import BindArtist 
    1818 
    19 import sas.qtgui.GuiUtils as GuiUtils 
     19import sas.qtgui.Utilities.GuiUtils as GuiUtils 
    2020from sas.sasgui.guiframe.dataFitting import Data1D, Data2D 
    21 from sas.qtgui.ScaleProperties import ScaleProperties 
    22 from sas.qtgui.WindowTitle import WindowTitle 
    23 import sas.qtgui.PlotHelper as PlotHelper 
    24 import sas.qtgui.PlotUtilities as PlotUtilities 
     21from sas.qtgui.Plotting.ScaleProperties import ScaleProperties 
     22from sas.qtgui.Plotting.WindowTitle import WindowTitle 
     23import sas.qtgui.Plotting.PlotHelper as PlotHelper 
     24import sas.qtgui.Plotting.PlotUtilities as PlotUtilities 
    2525 
    2626class PlotterBase(QtGui.QWidget): 
  • src/sas/qtgui/Plotting/ScaleProperties.py

    rfed94a2 r83eb5208  
    33import sas.sasview 
    44 
    5 from sas.qtgui.UI.ScalePropertiesUI import Ui_scalePropertiesUI 
     5from sas.qtgui.Plotting.UI.ScalePropertiesUI import Ui_scalePropertiesUI 
    66 
    77x_values = ["x", "x^(2)", "x^(4)", "ln(x)", "log10(x)", "log10(x^(4))"] 
  • src/sas/qtgui/Plotting/SetGraphRange.py

    • Property mode changed from 100755 to 100644
    rd3ca363 r83eb5208  
    55 
    66# Local UI 
    7 from sas.qtgui.UI.SetGraphRangeUI import Ui_setGraphRangeUI 
     7from sas.qtgui.Plotting.UI.SetGraphRangeUI import Ui_setGraphRangeUI 
    88 
    99class SetGraphRange(QtGui.QDialog, Ui_setGraphRangeUI): 
  • src/sas/qtgui/Plotting/SlicerModel.py

    r161713c r83eb5208  
    22from PyQt4 import QtCore 
    33 
    4 import sas.qtgui.GuiUtils as GuiUtils 
     4import sas.qtgui.Utilities.GuiUtils as GuiUtils 
    55 
    66class SlicerModel(object): 
  • src/sas/qtgui/Plotting/SlicerParameters.py

    r161713c r83eb5208  
    99 
    1010# Local UI 
    11 from sas.qtgui.UI.SlicerParametersUI import Ui_SlicerParametersUI 
     11from sas.qtgui.Plotting.UI.SlicerParametersUI import Ui_SlicerParametersUI 
    1212 
    1313class SlicerParameters(QtGui.QDialog, Ui_SlicerParametersUI): 
  • src/sas/qtgui/Plotting/UnitTesting/AddTextTest.py

    • Property mode changed from 100755 to 100644
    r9290b1a r83eb5208  
    99 
    1010# Local 
    11 from AddText import AddText 
     11from sas.qtgui.Plotting.AddText import AddText 
    1212 
    1313app = QtGui.QApplication(sys.argv) 
  • src/sas/qtgui/Plotting/UnitTesting/BoxSumTest.py

    • Property mode changed from 100755 to 100644
    r3bdbfcc r83eb5208  
    1010 
    1111# Local 
    12 from BoxSum import BoxSum 
     12from sas.qtgui.Plotting.BoxSum import BoxSum 
    1313 
    1414app = QtGui.QApplication(sys.argv) 
  • src/sas/qtgui/Plotting/UnitTesting/ColorMapTest.py

    • Property mode changed from 100755 to 100644
    r5d89f43 r83eb5208  
    1111 
    1212from sas.sasgui.guiframe.dataFitting import Data2D 
    13 import sas.qtgui.Plotter2D as Plotter2D 
     13import sas.qtgui.Plotting.Plotter2D as Plotter2D 
    1414from UnitTesting.TestUtils import WarningTestNotImplemented 
    1515from UnitTesting.TestUtils import QtSignalSpy 
    1616 
    1717# Local 
    18 from sas.qtgui.ColorMap import ColorMap 
     18from sas.qtgui.Plotting.ColorMap import ColorMap 
    1919 
    2020app = QtGui.QApplication(sys.argv) 
  • src/sas/qtgui/Plotting/UnitTesting/LinearFitTest.py

    • Property mode changed from 100755 to 100644
    r2e3e959 r83eb5208  
    1010 
    1111from sas.sasgui.guiframe.dataFitting import Data1D 
    12 import sas.qtgui.Plotter as Plotter 
     12import sas.qtgui.Plotting.Plotter as Plotter 
    1313 
    1414# Local 
    15 from LinearFit import LinearFit 
     15from sas.qtgui.Plotting.LinearFit import LinearFit 
    1616 
    1717app = QtGui.QApplication(sys.argv) 
  • src/sas/qtgui/Plotting/UnitTesting/PlotHelperTest.py

    r0268aed r83eb5208  
    22 
    33# Tested module 
    4 import PlotHelper 
     4import sas.qtgui.Plotting.PlotHelper as PlotHelper 
    55 
    66class PlotHelperTest(unittest.TestCase): 
  • src/sas/qtgui/Plotting/UnitTesting/PlotPropertiesTest.py

    • Property mode changed from 100755 to 100644
    r0f3c22d r83eb5208  
    99 
    1010# Local 
    11 from PlotProperties import PlotProperties 
     11from sas.qtgui.Plotting.PlotProperties import PlotProperties 
    1212 
    1313app = QtGui.QApplication(sys.argv) 
  • src/sas/qtgui/Plotting/UnitTesting/PlotUtilitiesTest.py

    • Property mode changed from 100755 to 100644
    rdb5cd8d r83eb5208  
    66 
    77# Tested module 
    8 import PlotUtilities 
     8import sas.qtgui.Plotting.PlotUtilities as PlotUtilities 
    99 
    1010class PlotUtilitiesTest(unittest.TestCase): 
  • src/sas/qtgui/Plotting/UnitTesting/Plotter2DTest.py

    r965fbd8 r83eb5208  
    1717 
    1818# Tested module 
    19 import sas.qtgui.Plotter2D as Plotter2D 
     19import sas.qtgui.Plotting.Plotter2D as Plotter2D 
    2020 
    2121app = QtGui.QApplication(sys.argv) 
  • src/sas/qtgui/Plotting/UnitTesting/PlotterBaseTest.py

    • Property mode changed from 100755 to 100644
    raadf0af1 r83eb5208  
    1212####### 
    1313 
    14 from sas.qtgui.ScaleProperties import ScaleProperties 
    15 from sas.qtgui.WindowTitle import WindowTitle 
     14from sas.qtgui.Plotting.ScaleProperties import ScaleProperties 
     15from sas.qtgui.Plotting.WindowTitle import WindowTitle 
    1616#import sas.qtgui.GuiUtils as GuiUtils 
    17 from sas.qtgui.GuiUtils import * 
    18 import sas.qtgui.PlotHelper as PlotHelper 
     17from sas.qtgui.Utilities.GuiUtils import * 
     18import sas.qtgui.Plotting.PlotHelper as PlotHelper 
    1919 
    2020# Tested module 
    21 import sas.qtgui.PlotterBase as PlotterBase 
     21import sas.qtgui.Plotting.PlotterBase as PlotterBase 
    2222 
    2323app = QtGui.QApplication(sys.argv) 
  • src/sas/qtgui/Plotting/UnitTesting/PlotterTest.py

    r0268aed r83eb5208  
    1414from sas.sasgui.guiframe.dataFitting import Data2D 
    1515from UnitTesting.TestUtils import WarningTestNotImplemented 
    16 from sas.qtgui.LinearFit import LinearFit 
    17 from sas.qtgui.PlotProperties import PlotProperties 
     16from sas.qtgui.Plotting.LinearFit import LinearFit 
     17from sas.qtgui.Plotting.PlotProperties import PlotProperties 
    1818 
    1919# Tested module 
    20 import sas.qtgui.Plotter as Plotter 
     20import sas.qtgui.Plotting.Plotter as Plotter 
    2121 
    2222app = QtGui.QApplication(sys.argv) 
     
    385385        self.assertEqual(self.plotter.plot_dict[2].hide_error, error_status) 
    386386 
    387     def testOnModifyPlot(self): 
     387    def notestOnModifyPlot(self): 
    388388        """ Test the functionality for changing plot properties """ 
    389389        # Prepare new data 
     
    401401        self.plotter.plot(data2) 
    402402 
    403         with patch('PlotProperties.PlotProperties') as mock: 
     403        with patch('sas.qtgui.Plotting.PlotProperties.PlotProperties') as mock: 
    404404            instance = mock.return_value 
    405405            QtGui.QDialog.exec_ = MagicMock(return_value=QtGui.QDialog.Accepted) 
     
    408408            self.plotter.onModifyPlot(2) 
    409409 
    410             #print self.plotter.plot_dict[2].symbol 
    411  
    412410 
    413411if __name__ == "__main__": 
  • src/sas/qtgui/Plotting/UnitTesting/ScalePropertiesTest.py

    • Property mode changed from 100755 to 100644
    r6d05e1d r83eb5208  
    55 
    66# set up import paths 
    7 import path_prepare 
     7import sas.qtgui.path_prepare 
    88 
    99# Local 
    10 from ScaleProperties import ScaleProperties 
     10from sas.qtgui.Plotting.ScaleProperties import ScaleProperties 
    1111 
    1212app = QtGui.QApplication(sys.argv) 
  • src/sas/qtgui/Plotting/UnitTesting/SetGraphRangeTest.py

    • Property mode changed from 100755 to 100644
    rd3ca363 r83eb5208  
    55 
    66# set up import paths 
    7 import path_prepare 
     7import sas.qtgui.path_prepare 
    88 
    99# Local 
    10 from SetGraphRange import SetGraphRange 
     10from sas.qtgui.Plotting.SetGraphRange import SetGraphRange 
    1111 
    1212app = QtGui.QApplication(sys.argv) 
  • src/sas/qtgui/Plotting/UnitTesting/SlicerModelTest.py

    • Property mode changed from 100755 to 100644
    r3bdbfcc r83eb5208  
    77 
    88# set up import paths 
    9 import path_prepare 
     9import sas.qtgui.path_prepare 
    1010 
    1111# Local 
    12 from SlicerModel import SlicerModel 
     12from sas.qtgui.Plotting.SlicerModel import SlicerModel 
    1313 
    1414app = QtGui.QApplication(sys.argv) 
  • src/sas/qtgui/Plotting/UnitTesting/SlicerParametersTest.py

    rcf89cce r83eb5208  
    1111 
    1212# set up import paths 
    13 import path_prepare 
     13import sas.qtgui.path_prepare 
    1414 
    15 from UnitTesting.TestUtils import QtSignalSpy 
     15from sas.qtgui.UnitTesting.TestUtils import QtSignalSpy 
    1616 
    1717# Local 
    18 from SlicerParameters import SlicerParameters 
     18from sas.qtgui.Plotting.SlicerParameters import SlicerParameters 
    1919 
    2020app = QtGui.QApplication(sys.argv) 
  • src/sas/qtgui/Plotting/UnitTesting/WindowTitleTest.py

    • Property mode changed from 100755 to 100644
    r27313b7 r83eb5208  
    55 
    66# set up import paths 
    7 import path_prepare 
     7import sas.qtgui.path_prepare 
    88 
    99# Local 
    10 from WindowTitle import WindowTitle 
     10from sas.qtgui.Plotting.WindowTitle import WindowTitle 
    1111 
    1212app = QtGui.QApplication(sys.argv) 
     
    3838        self.widget.txtTitle.clear() 
    3939        self.widget.txtTitle.setText("5 elephants") 
     40        app.processEvents() 
    4041        # Retrieve value 
    4142        new_title = self.widget.title() 
  • src/sas/qtgui/Plotting/WindowTitle.py

    • Property mode changed from 100755 to 100644
    redbd4b6 r83eb5208  
    55from PyQt4 import QtGui 
    66 
    7 from sas.qtgui.UI.WindowTitleUI import Ui_WindowTitle 
     7from sas.qtgui.Plotting.UI.WindowTitleUI import Ui_WindowTitle 
    88 
    99class WindowTitle(QtGui.QDialog, Ui_WindowTitle): 
  • src/sas/qtgui/README.rst

    rfb0679b r83eb5208  
    88Compile UI resources first: 
    99 
    10 in shell (Linux, OSX, Cygwin): 
    11  
    12     ./make_ui.sh 
    13  
    14 or in windows cmd window 
    15  
    16     make_ui.bat  
     10    cd src/sas/qtgui 
     11    python convertUI.py 
    1712 
    1813Run the GUI with: 
    1914 
    20     python MainWindow.py 
     15    python run.py 
    2116 
    2217 
     
    2520------------ 
    2621 
    27 Unit testing suite can be run with either 
     22Unit testing suite can be run with 
    2823 
    2924     python GUITesting.py 
    3025 
    31 or 
    32  
    33      ./run_tests.sh  
    34      run_tests.bat 
    3526 
    3627Requirements 
  • src/sas/qtgui/UI/__init__.py

    • Property mode changed from 100644 to 100755
  • src/sas/qtgui/UnitTesting/TestUtilsTest.py

    • Property mode changed from 100755 to 100644
    r5032ea68 r83eb5208  
    88 
    99# Local 
    10 from GuiUtils import Communicate 
    11 from UnitTesting.TestUtils import * 
     10from sas.qtgui.Utilities.GuiUtils import Communicate 
     11from sas.qtgui.UnitTesting.TestUtils import * 
    1212 
    1313app = QApplication(sys.argv) 
  • src/sas/qtgui/Utilities/GuiUtils.py

    r7d077d1 r83eb5208  
    8888        pass 
    8989        #logging.error("Error loading %s/%s: %s" % (path, confg_file, sys.exc_value)) 
     90    except ValueError: 
     91        print "Value error" 
     92        pass 
    9093    finally: 
    9194        if fObj is not None: 
     
    117120    #logging.info("found local_config in %s", PATH_APP) 
    118121 
    119  
    120122from sas.sasgui.guiframe.customdir  import SetupCustom 
    121123c_conf_dir = SetupCustom().setup_dir(PATH_APP) 
     124 
    122125custom_config = _find_local_config('custom_config', c_conf_dir) 
    123126if custom_config is None: 
  • src/sas/qtgui/Utilities/UnitTesting/GuiUtilsTest.py

    r965fbd8 r83eb5208  
    88 
    99# set up import paths 
    10 import path_prepare 
     10import sas.qtgui.path_prepare 
    1111 
    1212# SV imports 
     
    1717 
    1818# Tested module 
    19 from GuiUtils import * 
     19from sas.qtgui.Utilities.GuiUtils import * 
    2020 
    2121app = QtGui.QApplication(sys.argv) 
  • src/sas/qtgui/Utilities/UnitTesting/SasviewLoggerTest.py

    r31c5b58 r83eb5208  
    77 
    88# set up import paths 
    9 import path_prepare 
     9import sas.qtgui.path_prepare 
    1010 
    1111# Local 
    12 from SasviewLogger import XStream 
    13 from SasviewLogger import QtHandler 
     12from sas.qtgui.Utilities.SasviewLogger import XStream 
     13from sas.qtgui.Utilities.SasviewLogger import QtHandler 
    1414 
    1515app = QApplication(sys.argv) 
  • src/sas/qtgui/images/convert_rc.bat

    rf51ed67 r83eb5208  
    11@echo off 
     2 
    23 
    34pyrcc4.exe -py3 %1.qrc -o ..\UI\%1_rc.py 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py

    r116260a r83eb5208  
    55from BaseInteractor import _BaseInteractor 
    66from sas.sasgui.guiframe.dataFitting import Data1D 
    7 import sas.qtgui.GuiUtils as GuiUtils 
    8 from sas.qtgui.GuiUtils import formatNumber 
    9 from sas.qtgui.SlicerModel import SlicerModel 
     7import sas.qtgui.Utilities.GuiUtils as GuiUtils 
     8from sas.qtgui.Utilities.GuiUtils import formatNumber 
     9from sas.qtgui.Plotting.SlicerModel import SlicerModel 
    1010 
    1111class AnnulusInteractor(_BaseInteractor, SlicerModel): 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py

    r116260a r83eb5208  
    88from BaseInteractor import _BaseInteractor 
    99from sas.sasgui.guiframe.dataFitting import Data1D 
    10 import sas.qtgui.GuiUtils as GuiUtils 
    11 from sas.qtgui.SlicerModel import SlicerModel 
     10import sas.qtgui.Utilities.GuiUtils as GuiUtils 
     11from sas.qtgui.Plotting.SlicerModel import SlicerModel 
    1212 
    1313MIN_PHI = 0.05 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py

    r3bdbfcc r83eb5208  
    55from BaseInteractor import _BaseInteractor 
    66from sas.sasgui.guiframe.dataFitting import Data1D 
    7 import sas.qtgui.GuiUtils as GuiUtils 
    8 from sas.qtgui.SlicerModel import SlicerModel 
     7import sas.qtgui.Utilities.GuiUtils as GuiUtils 
     8from sas.qtgui.Plotting.SlicerModel import SlicerModel 
    99 
    1010 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py

    r3bdbfcc r83eb5208  
    66from PyQt4 import QtGui 
    77from PyQt4 import QtCore 
    8 from sas.qtgui.GuiUtils import formatNumber 
     8from sas.qtgui.Utilities.GuiUtils import formatNumber 
    99 
    1010from BaseInteractor import _BaseInteractor 
     
    1212from sas.sascalc.dataloader.manipulations import Boxsum 
    1313 
    14 from sas.qtgui.SlicerModel import SlicerModel 
     14from sas.qtgui.Plotting.SlicerModel import SlicerModel 
    1515 
    1616 
Note: See TracChangeset for help on using the changeset viewer.