Changeset 316e231 in sasview for calculatorview/src/sans

Timestamp:

May 3, 2012 11:23:15 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:

56acb5d

Parents:

74d7b59

Message:

set all the custom model names same as its filename

File:

• calculatorview/src/sans/perspectives/calculator/model_editor.py (modified) (7 diffs)

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

@@ -324 +324 @@
             elif line.count("self.description = '%s'"):
                 out_f.write(line % description + "\n")
-            elif line.count("self.name = '%s'"):
-                out_f.write(line % name + "\n")
+            #elif line.count("self.name = '%s'"):
+            #    out_f.write(line % name + "\n")
             else:
                 out_f.write(line + "\n")
@@ -690 +690 @@
                 if has_scipy:
                     out_f.write("import scipy" + "\n")
-            elif line.count("name = "):
-                out_f.write(line % self.name + "\n")
+            #elif line.count("name = "):
+            #    out_f.write(line % self.name + "\n")
             elif line:
                 out_f.write(line + "\n")
@@ -777 +777 @@
 from sans.models.pluginmodel import Model1DPlugin
 from math import *
+import os
+import sys
 import numpy
 #import scipy?
 class Model(Model1DPlugin):
-    name = "%s"                             
+    name = ""                             
     def __init__(self):
-        Model1DPlugin.__init__(self, name=self.name)                                                     
+        Model1DPlugin.__init__(self, name=self.name)  
+        #set name same as file name 
+        self.name = self.get_fname()                                                   
         #self.params here
         self.description = "%s"
@@ -827 +831 @@
 """
 TEST_TEMPLATE = """
+    def get_fname(self):
+        path = sys._getframe().f_code.co_filename
+        basename  = os.path.basename(path)
+        name, _ = os.path.splitext(basename)
+        return name
 ######################################################################
 ## THIS IS FOR TEST. DO NOT MODIFY THE FOLLOWING LINES!!!!!!!!!!!!!!!!       
@@ -854 +863 @@
 #P2_model: 
 from sans.models.%s import %s as P2
+import os
+import sys
 
 class Model(Model1DPlugin):
@@ -863 +874 @@
         ## Setting  model name model description
         self.description = '%s'
-        self.name = '%s'
+        self.name = self.get_fname()
         if self.name.rstrip().lstrip() == '':
             self.name = self._get_name(p_model1.name, p_model2.name)
@@ -1118 +1129 @@
 ( p_model1.name, p_model2.name )
         self.description += description
-        
+          
+    def get_fname(self):
+        path = sys._getframe().f_code.co_filename
+        basename  = os.path.basename(path)
+        name, _ = os.path.splitext(basename)
+        return name     
+           
 if __name__ == "__main__": 
     m1= Model()