Changeset 9053779 in sasview

Timestamp:

Jun 16, 2012 10:53:51 AM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

79c8066

Parents:

4a47244

Message:

fixed a bug in 2D dropdown menu associated w/data operator

Files:

• calculatorview/src/sans/perspectives/calculator/data_operator.py (modified) (1 diff)
• sansguiframe/src/sans/guiframe/dataFitting.py (modified) (2 diffs)

calculatorview/src/sans/perspectives/calculator/data_operator.py

@@ -453 +453 @@
                 val = None
         self.data2_cbox.SetClientData(pos3, val)
-        dnames = [dstate.data.name for dstate in self._data.values()]
-        ind = numpy.argsort(dnames)
-        for datastate in numpy.array(self._data.values())[ind]:
-            data = datastate.data
-            if data != None:
-                name = data.name
-                pos1 = self.data1_cbox.Append(str(name))
-                self.data1_cbox.SetClientData(pos1, data)
-                pos2 = self.data2_cbox.Append(str(name))
-                self.data2_cbox.SetClientData(pos2, data)
-                if str(current1) == str(name):
-                  pos_pre1 = pos1 
-                if str(current2) == str(name):
-                  pos_pre2 = pos2
-            try:
-                theory_list = datastate.get_theory()
-                for theory, _ in theory_list.values():
-                    th_name = theory.name
-                    posth1 = self.data1_cbox.Append(str(th_name))
-                    self.data1_cbox.SetClientData(posth1, theory)
-                    posth2 = self.data2_cbox.Append(str(th_name))
-                    self.data2_cbox.SetClientData(posth2, theory)
-                    if str(current1) == str(th_name):
-                        pos_pre1 = posth1
-                    if str(current2) == str(th_name):
-                        pos_pre2 = posth2
-            except:
-                continue 
+        dnames = []
+        for dstate in self._data.values():
+            if dstate != None:
+                if dstate.data != None:
+                    dnames.append(dstate.data.name)
+        if len(dnames) > 0:
+            ind = numpy.argsort(dnames)
+            for datastate in numpy.array(self._data.values())[ind]:
+                data = datastate.data
+                if data != None:
+                    name = data.name
+                    pos1 = self.data1_cbox.Append(str(name))
+                    self.data1_cbox.SetClientData(pos1, data)
+                    pos2 = self.data2_cbox.Append(str(name))
+                    self.data2_cbox.SetClientData(pos2, data)
+                    if str(current1) == str(name):
+                      pos_pre1 = pos1 
+                    if str(current2) == str(name):
+                      pos_pre2 = pos2
+                try:
+                    theory_list = datastate.get_theory()
+                    for theory, _ in theory_list.values():
+                        th_name = theory.name
+                        posth1 = self.data1_cbox.Append(str(th_name))
+                        self.data1_cbox.SetClientData(posth1, theory)
+                        posth2 = self.data2_cbox.Append(str(th_name))
+                        self.data2_cbox.SetClientData(posth2, theory)
+                        if str(current1) == str(th_name):
+                            pos_pre1 = posth1
+                        if str(current2) == str(th_name):
+                            pos_pre2 = posth2
+                except:
+                    continue 
         self.data1_cbox.SetSelection(pos_pre1)
         self.data2_cbox.SetSelection(pos_pre2)

sansguiframe/src/sans/guiframe/dataFitting.py

@@ -445 +445 @@
                          q_data=None, err_image=None, xmin=None, xmax=None,
                          ymin=None, ymax=None, zmin=None, zmax=None)
-        result.clone_without_data(len(self.data), self)
+        result.clone_without_data(len(self.data))
         result.copy_from_datainfo(data2d=self)
         result.xmin = self.xmin
@@ -509 +509 @@
         length = len(self.data)
         tot_length = length + len(other.data)
-        result.clone_without_data(tot_length, self)
+        result.clone_without_data(tot_length)
         result.xmin = self.xmin
         result.xmax = self.xmax