Changeset a618972 in sasview

Timestamp:

Apr 5, 2010 4:36:54 PM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

4e74e13

Parents:

90d04eb

Message:

check a name of a plottable and remove "_" when necessary

File:

• guiframe/data_loader.py (modified) (3 diffs)

guiframe/data_loader.py

@@ -1 +1 @@
 import os, sys,numpy
 import wx
+import re
 from dataFitting import Data1D
 from dataFitting import Data2D
 from DataLoader.loader import Loader
 
+def parse_name(name, expression):
+    """
+        remove "_" in front of a name
+    """
+    if re.match(expression, name) is not None:
+        word = re.split(expression, name, 1)
+        for item in word:           
+            if item.lstrip().rstrip() != '':
+                return item
+    else:
+        return name
+    
 def choose_data_file(parent, location=None):
     path = None
@@ -145 +158 @@
             output.filename = str(filename)
         ## name of the data allow to differentiate data when plotted
-        name = output.filename
+        name = parse_name(name=output.filename, expression="_")
         if not name in parent.indice_load_data.keys():
             parent.indice_load_data[name] = 0
@@ -200 +213 @@
             new_plot.dxw = dxw
            
-            name = str(item.run[0])
+            name = parse_name(name=str(item.run[0]), expression="_")
             if not name in parent.indice_load_data.keys():
                 parent.indice_load_data[name] = 0