Changeset bac3988 in sasview for src/sas/sasgui/perspectives/calculator

Timestamp:

Mar 17, 2016 11:08:10 AM (9 years ago)

Author:

ajj

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:

1c628f0

Parents:

a301204

Message:

Fixing category lists and list of models in GUI

File:

• src/sas/sasgui/perspectives/calculator/model_editor.py (modified) (3 diffs)

src/sas/sasgui/perspectives/calculator/model_editor.py

@@ -574 +574 @@
                     if not self.is_p1_custom:
                         line = line.replace('#', '')
-                        out_f.write(line % (name1, name1) + "\n")
+                        out_f.write(line % (name1) + "\n")
                     else:
                         out_f.write(line + "\n")
@@ -586 +586 @@
                     if not self.is_p2_custom:
                         line = line.replace('#', '')
-                        out_f.write(line % (name2, name2) + "\n")
+                        out_f.write(line % (name2) + "\n")
                     else:
                         out_f.write(line + "\n")
@@ -1265 +1265 @@
 # User can change the name of the model (only with single functional model)
 #P1_model:
-#from sas.models.%s import %s as P1
+#from sasmodels.models import %s as P1
 #from %s import Model as P1
 
 #P2_model:
-#from sas.models.%s import %s as P2
+#from sasmodels.models import %s as P2
 #from %s import Model as P2
 import os