Changeset c1cfa80 in sasview

Timestamp:

Aug 31, 2018 8:20:25 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

facf4ca, 0eff615

Parents:

3a473ef

Message:

Added minor fixes from master

• doc dates
• improved tooltip on chi2 control
• regular expression improvement

Files:

• docs/sphinx-docs/source/_extensions/dollarmath.py (modified) (1 diff)
• docs/sphinx-docs/source/conf.py (modified) (2 diffs)
• src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui (modified) (1 diff)

docs/sphinx-docs/source/_extensions/dollarmath.py

@@ -11 +11 @@
 
 import re
-_dollar = re.compile(r"(?:^|(?<=\s))[$]([^\n]*?)(?<![\\])[$](?:$|(?=\s|[.,;:?\\()]))")
+_dollar = re.compile(r"(?:^|(?<=\s|[-(]))[$]([^\n]*?)(?<![\\])[$](?:$|(?=\s|[-.,;:?\\)]))")
 _notdollar = re.compile(r"\\[$]")
 

docs/sphinx-docs/source/conf.py

@@ -71 +71 @@
 # General information about the project.
 project = u'SasView'
-copyright = u'2017, The SasView Project'
+copyright = u'2018, The SasView Project'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -78 +78 @@
 #
 # The short X.Y version.
-version = '4.1'
+version = '5.0'
 # The full version, including alpha/beta/rc tags.
 release = '5.0.0'

src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui

@@ -315 +315 @@
        <item row="1" column="3">
         <widget class="QGroupBox" name="groupBox_9">
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;χ&lt;span style=&quot; vertical-align:super;&quot;&gt;2&lt;/span&gt;/DOF (DOF=N&lt;span style=&quot; vertical-align:sub;&quot;&gt;pts&lt;/span&gt;-N&lt;span style=&quot; vertical-align:sub;&quot;&gt;par&lt;/span&gt; fitted)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
          <property name="title">
           <string>Fitting error</string>