Changeset 965fbd8 in sasview

Timestamp:

Feb 2, 2017 9:09:39 AM (8 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:

• ColorMap.py (modified) (2 diffs)
• DataExplorer.py (modified) (1 diff)
• UnitTesting/DataExplorerTest.py (modified) (1 diff)
• UnitTesting/GuiUtilsTest.py (modified) (1 diff)
• UnitTesting/Plotter2DTest.py (modified) (1 diff, 1 prop)
• run_tests.bat (modified) (1 prop)

src/sas/qtgui/ColorMap.py

@@ -111 +111 @@
         self.canvas.draw()
 
+    def onApply(self):
+        """
+        Respond to the Apply button click.
+        Send a signal to the plotter with vmin/vmax/cmap for chart update
+        """
+        self.apply_signal.emit(self.norm(), self.cmap())
+
     def initDetectorData(self):
         """
@@ -207 +214 @@
                                             norm=self._norm,
                                             orientation='horizontal')
-        self.cb.set_label('Detector Colors')
+        self.cb.set_label('Color map range')
 
     def onColorMapReversed(self, isChecked):

src/sas/qtgui/DataExplorer.py

@@ -789 +789 @@
         new_plot = Plotter2D(self, quickplot=True, dimension=3)
         new_plot.data = data
-        new_plot.plot(marker='o', linestyle='')
+        new_plot.plot()
 
         # Update the global plot counter

src/sas/qtgui/UnitTesting/DataExplorerTest.py

@@ -592 +592 @@
         p_file="cyl_400_20.txt"
         output_object = loader.load(p_file)
-        new_data = [manager.create_gui_data(output_object, p_file)]
+        output_item = QtGui.QStandardItem()
+        new_data = [(output_item, manager.create_gui_data(output_object, p_file))]
 
         # Mask plotting

src/sas/qtgui/UnitTesting/GuiUtilsTest.py

@@ -159 +159 @@
         # Make sure only the checked data is present
         # FRIDAY IN
-        self.assertIn(test_list0, plot_list)
+        self.assertIn(test_list0, plot_list[0])
         # SATURDAY IN
-        self.assertIn(test_list1, plot_list)
+        self.assertIn(test_list1, plot_list[1])
         # MONDAY NOT IN
-        self.assertNotIn(test_list2, plot_list)
+        self.assertNotIn(test_list2, plot_list[0])
+        self.assertNotIn(test_list2, plot_list[1])
 
     def testInfoFromData(self):

src/sas/qtgui/UnitTesting/Plotter2DTest.py

@@ -100 +100 @@
 
         self.assertEqual(self.plotter.cmap, "jet")
-        self.assertEqual(self.plotter.vmin, -0.1)
-        self.assertEqual(self.plotter.vmax, 0.1)
+        self.assertAlmostEqual(self.plotter.vmin, 0.1, 6)
+        self.assertAlmostEqual(self.plotter.vmax, 1e+20, 6)
 
     def testOnToggleScale(self):