Changeset 278178b in sasview

Timestamp:

Oct 10, 2016 4:43:30 PM (8 years ago)

Author:

smk78

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:

0f7c930

Parents:

49e000b (diff), a28e52b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview.git

Files:

• src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) (2 diffs)
• src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) (1 diff)
• sasview/local_config.py (modified) (3 diffs)
• src/sas/sasgui/guiframe/aboutbox.py (modified) (6 diffs)
• src/sas/sasgui/guiframe/images/tudelft_logo.png (added)

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)

src/sas/sasgui/perspectives/fitting/simfitpage.py

@@ -1093 +1093 @@
                 sim_page.constraints_list[index][3].SetValue(constraint_value)
                 sim_page._on_add_constraint(None)
+                sim_page._manager.sim_page = sim_page
 
     def _format_id(self, original_id):

sasview/local_config.py

@@ -43 +43 @@
 _acknowledgement_publications = \
 '''This work benefited from the use of the SasView application, originally developed under NSF Award 
-DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 research 
-and innovation programme under the SINE2020 project Grant No 654000 and by Adam Washington.'''
+DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 programme 
+under the SINE2020 project Grant No 654000, and by Patrick O'Brien & Adam Washington.'''
 
 _acknowledgement =  \
-'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547, but is currently maintained by a 
-collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL and ANSTO. SasView also contains code developed with funding from the EU Horizon 2020 
-research and innovation programme under the SINE2020 project (Grant No 654000) and by Adam Washington (corfunc-py).'''
+'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547, but is currently maintained 
+by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft. SasView also contains code developed with funding from the 
+EU Horizon 2020 programme under the SINE2020 project (Grant No 654000), and by Patrick O'Brien (pycrust) and Adam Washington (corfunc-py).'''
 
 _homepage = "http://www.sasview.org"
@@ -71 +71 @@
 _ill_logo = os.path.join(icon_path, "ill_logo.png")
 _ansto_logo = os.path.join(icon_path, "ansto_logo.png")
+_tudelft_logo = os.path.join(icon_path, "tudelft_logo.png")
 _nsf_logo = os.path.join(icon_path, "nsf_logo.png")
 _danse_logo = os.path.join(icon_path, "danse_logo.png")
@@ -83 +84 @@
 _ill_url = "http://www.ill.eu/"
 _ansto_url = "http://www.ansto.gov.au/"
+_tudelft_url = "http://www.tnw.tudelft.nl/en/cooperation/facilities/reactor-instituut-delft/"
 _danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html"
 _inst_url = "http://www.utk.edu"
 _corner_image = os.path.join(icon_path, "angles_flat.png")
 _welcome_image = os.path.join(icon_path, "SVwelcome.png")
-_copyright = "(c) 2009 - 2016, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL and ANSTO"
+_copyright = "(c) 2009 - 2016, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft"
 marketplace_url = "http://marketplace.sasview.org/"
 

src/sas/sasgui/guiframe/aboutbox.py

@@ -117 +117 @@
         self.bitmap_button_ill = wx.BitmapButton(self, -1, wx.NullBitmap)
         self.bitmap_button_ansto = wx.BitmapButton(self, -1, wx.NullBitmap)
+        self.bitmap_button_tudelft = wx.BitmapButton(self, -1, wx.NullBitmap)
         
         self.static_line_3 = wx.StaticLine(self, -1)
@@ -135 +136 @@
         self.Bind(wx.EVT_BUTTON, self.onIllLogo, self.bitmap_button_ill)
         self.Bind(wx.EVT_BUTTON, self.onAnstoLogo, self.bitmap_button_ansto)
+        self.Bind(wx.EVT_BUTTON, self.onTudelftLogo, self.bitmap_button_tudelft)
         # end wxGlade
         # fill in acknowledgements
@@ -221 +223 @@
         logo = wx.Bitmap(image)
         self.bitmap_button_ansto.SetBitmapLabel(logo)
+        
+        image = file_dir + "/images/tudelft_logo.png"
+        if os.path.isfile(config._tudelft_logo):
+            image = config._tudelft_logo
+        logo = wx.Bitmap(image)
+        self.bitmap_button_tudelft.SetBitmapLabel(logo)
                 
         # resize dialog window to fit version number nicely
@@ -251 +259 @@
         self.bitmap_button_ill.SetSize(self.bitmap_button_ill.GetBestSize())
         self.bitmap_button_ansto.SetSize(self.bitmap_button_ansto.GetBestSize())
+        self.bitmap_button_tudelft.SetSize(self.bitmap_button_tudelft.GetBestSize())
         # end wxGlade
 
@@ -314 +323 @@
         sizer_logos.Add(self.bitmap_button_ansto, 0, 
                         wx.LEFT|wx.ADJUST_MINSIZE, 2)
+        sizer_logos.Add(self.bitmap_button_tudelft, 0, 
+                        wx.LEFT|wx.ADJUST_MINSIZE, 2)
                 
         sizer_logos.Add((10, 50), 0, wx.ADJUST_MINSIZE, 0)
@@ -405 +416 @@
         event.Skip()
 
+    def onTudelftLogo(self, event):
+        """
+        """ 
+        # wxGlade: DialogAbout.<event_handler>
+        launchBrowser(config._tudelft_url)
+        event.Skip()
+
 # end of class DialogAbout