CDPP / AMDA_Kernel

Commit 724e3c7a228bdf3edc01e64b1911986dee7f43a9

Authored by Benjamin Renard
1 parent f1cd4937
Exists in master and in 90 other branches 10038, 10098, 5390, 5770, 6728, 7616, 7811, 7875, 8034_7628, 8038, 8041, 8045_8044, 8295, 8459, 8528, 8928, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 9347, 9383, 9719, 9719.new, AllLegends, CDF_ISTP, CDF_ISTP_HOPEFULLY_ALL_WORKING, FER_10400, FER_10412, FER_10663, FER_10765, FER_11000, FER_11100, FER_11242, FER_11277, FER_11500, FER_11537, FER_11588, FER_11651, FER_19836, FER_5344, FER_6031, FER_6598, FER_6966, FER_7318, FER_7618, FER_7857, FER_8455, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, JUNO_JEDI, MAZ_10936, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, amdadev, amdadev_test, cu2022, das2, density_maps, develop, evol_9042, expression-parser-bre, feature/9259, frames-transformation, pickle, rm_5776, rm_6015, rm_6599, rm_6616, rm_6616_bis, rm_6912, rm_7926, rm_8050, rm_8932, shue, shue97, sum-components-indexes, test-merge, tickplot, ubuntu

Give the possibility to define resolution for a spectro (#6832)

Showing 2 changed files with 9 additions and 1 deletions   Show diff stats
Inline Side-by-side
config/xsd/request/plot.xsd
  Diff comments   View file @724e3c7
@@ -869,6 +869,7 @@ Note : This attribute may be unecessary since kind of line may be deduce from Pl @@ -869,6 +869,7 @@ Note : This attribute may be unecessary since kind of line may be deduce from Pl
869 <xs:complexType name="ParameterSpectroPropertiesType"> 869 <xs:complexType name="ParameterSpectroPropertiesType">
870 <xs:attribute name="yAxis" type="xs:string" /> 870 <xs:attribute name="yAxis" type="xs:string" />
871 <xs:attribute name="index" type="xs:string" use="optional"></xs:attribute> 871 <xs:attribute name="index" type="xs:string" use="optional"></xs:attribute>
  872 + <xs:attribute name="resolution" type="xs:integer" use="optional"></xs:attribute>
872 <xs:attribute name="min" type="xs:double" use="optional"></xs:attribute> 873 <xs:attribute name="min" type="xs:double" use="optional"></xs:attribute>
873 <xs:attribute name="max" type="xs:double" use="optional"></xs:attribute> 874 <xs:attribute name="max" type="xs:double" use="optional"></xs:attribute>
874 <xs:attribute name="uselog0asmin" type="xs:boolean" use="optional"></xs:attribute> 875 <xs:attribute name="uselog0asmin" type="xs:boolean" use="optional"></xs:attribute>
src/ParamOutputImpl/Plot/SpectroNode.hh
  Diff comments   View file @724e3c7
@@ -49,9 +49,16 @@ public: @@ -49,9 +49,16 @@ public:
49 std::shared_ptr<SpectroProperties> spectroPropsPtr = 49 std::shared_ptr<SpectroProperties> spectroPropsPtr =
50 std::shared_ptr<SpectroProperties>(new SpectroProperties(defaultProps)); 50 std::shared_ptr<SpectroProperties>(new SpectroProperties(defaultProps));
51 51
52 - // read index definition  
53 xmlChar * value = NULL; 52 xmlChar * value = NULL;
54 53
  54 + // -- parameter resolution
  55 + value = xmlGetProp(pNode_, (const xmlChar *) "resolution");
  56 + if( value ) {
  57 + spectroPropsPtr->setMaxResolution(atoi((const char*)value));
  58 + xmlFree(value);
  59 + }
  60 +
  61 + // read index definition
55 value = xmlGetProp(pNode_, (const xmlChar*) "index"); 62 value = xmlGetProp(pNode_, (const xmlChar*) "index");
56 if (value) { 63 if (value) {
57 spectroPropsPtr->setIndexDef((const char*) value); 64 spectroPropsPtr->setIndexDef((const char*) value);