Merge remote-tracking branch 'origin/feature/8478_Keep_last_used_colo…

…r_map'
mantidproject · Nov 22, 2013 · 6f19f05 · 6f19f05
2 parents 26086e3 + 95c3445
commit 6f19f05
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 259 deletions.
diff --git a/Code/Mantid/Installers/colormaps/_standard.map b/Code/Mantid/Installers/colormaps/_standard.map
diff --git a/Code/Mantid/MantidPlot/src/Spectrogram.cpp b/Code/Mantid/MantidPlot/src/Spectrogram.cpp
@@ -304,9 +304,26 @@ void Spectrogram::setGrayScale()
 
 void Spectrogram::setDefaultColorMap()
 {
-  //Use the default (__standard) colormap from MantidColorMap.
-  mColorMap.setupDefaultMap();
+  // option 1 use last used colour map
+  QSettings settings;
+  settings.beginGroup("Mantid/2DPlotSpectrogram");
+  //Load Colormap. If the file is invalid the default stored colour map is used
+  QString lastColormapFile = settings.value("ColormapFile", "").toString();
+  settings.endGroup();
+
+  if (lastColormapFile.size() > 0)
+  {
+      mCurrentColorMap = lastColormapFile;
+      mColorMap.loadMap(lastColormapFile);
+  }
+  else
+  {
+    //option 2 use the default colormap from MantidColorMap.
+    mColorMap.setupDefaultMap();
+  }
+
   setColorMap(mColorMap);
+
   color_map_policy = Default;
 
   QwtPlot *plot = this->plot();

diff --git a/Code/Mantid/scripts/Examples/InstrumentView_Example.py b/Code/Mantid/scripts/Examples/InstrumentView_Example.py
@@ -7,7 +7,7 @@
 
 insView = getInstrumentView("LOQTest")
 
-#insView.changeColorMap("../../../repo/Code/Mantid/Installers/colormaps/_standard.map")   # Change to the correct path
+#insView.changeColorMap("../../../repo/Code/Mantid/Installers/colormaps/Jet.map")   # Change to the correct path
 
 insView.setColorMapRange(0.,195)
 # Or can set a minimum and maximum separately