Changeset 796c4d4 in sasview for fittingview/src/sans

Timestamp:

Mar 27, 2012 1:36:24 PM (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:

cdc2ee2

Parents:

602c2f3

Message:

new: overwright default changes; sum:added name control

File:

• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (1 diff)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -279 +279 @@
         model_manager = models.ModelManager()
         model_list = model_manager.get_model_name_list()
-
-        textdial = TextDialog(None, -1, 'Easy Sum(p1, p2)', model_list)
+        plug_dir = models.find_plugins_dir()
+        textdial = TextDialog(None, self, -1, 'Easy Sum(p1, p2)', 
+                              model_list, plug_dir)
         self.put_icon(textdial)
-        if textdial.ShowModal() == wx.ID_OK:
-            try:
-                label = textdial.getText()
-                plug_dir = models.find_plugins_dir()
-                fname = os.path.join(plug_dir, "easy_sum_of_p1_p2.py")
-                name1 = label[0]
-                name2 = label[1]
-                textdial.write_string(fname, name1, name2)
-                textdial.compile_file(fname)
-                self.update_custom_combo()
-            except:
-                raise
-                if self.parent != None:
-                    from sans.guiframe.events import StatusEvent 
-                    msg= "Easy Custom Sum: Error occurred..."
-                    wx.PostEvent(self.parent, StatusEvent(status = msg ))
-                else:
-                    raise
+        dial = textdial.ShowModal()
+
         textdial.Destroy()