Changeset c95a1a5 in sasview

Timestamp:

Jul 26, 2015 2:40:37 PM (9 years ago)

Author:

butler

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

Children:

e0c16ce

Parents:

44d20af (diff), a003f3c (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:

• build_tools/dmgpack.sh (added)
• build_tools/jenkins_osx_build.sh (modified) (1 diff)
• sasview.latestversion (modified) (1 diff)
• sasview/README.txt (modified) (1 diff)
• sasview/__init__.py (modified) (1 diff)
• sasview/setup_mac.py (modified) (3 diffs)
• src/sas/guiframe/data_processor.py (modified) (79 diffs)
• src/sas/models/c_extension/c_models/GelFit.cpp (modified) (2 diffs)
• src/sas/models/include/GelFit.h (modified) (1 diff)
• src/sas/models/include/dabmodel.h (modified) (1 diff)

build_tools/jenkins_osx_build.sh

@@ -47 +47 @@
 
 cd $WORKSPACE/sasview/dist
-tar -czf `python -c "import pkg_resources;print '%s.tar.gz' % pkg_resources.get_distribution('sasview').egg_name()"` sasview.app
+tar -czf `python -c "import pkg_resources;print '%s.tar.gz' % pkg_resources.get_distribution('sasview').egg_name()"` `python -c "import sasview; print 'SasView-%s.app' % sasview.__version__"`

sasview.latestversion

@@ -1 @@
-3.1.0
+3.1.1

sasview/README.txt

@@ -4 +4 @@
 1- Features
 ===========
+
+   - New in Version 3.1.1
+     --------------------
+     - Fixes bug #457 that prevented SasView from starting if the user was not
+       connected to the internet, or was behind a proxy server.
 
    - New in Version 3.1.0

sasview/__init__.py

@@ -1 @@
-__version__ = "3.1.0"
+__version__ = "3.1.1"
 __build__ = "1"

sasview/setup_mac.py

@@ -116 +116 @@
                                    CFBundleTypeRole="Shell" )],)
 
+#Get version - NB nasty hack. Need to find correct way to give path to installed sasview (AJJ)
+import __init__ as sasviewver
+
+VERSION = sasviewver.__version__
+APPNAME = "SasView "+VERSION
+DMGNAME = "SasView-"+VERSION
+
 APP = ['sasview.py']
 DATA_FILES += ['images','test','media']
@@ -133 +140 @@
            }
 setup(
-    name="sasview",
+    name=APPNAME,
     app=APP,
     data_files=DATA_FILES,
@@ -140 +147 @@
     setup_requires=['py2app'],
 )
+
+#Build dmg
+DMG="dist/%s.dmg"%DMGNAME
+if os.path.exists(DMG): os.unlink(DMG)
+os.system('cd dist && ../../build_tools/dmgpack.sh "%s" "%s.app"'%(DMGNAME,APPNAME))
+os.system('chmod a+r "%s"'%DMG)
+

src/sas/guiframe/data_processor.py

@@ -9 +9 @@
 
 The organization of the classes goes as:
-.. image::  media/BatchGridClassLayout.png
+
+.. image::  ../../user/guiframe/BatchGridClassLayout.png
    :align:   center
 
@@ -37 +38 @@
     """
     Object describing a cell in  the grid.
-
     """
     def __init__(self):
         """
         Initialize attributes of class (label, value, col, row, object)
-        
         """
         self.label = ""
@@ -54 +53 @@
     """
     Return a dictionary of column label and index or row selected
-    
+
     :param sentence: String to parse
     :param list: list of columns label
-    
+    :returns: col_dict
     """
 
@@ -116 +115 @@
 
 class GridCellEditor(sheet.CCellEditor):
-    """ 
+    """
     Custom cell editor
-    
+
     This subclasses the sheet.CCellEditor (itself a subclass of
     grid.GridCellEditor) in order to override two of its methods:
@@ -125 +124 @@
     This is necessary as the sheet module is broken in wx 3.0.2 and
     improperly subclasses grid.GridCellEditor
-    
     """
     def __init__(self, grid):
         """
         Override of CCellEditor init. Runs the grid.GridCellEditor init code
