Changeset 9220d255 in sasview for src/sas/qtgui


Ignore:
Timestamp:
Oct 24, 2017 3:10:48 AM (7 years ago)
Author:
wojciech
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:
cca56a5
Parents:
4fdb727 (diff), f4a1433 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI_magnetism_bug

Location:
src/sas/qtgui
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • src/sas/qtgui/Calculators/SlitSizeCalculator.py

    rb0c5e8c rf4a1433  
    6363            return 
    6464        loader = Loader() 
    65         data = loader.load(path_str) 
     65        data = loader.load(path_str)[0] 
    6666 
    6767        self.data_file.setText(os.path.basename(path_str)) 
    … …  
    104104        Computes slit lenght from given 1D data 
    105105        """ 
    106  
    107106        if data is None: 
    108107            self.clearResults() 

  • src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py

    r464cd07 rf4a1433  
    305305        self.widget.loadFile() 
    306306        self.assertEqual(self.widget.cmdLoad.text(), 'Loading...') 
    307         time.sleep(1) 
     307        time.sleep(2) 
    308308 
    309309        self.assertEqual(self.widget.txtData.text(), 'A_Raw_Example-1.omf') 
    … …  
    377377        self.assertFalse(self.widget.cmdCompute.isEnabled()) 
    378378 
    379         self.widget.complete([numpy.ones(1), numpy.zeros(1), numpy.zeros(1)], update=None) 
    380         self.assertEqual(self.widget.cmdCompute.text(), 'Compute') 
    381         self.assertTrue(self.widget.cmdCompute.isEnabled()) 
     379        #self.widget.complete([numpy.ones(1), numpy.zeros(1), numpy.zeros(1)], update=None) 
     380        #self.assertEqual(self.widget.cmdCompute.text(), 'Compute') 
     381        #self.assertTrue(self.widget.cmdCompute.isEnabled()) 
    382382 
    383383    # TODO 

  • src/sas/qtgui/Calculators/UnitTesting/SLDCalculatorTest.py

    r464cd07 rf4a1433  
    9898 
    9999        # Assure the output fields are set 
    100         self.assertEqual(self.widget.ui.editNeutronIncXs.text(), '5.37') 
     100        self.assertEqual(self.widget.ui.editNeutronIncXs.text(), '5.62') 
    101101 
    102102        # Change mass density 
    … …  
    128128 
    129129        # Assure the mass density field is set 
    130         self.assertEqual(self.widget.ui.editNeutronIncXs.text(), '40.6') 
     130        self.assertEqual(self.widget.ui.editNeutronIncXs.text(), '43.4') 
    131131 
    132132        # Reset the widget 

  • src/sas/qtgui/Calculators/UnitTesting/SlitSizeCalculatorTest.py

    r8222f171 rf4a1433  
    7171        filename = "beam_profile.DAT" 
    7272        loader = Loader() 
    73         data = loader.load(filename) 
     73        data = loader.load(filename)[0] 
    7474 
    7575        self.widget.calculateSlitSize(data) 
    … …  
    8181        """ Test on wrong input data """ 
    8282 
    83         filename = "Dec07031.ASC" 
     83        filename = "P123_D2O_10_percent.dat" 
    8484        loader = Loader() 
    85         data = loader.load(filename) 
     85        data = loader.load(filename)[0] 
    8686        self.assertRaisesRegexp(RuntimeError, 
    8787                                "Slit Length cannot be computed for 2D Data", 

  • src/sas/qtgui/GUITests.py

    rd5c5d3d rf4a1433  
    7676 
    7777        # Main window 
     78        unittest.makeSuite(DataExplorerTest.DataExplorerTest,  'test'), 
     79        unittest.makeSuite(GuiManagerTest.GuiManagerTest,      'test'), 
     80        unittest.makeSuite(GuiUtilsTest.GuiUtilsTest,          'test'), 
    7881        unittest.makeSuite(AboutBoxTest.AboutBoxTest,          'test'), 
    79         unittest.makeSuite(DataExplorerTest.DataExplorerTest,  'test'), 
    8082        unittest.makeSuite(WelcomePanelTest.WelcomePanelTest,  'test'), 
    8183        unittest.makeSuite(DroppableDataLoadWidgetTest.DroppableDataLoadWidgetTest, 'test'), 
    82         unittest.makeSuite(GuiManagerTest.GuiManagerTest,      'test'), 
    83         unittest.makeSuite(GuiUtilsTest.GuiUtilsTest,          'test'), 
    8484        unittest.makeSuite(MainWindowTest.MainWindowTest,      'test'), 
    8585 

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

    r7d9c83c rf4a1433  
    8686        #creating a name for data 
    8787        title = "" 
    88         file_name = os.path.basename(path) if path is not None else data.filename 
     88        file_name = os.path.basename(path) if path is not None else os.path.basename(data.filename) 
    8989        if file_name: 
    9090            name = file_name 
    … …  
    100100            title = file_name 
    101101 
    102         if new_plot.filename.strip() == "": 
     102        stripped_filename = new_plot.filename.strip() 
     103        if not stripped_filename: 
     104            new_plot.filename = file_name 
     105        if stripped_filename != os.path.basename(stripped_filename): 
    103106            new_plot.filename = file_name 
    104107 

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

    r464cd07 rf4a1433  
    2525import sas.qtgui.Plotting.PlotHelper as PlotHelper 
    2626 
    27 if not QApplication.instance(): 
    28     app = QApplication(sys.argv) 
     27#if not QApplication.instance(): 
     28app = QApplication(sys.argv) 
    2929 
    3030class DataExplorerTest(unittest.TestCase): 
    … …  
    150150 
    151151        # Populate the model 
    152         filename = ["cyl_400_20.txt", "Dec07031.ASC", "cyl_400_20.txt"] 
     152        filename = ["cyl_400_20.txt", "P123_D2O_10_percent.dat", "cyl_400_20.txt"] 
    153153        self.form.readData(filename) 
    154154 
    … …  
    170170 
    171171        # Populate the model 
    172         filename = ["cyl_400_20.txt", "Dec07031.ASC", "cyl_400_20.txt"] 
     172        #filename = ["cyl_400_20.txt", "P123_D2O_10_percent.dat", "cyl_400_20.txt"] 
     173        filename = ["cyl_400_20.txt", "cyl_400_20.txt", "P123_D2O_10_percent.dat"] 
    173174        self.form.readData(filename) 
     175 
     176        self.form.show() 
     177        app.exec_() 
    174178 
    175179        # Assure the model contains three items 
    … …  
    319323        """ 
    320324        # Populate the model with 1d and 2d data 
    321         filename = ["cyl_400_20.txt", "Dec07031.ASC"] 
     325        filename = ["cyl_400_20.txt", "P123_D2O_10_percent.dat"] 
    322326        self.form.readData(filename) 
    323327 
    … …  
    469473 
    470474        defaults = 'All (*.*);;canSAS files (*.xml);;SESANS files' +\ 
    471             ' (*.ses);;ASCII files (*.txt);;IGOR 2D files (*.asc);;' +\ 
     475            ' (*.ses);;ASCII files (*.txt);;' +\ 
    472476            'IGOR/DAT 2D Q_map files (*.dat);;IGOR 1D files (*.abs);;'+\ 
    473             'HFIR 1D files (*.d1d);;DANSE files (*.sans);;NXS files (*.nxs)' 
     477            'DANSE files (*.sans)' 
    474478        default_list = defaults.split(';;') 
    475479 
    … …  
    525529        p_file="cyl_400_20.txt" 
    526530        output_object = loader.load(p_file) 
    527         new_data = [manager.create_gui_data(output_object, p_file)] 
     531        new_data = [manager.create_gui_data(output_object[0], p_file)] 
    528532 
    529533        # Mask retrieval of the data 
    … …  
    556560 
    557561        # get Data2D 
    558         p_file="Dec07031.ASC" 
     562        p_file="P123_D2O_10_percent.dat" 
    559563        output_object = loader.load(p_file) 
    560         new_data = [manager.create_gui_data(output_object, p_file)] 
     564        new_data = [manager.create_gui_data(output_object[0], p_file)] 
    561565 
    562566        # Mask retrieval of the data 
    … …  
    594598        output_object = loader.load(p_file) 
    595599        output_item = QtGui.QStandardItem() 
    596         new_data = [(output_item, manager.create_gui_data(output_object, p_file))] 
     600        new_data = [(output_item, manager.create_gui_data(output_object[0], p_file))] 
    597601 
    598602        # Mask plotting 
    … …  
    737741 
    738742        # get Data2D 
    739         p_file=["Dec07031.ASC"] 
     743        p_file=["P123_D2O_10_percent.dat"] 
    740744        # Read in the file 
    741745        output, message = self.form.readData(p_file) 
    … …  
    754758        QFileDialog.getSaveFileName.assert_called_with( 
    755759                                caption="Save As", 
    756                                 directory='Dec07031_out.dat', 
     760                                directory='P123_D2O_10_percent_out.dat', 
    757761                                filter='IGOR/DAT 2D file in Q_map (*.dat)', 
    758762                                parent=None) 
    … …  
    782786        """ 
    783787        # get Data1D 
    784         p_file=["Dec07031.ASC"] 
     788        p_file=["P123_D2O_10_percent.dat"] 
    785789        # Read in the file 
    786790        output, message = self.form.readData(p_file) 

  • src/sas/qtgui/Plotting/Plotter2D.py

    rd5c5d3d rf4a1433  
    394394        if data is None: 
    395395            return 
    396         if data.ndim == 1: 
     396        if data.ndim == 0: 
     397            return 
     398        elif data.ndim == 1: 
    397399            output = PlotUtilities.build_matrix(data, self.qx_data, self.qy_data) 
    398400        else: 

  • src/sas/qtgui/Utilities/UnitTesting/GuiUtilsTest.py

    rf0bb711 rf4a1433  
    179179        p_file="cyl_400_20.txt" 
    180180        output_object = loader.load(p_file) 
    181         new_data = manager.create_gui_data(output_object, p_file) 
     181        new_data = manager.create_gui_data(output_object[0], p_file) 
    182182 
    183183        # Extract Info elements into a model item 

  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    ra95c44b r4fdb727  
    333333        self.chk2DView.setVisible(False) 
    334334        self.chkMagnetism.setEnabled(self.is2D) 
     335        self.chkMagnetism.setVisible(self.is2D) 
     336        self.tabFitting.setTabEnabled(TAB_MAGNETISM, self.is2D) 
    335337        # Combo box or label for file name" 
    336338        if self.is_batch_fitting: 
Note: See TracChangeset for help on using the changeset viewer.