CDPP / AMDA_Kernel

Commit d3aadfc2e0d91eba8c0d337d0132c1d8b24ddb14

Authored by Benjamin Renard
2 parents 46ee40b3 1af9b64b
Exists in master and in 60 other branches 10038, 10098, 5390, 7616, 7875, 8459, 8528, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 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, cu2022, das2, density_maps, develop, evol_9042, feature/9259, test-merge, ubuntu

Merge branch 'develop' of https://gitlab.irap.omp.eu/CDPP/AMDA_Kernel into develop

Showing 1 changed file with 14 additions and 0 deletions   Show diff stats
Inline Side-by-side
src/ParamOutputImpl/Plot/TimeAxis.cc
  Diff comments   View file @d3aadfc
... ... @@ -169,6 +169,20 @@ std::string getPlTimeFormat(std::string userFormat, double startTime,
169 169 return "%d/%H:%M";
170 170 }
171 171 return "%d/%m/%Y";
  172 + }else if(userFormat == "yyyy/dd/mm" ){
  173 + if (!std::isnan(numberOfMajorTicks)
  174 + && interval / TimeAxis::SECONDS_IN_DAY
  175 + < numberOfMajorTicks) {
  176 + return "%d/%H:%M";
  177 + }
  178 + return "%Y/%m/%d";
  179 + }else if(userFormat == "yyyy-dd-mm" ){
  180 + if (!std::isnan(numberOfMajorTicks)
  181 + && interval / TimeAxis::SECONDS_IN_DAY
  182 + < numberOfMajorTicks) {
  183 + return "%d/%H:%M";
  184 + }
  185 + return "%Y-%m-%d";
172 186 }else {
173 187 if (!std::isnan(numberOfMajorTicks)
174 188 && interval / TimeAxis::SECONDS_IN_DAY
... ...