Ignore:
Timestamp:
Apr 4, 2017 1:10:30 PM (8 years ago)
Author:
Ricardo Ferraz Leal <ricleal@…>
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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
01febaf
Parents:
9c0f3c17 (diff), dd11014 (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 github.com:SasView/sasview into logger

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/plottools/PlotPanel.py

    r9a5097c r9c0f3c17  
    3333from sas.sasgui.guiframe.events import StatusEvent 
    3434from .toolbar import NavigationToolBar, PlotPrintout, bind 
     35 
     36logger = logging.getLogger(__name__) 
    3537 
    3638def show_tree(obj, d=0): 
     
    15061508                    from mpl_toolkits.mplot3d import Axes3D 
    15071509                except: 
    1508                     logging.error("PlotPanel could not import Axes3D") 
     1510                    logger.error("PlotPanel could not import Axes3D") 
    15091511                self.subplot.figure.clear() 
    15101512                ax = Axes3D(self.subplot.figure) 
Note: See TracChangeset for help on using the changeset viewer.