Changeset 9f4f8f4 in sasview

Timestamp:

Aug 11, 2011 12:09:55 PM (13 years ago)

Author:

Jessica Tumarkin <jtumarki@…>

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

3d2d54a6

Parents:

643a82a

Message:

committing custom_color stuff that I did not commit earlier

File:

• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (5 diffs)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -67 +67 @@
         self.calc_2D = None
         self.calc_1D = None
+        
+        self.color_dict = {}
+        
         self.fit_thread_list = {}
         self.residuals = None
@@ -94 +97 @@
         self.sim_page = None
         self.index_model = 0
+        self.test_model_color = None
         #Create a reader for fit page's state
         self.state_reader = None 
@@ -107 +111 @@
         # Log startup
         logging.info("Fitting plug-in started") 
+    
+    def add_color(self, color, id):
+        """
+        adds a color as a key with a plot id as its value to a dictionary
+        """
+        self.color_dict[id] = color
         
     def on_batch_selection(self, flag):
@@ -204 +214 @@
             return []
         item = plotpanel.plots[graph.selected_plottable]
+        self.test_model_color = item.custom_color
+        #print "i'm in fitting - color is",self.test_model_color
         if item.__class__.__name__ is "Data2D": 
             if hasattr(item,"is_data"):
@@ -1437 +1449 @@
             current_pg = self.fit_panel.get_page_by_id(page_id)
             title = new_plot.title
-
+            new_plot.custom_color = self.test_model_color
+            #print "just set the new plot color"
+            if new_plot.id in self.color_dict:
+                new_plot.custom_color = self.color_dict[new_plot.id]
+            #print "I HAVE JUST ADDED A NEW COLOR/ID ", new_plot.custom_color
             wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
                                             title= str(title)))