Changeset d472e86 in sasview

Timestamp:

Oct 10, 2016 6:01:35 PM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

a28e52b

Parents:

3e1c9e5

git-author:

Piotr Rozyczko <rozyczko@…> (10/10/16 18:00:37)

git-committer:

Piotr Rozyczko <rozyczko@…> (10/10/16 18:01:35)

Message:

C models also available through Edit Custom Model/Advanced?

File:

• src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) (2 diffs)

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

@@ -110 +110 @@
                     size=(PANEL_WIDTH, PANEL_HEIGHT)):
         self.config = None
+
         editor.EditorNotebookFrame.__init__(self, parent=parent,
-                                        title=title, size=size,
-                                        filename=filename)
+                                        title=title, size=size)
         self.parent = parent
         self._manager = manager
@@ -126 +126 @@
         self.dataDir = dataDir
         self.Centre()
+
+        # See if there is a corresponding C file
+        if filename != None:
+            c_filename = os.path.splitext(filename)[0] + ".c"
+            if os.path.isfile(c_filename):
+                self.bufferCreate(c_filename)
+
+            # If not, just open the requested .py, if any.
+            # Needs to be after the C file so the tab focus is correct.
+            if os.path.isfile(filename):
+                    self.bufferCreate(filename)
 
         self.Bind(wx.EVT_MENU, self.OnNewFile, id=wx.ID_NEW)