Changeset db08737 in sasview

Timestamp:

Sep 23, 2010 2:40:48 PM (14 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:

20905a0

Parents:

a1b2471

Message:

custom order for multishell parameters

Files:

• sansview/perspectives/fitting/fitpage.py (modified) (1 diff)
• theoryview/perspectives/theory/model_panel.py (modified) (1 diff)

sansview/perspectives/fitting/fitpage.py

@@ -2070 +2070 @@
         self.disp_list=self.model.getDispParamList()
 
-        keys.sort()
+        def custom_compare(a,b):
+            """
+            Custom compare to order, first by alphabets then second by number.
+            """ 
+            a_last = a[len(a)-1]
+            b_last = b[len(b)-1]
+            
+            num_a = None
+            num_b = None
+            # check if it contains a int number(<10)
+            try: 
+                num_a = int(a_last)
+            except: pass
+            try:
+                num_b = int(b_last)
+            except: pass
+            # both have a number    
+            if num_a != None and num_b != None:
+                if num_a > num_b: return 1
+                elif num_a == num_b: 
+                    return cmp(a.lower(), b.lower())
+                else: return -1
+            # one of them has a number
+            elif num_a == None: return -1
+            elif num_b == None: return 1
+            # no nuumbers
+            else:
+                return cmp(a.lower(), b.lower())
+            
+        keys.sort(custom_compare)
     
         iy = 0

theoryview/perspectives/theory/model_panel.py

@@ -528 +528 @@
         self.disp_list=self.model.getDispParamList()
        
-        keys.sort()
+        def custom_compare(a,b):
+            """
+            Custom compare to order, first by alphabets then second by number.
+            """ 
+            a_last = a[len(a)-1]
+            b_last = b[len(b)-1]
+            
+            num_a = None
+            num_b = None
+            # check if it contains a int number(<10)
+            try: 
+                num_a = int(a_last)
+            except: pass
+            try:
+                num_b = int(b_last)
+            except: pass
+            # both have a number    
+            if num_a != None and num_b != None:
+                if num_a > num_b: return 1
+                elif num_a == num_b: 
+                    return cmp(a.lower(), b.lower())
+                else: return -1
+            # one of them has a number
+            elif num_a == None: return -1
+            elif num_b == None: return 1
+            # no nuumbers
+            else:
+                return cmp(a.lower(), b.lower())
+            
+        keys.sort(custom_compare)
+
     
         iy = 0