gwm17/implot
1
0
Fork 0
mirror of https://github.com/gwm17/implot.git synced 2024-11-23 02:38:53 -05:00
Code Issues Projects Releases Wiki Activity

Add Option for ISO 8601 Date Formatting (#132)

Browse Source 
* add support for ISO 8601 timestamps

* clean up work on ISO 8601
This commit is contained in:
Evan Pezent 2020-10-14 22:07:27 -05:00 committed by GitHub
parent ce6d720828
commit f9a15a7147
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 187 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

302
implot.cpp
View File

@ -125,6 +125,7 @@ ImPlotStyle::ImPlotStyle() {
AntiAliasedLines = false; AntiAliasedLines = false;
UseLocalTime = false; UseLocalTime = false;
Use24HourClock = false; Use24HourClock = false;
UseISO8601 = false;
} }
namespace ImPlot { namespace ImPlot {
@ -828,144 +829,99 @@ ImPlotTime CombineDateTime(const ImPlotTime& date_part, const ImPlotTime& tod_pa
static const char* MONTH_NAMES[] = {"January","February","March","April","May","June","July","August","September","October","November","December"}; static const char* MONTH_NAMES[] = {"January","February","March","April","May","June","July","August","September","October","November","December"};
static const char* WD_ABRVS[] = {"Su","Mo","Tu","We","Th","Fr","Sa"}; static const char* WD_ABRVS[] = {"Su","Mo","Tu","We","Th","Fr","Sa"};
static const char* MONTH_ABRVS[] = {"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"}; static const char* MONTH_ABRVS[] = {"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"};
int FormatTime12(const ImPlotTime& t, char* buffer, int size, ImPlotTimeFmt fmt) { int FormatTime(const ImPlotTime& t, char* buffer, int size, ImPlotTimeFmt fmt, bool use_24_hr_clk) {
tm& Tm = GImPlot->Tm; tm& Tm = GImPlot->Tm;
GetTime(t, &Tm); GetTime(t, &Tm);
const char* ap = Tm.tm_hour < 12 ? "am" : "pm";
const int us = t.Us % 1000; const int us = t.Us % 1000;
const int ms = t.Us / 1000; const int ms = t.Us / 1000;
const int sec = Tm.tm_sec; const int sec = Tm.tm_sec;
const int min = Tm.tm_min; const int min = Tm.tm_min;
const int hr = (Tm.tm_hour == 0 || Tm.tm_hour == 12) ? 12 : Tm.tm_hour % 12; if (use_24_hr_clk) {
const int day = Tm.tm_mday; const int hr = Tm.tm_hour;
const int mon = Tm.tm_mon + 1; switch(fmt) {
const int year = Tm.tm_year + 1900; case ImPlotTimeFmt_Us: return snprintf(buffer, size, ".%03d %03d", ms, us);
const int yr = year % 100; case ImPlotTimeFmt_SUs: return snprintf(buffer, size, ":%02d.%03d %03d", sec, ms, us);
case ImPlotTimeFmt_SMs: return snprintf(buffer, size, ":%02d.%03d", sec, ms);
switch(fmt) { case ImPlotTimeFmt_S: return snprintf(buffer, size, ":%02d", sec);
case ImPlotTimeFmt_Us: return snprintf(buffer, size, ".%03d %03d", ms, us); case ImPlotTimeFmt_HrMinSMs: return snprintf(buffer, size, "%02d:%02d:%02d.%03d", hr, min, sec, ms);
case ImPlotTimeFmt_SUs: return snprintf(buffer, size, ":%02d.%03d %03d", sec, ms, us); case ImPlotTimeFmt_HrMinS: return snprintf(buffer, size, "%02d:%02d:%02d", hr, min, sec);
case ImPlotTimeFmt_SMs: return snprintf(buffer, size, ":%02d.%03d", sec, ms); case ImPlotTimeFmt_HrMin: return snprintf(buffer, size, "%02d:%02d", hr, min);
case ImPlotTimeFmt_S: return snprintf(buffer, size, ":%02d", sec); case ImPlotTimeFmt_Hr: return snprintf(buffer, size, "%02d:00", hr);
case ImPlotTimeFmt_HrMinSMs: return snprintf(buffer, size, "%d:%02d:%02d.%03d%s", hr, min, sec, ms, ap); default: return 0;
case ImPlotTimeFmt_HrMinS: return snprintf(buffer, size, "%d:%02d:%02d%s", hr, min, sec, ap); }
case ImPlotTimeFmt_HrMin: return snprintf(buffer, size, "%d:%02d%s", hr, min, ap); }
case ImPlotTimeFmt_Hr: return snprintf(buffer, size, "%d%s", hr, ap); else {
case ImPlotTimeFmt_DayMo: return snprintf(buffer, size, "%d/%d", mon, day); const char* ap = Tm.tm_hour < 12 ? "am" : "pm";
case ImPlotTimeFmt_DayMoHr: return snprintf(buffer, size, "%d/%d %d%s", mon, day, hr, ap); const int hr = (Tm.tm_hour == 0 || Tm.tm_hour == 12) ? 12 : Tm.tm_hour % 12;
case ImPlotTimeFmt_DayMoHrMin: return snprintf(buffer, size, "%d/%d %d:%02d%s", mon, day, hr, min, ap); switch(fmt) {
case ImPlotTimeFmt_DayMoYr: return snprintf(buffer, size, "%d/%d/%02d", mon, day, yr); case ImPlotTimeFmt_Us: return snprintf(buffer, size, ".%03d %03d", ms, us);
case ImPlotTimeFmt_DayMoYrHrMin: return snprintf(buffer, size, "%d/%d/%02d %d:%02d%s", mon, day, yr, hr, min, ap); case ImPlotTimeFmt_SUs: return snprintf(buffer, size, ":%02d.%03d %03d", sec, ms, us);
case ImPlotTimeFmt_DayMoYrHrMinS: return snprintf(buffer, size, "%d/%d/%02d %d:%02d:%02d%s", mon, day, yr, hr, min, sec, ap); case ImPlotTimeFmt_SMs: return snprintf(buffer, size, ":%02d.%03d", sec, ms);
case ImPlotTimeFmt_DayMoYrHrMinSUs: return snprintf(buffer, size, "%d/%d/%d %d:%02d:%02d.%03d%03d%s", mon, day, year, hr, min, sec, ms, us, ap); case ImPlotTimeFmt_S: return snprintf(buffer, size, ":%02d", sec);
case ImPlotTimeFmt_MoYr: return snprintf(buffer, size, "%s %d", MONTH_ABRVS[Tm.tm_mon], year); case ImPlotTimeFmt_HrMinSMs: return snprintf(buffer, size, "%d:%02d:%02d.%03d%s", hr, min, sec, ms, ap);
case ImPlotTimeFmt_Mo: return snprintf(buffer, size, "%s", MONTH_ABRVS[Tm.tm_mon]); case ImPlotTimeFmt_HrMinS: return snprintf(buffer, size, "%d:%02d:%02d%s", hr, min, sec, ap);
case ImPlotTimeFmt_Yr: return snprintf(buffer, size, "%d", year); case ImPlotTimeFmt_HrMin: return snprintf(buffer, size, "%d:%02d%s", hr, min, ap);
default: return 0; case ImPlotTimeFmt_Hr: return snprintf(buffer, size, "%d%s", hr, ap);
default: return 0;
}
} }
} }
int FormatTime24(const ImPlotTime& t, char* buffer, int size, ImPlotTimeFmt fmt) { int FormatDate(const ImPlotTime& t, char* buffer, int size, ImPlotDateFmt fmt, bool use_iso_8601) {
tm& Tm = GImPlot->Tm; tm& Tm = GImPlot->Tm;
GetTime(t, &Tm); GetTime(t, &Tm);
const int us = t.Us % 1000;
const int ms = t.Us / 1000;
const int sec = Tm.tm_sec;
const int min = Tm.tm_min;
const int hr = Tm.tm_hour;
const int day = Tm.tm_mday; const int day = Tm.tm_mday;
const int mon = Tm.tm_mon + 1; const int mon = Tm.tm_mon + 1;
const int year = Tm.tm_year + 1900; const int year = Tm.tm_year + 1900;
const int yr = year % 100; const int yr = year % 100;
if (use_iso_8601) {
switch(fmt) { switch (fmt) {
case ImPlotTimeFmt_Us: return snprintf(buffer, size, ".%03d %03d", ms, us); case ImPlotDateFmt_DayMo: return snprintf(buffer, size, "--%02d-%02d", mon, day);
case ImPlotTimeFmt_SUs: return snprintf(buffer, size, ":%02d.%03d %03d", sec, ms, us); case ImPlotDateFmt_DayMoYr: return snprintf(buffer, size, "%d-%02d-%02d", year, mon, day);
case ImPlotTimeFmt_SMs: return snprintf(buffer, size, ":%02d.%03d", sec, ms); case ImPlotDateFmt_MoYr: return snprintf(buffer, size, "%d-%02d", year, mon);
case ImPlotTimeFmt_S: return snprintf(buffer, size, ":%02d", sec); case ImPlotDateFmt_Mo: return snprintf(buffer, size, "--%02d-01", mon);
case ImPlotTimeFmt_HrMinSMs: return snprintf(buffer, size, "%02d:%02d:%02d.%03d", hr, min, sec, ms); case ImPlotDateFmt_Yr: return snprintf(buffer, size, "%d", year);
case ImPlotTimeFmt_HrMinS: return snprintf(buffer, size, "%02d:%02d:%02d", hr, min, sec); default: return 0;
case ImPlotTimeFmt_HrMin: return snprintf(buffer, size, "%02d:%02d", hr, min); }
case ImPlotTimeFmt_Hr: return snprintf(buffer, size, "%02d:00", hr);
case ImPlotTimeFmt_DayMo: return snprintf(buffer, size, "%d/%d", mon, day);
case ImPlotTimeFmt_DayMoHr: return snprintf(buffer, size, "%d/%d %02d:00", mon, day, hr);
case ImPlotTimeFmt_DayMoHrMin: return snprintf(buffer, size, "%d/%d %02d:%02d", mon, day, hr, min);
case ImPlotTimeFmt_DayMoYr: return snprintf(buffer, size, "%d/%d/%02d", mon, day, yr);
case ImPlotTimeFmt_DayMoYrHrMin: return snprintf(buffer, size, "%d/%d/%02d %02d:%02d", mon, day, yr, hr, min);
case ImPlotTimeFmt_DayMoYrHrMinS: return snprintf(buffer, size, "%d/%d/%02d %02d:%02d:%02d", mon, day, yr, hr, min, sec);
case ImPlotTimeFmt_DayMoYrHrMinSUs: return snprintf(buffer, size, "%d/%d/%d %02d:%02d:%02d.%03d%03d", mon, day, year, hr, min, sec, ms, us);
case ImPlotTimeFmt_MoYr: return snprintf(buffer, size, "%s %d", MONTH_ABRVS[Tm.tm_mon], year);
case ImPlotTimeFmt_Mo: return snprintf(buffer, size, "%s", MONTH_ABRVS[Tm.tm_mon]);
case ImPlotTimeFmt_Yr: return snprintf(buffer, size, "%d", year);
default: return 0;
} }
} else {
switch (fmt) {
// Returns the nominally largest possible width for a time format case ImPlotDateFmt_DayMo: return snprintf(buffer, size, "%d/%d", mon, day);
inline float GetTimeLabelWidth12(ImPlotTimeFmt fmt) { case ImPlotDateFmt_DayMoYr: return snprintf(buffer, size, "%d/%d/%02d", mon, day, yr);
switch (fmt) { case ImPlotDateFmt_MoYr: return snprintf(buffer, size, "%s %d", MONTH_ABRVS[Tm.tm_mon], year);
case ImPlotTimeFmt_Us: return ImGui::CalcTextSize(".888 888").x; // .428 552 case ImPlotDateFmt_Mo: return snprintf(buffer, size, "%s", MONTH_ABRVS[Tm.tm_mon]);
case ImPlotTimeFmt_SUs: return ImGui::CalcTextSize(":88.888 888").x; // :29.428 552 case ImPlotDateFmt_Yr: return snprintf(buffer, size, "%d", year);
case ImPlotTimeFmt_SMs: return ImGui::CalcTextSize(":88.888").x; // :29.428 default: return 0;
case ImPlotTimeFmt_S: return ImGui::CalcTextSize(":88").x; // :29 }
case ImPlotTimeFmt_HrMinSMs: return ImGui::CalcTextSize("88:88:88.888pm").x; // 7:21:29.428pm
case ImPlotTimeFmt_HrMinS: return ImGui::CalcTextSize("88:88:88pm").x; // 7:21:29pm
case ImPlotTimeFmt_HrMin: return ImGui::CalcTextSize("88:88pm").x; // 7:21pm
case ImPlotTimeFmt_Hr: return ImGui::CalcTextSize("88pm").x; // 7pm
case ImPlotTimeFmt_DayMo: return ImGui::CalcTextSize("88/88").x; // 10/3
case ImPlotTimeFmt_DayMoHr: return ImGui::CalcTextSize("88/88 88pm").x; // 10/3 7:21pm
case ImPlotTimeFmt_DayMoHrMin: return ImGui::CalcTextSize("88/88 88:88pm").x; // 10/3 7:21pm
case ImPlotTimeFmt_DayMoYr: return ImGui::CalcTextSize("88/88/88").x; // 10/3/1991
case ImPlotTimeFmt_DayMoYrHrMin: return ImGui::CalcTextSize("88/88/88 88:88pm").x; // 10/3/91 7:21pm
case ImPlotTimeFmt_DayMoYrHrMinS: return ImGui::CalcTextSize("88/88/88 88:88:88pm").x; // 10/3/91 7:21:29pm
case ImPlotTimeFmt_DayMoYrHrMinSUs: return ImGui::CalcTextSize("88/88/8888 88:88:88.888888pm").x; // 10/3/1991 7:21:29.123456pm
case ImPlotTimeFmt_MoYr: return ImGui::CalcTextSize("MMM 8888").x; // Oct 1991
case ImPlotTimeFmt_Mo: return ImGui::CalcTextSize("MMM").x; // Oct
case ImPlotTimeFmt_Yr: return ImGui::CalcTextSize("8888").x; // 1991
default: return 0;
} }
} }
// Returns the nominally largest possible width for a time format int FormatDateTime(const ImPlotTime& t, char* buffer, int size, ImPlotDateTimeFmt fmt) {
inline float GetTimeLabelWidth24(ImPlotTimeFmt fmt) { int written = 0;
switch (fmt) { if (fmt.Date != ImPlotDateFmt_None)
case ImPlotTimeFmt_Us: return ImGui::CalcTextSize(".888 888").x; // .428 552 written += FormatDate(t, buffer, size, fmt.Date, fmt.UseISO8601);
case ImPlotTimeFmt_SUs: return ImGui::CalcTextSize(":88.888 888").x; // :29.428 552 if (fmt.Time != ImPlotTimeFmt_None) {
case ImPlotTimeFmt_SMs: return ImGui::CalcTextSize(":88.888").x; // :29.428 if (fmt.Date != ImPlotDateFmt_None)
case ImPlotTimeFmt_S: return ImGui::CalcTextSize(":88").x; // :29 buffer[written++] = ' ';
case ImPlotTimeFmt_HrMinSMs: return ImGui::CalcTextSize("88:88:88.888").x; // 19:21:29.428 written += FormatTime(t, &buffer[written], size - written, fmt.Time, fmt.Use24HourClock);
case ImPlotTimeFmt_HrMinS: return ImGui::CalcTextSize("88:88:88").x; // 19:21:29
case ImPlotTimeFmt_HrMin: return ImGui::CalcTextSize("88:88").x; // 19:21
case ImPlotTimeFmt_Hr: return ImGui::CalcTextSize("88:00").x; // 19:00
case ImPlotTimeFmt_DayMo: return ImGui::CalcTextSize("88/88").x; // 10/3
case ImPlotTimeFmt_DayMoHr: return ImGui::CalcTextSize("88/88 88:00").x; // 10/3 19:00
case ImPlotTimeFmt_DayMoHrMin: return ImGui::CalcTextSize("88/88 88:88").x; // 10/3 19:21
case ImPlotTimeFmt_DayMoYr: return ImGui::CalcTextSize("88/88/88").x; // 10/3/1991
case ImPlotTimeFmt_DayMoYrHrMin: return ImGui::CalcTextSize("88/88/88 88:88").x; // 10/3/91 19:21
case ImPlotTimeFmt_DayMoYrHrMinS: return ImGui::CalcTextSize("88/88/88 88:88:88").x; // 10/3/91 19:21:29
case ImPlotTimeFmt_DayMoYrHrMinSUs: return ImGui::CalcTextSize("88/88/8888 88:88:88.888888").x; // 10/3/1991 19:21:29.123456
case ImPlotTimeFmt_MoYr: return ImGui::CalcTextSize("MMM 8888").x; // Oct 1991
case ImPlotTimeFmt_Mo: return ImGui::CalcTextSize("MMM").x; // Oct
case ImPlotTimeFmt_Yr: return ImGui::CalcTextSize("8888").x; // 1991
default: return 0;
} }
return written;
} }
void PrintTime(const ImPlotTime& t, ImPlotTimeFmt fmt) { inline float GetDateTimeWidth(ImPlotDateTimeFmt fmt) {
static char buff[32]; static ImPlotTime t_max_width = MakeTime(2888, 12, 22, 12, 58, 58, 888888); // best guess at time that maximizes pixel width
FormatTime12(t, buff, 32, fmt); char buffer[32];
printf("%s\n",buff); FormatDateTime(t_max_width, buffer, 32, fmt);
return ImGui::CalcTextSize(buffer).x;
} }
inline void LabelTickTime(ImPlotTick& tick, ImGuiTextBuffer& buffer, const ImPlotTime& t, ImPlotTimeFmt fmt, bool hour24) { inline void LabelTickTime(ImPlotTick& tick, ImGuiTextBuffer& buffer, const ImPlotTime& t, ImPlotDateTimeFmt fmt) {
char temp[32]; char temp[32];
if (tick.ShowLabel) { if (tick.ShowLabel) {
tick.TextOffset = buffer.size(); tick.TextOffset = buffer.size();
hour24 ? FormatTime24(t, temp, 32, fmt) : FormatTime12(t, temp, 32, fmt); FormatDateTime(t, temp, 32, fmt);
buffer.append(temp, temp + strlen(temp) + 1); buffer.append(temp, temp + strlen(temp) + 1);
tick.LabelSize = ImGui::CalcTextSize(buffer.Buf.Data + tick.TextOffset); tick.LabelSize = ImGui::CalcTextSize(buffer.Buf.Data + tick.TextOffset);
} }
@ -978,58 +934,66 @@ inline bool TimeLabelSame(const char* l1, const char* l2) {
return strcmp(l1 + len1 - n, l2 + len2 - n) == 0; return strcmp(l1 + len1 - n, l2 + len2 - n) == 0;
} }
static const ImPlotTimeFmt TimeFormatLevel0[ImPlotTimeUnit_COUNT] = { static const ImPlotDateTimeFmt TimeFormatLevel0[ImPlotTimeUnit_COUNT] = {
ImPlotTimeFmt_Us, ImPlotDateTimeFmt(ImPlotDateFmt_None, ImPlotTimeFmt_Us),
ImPlotTimeFmt_SMs, ImPlotDateTimeFmt(ImPlotDateFmt_None, ImPlotTimeFmt_SMs),
ImPlotTimeFmt_S, ImPlotDateTimeFmt(ImPlotDateFmt_None, ImPlotTimeFmt_S),
ImPlotTimeFmt_HrMin, ImPlotDateTimeFmt(ImPlotDateFmt_None, ImPlotTimeFmt_HrMin),
ImPlotTimeFmt_Hr, ImPlotDateTimeFmt(ImPlotDateFmt_None, ImPlotTimeFmt_Hr),
ImPlotTimeFmt_DayMo, ImPlotDateTimeFmt(ImPlotDateFmt_DayMo, ImPlotTimeFmt_None),
ImPlotTimeFmt_Mo, ImPlotDateTimeFmt(ImPlotDateFmt_Mo, ImPlotTimeFmt_None),
ImPlotTimeFmt_Yr ImPlotDateTimeFmt(ImPlotDateFmt_Yr, ImPlotTimeFmt_None)
}; };
static const ImPlotTimeFmt TimeFormatLevel1[ImPlotTimeUnit_COUNT] = { static const ImPlotDateTimeFmt TimeFormatLevel1[ImPlotTimeUnit_COUNT] = {
ImPlotTimeFmt_HrMin, ImPlotDateTimeFmt(ImPlotDateFmt_None, ImPlotTimeFmt_HrMin),
ImPlotTimeFmt_HrMinS, ImPlotDateTimeFmt(ImPlotDateFmt_None, ImPlotTimeFmt_HrMinS),
ImPlotTimeFmt_HrMin, ImPlotDateTimeFmt(ImPlotDateFmt_None, ImPlotTimeFmt_HrMin),
ImPlotTimeFmt_HrMin, ImPlotDateTimeFmt(ImPlotDateFmt_None, ImPlotTimeFmt_HrMin),
ImPlotTimeFmt_DayMoYr, ImPlotDateTimeFmt(ImPlotDateFmt_DayMoYr, ImPlotTimeFmt_None),
ImPlotTimeFmt_DayMoYr, ImPlotDateTimeFmt(ImPlotDateFmt_DayMoYr, ImPlotTimeFmt_None),
ImPlotTimeFmt_Yr, ImPlotDateTimeFmt(ImPlotDateFmt_Yr, ImPlotTimeFmt_None),
ImPlotTimeFmt_Yr ImPlotDateTimeFmt(ImPlotDateFmt_Yr, ImPlotTimeFmt_None)
}; };
static const ImPlotTimeFmt TimeFormatLevel1First[ImPlotTimeUnit_COUNT] = { static const ImPlotDateTimeFmt TimeFormatLevel1First[ImPlotTimeUnit_COUNT] = {
ImPlotTimeFmt_DayMoYrHrMinS, ImPlotDateTimeFmt(ImPlotDateFmt_DayMoYr, ImPlotTimeFmt_HrMinS),
ImPlotTimeFmt_DayMoYrHrMinS, ImPlotDateTimeFmt(ImPlotDateFmt_DayMoYr, ImPlotTimeFmt_HrMinS),
ImPlotTimeFmt_DayMoYrHrMin, ImPlotDateTimeFmt(ImPlotDateFmt_DayMoYr, ImPlotTimeFmt_HrMin),
ImPlotTimeFmt_DayMoYrHrMin, ImPlotDateTimeFmt(ImPlotDateFmt_DayMoYr, ImPlotTimeFmt_HrMin),
ImPlotTimeFmt_DayMoYr, ImPlotDateTimeFmt(ImPlotDateFmt_DayMoYr, ImPlotTimeFmt_None),
ImPlotTimeFmt_DayMoYr, ImPlotDateTimeFmt(ImPlotDateFmt_DayMoYr, ImPlotTimeFmt_None),
ImPlotTimeFmt_Yr, ImPlotDateTimeFmt(ImPlotDateFmt_Yr, ImPlotTimeFmt_None),
ImPlotTimeFmt_Yr ImPlotDateTimeFmt(ImPlotDateFmt_Yr, ImPlotTimeFmt_None)
}; };
static const ImPlotTimeFmt TimeFormatMouseCursor[ImPlotTimeUnit_COUNT] = { static const ImPlotDateTimeFmt TimeFormatMouseCursor[ImPlotTimeUnit_COUNT] = {
ImPlotTimeFmt_Us, ImPlotDateTimeFmt(ImPlotDateFmt_None, ImPlotTimeFmt_Us),
ImPlotTimeFmt_SUs, ImPlotDateTimeFmt(ImPlotDateFmt_None, ImPlotTimeFmt_SUs),
ImPlotTimeFmt_SMs, ImPlotDateTimeFmt(ImPlotDateFmt_None, ImPlotTimeFmt_SMs),
ImPlotTimeFmt_HrMinS, ImPlotDateTimeFmt(ImPlotDateFmt_None, ImPlotTimeFmt_HrMinS),
ImPlotTimeFmt_HrMin, ImPlotDateTimeFmt(ImPlotDateFmt_None, ImPlotTimeFmt_HrMin),
ImPlotTimeFmt_DayMoHr, ImPlotDateTimeFmt(ImPlotDateFmt_DayMo, ImPlotTimeFmt_Hr),
ImPlotTimeFmt_DayMoYr, ImPlotDateTimeFmt(ImPlotDateFmt_DayMoYr, ImPlotTimeFmt_None),
ImPlotTimeFmt_MoYr ImPlotDateTimeFmt(ImPlotDateFmt_MoYr, ImPlotTimeFmt_None)
}; };
void AddTicksTime(const ImPlotRange& range, float plot_width, bool hour24, ImPlotTickCollection& ticks) { inline ImPlotDateTimeFmt GetDateTimeFmt(const ImPlotDateTimeFmt* ctx, ImPlotTimeUnit idx) {
ImPlotStyle& style = GetStyle();
ImPlotDateTimeFmt fmt = ctx[idx];
fmt.UseISO8601 = style.UseISO8601;
fmt.Use24HourClock = style.Use24HourClock;
return fmt;
}
void AddTicksTime(const ImPlotRange& range, float plot_width, ImPlotTickCollection& ticks) {
// get units for level 0 and level 1 labels // get units for level 0 and level 1 labels
const ImPlotTimeUnit unit0 = GetUnitForRange(range.Size() / (plot_width / 100)); // level = 0 (top) const ImPlotTimeUnit unit0 = GetUnitForRange(range.Size() / (plot_width / 100)); // level = 0 (top)
const ImPlotTimeUnit unit1 = unit0 + 1; // level = 1 (bottom) const ImPlotTimeUnit unit1 = unit0 + 1; // level = 1 (bottom)
// get time format specs // get time format specs
const ImPlotTimeFmt fmt0 = TimeFormatLevel0[unit0]; const ImPlotDateTimeFmt fmt0 = GetDateTimeFmt(TimeFormatLevel0, unit0);
const ImPlotTimeFmt fmt1 = TimeFormatLevel1[unit1]; const ImPlotDateTimeFmt fmt1 = GetDateTimeFmt(TimeFormatLevel1, unit1);
const ImPlotTimeFmt fmtf = TimeFormatLevel1First[unit1]; const ImPlotDateTimeFmt fmtf = GetDateTimeFmt(TimeFormatLevel1First, unit1);
// min max times // min max times
const ImPlotTime t_min = ImPlotTime::FromDouble(range.Min); const ImPlotTime t_min = ImPlotTime::FromDouble(range.Min);
const ImPlotTime t_max = ImPlotTime::FromDouble(range.Max); const ImPlotTime t_max = ImPlotTime::FromDouble(range.Max);
@ -1041,9 +1005,9 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, bool hour24, ImPlo
// pixels per major (level 1) division // pixels per major (level 1) division
const float pix_per_major_div = plot_width / (float)(range.Size() / TimeUnitSpans[unit1]); const float pix_per_major_div = plot_width / (float)(range.Size() / TimeUnitSpans[unit1]);
// nominal pixels taken up by labels // nominal pixels taken up by labels
const float fmt0_width = hour24 ? GetTimeLabelWidth24(fmt0) : GetTimeLabelWidth12(fmt0); const float fmt0_width = GetDateTimeWidth(fmt0);
const float fmt1_width = hour24 ? GetTimeLabelWidth24(fmt1) : GetTimeLabelWidth12(fmt1); const float fmt1_width = GetDateTimeWidth(fmt1);
const float fmtf_width = hour24 ? GetTimeLabelWidth24(fmtf) : GetTimeLabelWidth12(fmtf); const float fmtf_width = GetDateTimeWidth(fmtf);
// the maximum number of minor (level 0) labels that can fit between major (level 1) divisions // the maximum number of minor (level 0) labels that can fit between major (level 1) divisions
const int minor_per_major = (int)(max_density * pix_per_major_div / fmt0_width); const int minor_per_major = (int)(max_density * pix_per_major_div / fmt0_width);
// the minor step size (level 0) // the minor step size (level 0)
@ -1058,12 +1022,12 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, bool hour24, ImPlo
// minor level 0 tick // minor level 0 tick
ImPlotTick tick_min(t1.ToDouble(),true,true); ImPlotTick tick_min(t1.ToDouble(),true,true);
tick_min.Level = 0; tick_min.Level = 0;
LabelTickTime(tick_min,ticks.TextBuffer,t1,fmt0,hour24); LabelTickTime(tick_min,ticks.TextBuffer,t1,fmt0);
ticks.Append(tick_min); ticks.Append(tick_min);
// major level 1 tick // major level 1 tick
ImPlotTick tick_maj(t1.ToDouble(),true,true); ImPlotTick tick_maj(t1.ToDouble(),true,true);
tick_maj.Level = 1; tick_maj.Level = 1;
LabelTickTime(tick_maj,ticks.TextBuffer,t1, last_major == NULL ? fmtf : fmt1,hour24); LabelTickTime(tick_maj,ticks.TextBuffer,t1, last_major == NULL ? fmtf : fmt1);
const char* this_major = ticks.TextBuffer.Buf.Data + tick_maj.TextOffset; const char* this_major = ticks.TextBuffer.Buf.Data + tick_maj.TextOffset;
if (last_major && TimeLabelSame(last_major,this_major)) if (last_major && TimeLabelSame(last_major,this_major))
tick_maj.ShowLabel = false; tick_maj.ShowLabel = false;
@ -1078,12 +1042,12 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, bool hour24, ImPlo
if (t12 >= t_min && t12 <= t_max) { if (t12 >= t_min && t12 <= t_max) {
ImPlotTick tick(t12.ToDouble(),false,px_to_t2 >= fmt0_width); ImPlotTick tick(t12.ToDouble(),false,px_to_t2 >= fmt0_width);
tick.Level = 0; tick.Level = 0;
LabelTickTime(tick,ticks.TextBuffer,t12,fmt0,hour24); LabelTickTime(tick,ticks.TextBuffer,t12,fmt0);
ticks.Append(tick); ticks.Append(tick);
if (last_major == NULL && px_to_t2 >= fmt0_width && px_to_t2 >= (fmt1_width + fmtf_width) / 2) { if (last_major == NULL && px_to_t2 >= fmt0_width && px_to_t2 >= (fmt1_width + fmtf_width) / 2) {
ImPlotTick tick_maj(t12.ToDouble(),true,true); ImPlotTick tick_maj(t12.ToDouble(),true,true);
tick_maj.Level = 1; tick_maj.Level = 1;
LabelTickTime(tick_maj,ticks.TextBuffer,t12,fmtf,hour24); LabelTickTime(tick_maj,ticks.TextBuffer,t12,fmtf);
last_major = ticks.TextBuffer.Buf.Data + tick_maj.TextOffset; last_major = ticks.TextBuffer.Buf.Data + tick_maj.TextOffset;
ticks.Append(tick_maj); ticks.Append(tick_maj);
} }
@ -1095,8 +1059,8 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, bool hour24, ImPlo
} }
} }
else { else {
const float label_width = hour24 ? GetTimeLabelWidth24(TimeFormatLevel0[ImPlotTimeUnit_Yr]) : const ImPlotDateTimeFmt fmty = GetDateTimeFmt(TimeFormatLevel0, ImPlotTimeUnit_Yr);
GetTimeLabelWidth12(TimeFormatLevel0[ImPlotTimeUnit_Yr]); const float label_width = GetDateTimeWidth(fmty);
const int max_labels = (int)(max_density * plot_width / label_width); const int max_labels = (int)(max_density * plot_width / label_width);
const int year_min = GetYear(t_min); const int year_min = GetYear(t_min);
const int year_max = GetYear(CeilTime(t_max, ImPlotTimeUnit_Yr)); const int year_max = GetYear(CeilTime(t_max, ImPlotTimeUnit_Yr));
@ -1111,7 +1075,7 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, bool hour24, ImPlo
if (t >= t_min && t <= t_max) { if (t >= t_min && t <= t_max) {
ImPlotTick tick(t.ToDouble(), true, true); ImPlotTick tick(t.ToDouble(), true, true);
tick.Level = 0; tick.Level = 0;
LabelTickTime(tick, ticks.TextBuffer, t, TimeFormatLevel0[ImPlotTimeUnit_Yr], hour24); LabelTickTime(tick, ticks.TextBuffer, t, fmty);
ticks.Append(tick); ticks.Append(tick);
} }
} }
@ -1131,8 +1095,7 @@ int LabelAxisValue(const ImPlotAxis& axis, const ImPlotTickCollection& ticks, do
ImPlotTimeUnit unit = (axis.Direction == ImPlotDirection_Horizontal) ImPlotTimeUnit unit = (axis.Direction == ImPlotDirection_Horizontal)
? GetUnitForRange(axis.Range.Size() / (gp.BB_Plot.GetWidth() / 100)) ? GetUnitForRange(axis.Range.Size() / (gp.BB_Plot.GetWidth() / 100))
: GetUnitForRange(axis.Range.Size() / (gp.BB_Plot.GetHeight() / 100)); : GetUnitForRange(axis.Range.Size() / (gp.BB_Plot.GetHeight() / 100));
return gp.Style.Use24HourClock ? FormatTime24(ImPlotTime::FromDouble(value), buff, size, TimeFormatMouseCursor[unit]) return FormatDateTime(ImPlotTime::FromDouble(value), buff, size, GetDateTimeFmt(TimeFormatMouseCursor, unit));
: FormatTime12(ImPlotTime::FromDouble(value), buff, size, TimeFormatMouseCursor[unit]);
} }
else { else {
double range = ticks.Size > 1 ? (ticks.Ticks[1].PlotPos - ticks.Ticks[0].PlotPos) : axis.Range.Size(); double range = ticks.Size > 1 ? (ticks.Ticks[1].PlotPos - ticks.Ticks[0].PlotPos) : axis.Range.Size();
@ -1345,7 +1308,7 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons
// (4) get x ticks // (4) get x ticks
if (gp.RenderX && gp.NextPlotData.ShowDefaultTicksX) { if (gp.RenderX && gp.NextPlotData.ShowDefaultTicksX) {
if (gp.X.IsTime) if (gp.X.IsTime)
AddTicksTime(plot.XAxis.Range, plot_width, gp.Style.Use24HourClock, gp.XTicks); AddTicksTime(plot.XAxis.Range, plot_width, gp.XTicks);
else if (ImHasFlag(plot.XAxis.Flags, ImPlotAxisFlags_LogScale)) else if (ImHasFlag(plot.XAxis.Flags, ImPlotAxisFlags_LogScale))
AddTicksLogarithmic(plot.XAxis.Range, (int)IM_ROUND(plot_width * 0.01f), gp.XTicks); AddTicksLogarithmic(plot.XAxis.Range, (int)IM_ROUND(plot_width * 0.01f), gp.XTicks);
else else
@ -1806,7 +1769,7 @@ void ShowAxisContextMenu(ImPlotAxisState& state, bool time_allowed) {
ImGui::SameLine(); ImGui::SameLine();
BeginDisabledControls(state.LockMin); BeginDisabledControls(state.LockMin);
if (ImGui::BeginMenu("Min Time")) { if (ImGui::BeginMenu("Min Time")) {
if (ShowTimePicker("mintime", &tmin, GImPlot->Style.Use24HourClock)) { if (ShowTimePicker("mintime", &tmin)) {
if (tmin >= tmax) if (tmin >= tmax)
tmax = AddTime(tmin, ImPlotTimeUnit_S, 1); tmax = AddTime(tmin, ImPlotTimeUnit_S, 1);
axis.SetRange(tmin.ToDouble(),tmax.ToDouble()); axis.SetRange(tmin.ToDouble(),tmax.ToDouble());
@ -1829,7 +1792,7 @@ void ShowAxisContextMenu(ImPlotAxisState& state, bool time_allowed) {
ImGui::SameLine(); ImGui::SameLine();
BeginDisabledControls(state.LockMax); BeginDisabledControls(state.LockMax);
if (ImGui::BeginMenu("Max Time")) { if (ImGui::BeginMenu("Max Time")) {
if (ShowTimePicker("maxtime", &tmax, GImPlot->Style.Use24HourClock)) { if (ShowTimePicker("maxtime", &tmax)) {
if (tmax <= tmin) if (tmax <= tmin)
tmin = AddTime(tmax, ImPlotTimeUnit_S, -1); tmin = AddTime(tmax, ImPlotTimeUnit_S, -1);
axis.SetRange(tmin.ToDouble(),tmax.ToDouble()); axis.SetRange(tmin.ToDouble(),tmax.ToDouble());
@ -2230,8 +2193,7 @@ void EndPlot() {
} }
else if (ImHasFlag(plot.XAxis.Flags, ImPlotAxisFlags_Time)) { else if (ImHasFlag(plot.XAxis.Flags, ImPlotAxisFlags_Time)) {
ImPlotTimeUnit unit = GetUnitForRange(plot.XAxis.Range.Size() / (gp.BB_Plot.GetWidth() / 100)); ImPlotTimeUnit unit = GetUnitForRange(plot.XAxis.Range.Size() / (gp.BB_Plot.GetWidth() / 100));
const int written = gp.Style.Use24HourClock ? FormatTime24(ImPlotTime::FromDouble(gp.MousePos[0].x), &writer.Buffer[writer.Pos], writer.Size - writer.Pos - 1, TimeFormatMouseCursor[unit]) const int written = FormatDateTime(ImPlotTime::FromDouble(gp.MousePos[0].x), &writer.Buffer[writer.Pos], writer.Size - writer.Pos - 1, GetDateTimeFmt(TimeFormatMouseCursor, unit));
: FormatTime12(ImPlotTime::FromDouble(gp.MousePos[0].x), &writer.Buffer[writer.Pos], writer.Size - writer.Pos - 1, TimeFormatMouseCursor[unit]);
if (written > 0) if (written > 0)
writer.Pos += ImMin(written, writer.Size - writer.Pos - 1); writer.Pos += ImMin(written, writer.Size - writer.Pos - 1);
} }
@ -3738,7 +3700,7 @@ bool ShowDatePicker(const char* id, int* level, ImPlotTime* t, const ImPlotTime*
return clk; return clk;
} }
bool ShowTimePicker(const char* id, ImPlotTime* t, bool hour24) { bool ShowTimePicker(const char* id, ImPlotTime* t) {
ImGui::PushID(id); ImGui::PushID(id);
tm& Tm = GImPlot->Tm; tm& Tm = GImPlot->Tm;
GetTime(*t,&Tm); GetTime(*t,&Tm);
@ -3752,6 +3714,8 @@ bool ShowTimePicker(const char* id, ImPlotTime* t, bool hour24) {
static const char* am_pm[] = {"am","pm"}; static const char* am_pm[] = {"am","pm"};
bool hour24 = GImPlot->Style.Use24HourClock;
int hr = hour24 ? Tm.tm_hour : ((Tm.tm_hour == 0 || Tm.tm_hour == 12) ? 12 : Tm.tm_hour % 12); int hr = hour24 ? Tm.tm_hour : ((Tm.tm_hour == 0 || Tm.tm_hour == 12) ? 12 : Tm.tm_hour % 12);
int min = Tm.tm_min; int min = Tm.tm_min;
int sec = Tm.tm_sec; int sec = Tm.tm_sec;

3
implot.h
View File

@ -246,7 +246,8 @@ struct ImPlotStyle {
// settings/flags // settings/flags
bool AntiAliasedLines; // = false, enable global anti-aliasing on plot lines (overrides ImPlotFlags_AntiAliased) bool AntiAliasedLines; // = false, enable global anti-aliasing on plot lines (overrides ImPlotFlags_AntiAliased)
bool UseLocalTime; // = false, axis labels will be formatted for your timezone when ImPlotAxisFlag_Time is enabled bool UseLocalTime; // = false, axis labels will be formatted for your timezone when ImPlotAxisFlag_Time is enabled
bool Use24HourClock; // = false, hours will be formatted for 24 hour clock bool UseISO8601; // = false, dates will be formatted according to ISO 8601 where applicable (e.g. YYYY-MM-DD, YYYY-MM, --MM-DD, etc.)
bool Use24HourClock; // = false, times will be formatted using 24 hour clock
IMPLOT_API ImPlotStyle(); IMPLOT_API ImPlotStyle();
}; };

8
implot_demo.cpp
View File

@ -618,9 +618,11 @@ void ShowDemoWindow(bool* p_open) {
"UNIX timestamps in seconds and axis labels are formated as date/time."); "UNIX timestamps in seconds and axis labels are formated as date/time.");
ImGui::BulletText("By default, labels are in UTC time but can be set to use local time instead."); ImGui::BulletText("By default, labels are in UTC time but can be set to use local time instead.");
ImGui::Checkbox("Use Local Time",&ImPlot::GetStyle().UseLocalTime); ImGui::Checkbox("Local Time",&ImPlot::GetStyle().UseLocalTime);
ImGui::SameLine(); ImGui::SameLine();
ImGui::Checkbox("Use 24 Hour Clock",&ImPlot::GetStyle().Use24HourClock); ImGui::Checkbox("ISO 8601",&ImPlot::GetStyle().UseISO8601);
ImGui::SameLine();
ImGui::Checkbox("24 Hour Clock",&ImPlot::GetStyle().Use24HourClock);
static HugeTimeData* data = NULL; static HugeTimeData* data = NULL;
if (data == NULL) { if (data == NULL) {
@ -1455,7 +1457,7 @@ void PlotCandlestick(const char* label_id, const double* xs, const double* opens
if (idx != -1) { if (idx != -1) {
ImGui::BeginTooltip(); ImGui::BeginTooltip();
char buff[32]; char buff[32];
ImPlot::FormatTime12(ImPlotTime::FromDouble(xs[idx]),buff,32,ImPlotTimeFmt_DayMoYr); ImPlot::FormatDate(ImPlotTime::FromDouble(xs[idx]),buff,32,ImPlotDateFmt_DayMoYr,ImPlot::GetStyle().UseISO8601);
ImGui::Text("Day: %s", buff); ImGui::Text("Day: %s", buff);
ImGui::Text("Open: $%.2f", opens[idx]); ImGui::Text("Open: $%.2f", opens[idx]);
ImGui::Text("Close: $%.2f", closes[idx]); ImGui::Text("Close: $%.2f", closes[idx]);

75
implot_internal.h
View File

@ -161,6 +161,7 @@ struct ImPlotPointArray {
typedef int ImPlotDirection; // -> enum ImPlotDirection_ typedef int ImPlotDirection; // -> enum ImPlotDirection_
typedef int ImPlotScale; // -> enum ImPlotScale_ typedef int ImPlotScale; // -> enum ImPlotScale_
typedef int ImPlotTimeUnit; // -> enum ImPlotTimeUnit_ typedef int ImPlotTimeUnit; // -> enum ImPlotTimeUnit_
typedef int ImPlotDateFmt; // -> enum ImPlotDateFmt_
typedef int ImPlotTimeFmt; // -> enum ImPlotTimeFmt_ typedef int ImPlotTimeFmt; // -> enum ImPlotTimeFmt_
// Axis direction // Axis direction
@ -189,32 +190,46 @@ enum ImPlotTimeUnit_ {
ImPlotTimeUnit_COUNT ImPlotTimeUnit_COUNT
}; };
enum ImPlotTimeFmt_ { enum ImPlotDateFmt_ { // default [ ISO 8601 ]
ImPlotTimeFmt_Us, // .428 552 ImPlotDateFmt_None = 0,
ImPlotTimeFmt_SUs, // :29.428 552 ImPlotDateFmt_DayMo, // 10/3 [ --10-03 ]
ImPlotTimeFmt_SMs, // :29.428 ImPlotDateFmt_DayMoYr, // 10/3/91 [ 1991-10-03 ]
ImPlotTimeFmt_S, // :29 ImPlotDateFmt_MoYr, // Oct 1991 [ 1991-10 ]
ImPlotTimeFmt_HrMinSMs, // 7:21:29.428pm (19:21:29.428) ImPlotDateFmt_Mo, // Oct [ --10-01 ]
ImPlotTimeFmt_HrMinS, // 7:21:29pm (19:21:29) ImPlotDateFmt_Yr // 1991 [ 1991 ]
ImPlotTimeFmt_HrMin, // 7:21pm (19:21) };
ImPlotTimeFmt_Hr, // 7pm (19:00)
ImPlotTimeFmt_DayMo, // 10/3 enum ImPlotTimeFmt_ { // default [ 24 Hour Clock ]
ImPlotTimeFmt_DayMoHr, // 10/3 7pm (10/3 19:00) ImPlotTimeFmt_None = 0,
ImPlotTimeFmt_DayMoHrMin, // 10/3 7:21pm (10/3 19:21) ImPlotTimeFmt_Us, // .428 552 [ .428 552 ]
ImPlotTimeFmt_DayMoYr, // 10/3/91 ImPlotTimeFmt_SUs, // :29.428 552 [ :29.428 552 ]
ImPlotTimeFmt_DayMoYrHrMin, // 10/3/91 7:21pm (10/3/91 19:21) ImPlotTimeFmt_SMs, // :29.428 [ :29.428 ]
ImPlotTimeFmt_DayMoYrHrMinS, // 10/3/91 7:21:29pm (10/3/91 19:21:29) ImPlotTimeFmt_S, // :29 [ :29 ]
ImPlotTimeFmt_DayMoYrHrMinSUs, // 10/3/1991 7:21:29.123456pm (10/3/1991 19:21:29.123456) ImPlotTimeFmt_HrMinSMs, // 7:21:29.428pm [ 19:21:29.428 ]
ImPlotTimeFmt_MoYr, // Oct 1991 ImPlotTimeFmt_HrMinS, // 7:21:29pm [ 19:21:29 ]
ImPlotTimeFmt_Mo, // Oct ImPlotTimeFmt_HrMin, // 7:21pm [ 19:21 ]
ImPlotTimeFmt_Yr // 1991 ImPlotTimeFmt_Hr // 7pm [ 19:00 ]
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// [SECTION] ImPlot Structs // [SECTION] ImPlot Structs
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/// Two part timestamp struct. // Combined data/time format spec
struct ImPlotDateTimeFmt {
ImPlotDateTimeFmt(ImPlotDateFmt date_fmt, ImPlotTimeFmt time_fmt, bool use_24_hr_clk = false, bool use_iso_8601 = false) {
Date = date_fmt;
Time = time_fmt;
UseISO8601 = use_iso_8601;
Use24HourClock = use_24_hr_clk;
}
ImPlotDateFmt Date;
ImPlotTimeFmt Time;
bool UseISO8601;
bool Use24HourClock;
};
// Two part timestamp struct.
struct ImPlotTime { struct ImPlotTime {
time_t S; // second part time_t S; // second part
int Us; // microsecond part int Us; // microsecond part
@ -790,14 +805,14 @@ IMPLOT_API void LabelTickDefault(ImPlotTick& tick, ImGuiTextBuffer& buffer);
// Label a tick with scientific formating. // Label a tick with scientific formating.
IMPLOT_API void LabelTickScientific(ImPlotTick& tick, ImGuiTextBuffer& buffer); IMPLOT_API void LabelTickScientific(ImPlotTick& tick, ImGuiTextBuffer& buffer);
// Label a tick with time formatting. // Label a tick with time formatting.
IMPLOT_API void LabelTickTime(ImPlotTick& tick, ImGuiTextBuffer& buffer, const ImPlotTime& t, ImPlotTimeFmt fmt, bool hour24); IMPLOT_API void LabelTickTime(ImPlotTick& tick, ImGuiTextBuffer& buffer, const ImPlotTime& t, ImPlotDateTimeFmt fmt);
// Populates a list of ImPlotTicks with normal spaced and formatted ticks // Populates a list of ImPlotTicks with normal spaced and formatted ticks
IMPLOT_API void AddTicksDefault(const ImPlotRange& range, int nMajor, int nMinor, ImPlotTickCollection& ticks); IMPLOT_API void AddTicksDefault(const ImPlotRange& range, int nMajor, int nMinor, ImPlotTickCollection& ticks);
// Populates a list of ImPlotTicks with logarithmic space and formatted ticks // Populates a list of ImPlotTicks with logarithmic space and formatted ticks
IMPLOT_API void AddTicksLogarithmic(const ImPlotRange& range, int nMajor, ImPlotTickCollection& ticks); IMPLOT_API void AddTicksLogarithmic(const ImPlotRange& range, int nMajor, ImPlotTickCollection& ticks);
// Populates a list of ImPlotTicks with time formatted ticks. // Populates a list of ImPlotTicks with time formatted ticks.
IMPLOT_API void AddTicksTime(const ImPlotRange& range, int nMajor, bool hour24, ImPlotTickCollection& ticks); IMPLOT_API void AddTicksTime(const ImPlotRange& range, int nMajor, ImPlotTickCollection& ticks);
// Populates a list of ImPlotTicks with custom spaced and labeled ticks // Populates a list of ImPlotTicks with custom spaced and labeled ticks
IMPLOT_API void AddTicksCustom(const double* values, const char* const labels[], int n, ImPlotTickCollection& ticks); IMPLOT_API void AddTicksCustom(const double* values, const char* const labels[], int n, ImPlotTickCollection& ticks);
@ -926,21 +941,21 @@ IMPLOT_API ImPlotTime RoundTime(const ImPlotTime& t, ImPlotTimeUnit unit);
// Combines the date of one timestamp with the time-of-day of another timestamp. // Combines the date of one timestamp with the time-of-day of another timestamp.
IMPLOT_API ImPlotTime CombineDateTime(const ImPlotTime& date_part, const ImPlotTime& time_part); IMPLOT_API ImPlotTime CombineDateTime(const ImPlotTime& date_part, const ImPlotTime& time_part);
// Formats a timestamp t into a buffer according to #fmt for 12 hour clock // Formats the time part of timestamp t into a buffer according to #fmt
IMPLOT_API int FormatTime12(const ImPlotTime& t, char* buffer, int size, ImPlotTimeFmt fmt); IMPLOT_API int FormatTime(const ImPlotTime& t, char* buffer, int size, ImPlotTimeFmt fmt, bool use_24_hr_clk);
// Formats a timestamp t into a buffer according to #fmt for 24 hour clock. // Formats the date part of timestamp t into a buffer according to #fmt
IMPLOT_API int FormatTime24(const ImPlotTime& t, char* buffer, int size, ImPlotTimeFmt fmt); IMPLOT_API int FormatDate(const ImPlotTime& t, char* buffer, int size, ImPlotDateFmt fmt, bool use_iso_8601);
// Prints a timestamp to console // Formats the time and/or date parts of a timestamp t into a buffer according to #fmt
IMPLOT_API void PrintTime(const ImPlotTime& t, ImPlotTimeFmt fmt = ImPlotTimeFmt_DayMoYrHrMinSUs); IMPLOT_API int FormatDateTime(const ImPlotTime& t, char* buffer, int size, ImPlotDateTimeFmt fmt);
// Shows a date picker widget block (year/month/day). // Shows a date picker widget block (year/month/day).
// #level = 0 for day, 1 for month, 2 for year. Modified by user interaction. // #level = 0 for day, 1 for month, 2 for year. Modified by user interaction.
// #t will be set when a day is clicked and the function will return true. // #t will be set when a day is clicked and the function will return true.
// #t1 and #t2 are optional dates to highlight. // #t1 and #t2 are optional dates to highlight.
IMPLOT_API bool ShowDatePicker(const char* id, int* level, ImPlotTime* t, const ImPlotTime* t1 = NULL, const ImPlotTime* t2 = NULL); IMPLOT_API bool ShowDatePicker(const char* id, int* level, ImPlotTime* t, const ImPlotTime* t1 = NULL, const ImPlotTime* t2 = NULL);
// Shows a time picker widget block (hour/min/sec). #hour24 will format time for 24 hour clock. // Shows a time picker widget block (hour/min/sec).
// #t will be set when a new hour, minute, or sec is selected or am/pm is toggled, and the function will return true. // #t will be set when a new hour, minute, or sec is selected or am/pm is toggled, and the function will return true.
IMPLOT_API bool ShowTimePicker(const char* id, ImPlotTime* t, bool hour24); IMPLOT_API bool ShowTimePicker(const char* id, ImPlotTime* t);
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// [SECTION] Internal / Experimental Plotters // [SECTION] Internal / Experimental Plotters