Changeset 8b138bd in sasview


Ignore:
Timestamp:
Aug 16, 2016 12:18:26 PM (6 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:
66f21cd
Parents:
895c9cb (diff), 318427a9 (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:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/guiframe/media/graph_help.rst

    rf93b473f r318427a9  
    9494*  PNG (portable network graphics) 
    9595*  PS (postscript) 
    96 *  RAW/RGBA (bitmap) 
     96*  RAW/RGBA (bitmap, stored as 935x635 pixels of depth 8) 
    9797*  SVG/SVGA (scalable vector graphics) 
    9898*  TIF/TIFF (tagged iamge file) 
     99 
     100The PGF image type option requires a LaTeX compiler: xelatex (default),  
     101lualatex, or pdflatex. These are not shipped with SasView. 
    99102 
    100103Printing a plot 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

    re63cf11 r895c9cb  
    671671        self._slicerpop.AppendSeparator() 
    672672        wx_id = ids.next() 
     673        self._slicerpop.Append(wx_id, '&Set Graph Range') 
     674        wx.EVT_MENU(self, wx_id, self.onSetRange) 
     675        wx_id = ids.next() 
    673676        self._slicerpop.Append(wx_id, '&Reset Graph Range') 
    674677        wx.EVT_MENU(self, wx_id, self.onResetGraph) 
     
    687690        self.PopupMenu(self._slicerpop, pos) 
    688691 
     692    def onSetRange(self, event): 
     693        # Display dialog 
     694        # self.subplot.set_xlim((low, high)) 
     695        # self.subplot.set_ylim((low, high)) 
     696        from sas.sasgui.plottools.RangeDialog import RangeDialog 
     697        d = RangeDialog(self, -1) 
     698        xlim = self.subplot.get_xlim() 
     699        ylim = self.subplot.get_ylim() 
     700        d.SetXRange(xlim) 
     701        d.SetYRange(ylim) 
     702        if d.ShowModal() == wx.ID_OK: 
     703            x_range = d.GetXRange() 
     704            y_range = d.GetYRange() 
     705            if x_range is not None and y_range is not None: 
     706                self.subplot.set_xlim(x_range) 
     707                self.subplot.set_ylim(y_range) 
     708                self.subplot.figure.canvas.draw_idle() 
     709        d.Destroy() 
     710 
    689711    def onFreeze(self, event): 
    690712        """ 
Note: See TracChangeset for help on using the changeset viewer.