Changeset 95eef00 in sasview for src/sas/sasgui/guiframe

Timestamp:

Oct 7, 2016 4:05:57 PM (8 years ago)

Author:

krzywon

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:

b61bd57

Parents:

e6de6b8 (diff), 48b8f6d (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' into wx_save_simfit

Location:

src/sas/sasgui/guiframe

Files:

• gui_manager.py (modified) (5 diffs)
• media/data_formats_help.rst (modified) (2 diffs)
• data_panel.py (modified) (1 diff)

src/sas/sasgui/guiframe/gui_manager.py

@@ -1334 +1334 @@
                     self._applications_menu_name = name
 
+    def _on_marketplace_click(self, event):
+        """
+            Click event for the help menu item linking to the Marketplace.
+        """
+        import webbrowser
+        webbrowser.open_new(config.marketplace_url)
+
     def _add_help_menu(self):
         """
@@ -1339 +1346 @@
         tutorial PDF and documentation pages.
         """
-        # Help menu
         self._help_menu = wx.Menu()
-        style = self.__gui_style & GUIFRAME.WELCOME_PANEL_ON
 
         wx_id = wx.NewId()
         self._help_menu.Append(wx_id, '&Documentation', '')
         wx.EVT_MENU(self, wx_id, self._onSphinxDocs)
-        self._help_menu.AppendSeparator()
 
         if config._do_tutorial and (IS_WIN or sys.platform == 'darwin'):
@@ -1352 +1356 @@
             self._help_menu.Append(wx_id, '&Tutorial', 'Software tutorial')
             wx.EVT_MENU(self, wx_id, self._onTutorial)
-            self._help_menu.AppendSeparator()
-
 
         if config._do_acknowledge:
@@ -1359 +1361 @@
             self._help_menu.Append(wx_id, '&Acknowledge', 'Acknowledging SasView')
             wx.EVT_MENU(self, wx_id, self._onAcknowledge)
-            self._help_menu.AppendSeparator()
-
 
         if config._do_aboutbox:
@@ -1367 +1367 @@
             self._help_menu.Append(wx_id, '&About', 'Software information')
             wx.EVT_MENU(self, wx_id, self._onAbout)
-            self._help_menu.AppendSeparator()
-
+
+        if config.marketplace_url:
+            wx_id = wx.NewId()
+            self._help_menu.Append(wx_id, '&Model marketplace', '')
+            wx.EVT_MENU(self, wx_id, self._on_marketplace_click)
 
         # Checking for updates

src/sas/sasgui/guiframe/media/data_formats_help.rst

@@ -10 +10 @@
 ============
 
-SasView reads several different 1D (I(Q) vs Q), 2D SANS(I(Qx,Qy) vs (Qx,Qy))
-and SESANS (P(z) vs z)
-data files. But please note that SasView does not at present load data where
-the Q and I(Q) data are in separate files.
+SasView reads several different 1D SAS (*I(Q) vs Q*), 2D SAS(*I(Qx,Qy) vs (Qx,Qy)*) and 1D SESANS (*P(z) vs z*) data files. From SasView 4.1 onwards, a :ref:`File_Converter_Tool` allows some legacy formats to be converted into modern formats that SasView will read.
 
-1D Formats SANS
----------------
+1D SAS Formats
+--------------
 
-SasView will read files with 2 to 4 columns of numbers in the following order: 
+SasView will read ASCII ('text') files with 2 to 4 columns of numbers in the following order: 
 
-    Q, I(Q), (dI(Q), dQ(Q))
+    *Q, I(Q), ( dI(Q), dQ(Q) )*
     
-where dQ(Q) is the instrumental resolution in Q and assumed to have originated 
+where *dQ(Q)* is the instrumental resolution in *Q* and assumed to have originated 
 from pinhole geometry.
 
 Numbers can be separated by spaces or commas.
 
-SasView recognises the following file extensions:
+SasView recognises the following file extensions which are not case-sensitive:
 
 *  .TXT
@@ -34 +31 @@
 *  .XML (in canSAS format v1.0 and 1.1)
 
-If using CSV output from, for example, a spreadsheet, ensure that it is not 
-using commas as delimiters for thousands.
+If using CSV output from, for example, a spreadsheet, ensure that it is not using commas as delimiters for thousands.
+
+The SasView :ref:`File_Converter_Tool` available in SasView 4.1 onwards can be used to convert data sets with separated *I(Q)* and *Q* files (for example, BSL/OTOKO, and some output from FIT2D and other SAXS-oriented software) into either the canSAS SASXML (XML) format or the NeXus NXcanSAS (HDF5) format.
 
 For a description of the CanSAS/SASXML format see:
 http://www.cansas.org/formats/canSAS1d/1.1/doc/
 
+For a description of the ISIS 1D format see:
+http://www.isis.stfc.ac.uk/instruments/loq/software/colette-ascii-file-format-descriptions9808.pdf
+
+For a description of the NXcanSAS format see:
+http://cansas-org.github.io/NXcanSAS/classes/contributed_definitions/NXcanSAS.html
+
+All the above formats are written by the `Mantid Framework <http://www.mantidproject.org/>`_.
+
 For a description of the NIST 1D format see:
 http://danse.chem.utk.edu/trac/wiki/NCNROutput1D_IQ
 
-For a description of the ISIS 1D format see:
-http://www.isis.stfc.ac.uk/instruments/loq/software/colette-ascii-file-format-descriptions9808.pdf
+For a description of the BSL/OTOKO format see: 
+http://www.diamond.ac.uk/Beamlines/Soft-Condensed-Matter/small-angle/SAXS-Software/CCP13/BSL.html
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-2D Formats SANS
----------------
+2D SAS Formats
+--------------
 
-SasView will only read files in the NIST 2D format with the extensions 
-.ASC or .DAT
+SasView will read ASCII ('text') files in the NIST 2D format (with the extensions .ASC or .DAT) or files in the NeXus NXcanSAS (HDF5) format (with the extension .H5). File extensions are not case-sensitive. Both of these formats are written by the `Mantid Framework <http://www.mantidproject.org/>`_.
 
-Most of the header lines can be removed except the last line, and only the 
-first three columns (Qx, Qy, and I(Qx,Qy)) are actually required.
+Most of the header lines in the NIST 2D format can actually be removed except the last line, and only the first three columns (*Qx, Qy,* and *I(Qx,Qy)*) are actually required.
+
+The SasView :ref:`File_Converter_Tool` available in SasView 4.1 onwards can be used to convert data sets in the 2D BSL/OTOKO format into the NeXus NXcanSAS (HDF5) format.
 
 For a description of the NIST 2D format see:
 http://danse.chem.utk.edu/trac/wiki/NCNROutput1D_2DQxQy 
 
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+For a description of the NXcanSAS format see: 
+http://cansas-org.github.io/NXcanSAS/classes/contributed_definitions/NXcanSAS.html
 
-SESANS Format
--------------
-
-The current file extension is .ses or .sesans (not case sensitive).
-
-The file format is to have a list of name-value pairs as a header at the top of the file, detailing general experimental parameters necessary for fitting and analyzing data. This list should contain all information necessary for the file to be 'portable' between users.
-
-Following that is a 6 column list of instrument experimental variables:
-
-- Spin echo length (z, in Angstroms)
-- Spin echo length error (:math:`\Delta` z, in Angstroms) (experimental resolution)
-- neutron wavelength (:math:`\lambda`, in Angstroms) (essential for ToF instruments)
-- neutron wavelength error (:math:`\Delta \lambda`, in Angstroms)
-- Normalized polarization (:math:`P/P_0`, unitless)
-- Normalized polarization error (:math:`\Delta(P/P_0)`, unitless) (measurement error)
+For a description of the BSL/OTOKO format see: For a description of the BSL/OTOKO format see: 
+http://www.diamond.ac.uk/Beamlines/Soft-Condensed-Matter/small-angle/SAXS-Software/CCP13/BSL.html
 
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. note::  This help document was last changed by Wim Bouwman, 05Oct2016
+1D SESANS Format
+----------------
+
+SasView version 4.1 onwards will read ASCII ('text') files in a prototype SESANS standard format (with the extensions .SES or .SESANS). The file extensions are not case-sensitive.
+
+The file format has a list of name-value pairs at the top of the file which detail the general experimental parameters necessary for fitting and analyzing data. This list should contain all the information necessary for the file to be 'portable' between users.
+
+Following the header is a 6 column list of instrument experimental variables:
+
+- Spin echo length (z, in Angstroms)
+- Spin echo length error (:math:`\Delta`\ z, in Angstroms) (experimental resolution)
+- Neutron wavelength (:math:`\lambda`, in Angstroms) (essential for ToF instruments)
+- Neutron wavelength error (:math:`\Delta \lambda`, in Angstroms)
+- Normalized polarization (:math:`P/P_0`, unitless)
+- Normalized polarization error (:math:`\Delta(P/P_0)`, unitless) (measurement error)
+
+.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+
+.. note::  This help document was last changed by Steve King, 07Oct2016

src/sas/sasgui/guiframe/data_panel.py

@@ -890 +890 @@
 
 
-    def on_remove(self, event):
+    def on_remove(self, event, msg=""):
         """
         Get a list of item checked and remove them from the treectrl
         Ask the parent to remove reference to this item
         """
-        msg = "This operation will delete the data sets checked "
-        msg += "and all the dependents."
+        if msg == "":
+            msg = "This operation will delete the data sets checked "
+            msg += "and all the dependents."
         msg_box = wx.MessageDialog(None, msg, 'Warning', wx.OK|wx.CANCEL)
         if msg_box.ShowModal() != wx.ID_OK:
-            return
+            return True
 
         data_to_remove, theory_to_remove, _ = self.set_data_helper()