-
         """
         super(GridCellEditor, self).__init__(grid)
 
     def PaintBackground(self, dc, rect, attr):
-        """ 
+        """
         Overrides wx.sheet.CCellEditor.PaintBackground which incorrectly calls
         the base class method.
-        
+
         In wx3.0 all paint objects must explicitly
         have a wxPaintDC (Device Context) object.  Thus the paint event which
@@ -145 +142 @@
         not updated to reflect this and hence fails.  This could thus
         become obsolete in a future bug fix of wxPython.
-        
+
         Apart from adding a dc variable in the list of arguments in the def
         and in the call to the base class the rest of this method is copied
         as is from sheet.CCellEditor.PaintBackground
-        
-        :param dc: the wxDC object for the paint
-        -------
+
+        **From original GridCellEditor docs:**
+
         Draws the part of the cell not occupied by the edit control.  The
         base class version just fills it with background colour from the
@@ -159 +156 @@
         to do something out of the ordinary.
 
+        :param dc: the wxDC object for the paint
         """
         # Call base class method.
@@ -165 +163 @@
 
     def EndEdit(self, row, col, grid, previous):
-        """ 
+        """
         Commit editing the current cell. Returns True if the value has changed.
-        
+
         :param previous: previous value in the cell
-        
         """
         changed = False                             # Assume value not changed
@@ -184 +181 @@
     """
     Class that receives the results of a batch fit.
-    
+
     GridPage displays the received results in a wx.grid using sheet.  This is
     then used by GridPanel and GridFrame to present the full GUI.
-    
     """
     def __init__(self, parent, panel=None):
         """
         Initialize
-        
+
         Initialize all the attributes of GridPage, and the events. include
         the init stuff from sheet.CSheet as well.
-        
         """
         #sheet.CSheet.__init__(self, parent)
-        
+
         # The following is the __init__ from CSheet. ##########################
         # We re-write it here because the class is broken in wx 3.0,
@@ -243 +238 @@
         # CSheet init method.  Basically these override any intrinsic binding
         self.Bind(wx.grid.EVT_GRID_LABEL_RIGHT_CLICK, self.on_right_click)
-        self.Bind(wx.grid.EVT_GRID_LABEL_LEFT_CLICK, self.on_left_click)        
+        self.Bind(wx.grid.EVT_GRID_LABEL_LEFT_CLICK, self.on_left_click)
 
         self.AdjustScrollbars()
@@ -283 +278 @@
         if self.GetNumberCols() > 0:
             self.default_col_width = self.GetColSize(0)
-        # We have moved these to the top of the init section with the 
-        # rest of the grid event bindings from the sheet init when 
+        # We have moved these to the top of the init section with the
+        # rest of the grid event bindings from the sheet init when
         # appropriate
         #self.Bind(wx.grid.EVT_GRID_LABEL_LEFT_CLICK, self.on_left_click)
@@ -295 +290 @@
         """
         Overrides sheet.CSheet.OnLefClick.
-        
+
         Processes when a cell is selected by left clicking on that cell. First
         process the base Sheet method then the current class specific method
-         
         """
         sheet.CSheet.OnLeftClick(self, event)
         self.on_selected_cell(event)
-        
+
 
     def OnCellChange(self, event):
         """
         Overrides sheet.CSheet.OnCellChange.  
-        
+
         Processes when a cell has been edited by a cell editor. Checks for the
         edited row being outside the max row to use attribute and if so updates
-        the last row.  Then calls the base handler using skip. 
-
+        the last row.  Then calls the base handler using skip.
         """
         row, _ = event.GetRow(), event.GetCol()
@@ -323 +316 @@
         """
         Handler catching cell selection.
-        
+
         Called after calling base 'on left click' method.
-
         """
 
@@ -398 +390 @@
         """
         Is triggered when the left mouse button is clicked while the mouse
-        is hovering over the column 'label.' 
-        
+        is hovering over the column 'label.'
+
         This processes the information on the selected column: the column name
         (in row 0 of column) and the range of cells with a valid value to be
         used by the GridPanel set_axis methods.
