Changeset 2cff9db in sasview


Ignore:
Timestamp:
Aug 12, 2016 4:38:26 AM (8 years ago)
Author:
lewis
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:
b61bd57, 2f12acc
Parents:
efb482a (diff), b636c0ba (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

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • build_tools/jenkins_win64_build.bat

    rab06de7 rb636c0ba  
    44set INNO="C:\util\inno\ISCC.exe" 
    55set GIT_SED=C:\"Program Files"\Git\bin\sed.exe 
    6  
    76set SAS_COMPILER=tinycc 
    8 set WORKSPACE=C:\build 
    97 
    108set PYTHONPATH=%WORKSPACE%\sasview\utils 
     
    2321%GIT_SED% -i.bak "s/GIT_COMMIT/%githash%/g" __init__.py 
    2422 
    25  
    26  
    2723:: MAKE DIR FOR EGGS ################################################## 
    2824cd %WORKSPACE% 
     
    3026MD sasview-install 
    3127MD utils 
     28 
     29:: TINYCC build #################################################### 
     30cd %WORKSPACE% 
     31cd tinycc 
     32%PYTHON% setup.py build 
     33xcopy /S build\lib\* %WORKSPACE%\sasview\utils\ 
    3234 
    3335 
     
    3739%PYTHON% setup.py build 
    3840 
    39  
    40  
    4141:: SASMODELS doc ###################################################### 
    4242cd doc 
    4343make html 
    44  
    4544 
    4645:: SASMODELS build egg ################################################ 
     
    4847cd sasmodels 
    4948%PYTHON% setup.py bdist_egg 
    50  
    5149 
    5250:: SASMODELS install egg ############################################## 
     
    7977 
    8078 
    81 :: TINYCC build #################################################### 
    82 cd %WORKSPACE% 
    83 cd tinycc 
    84 %PYTHON% setup.py build 
    85 xcopy /S build\lib\* %WORKSPACE%\sasview\utils\ 
    86  
    8779:: SASVIEW INSTALLER ################################################## 
    8880cd %WORKSPACE% 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

    ra78890d refb482a  
    555555        self._slicerpop.set_graph(self.graph) 
    556556        ids = iter(self._menu_ids) 
    557         if not self.graph.selected_plottable in self.plots: 
    558             # Various plot options 
    559             wx_id = ids.next() 
    560             self._slicerpop.Append(wx_id, '&Save Image', 'Save image as PNG') 
    561             wx.EVT_MENU(self, wx_id, self.onSaveImage) 
    562             wx_id = ids.next() 
    563             self._slicerpop.Append(wx_id, '&Print Image', 'Print image ') 
    564             wx.EVT_MENU(self, wx_id, self.onPrint) 
    565  
    566             wx_id = ids.next() 
    567             self._slicerpop.Append(wx_id, '&Copy to Clipboard', 
    568                                    'Copy to the clipboard') 
    569             wx.EVT_MENU(self, wx_id, self.OnCopyFigureMenu) 
    570  
    571             self._slicerpop.AppendSeparator() 
     557 
     558        # Various plot options 
     559        wx_id = ids.next() 
     560        self._slicerpop.Append(wx_id, '&Save Image', 'Save image as PNG') 
     561        wx.EVT_MENU(self, wx_id, self.onSaveImage) 
     562        wx_id = ids.next() 
     563        self._slicerpop.Append(wx_id, '&Print Image', 'Print image ') 
     564        wx.EVT_MENU(self, wx_id, self.onPrint) 
     565 
     566        wx_id = ids.next() 
     567        self._slicerpop.Append(wx_id, '&Copy to Clipboard', 
     568                               'Copy to the clipboard') 
     569        wx.EVT_MENU(self, wx_id, self.OnCopyFigureMenu) 
     570 
     571        self._slicerpop.AppendSeparator() 
    572572 
    573573        for plot in self.plots.values(): 
     
    641641            # Option to hide 
    642642            # TODO: implement functionality to hide a plottable (legend click) 
    643         if not self.graph.selected_plottable in self.plots: 
     643 
     644        self._slicerpop.AppendSeparator() 
     645        loc_menu = wx.Menu() 
     646        for label in self._loc_labels: 
     647            wx_id = ids.next() 
     648            loc_menu.Append(wx_id, str(label), str(label)) 
     649            wx.EVT_MENU(self, wx_id, self.onChangeLegendLoc) 
     650 
     651        wx_id = ids.next() 
     652        self._slicerpop.Append(wx_id, '&Modify Graph Appearance', 
     653                               'Modify graph appearance') 
     654        wx.EVT_MENU(self, wx_id, self.modifyGraphAppearance) 
     655        self._slicerpop.AppendSeparator() 
     656 
     657 
     658        if self.position != None: 
     659            wx_id = ids.next() 
     660            self._slicerpop.Append(wx_id, '&Add Text') 
     661            wx.EVT_MENU(self, wx_id, self._on_addtext) 
     662            wx_id = ids.next() 
     663            self._slicerpop.Append(wx_id, '&Remove Text') 
     664            wx.EVT_MENU(self, wx_id, self._on_removetext) 
    644665            self._slicerpop.AppendSeparator() 
    645             loc_menu = wx.Menu() 
    646             for label in self._loc_labels: 
    647                 wx_id = ids.next() 
    648                 loc_menu.Append(wx_id, str(label), str(label)) 
    649                 wx.EVT_MENU(self, wx_id, self.onChangeLegendLoc) 
    650  
    651             wx_id = ids.next() 
    652             self._slicerpop.Append(wx_id, '&Modify Graph Appearance', 
    653                                    'Modify graph appearance') 
    654             wx.EVT_MENU(self, wx_id, self.modifyGraphAppearance) 
    655             self._slicerpop.AppendSeparator() 
    656  
    657  
    658             if self.position != None: 
    659                 wx_id = ids.next() 
    660                 self._slicerpop.Append(wx_id, '&Add Text') 
    661                 wx.EVT_MENU(self, wx_id, self._on_addtext) 
    662                 wx_id = ids.next() 
    663                 self._slicerpop.Append(wx_id, '&Remove Text') 
    664                 wx.EVT_MENU(self, wx_id, self._on_removetext) 
    665                 self._slicerpop.AppendSeparator() 
    666             wx_id = ids.next() 
    667             self._slicerpop.Append(wx_id, '&Change Scale') 
    668             wx.EVT_MENU(self, wx_id, self._onProperties) 
     666        wx_id = ids.next() 
     667        self._slicerpop.Append(wx_id, '&Change Scale') 
     668        wx.EVT_MENU(self, wx_id, self._onProperties) 
     669        self._slicerpop.AppendSeparator() 
     670        wx_id = ids.next() 
     671        self._slicerpop.Append(wx_id, '&Reset Graph Range') 
     672        wx.EVT_MENU(self, wx_id, self.onResetGraph) 
     673 
     674        if self.parent.ClassName.count('wxDialog') == 0: 
    669675            self._slicerpop.AppendSeparator() 
    670676            wx_id = ids.next() 
    671             self._slicerpop.Append(wx_id, '&Reset Graph Range') 
    672             wx.EVT_MENU(self, wx_id, self.onResetGraph) 
    673  
    674             if self.parent.ClassName.count('wxDialog') == 0: 
    675                 self._slicerpop.AppendSeparator() 
    676                 wx_id = ids.next() 
    677                 self._slicerpop.Append(wx_id, '&Window Title') 
    678                 wx.EVT_MENU(self, wx_id, self.onChangeCaption) 
     677            self._slicerpop.Append(wx_id, '&Window Title') 
     678            wx.EVT_MENU(self, wx_id, self.onChangeCaption) 
    679679        try: 
    680680            pos_evt = event.GetPosition() 
Note: See TracChangeset for help on using the changeset viewer.