Changeset 965fbd8 in sasview


Ignore:
Timestamp:
Feb 2, 2017 9:09:39 AM (6 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:
b789967
Parents:
3bdbfcc
Message:

More merge related fixes

Location:
src/sas/qtgui
Files:
6 edited

Legend:

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

    r3bdbfcc r965fbd8  
    111111        self.canvas.draw() 
    112112 
     113    def onApply(self): 
     114        """ 
     115        Respond to the Apply button click. 
     116        Send a signal to the plotter with vmin/vmax/cmap for chart update 
     117        """ 
     118        self.apply_signal.emit(self.norm(), self.cmap()) 
     119 
    113120    def initDetectorData(self): 
    114121        """ 
     
    207214                                            norm=self._norm, 
    208215                                            orientation='horizontal') 
    209         self.cb.set_label('Detector Colors') 
     216        self.cb.set_label('Color map range') 
    210217 
    211218    def onColorMapReversed(self, isChecked): 
  • src/sas/qtgui/DataExplorer.py

    r3bdbfcc r965fbd8  
    789789        new_plot = Plotter2D(self, quickplot=True, dimension=3) 
    790790        new_plot.data = data 
    791         new_plot.plot(marker='o', linestyle='') 
     791        new_plot.plot() 
    792792 
    793793        # Update the global plot counter 
  • src/sas/qtgui/UnitTesting/DataExplorerTest.py

    rcad617b r965fbd8  
    592592        p_file="cyl_400_20.txt" 
    593593        output_object = loader.load(p_file) 
    594         new_data = [manager.create_gui_data(output_object, p_file)] 
     594        output_item = QtGui.QStandardItem() 
     595        new_data = [(output_item, manager.create_gui_data(output_object, p_file))] 
    595596 
    596597        # Mask plotting 
  • src/sas/qtgui/UnitTesting/GuiUtilsTest.py

    rb46f285 r965fbd8  
    159159        # Make sure only the checked data is present 
    160160        # FRIDAY IN 
    161         self.assertIn(test_list0, plot_list) 
     161        self.assertIn(test_list0, plot_list[0]) 
    162162        # SATURDAY IN 
    163         self.assertIn(test_list1, plot_list) 
     163        self.assertIn(test_list1, plot_list[1]) 
    164164        # MONDAY NOT IN 
    165         self.assertNotIn(test_list2, plot_list) 
     165        self.assertNotIn(test_list2, plot_list[0]) 
     166        self.assertNotIn(test_list2, plot_list[1]) 
    166167 
    167168    def testInfoFromData(self): 
  • src/sas/qtgui/UnitTesting/Plotter2DTest.py

    • Property mode changed from 100755 to 100644
    r3bdbfcc r965fbd8  
    100100 
    101101        self.assertEqual(self.plotter.cmap, "jet") 
    102         self.assertEqual(self.plotter.vmin, -0.1) 
    103         self.assertEqual(self.plotter.vmax, 0.1) 
     102        self.assertAlmostEqual(self.plotter.vmin, 0.1, 6) 
     103        self.assertAlmostEqual(self.plotter.vmax, 1e+20, 6) 
    104104 
    105105    def testOnToggleScale(self): 
  • src/sas/qtgui/run_tests.bat

    • Property mode changed from 100644 to 100755
Note: See TracChangeset for help on using the changeset viewer.