Changeset ee563d5 in sasview for src/sas

Timestamp:

Oct 7, 2016 9:11:15 AM (8 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

61780e3

Parents:

9b6d62d (diff), 5dd7499 (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

Location:

src/sas/sasgui

Files:

• perspectives/calculator/media/image_viewer_help.rst (modified) (1 diff)
• perspectives/calculator/media/sas_calculator_help.rst (modified) (1 diff)
• perspectives/calculator/pyconsole.py (modified) (3 diffs)
• perspectives/corfunc/media/corfunc_help.rst (modified) (1 diff)
• perspectives/file_converter/media/file_converter_help.rst (modified) (1 diff)
• perspectives/fitting/media/plugin.rst (modified) (1 diff)
• guiframe/dataFitting.py (modified) (1 diff)

src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst

@@ -3 +3 @@
 .. This is a port of the original SasView html help file to ReSTructured text
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
+
+.. _Image_Viewer_Tool:
 
 Image Viewer Tool

src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst

@@ -3 +3 @@
 .. This is a port of the original SasView html help file to ReSTructured text
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
+
+.. _SANS_Calculator_Tool:
 
 Generic SANS Calculator Tool

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

@@ -9 +9 @@
 import wx
 from wx.lib.dialogs import ScrolledMessageDialog
+from wx.lib import layoutf
+
 import wx.py.editor as editor
 
@@ -63 +65 @@
         title, icon = "Info", wx.ICON_INFORMATION
     text = "\n".join(parts)
-    dlg = ScrolledMessageDialog(parent, text, title, size=((550, 250)))
+    dlg = ResizableScrolledMessageDialog(parent, text, title, size=((550, 250)))
     fnt = wx.Font(10, wx.TELETYPE, wx.NORMAL, wx.NORMAL)
     dlg.GetChildren()[0].SetFont(fnt)
@@ -70 +72 @@
     dlg.Destroy()
     return errmsg is None
+
+class ResizableScrolledMessageDialog(wx.Dialog):
+    """
+    Custom version of wx ScrolledMessageDialog, allowing border resize
+    """
+    def __init__(self, parent, msg, caption,
+        pos=wx.DefaultPosition, size=(500,300),
+        style=wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER ):
+        # Notice, that style can be overrriden in the caller.
+        wx.Dialog.__init__(self, parent, -1, caption, pos, size, style)
+        x, y = pos
+        if x == -1 and y == -1:
+            self.CenterOnScreen(wx.BOTH)
+
+        text = wx.TextCtrl(self, -1, msg, style=wx.TE_MULTILINE | wx.TE_READONLY)
+        ok = wx.Button(self, wx.ID_OK, "OK")
+
+        # Mysterious constraint layouts from 
+        # https://www.wxpython.org/docs/api/wx.lib.layoutf.Layoutf-class.html
+        lc = layoutf.Layoutf('t=t5#1;b=t5#2;l=l5#1;r=r5#1', (self,ok))
+        text.SetConstraints(lc)
+        lc = layoutf.Layoutf('b=b5#1;x%w50#1;w!80;h!25', (self,))
+        ok.SetConstraints(lc)
+
+        self.SetAutoLayout(1)
+        self.Layout()
 
 class PyConsole(editor.EditorNotebookFrame):

src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst

@@ -1 +1 @@
 .. corfunc_help.rst
+
+.. _Correlation_Function_Analysis:
 
 Correlation Function Analysis

src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst

@@ -1 +1 @@
 .. file_converter_help.rst
+
+.. _File_Converter_Tool:
 
 File Converter Tool

src/sas/sasgui/perspectives/fitting/media/plugin.rst

@@ -3 +3 @@
 Writing a Plugin Model
 ======================
+
+.. note:: If some code blocks are not readable, expand the documentation window
 
 Overview

src/sas/sasgui/guiframe/dataFitting.py

@@ -363 +363 @@
         _str = "%s\n" % LoadData2D.__str__(self)
         return _str 
-    
-    def _validity_check(self, other):
-        """
-        Checks that the data lengths are compatible.
-        Checks that the x vectors are compatible.
-        Returns errors vectors equal to original
-        errors vectors if they were present or vectors
-        of zeros when none was found.
-        
-        :param other: other data set for operation
-        
-        :return: dy for self, dy for other [numpy arrays]
-        
-        :raise ValueError: when lengths are not compatible
-        
-        """
-        err_other = None
-        if isinstance(other, Data2D):
-            # Check that data lengths are the same
-            if len(self.data) != len(other.data) or \
-                len(self.qx_data) != len(other.qx_data) or \
-                len(self.qy_data) != len(other.qy_data):
-                msg = "Unable to perform operation: data length are not equal"
-                raise ValueError, msg
-            #if len(self.data) < 1:
-            #    msg = "Incompatible data sets: I-values do not match"
-            #    raise ValueError, msg 
-            for ind in range(len(self.data)):
-                if self.qx_data[ind] != other.qx_data[ind]:
-                    msg = "Incompatible data sets: qx-values do not match"
-                    raise ValueError, msg
-                if self.qy_data[ind] != other.qy_data[ind]:
-                    msg = "Incompatible data sets: qy-values do not match"
-                    raise ValueError, msg
-                   
-            # Check that the scales match
-            err_other = other.err_data
-            if other.err_data == None or \
-                (len(other.err_data) != len(other.data)):
-                err_other = numpy.zeros(len(other.data))
-            
-        # Check that we have errors, otherwise create zero vector
-        err = self.err_data
-        if self.err_data == None or \
-            (len(self.err_data) != len(self.data)):
-            err = numpy.zeros(len(other.data))
-            
-        return err, err_other
-
-    def _validity_check_union(self, other):
-        """
-        Checks that the data lengths are compatible.
-        Checks that the x vectors are compatible.
-        Returns errors vectors equal to original
-        errors vectors if they were present or vectors
-        of zeros when none was found.
-        
-        :param other: other data set for operation
-        
-        :return: bool
-        
-        :raise ValueError: when data types are not compatible
-        
-        """
-        if not isinstance(other, Data2D):
-            msg = "Unable to perform operation: different types of data set"
-            raise ValueError, msg   
-        return True
-    
+
     def _perform_operation(self, other, operation):
         """