Changeset 2603
- Timestamp:
- 07/20/12 12:39:13 (12 years ago)
- Location:
- trunk/python
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/python/asapplotter.py
r2602 r2603 1624 1624 self._data = scan 1625 1625 self._reset() 1626 elif self._data: 1627 scan = self._data 1628 else: 1626 elif not self._data: 1629 1627 msg = "Input is not a scantable" 1630 1628 raise TypeError(msg) … … 1758 1756 self._plotter.set_panels(rows=self._rows,cols=self._cols, 1759 1757 nplots=ntotpl,margin=self._margins,ganged=True) 1760 if self.casabar_exists(): self._plotter.figmgr.casabar.disable_button() 1758 if self.casabar_exists(): 1759 #self._plotter.figmgr.casabar.disable_button() 1760 self._plotter.figmgr.casabar.set_pagecounter(1) 1761 self._plotter.figmgr.casabar.enable_button() 1761 1762 # Actual plot 1762 1763 npl = 0 … … 1787 1788 linestyle=0,linestyles=self._linestyles) 1788 1789 xlab = self._abcissa and self._abcissa[ipanel] \ 1789 or s can._getabcissalabel(irow)1790 or self._data._getabcissalabel(irow) 1790 1791 if self._offset and not self._abcissa: 1791 1792 xlab += " (relative)" 1792 1793 ylab = self._ordinate and self._ordinate[ipanel] \ 1793 or s can._get_ordinate_label()1794 or self._data._get_ordinate_label() 1794 1795 self._plotter.set_axes('xlabel', xlab) 1795 1796 self._plotter.set_axes('ylabel', ylab) … … 1799 1800 self._plotter.set_axes('title',lbl) 1800 1801 1801 y = s can._getspectrum(irow)1802 y = self._data._getspectrum(irow) 1802 1803 # flag application 1803 mr = s can._getflagrow(irow)1804 mr = self._data._getflagrow(irow) 1804 1805 if mr: # FLAGROW=True 1805 1806 y = ma.masked_array(y,mask=mr) 1806 1807 else: 1807 m = s can._getmask(irow)1808 m = self._data._getmask(irow) 1808 1809 from numpy import logical_not, logical_and 1809 1810 ### user mask is not available so far … … 1813 1814 y = ma.masked_array(y,mask=logical_not(array(m,copy=False))) 1814 1815 1815 x = array(s can._getabcissa(irow))1816 x = array(self._data._getabcissa(irow)) 1816 1817 if self._offset: 1817 1818 x += self._offset -
trunk/python/customgui_qt4agg.py
r2173 r2603 131 131 self.mode = 'none' 132 132 self.spec_show() 133 if not self.button: 134 self.notewin.close_widgets() 135 self.__disconnect_event() 133 136 return 134 137 self.figmgr.toolbar.set_message("text: select a position/text") … … 662 665 self.mode = 'none' 663 666 self.spec_show() 667 if not self.button: 668 self.notewin.close_widgets() 669 self.__disconnect_event() 664 670 return 665 671 self.figmgr.toolbar.set_message('text: select a position/text') -
trunk/python/customgui_tkagg.py
r2416 r2603 117 117 def modify_note(self): 118 118 if not self.figmgr.toolbar.mode == '': return 119 self.figmgr.toolbar.set_message('text: select a position/text')120 119 if self.mode == 'note': 121 120 self.bNote.config(relief='raised') 122 121 self.mode = 'none' 123 122 self.spec_show() 123 if not self.button: 124 self.notewin.close_widgets() 125 self.__disconnect_event() 124 126 return 127 self.figmgr.toolbar.set_message('text: select a position/text') 125 128 #self.bSpec.config(relief='raised') 126 129 self.bStat.config(relief='raised') … … 603 606 self.mode = 'none' 604 607 self.spec_show() 608 if not self.button: 609 self.notewin.close_widgets() 610 self.__disconnect_event() 605 611 return 606 612 self.figmgr.toolbar.set_message('text: select a position/text')
Note:
See TracChangeset
for help on using the changeset viewer.