Update SysMon to version 0.29

Refs #9843
mantidproject · Jan 8, 2015 · c15e56f · c15e56f
1 parent 29faf67
commit c15e56f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Code/Mantid/MantidPlot/SysMon/_version.py b/Code/Mantid/MantidPlot/SysMon/_version.py
@@ -1,4 +1,4 @@
 #File to identify the current version of the software
 #Note that this file must be manually updated to contain the same
 #version number as the git tag for the check-in.
-__version__="v0.28"
+__version__="v0.29"
diff --git a/Code/Mantid/MantidPlot/SysMon/sysmon.py b/Code/Mantid/MantidPlot/SysMon/sysmon.py
@@ -119,7 +119,8 @@ def __init__(self, parent=None):
             #create drawing canvas
             # a figure instance to plot on
 
-            if not re.match('1.[0-1]',matplotlib.__version__):
+            #rc_context in matplotlib requires version 1.2.0 or later, so check we don't have an older version of matplotlib
+            if not re.match('1.[0-1]',matplotlib.__version__) and not re.match('0.',matplotlib.__version__):
                 #if not an old version of matplotlib, then use the following command 
                 matplotlib.rc_context({'toolbar':False})
             #initialize figure 1 and its canvas for cpu and memory history plots
@@ -163,7 +164,7 @@ def __init__(self, parent=None):
         self.ui.tabWidget.setCurrentIndex(config.SYST_TAB)
 
         #initialize version label
-        self.ui.labelVersion.setText("Version: "+__version__+"_"+psutil.__version__)
+        self.ui.labelVersion.setText("Version: "+__version__+"_"+matplotlib.__version__+"_"+psutil.__version__)
 
     def constantUpdate(self):
         #redirct to global function