Commit 00cbd421727a972c8c261b0d49d19946333989b1
1 parent
3ff2d228
Exists in
master
and in
50 other branches
Merge #9751 - Format de date ISO pour les plots
Showing
1 changed file
with
14 additions
and
0 deletions
Show diff stats
src/ParamOutputImpl/Plot/TimeAxis.cc
... | ... | @@ -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 | ... | ... |