Changeset 9316609 in sasview for sansmodels/src/sans/models/c_models/WrapperGenerator.py

Timestamp:

Oct 28, 2008 3:22:22 PM (16 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:

92320e5

Parents:

89fef2c

Message:

added description to model

File:

• sansmodels/src/sans/models/c_models/WrapperGenerator.py (modified) (2 diffs)

sansmodels/src/sans/models/c_models/WrapperGenerator.py

@@ -109 +109 @@
          # Catch Description
         key = "[DESCRIPTION]"
-        find_description= False
+        find_description= 0
         temp=""
         for line in lines:
             if line.count(key)>0 :
-                find_description= True
+                
                 try:
+                    find_description= 1
                     index = line.index(key)
                     toks = line[index:].split("=",1 )
                     temp=toks[1].lstrip().rstrip()
                     text='text'
-                    key2="<%s>"%text.lower
+                    key2="<%s>"%text.lower()
                     if re.match(key2,temp)!=None:
-                        index2 = line.index(key2)
-                        temp=line[index:]
+                        #index2 = line.index(key2)
+                        #temp = temp[index2:]
+                        toks2=temp.split(key2,1)
+                        self.description=toks2[1]
+                        text='text'
+                        key2="</%s>"%text.lower()
+                        if re.search(key2,toks2[1])!=None:
+                            temp=toks2[1].split(key2,1)
+                            self.description=temp[0]
+                            break
+                        #print self.description
                     else:
                         self.description=temp
+                        break
                 except:
                      raise ValueError, "Could not parse file %s" % self.file
-                if find_description:
-                    text='text'
-                    key2="</%s>"%text.lower
-                    if re.match(key2,temp)!=None:
-                        index2 = line.index(key2)
-                        temp=line[:index]
-                    temp+=line
-        self.description= temp
+            elif find_description==1:
+                text='text'
+                key2="</%s>"%text.lower()
+                #print "second line",line,key2,re.search(key2,line)
+                if re.search(key2,line)!=None:
+                    tok=line.split(key2,1)
+                    temp=tok[0].split("//",1)
+                    self.description+=tok[1].lstrip().rstrip()
+                    break
+                else:
+                    #if re.search("*",line)!=None:
+                    #    temp=line.split("*",1)
+                    #    self.description+='\n'+temp[1].lstrip().rstrip()
+                    if re.search("//",line)!=None:
+                        temp=line.split("//",1)
+                        self.description+='\n\t\t'+temp[1].lstrip().rstrip()
+                        
+                    else:
+                        self.description+='\n\t\t'+line.lstrip().rstrip()
+                    
+                
                 
         for line in lines:
@@ -235 +259 @@
             newline = self.replaceToken(tmp_line, 
                                         "[PYTHONCLASS]", 'C'+self.pythonClass)
-            
+            #Catch model description
+            newline = self.replaceToken(tmp_line, 
+                                        "[DESCRIPTION]", self.description)
             # Catch C model name
             newline = self.replaceToken(newline,