-        
-        """
-        
+        """
+
         flag = event.CmdDown() or event.ControlDown()
 
@@ -449 +440 @@
         """
         Is triggered when the right mouse button is clicked while the mouse
-        is hovering over the column 'label.' 
-        
+        is hovering over the column 'label.'
+
         This brings up a context menu that allows the deletion of the column,
-        or the insertion of a new column either to the right or left of the 
+        or the insertion of a new column either to the right or left of the
         current column.  If inserting a new column can insert a blank column or
         choose a number of hidden columns.  By default all the error parameters
@@ -458 +449 @@
         intrinsic variables stored with the data such as Temperature, pressure,
         time etc can be used to populate this menu.
-        
-        """
-        
+        """
+
         col = event.GetCol()
         row = event.GetRow()
@@ -497 +487 @@
         method called to populate the 'insert column before current column'
         submenu.
-        
-        """
-        
+        """
+
         if self.data is None:
             return
@@ -521 +510 @@
         Method called to populate the 'insert column after current column'
         submenu
-        
-        """
-        
+        """
+
         if self.data is None:
             return
@@ -546 +534 @@
         Called when user chooses remove from the column right click menu
         Checks the columnn exists then calls the remove_column method
-        
-        """
-        
+        """
+
         if self.selected_cols is not None or len(self.selected_cols) > 0:
             col = self.selected_cols[0]
@@ -556 +543 @@
         """
         Remove the col column from the current grid
-        
-        """
-        
+        """
+
         # add data to the grid    
         row = 0
@@ -581 +567 @@
         of the column context menu obtained when right clicking on a given
         column header.
-        
+
         Sets up to insert column into the current grid before the current
         highlighted column location and sets up what to populate that column
         with.  Then calls insert_column method to actually do the insertion. 
-        
-        """
-        
+        """
+
         if self.selected_cols is not None or len(self.selected_cols) > 0:
             col = self.selected_cols[0]
@@ -602 +587 @@
         Called when user chooses insert 'column after' submenu
         of the column context menu obtained when right clicking on a given
-        column header. 
-        
+        column header.
+
         Sets up to insert column into the current grid after the current
         highlighted column location and sets up what to populate that column
         with.  Then calls insert_column method to actually do the insertion. 
-        
-        """
-        
+        """
+
         if self.selected_cols is not None or len(self.selected_cols) > 0:
             col = self.selected_cols[0] + 1
@@ -623 +607 @@
         Insert column at position col with data[col_name] into the current
         grid.
-        
-        """
-        
+        """
+
         row = 0
         self.InsertCols(pos=col, numCols=1, updateLabels=True)
@@ -648 +631 @@
         """
         Just calls the panel version of the method
-        
-        """
-        
+        """
+
         self.panel.set_xaxis(x=self.axis_value, label=self.axis_label)
 
@@ -656 +638 @@
         """
         Just calls the panel version of the method
-        
-        """
+        """
+
         self.panel.set_yaxis(y=self.axis_value, label=self.axis_label)
 
@@ -663 +645 @@
         """
         Add data to the grid
-        
+
         :param data_inputs: data to use from the context menu of the grid
-        :param data_ouputs: default columns deplayed
-        
-        """
-        
+        :param data_ouputs: default columns displayed
+        """
+
         self.file_name = file_name
         self.details = details
@@ -704 +685 @@
         """
         Set the values in grids
-        
-        """
-        
+        """
+
         # add data to the grid
         row = 0
@@ -741 +721 @@
         """
         Return value contained in the grid
-        
-        """
-        
+        """
+
         grid_view = {}
         for col in xrange(self.GetNumberCols()):
@@ -761 +740 @@
         """
         Return number of total rows
-        
         """
         return self._rows
@@ -768 +746 @@
         """
         Method to handle cell right click context menu. 
-        
+
         THIS METHOD IS NOT CURRENTLY USED.  It is designed to provide a
         cell pop up context by right clicking on a cell and gives the
@@ -774 +752 @@
         future versions and is being superceded by more traditional cut and
         paste options.
-        
-        """
-        
+        """
+
         wx_id = wx.NewId()
         c_menu = wx.Menu()
