Changeset 9c0f3c17 in sasview for src/sas/sasgui/plottools/canvas.py

Timestamp:

Apr 4, 2017 12:50:04 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:

f2940c4

Parents:

463e7ffc (diff), 1779e72 (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:

After merge conflict

File:

• src/sas/sasgui/plottools/canvas.py (modified) (3 diffs)

src/sas/sasgui/plottools/canvas.py

@@ -11 +11 @@
 from matplotlib.backends.backend_wx import RendererWx
 
+logger = logging.getLogger(__name__)
+
 
 def draw_image(self, x, y, im, bbox, clippath=None, clippath_trans=None):
@@ -96 +98 @@
             dc.DrawBitmap(self.canvas.bitmap, (0, 0))
         except:
-            logging.error(sys.exc_value)
+            logger.error(sys.exc_value)
 
     # restore original figure  resolution
@@ -207 +209 @@
                 fig.draw(self)
             except ValueError:
-                logging.error(sys.exc_value)
+                logger.error(sys.exc_value)
         else:
             self._isRendered = False