Merge branch 'FER_7618' into amdadev

Benjamin Renard
2 parents c22a2dbd ee9a5027
Showing 3 changed files with 62 additions and 3 deletions Show diff stats
src/ParamOutputImpl/Plot/ColorAxis.cc
src/ParamOutputImpl/Plot/ColorAxis.hh
src/ParamOutputImpl/Plot/PanelPlotOutput.cc
@@ -36,3 +36,26 @@ ColorAxis::Format ColorAxis::getFormat()
 	return DigitalAxis::Format::SCIENTIFIC;
 }
  
+void ColorAxis::writeContext(ContextFileWriter& writer) {
+	writer.startElement("axis");
+
+	writer.addAttribute("id", _id.c_str());
+
+	writer.addAttribute("logarithmic", (_scale == Scale::LOGARITHMIC) ? "true" : "false");
+
+	std::ostringstream outMin;
+	outMin << std::setprecision(12) << getRange().getMin();
+	std::ostringstream outMax;
+	outMax << std::setprecision(12) << getRange().getMax();
+
+	writer.addAttribute("min", outMin.str().c_str());
+	writer.addAttribute("max", outMax.str().c_str());
+	std::ostringstream colorListStr;
+	
+	for (unsigned int i(0); i < _colorsList.size(); ++i){
+		colorListStr << "[" <<  _colorsList[i][0] << "," <<  _colorsList[i][1] << "," << _colorsList[i][2] << "]|";
+	}
+	writer.addAttribute("colorsList",colorListStr.str().c_str());
+
+	writer.endElement();
+}
 \ No newline at end of file
@@ -48,10 +48,27 @@ public:
 		return _maxValColor;
 	}
  
+	// Getter function to retrieve the colorsList
+	const std::vector<std::array<int, 3>>& getColorsList() const {
+		return _colorsList;
+	}
+
+	// Setter function to set the colorsList
+	void setColorsList(const std::vector<std::array<int, 3>>& newList) {
+		_colorsList = newList;
+	}
+
+	/**
+	 * @brief Write axis context
+	 */
+	void writeContext(ContextFileWriter& writer);
+
 private :
 	Color _minValColor;
  
 	Color _maxValColor;
+
+	std::vector<std::array<int, 3>> _colorsList;
 };
  
 } /* namespace plot */
@@ -1120,6 +1120,17 @@ namespace plot
 		_pls->spal1(
 			ColormapManager::getInstance().getColorAxis(pZAxis->_color._colorMapIndex).c_str(), true);
  
+
+		PLStream *p_pls = NULL;
+		plgpls(&p_pls);
+
+		std::vector<std::array<int,3>> colorsList;
+		for (int i = 0; i < p_pls->ncol1; i++ ) {
+			colorsList.push_back({(int)p_pls->cmap1[i].r ,(int)p_pls->cmap1[i].g,(int)p_pls->cmap1[i].b});
+		}
+		// Get colored axis
+		boost::shared_ptr<ColorAxis> lZAxis = _panel->getColorAxis();
+		lZAxis->setColorsList(colorsList);
 		// set color bar and legend position
 		PLINT position = PL_POSITION_OUTSIDE | PL_POSITION_VIEWPORT;
 		PLINT label_opts[1];
@@ -2366,7 +2377,11 @@ namespace plot
 				writer.addAttribute("width", std::to_string(_plotAreaBounds._width * std::get<0>(_panel->_page->getSize())).c_str());
 				writer.addAttribute("height", std::to_string(_plotAreaBounds._height * std::get<1>(_panel->_page->getSize())).c_str());
 			}
-
+			std::ostringstream plotAreaBGColorStr;
+			plotAreaBGColorStr  << "[" << _panel->_plotAreaBackgroundColor._red << ","
+								<< _panel->_plotAreaBackgroundColor._green << ","
+								<< _panel->_plotAreaBackgroundColor._blue << "]";
+			writer.addAttribute("plotAreaBackgroundColor", plotAreaBGColorStr.str().c_str());
 			writer.addAttribute("hasSpectro", hasSpectro ? "true" : "false");
 			writer.addAttribute("hasSauvaud", hasSauvaud ? "true" : "false");
  
@@ -2377,8 +2392,12 @@ namespace plot
 				if (lAxis == nullptr)
 					continue;
  
-				if (lAxis->_visible && lAxis->_used)
-					lAxis->writeContext(writer);
+				if (lAxis->_visible && lAxis->_used){
+					if(lAxis->isZAxis())
+						_panel->getColorAxis()->writeContext(writer);
+					else
+						lAxis->writeContext(writer);
+				}
 			}
  
 			writer.endElement();