@@ -817 +794 @@
         future versions and is being superceded by more traditional cut and
         paste options
-
         """
 
@@ -825 +801 @@
         """
         Called when paste is chosen from cell right click context menu
-        
+
         THIS METHOD IS NOT CURRENTLY USED.  it is part of right click cell
         context menu which is being removed. This will probably be removed in
         future versions and is being superceded by more traditional cut and
         paste options
-
         """
 
@@ -847 +822 @@
         future versions and is being superceded by more traditional cut and
         paste options
-
         """
 
@@ -857 +831 @@
     window_name = "Fit panel"
     ## Title to appear on top of the window
-    
     """
-    
+
     window_caption = "Notebook "
 
@@ -898 +871 @@
         display the close button on the tab if more than 1 tab exits.
         Otherwise remove the close button
-
         """
 
@@ -918 +890 @@
         Return the select cell range from a given selected column. Checks that
         all cells are from the same column
-
         """
 
@@ -949 +920 @@
         """
         Add highlight rows
-
         """
 
@@ -980 +950 @@
         """
         return dictionary of columns labels on the current page
-
         """
 
@@ -996 +965 @@
         Receive a list of cells and  create a string presenting the selected
         cells that can be used as data for one axis of a plot.
-        
+
         :param cell_list: list of tuple
-
         """
         pos = self.GetSelection()
@@ -1075 +1043 @@
         """
         close the page
-
         """
 
@@ -1109 +1076 @@
         Order a list of 'inputs.' Used to sort rows and columns to present
         in batch results grid.
-
         """
 
@@ -1143 +1109 @@
         """
         Append a new column to the grid
-
         """
 
@@ -1155 +1120 @@
         """
         Remove the selected column from the grid
-
         """
         # I Believe this is no longer used now that we have removed the 
@@ -1166 +1130 @@
     """
     A ScrolledPanel class that contains the grid sheet as well as a number of
-    widgets to create interesting plots and buttons for help etc. 
-
+    widgets to create interesting plots and buttons for help etc.
     """
 
@@ -1174 +1137 @@
         """
         Initialize the GridPanel
-
         """
 
@@ -1264 +1226 @@
         Get object represented by the given cells and plot them.  Basically
         plot the colum in y vs the column in x.
-
         """
 
@@ -1345 +1306 @@
         """
         Evaluate the contains of textcrtl and plot result
-
         """
 
@@ -1456 +1416 @@
 
         :param evt: Triggers on clicking the help button
-
         """
 
@@ -1471 +1430 @@
         """
         Get sentence from dict
-
         """
 
@@ -1488 +1446 @@
         Draw the area related to the grid by adding it as the first element
         in the panel's grid_sizer
-
         """
 
@@ -1499 +1456 @@
         Add the area containing all the plot options, buttons etc to a plotting
         area sizer to later be added to the top level grid_sizer
-
         """
 
@@ -1543 +1499 @@
                                    (self.plot_button, 0,
                                     wx.LEFT | wx.TOP | wx.BOTTOM, 12),
-                                   (self.help_button,0, 
+                                   (self.help_button,0,
                                     wx.LEFT | wx.TOP | wx.BOTTOM, 12)])
 
@@ -1577 +1533 @@
         """
         Get the selected column on  the visible grid and set values for axis
-
         """
 
@@ -1601 +1556 @@
 
         :param cell_list: list of tuple
-
         """
 
@@ -1610 +1564 @@
         """
         get controls to modify
-
         """
 
@@ -1621 +1574 @@
         """
         """
-        # I Believe this is no longer used now that we have removed the 
+        # I Believe this is no longer used now that we have removed the
         # edit menu from the menubar - PDB July 12, 2015
         if self.notebook is not None:
@@ -1629 +1582 @@
         """
         """
-        # I Believe this is no longer used now that we have removed the 
+        # I Believe this is no longer used now that we have removed the
         # edit menu from the menubar - PDB July 12, 2015
         if self.notebook is not None:
@@ -1638 +1591 @@
     """
     The main wx.Frame for the batch results grid
-
     """
 
@@ -1645 +1597 @@
         """
         Initialize the Frame
-        
         """
 
