Merge branch 'master' into singularity

graphs/gui/canvasPanel.py

@@ -188,6 +188,7 @@ class GraphCanvasPanel(wx.Panel):
             if minX is not None and maxX is not None:
                 minY = min(allYs, default=None)
                 maxY = max(allYs, default=None)
+                yDiff = (maxY or 0) - (minY or 0)
                 xMark = max(min(self.xMark, maxX), minX)
                 # If in top 10% of X coordinates, align labels differently
                 if xMark > canvasMinX + 0.9 * (canvasMaxX - canvasMinX):
@@ -214,7 +215,12 @@ class GraphCanvasPanel(wx.Panel):
                 def addYMark(val):
                     if val is None:
                         return
-                    rounded = roundToPrec(val, 4)
+                    # Round according to shown Y range - the bigger the range,
+                    # the rougher the rounding
+                    if yDiff != 0:
+                        rounded = roundToPrec(val, 4, nsValue=yDiff)
+                    else:
+                        rounded = val
                     # If due to some bug or insufficient plot density we're
                     # out of bounds, do not add anything
                     if minY <= val <= maxY or minY <= rounded <= maxY:

graphs/gui/frame.py

@@ -38,6 +38,9 @@ from .ctrlPanel import GraphControlPanel
 pyfalog = Logger(__name__)
 
 
+REDRAW_DELAY = 500
+
+
 class GraphFrame(AuxiliaryFrame):
 
     def __init__(self, parent):
@@ -45,7 +48,7 @@ class GraphFrame(AuxiliaryFrame):
             pyfalog.warning('Matplotlib is not enabled. Skipping initialization.')
             return
 
-        super().__init__(parent, title='Graphs', style=wx.RESIZE_BORDER, size=(520, 390))
+        super().__init__(parent, title='Graphs', size=(520, 390), resizeable=True)
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
 
         self.SetIcon(wx.Icon(BitmapLoader.getBitmap('graphs_small', 'gui')))
@@ -90,6 +93,9 @@ class GraphFrame(AuxiliaryFrame):
         self.mainFrame.Bind(GE.GRAPH_OPTION_CHANGED, self.OnGraphOptionChanged)
         self.mainFrame.Bind(GE.EFFECTIVE_HP_TOGGLED, self.OnEffectiveHpToggled)
 
+        self.drawTimer = wx.Timer(self)
+        self.Bind(wx.EVT_TIMER, self.OnDrawTimer, self.drawTimer)
+
         self.Layout()
         self.UpdateWindowSize()
         self.draw()
@@ -128,7 +134,10 @@ class GraphFrame(AuxiliaryFrame):
         for fitID in event.fitIDs:
             self.clearCache(reason=GraphCacheCleanupReason.fitChanged, extraData=fitID)
         self.ctrlPanel.OnFitChanged(event)
-        self.draw()
+        # Data has to be recalculated - delay redraw
+        # to give time to finish UI update in main window
+        self.drawTimer.Stop()
+        self.drawTimer.Start(REDRAW_DELAY, True)
 
     def OnFitRemoved(self, event):
         event.Skip()
@@ -184,7 +193,10 @@ class GraphFrame(AuxiliaryFrame):
             self.ctrlPanel.refreshAxeLabels(restoreSelection=True)
             self.Layout()
             self.clearCache(reason=GraphCacheCleanupReason.hpEffectivityChanged)
-            self.draw()
+            # Data has to be recalculated - delay redraw
+            # to give time to finish UI update in main window
+            self.drawTimer.Stop()
+            self.drawTimer.Start(REDRAW_DELAY, True)
         # Even if graph is not selected, keep it updated
         for idx in range(self.graphSelection.GetCount()):
             view = self.getView(idx=idx)
@@ -202,6 +214,10 @@ class GraphFrame(AuxiliaryFrame):
         self.draw()
         event.Skip()
 
+    def OnDrawTimer(self, event):
+        event.Skip()
+        self.draw()
+
     def OnClose(self, event):
         self.mainFrame.Unbind(GE.FIT_RENAMED, handler=self.OnFitRenamed)
         self.mainFrame.Unbind(GE.FIT_CHANGED, handler=self.OnFitChanged)