Changeset 056b569 in sasview

Timestamp:

Nov 28, 2011 1:48:38 PM (12 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:

a1968c4

Parents:

fb58234

Message:

adde custom model editor

Location:

fittingview/src/sans/perspectives/fitting

Files:

• editmodel.py (added)
• fitting.py (modified) (2 diffs)

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

@@ -14 +14 @@
 import re
 import sys
+import os
 import wx
 import logging
@@ -216 +217 @@
         chain_menu.Check(not self.batch_reset_flag)
         chain_menu.Enable(self.batch_on)
+        
+        self.menu1.AppendSeparator()
+        self.id_editmodel = wx.NewId()
+        editmodel_help = "Edit cusomized model sample file" 
+        self.menu1.Append(self.id_editmodel, "Edit Custom Model", 
+                                   editmodel_help) 
+        wx.EVT_MENU(owner, self.id_editmodel,  self.edit_custom_model)
+        
         #create  menubar items
         return [(self.menu1, self.sub_menu)]
-            
-   
+    
+    def edit_custom_model(self, event):
+        """
+        Get the python editor panel
+        """
+        from editmodel import PyConsole
+        filename = os.path.join("plugins", "testmodel.py")
+        frame = PyConsole(parent=self.parent, filename=filename)
+        self.put_icon(frame)
+        frame.Show(True) 
+        
+    def put_icon(self, frame):
+        """
+        Put icon in the frame title bar
+        """
+        if hasattr(frame, "IsIconized"):
+            if not frame.IsIconized():
+                try:
+                    icon = self.parent.GetIcon()
+                    frame.SetIcon(icon)
+                except:
+                    pass      
+                     
     def on_add_sim_page(self, event):
         """