@@ -1690 +1641 @@
         populates the edit menu on the menubar.  Not activated as of SasView
         3.1.0
-
         """
         self.edit = wx.Menu()
@@ -1725 +1675 @@
     def on_copy(self, event):
         """
-        On Copy from the Edit menu item on the menubar  
-
+        On Copy from the Edit menu item on the menubar
         """
         # I Believe this is no longer used now that we have removed the 
@@ -1739 +1688 @@
         """
         On Paste from the Edit menu item on the menubar
-
         """
         # I Believe this is no longer used now that we have removed the 
@@ -1752 +1700 @@
         """
         On Clear from the Edit menu item on the menubar
-
         """
         # I Believe this is no longer used now that we have removed the 
@@ -1763 +1710 @@
         """
         Get Label Text
-
         """
         for item in self.insert_before_menu.GetMenuItems():
@@ -1773 +1719 @@
         """
         On remove column from the Edit menu Item on the menubar
-
         """
         # I Believe this is no longer used now that we have removed the 
@@ -1784 +1729 @@
         """
         On menu open
-
         """
         if self.file == event.GetMenu():
@@ -1846 +1790 @@
         """
         Saves data in grid to a csv file.
-        
+
         At this time only the columns displayed get saved.  Thus any error
         bars not inserted before saving will not be saved in the file
-
         """
 
@@ -1883 +1826 @@
         """
         Open file containing batch result
-
         """
 
@@ -1892 +1834 @@
         """
         open excel and display batch result in Excel
-
         """
 
@@ -1919 +1860 @@
         """
         Append a new column to the grid
-
         """
         self.panel.add_column()
@@ -1926 +1866 @@
         """
         Set data
-
         """
         self.panel.notebook.set_data(data_inputs=data_inputs,
@@ -1936 +1875 @@
         """
         Add a new table
-
         """
         # DO not event.Skip(): it will make 2 pages
@@ -1944 +1882 @@
     """
     Allow to select where the result of batch will be displayed or stored
-
     """
     def __init__(self, parent, data_inputs, data_outputs, file_name="",
@@ -1952 +1889 @@
 
         :param parent: Window instantiating this dialog
-        :param result: result to display in a grid or export to an external
+        :param result: result to display in a grid or export to an external\
                 application.
-
         """
 
@@ -1978 +1914 @@
         """
         Draw the content of the current dialog window
-
         """
 
@@ -2033 +1968 @@
         """
         Get the user selection and display output to the selected application
-
         """
 
@@ -2046 +1980 @@
         """
         close the Window
-
         """
 
@@ -2055 +1988 @@
         Receive event and display data into third party application
         or save data to file.
-
         """
         if self.save_to_file.GetValue():

src/sas/models/c_extension/c_models/GelFit.cpp

@@ -34 +34 @@
     radius = Parameter(104.0,true);
     radius.set_min(2.0);
-    scale = Parameter(2.0,true);
+    FractalExp = Parameter(2.0,true);
     background = Parameter(0.01);
 }
@@ -43 +43 @@
     dp[0] = zeta();
     dp[1] = radius();
-    dp[2] = scale();
+    dp[2] = FractalExp();
     
     if (dp[2] <= 0)

src/sas/models/include/GelFit.h

@@ -33 +33 @@
   Parameter radius;
 
-  //  [DEFAULT]=scale= 2
-  Parameter scale;
+  //  [DEFAULT]=FractalExp= 2
+  Parameter FractalExp;
 
   //  [DEFAULT]=background= 0.01

src/sas/models/include/dabmodel.h

@@ -17 +17 @@
 // [PYTHONCLASS] = DABModel
 // [DISP_PARAMS] = length, scale, background
-// [DESCRIPTION] = <text>Provide F(x) = scale/( 1 + (x*L)^2 )^(2) + background
-//    DAB (Debye Anderson Brumberger) function as a BaseComponent model
+// [DESCRIPTION] = <text>DAB (Debye Anderson Brumberger) Model
+//    F(x) = scale * L^3/( 1 + (q*L)^2 )^2 + background
+//    L: the correlation length
 //     </text>
 // [FIXED] =