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 ImPlotTime struct

Browse Source
This commit is contained in:
epezent 2020-09-05 09:38:08 -05:00
parent 61e6b5118e
commit f92625a462
2 changed files with 149 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

205
implot.cpp
View File

@ -596,28 +596,6 @@ static const double TimeUnitSpans[ImPlotTimeUnit_COUNT] = {
31557600 31557600
}; };
static const ImPlotTimeFmt TimeFormatLevel0[ImPlotTimeUnit_COUNT] = {
ImPlotTimeFmt_SUs,
ImPlotTimeFmt_SMs,
ImPlotTimeFmt_S,
ImPlotTimeFmt_HrMin,
ImPlotTimeFmt_Hr,
ImPlotTimeFmt_DayMo,
ImPlotTimeFmt_Mo,
ImPlotTimeFmt_Yr
};
static const ImPlotTimeFmt TimeFormatLevel1[ImPlotTimeUnit_COUNT] = {
ImPlotTimeFmt_DayMoHrMin,
ImPlotTimeFmt_DayMoHrMin,
ImPlotTimeFmt_DayMoHrMin,
ImPlotTimeFmt_DayMoHrMin,
ImPlotTimeFmt_DayMo,
ImPlotTimeFmt_DayMo,
ImPlotTimeFmt_Yr,
ImPlotTimeFmt_Yr
};
inline ImPlotTimeUnit GetUnitForRange(double range) { inline ImPlotTimeUnit GetUnitForRange(double range) {
static double cutoffs[ImPlotTimeUnit_COUNT] = {0.001, 1, 60, 3600, 86400, 2629800, 31557600, IMPLOT_MAX_TIME}; static double cutoffs[ImPlotTimeUnit_COUNT] = {0.001, 1, 60, 3600, 86400, 2629800, 31557600, IMPLOT_MAX_TIME};
for (int i = 0; i < ImPlotTimeUnit_COUNT; ++i) { for (int i = 0; i < ImPlotTimeUnit_COUNT; ++i) {
@ -761,63 +739,43 @@ double MakeYear(int year) {
return (double)s; return (double)s;
} }
void FormatTime(double t, char* buffer, int size, ImPlotTimeFmt fmt) { int FormatTime(double t, char* buffer, int size, ImPlotTimeFmt fmt) {
printf("%.6f\n",t);
time_t s = (time_t)t; time_t s = (time_t)t;
int ms = (int)(t * 1000 - floor(t) * 1000); int ms = (int)(t * 1000 - floor(t) * 1000);
ms = ms % 10 == 9 ? ms + 1 : ms; ms = ms % 10 == 9 ? ms + 1 : ms; // don't like this
int us = (int)(t * 1000000 - floor(t) * 1000000); int us = (int)(t * 1000000 - floor(t) * 1000000);
us = us % 10 == 9 ? us + 1 : us; us = us % 10 == 9 ? us + 1 : us; // don't like this
tm& Tm = GImPlot->Tm; tm& Tm = GImPlot->Tm;
GetGmTime(&s, &Tm); GetGmTime(&s, &Tm);
const char* ap = Tm.tm_hour < 12 ? "am" : "pm";
const int sec = Tm.tm_sec;
const int min = Tm.tm_min;
const int hr = (Tm.tm_hour == 0 || Tm.tm_hour == 12) ? 12 : Tm.tm_hour % 12;
const int day = Tm.tm_mday;
const int mon = Tm.tm_mon + 1;
const int year = Tm.tm_year + 1900;
const int yr = year % 100;
static const char mnames[12][4] = {"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"};
switch(fmt) { switch(fmt) {
case ImPlotTimeFmt_Yr: strftime(buffer, size, "%Y", &Tm); break; case ImPlotTimeFmt_Us: return snprintf(buffer, size, ".%06d", us);
case ImPlotTimeFmt_Mo: strftime(buffer, size, "%b", &Tm); break; case ImPlotTimeFmt_SUs: return snprintf(buffer, size, ":%02d.%06d", sec, us);
case ImPlotTimeFmt_DayMo: snprintf(buffer, size, "%d/%d", Tm.tm_mon + 1, Tm.tm_mday); break; case ImPlotTimeFmt_SMs: return snprintf(buffer, size, ":%02d.%03d", sec, ms);
case ImPlotTimeFmt_DayMoHrMin: case ImPlotTimeFmt_S: return snprintf(buffer, size, ":%02d", sec);
if (Tm.tm_hour == 0) case ImPlotTimeFmt_HrMinS: return snprintf(buffer, size, "%d:%02d:%02d%s", hr, min, sec, ap);
snprintf(buffer, size, "%d/%d 12:%02dam", Tm.tm_mon + 1, Tm.tm_mday, Tm.tm_min); case ImPlotTimeFmt_HrMin: return snprintf(buffer, size, "%d:%02d%s", hr, min, ap);
else if (Tm.tm_hour == 12) case ImPlotTimeFmt_Hr: return snprintf(buffer, size, "%u%s", hr, ap);
snprintf(buffer, size, "%d/%d 12:%02dpm", Tm.tm_mon + 1, Tm.tm_mday, Tm.tm_min); case ImPlotTimeFmt_DayMo: return snprintf(buffer, size, "%d/%d", mon, day);
else if (Tm.tm_hour < 12) case ImPlotTimeFmt_DayMoHrMin: return snprintf(buffer, size, "%d/%d %u:%02d%s", mon, day, hr, min, ap);
snprintf(buffer, size, "%d/%d %u:%02dam", Tm.tm_mon + 1, Tm.tm_mday, Tm.tm_hour, Tm.tm_min); case ImPlotTimeFmt_DayMoYr: return snprintf(buffer, size, "%d/%d/%d", mon, day, yr);
else if (Tm.tm_hour > 12) case ImPlotTimeFmt_DayMoYrHrMin: return snprintf(buffer, size, "%d/%d/%d %u:%02d%s", mon, day, yr, hr, min, ap);
snprintf(buffer, size, "%d/%d %u:%02dpm", Tm.tm_mon + 1, Tm.tm_mday, Tm.tm_hour - 12, Tm.tm_min); case ImPlotTimeFmt_DayMoYrHrMinS: return snprintf(buffer, size, "%d/%d/%d %u:%02d:%02d%s", mon, day, yr, hr, min, sec, ap);
break; case ImPlotTimeFmt_Mo: return snprintf(buffer, size, "%s", mnames[Tm.tm_mon]);
case ImPlotTimeFmt_DayMoYr: snprintf(buffer, size, "%d/%d/%d", Tm.tm_mon + 1, Tm.tm_mday, Tm.tm_year + 1900); break; case ImPlotTimeFmt_Yr: return snprintf(buffer, size, "%d", year);
case ImPlotTimeFmt_DayMoYrHrMin: default: return 0;
if (Tm.tm_hour == 0)
snprintf(buffer, size, "%d/%d/%d 12:%02dam", Tm.tm_mon + 1, Tm.tm_mday, Tm.tm_year + 1900, Tm.tm_min);
else if (Tm.tm_hour == 12)
snprintf(buffer, size, "%d/%d/%d 12:%02dpm", Tm.tm_mon + 1, Tm.tm_mday, Tm.tm_year + 1900, Tm.tm_min);
else if (Tm.tm_hour < 12)
snprintf(buffer, size, "%d/%d/%d %u:%02dam", Tm.tm_mon + 1, Tm.tm_mday, Tm.tm_year + 1900, Tm.tm_hour, Tm.tm_min);
else if (Tm.tm_hour > 12)
snprintf(buffer, size, "%d/%d/%d %u:%02dpm", Tm.tm_mon + 1, Tm.tm_mday, Tm.tm_year + 1900, Tm.tm_hour - 12, Tm.tm_min);
break;
case ImPlotTimeFmt_Hr:
if (Tm.tm_hour == 0)
snprintf(buffer, size, "12am");
else if (Tm.tm_hour == 12)
snprintf(buffer, size, "12pm");
else if (Tm.tm_hour < 12)
snprintf(buffer, size, "%uam", Tm.tm_hour);
else if (Tm.tm_hour > 12)
snprintf(buffer, size, "%upm", Tm.tm_hour - 12);
break;
case ImPlotTimeFmt_HrMin:
if (Tm.tm_hour == 0)
snprintf(buffer, size, "12:%02dam", Tm.tm_min);
else if (Tm.tm_hour == 12)
snprintf(buffer, size, "12:%02dpm", Tm.tm_min);
else if (Tm.tm_hour < 12)
snprintf(buffer, size, "%d:%02dam", Tm.tm_hour, Tm.tm_min);
else if (Tm.tm_hour > 12)
snprintf(buffer, size, "%d:%02dpm", Tm.tm_hour - 12, Tm.tm_min);
break;
case ImPlotTimeFmt_S: snprintf(buffer, size, ":%02d", Tm.tm_sec); break;
case ImPlotTimeFmt_SMs: snprintf(buffer, size, ":%02d.%03d", Tm.tm_sec, ms); break;
case ImPlotTimeFmt_SUs: snprintf(buffer, size, ":%02d.%06d", Tm.tm_sec, us); break;
default: break;
} }
} }
@ -830,17 +788,21 @@ void PrintTime(double t, ImPlotTimeFmt fmt) {
// Returns the nominally largest possible width for a time format // Returns the nominally largest possible width for a time format
inline float GetTimeLabelWidth(ImPlotTimeFmt fmt) { inline float GetTimeLabelWidth(ImPlotTimeFmt fmt) {
switch (fmt) { switch (fmt) {
case ImPlotTimeFmt_SUs: return ImGui::CalcTextSize(":88.888888").x; // :29.428552 case ImPlotTimeFmt_Us: return ImGui::CalcTextSize(".888888").x; // .428552
case ImPlotTimeFmt_SMs: return ImGui::CalcTextSize(":88.888").x; // :29.428 case ImPlotTimeFmt_SUs: return ImGui::CalcTextSize(":88.888888").x; // :29.428552
case ImPlotTimeFmt_S: return ImGui::CalcTextSize(":88").x; // :29 case ImPlotTimeFmt_SMs: return ImGui::CalcTextSize(":88.888").x; // :29.428
case ImPlotTimeFmt_HrMin: return ImGui::CalcTextSize("88:88pm").x; // 7:21pm case ImPlotTimeFmt_S: return ImGui::CalcTextSize(":88").x; // :29
case ImPlotTimeFmt_Hr: return ImGui::CalcTextSize("8pm").x; // 7pm case ImPlotTimeFmt_HrMinS: return ImGui::CalcTextSize("88:88:88pm").x; // 7:21:29pm
case ImPlotTimeFmt_DayMo: return ImGui::CalcTextSize("88/88").x; // 10/3 case ImPlotTimeFmt_HrMin: return ImGui::CalcTextSize("88:88pm").x; // 7:21pm
case ImPlotTimeFmt_DayMoHrMin: return ImGui::CalcTextSize("88/88 88:88pm").x; // 10/3 7:21pm case ImPlotTimeFmt_Hr: return ImGui::CalcTextSize("8pm").x; // 7pm
case ImPlotTimeFmt_DayMoYrHrMin: return ImGui::CalcTextSize("88/88/8888 88:88pm").x; // 10/3/1991 7:21pm case ImPlotTimeFmt_DayMo: return ImGui::CalcTextSize("88/88").x; // 10/3
case ImPlotTimeFmt_Mo: return ImGui::CalcTextSize("MMM").x; // Oct case ImPlotTimeFmt_DayMoHrMin: return ImGui::CalcTextSize("88/88 88:88pm").x; // 10/3 7:21pm
case ImPlotTimeFmt_Yr: return ImGui::CalcTextSize("8888").x; // 1991 case ImPlotTimeFmt_DayMoYr: return ImGui::CalcTextSize("88/88/88").x; // 10/3/1991
default: return 0; 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_Mo: return ImGui::CalcTextSize("MMM").x; // Oct
case ImPlotTimeFmt_Yr: return ImGui::CalcTextSize("8888").x; // 1991
default: return 0;
} }
} }
@ -854,17 +816,58 @@ inline void LabelTickTime(ImPlotTick& tick, ImGuiTextBuffer& buffer, ImPlotTimeF
} }
} }
static const ImPlotTimeFmt TimeFormatLevel0[ImPlotTimeUnit_COUNT] = {
ImPlotTimeFmt_Us,
ImPlotTimeFmt_SMs,
ImPlotTimeFmt_S,
ImPlotTimeFmt_HrMin,
ImPlotTimeFmt_Hr,
ImPlotTimeFmt_DayMo,
ImPlotTimeFmt_Mo,
ImPlotTimeFmt_Yr
};
static const ImPlotTimeFmt TimeFormatLevel1[ImPlotTimeUnit_COUNT] = {
ImPlotTimeFmt_HrMin,
ImPlotTimeFmt_HrMinS,
ImPlotTimeFmt_HrMin,
ImPlotTimeFmt_HrMin,
ImPlotTimeFmt_DayMo,
ImPlotTimeFmt_DayMo,
ImPlotTimeFmt_Yr,
ImPlotTimeFmt_Yr
};
static const ImPlotTimeFmt TimeFormatLevel1First[ImPlotTimeUnit_COUNT] = {
ImPlotTimeFmt_DayMoYrHrMinS,
ImPlotTimeFmt_DayMoYrHrMinS,
ImPlotTimeFmt_DayMoYrHrMin,
ImPlotTimeFmt_DayMoYrHrMin,
ImPlotTimeFmt_DayMoYr,
ImPlotTimeFmt_DayMoYr,
ImPlotTimeFmt_Yr,
ImPlotTimeFmt_Yr
};
void AddTicksTime(const ImPlotRange& range, float plot_width, ImPlotTickCollection& ticks) { 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
const ImPlotTimeFmt fmt0 = TimeFormatLevel0[unit0];
const ImPlotTimeFmt fmt1 = TimeFormatLevel1[unit1];
const ImPlotTimeFmt fmtf = TimeFormatLevel1First[unit1];
// maximum allowable density of labels // maximum allowable density of labels
const float max_density = 0.66f; const float max_density = 0.5f;
bool first = true;
const char* last_major = NULL;
if (unit0 != ImPlotTimeUnit_Yr) { if (unit0 != ImPlotTimeUnit_Yr) {
// 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 minor (level 0) label // nominal pixels taken up by minor (level 0) label
const float minor_label_width = GetTimeLabelWidth(TimeFormatLevel0[unit0]); const float minor_label_width = GetTimeLabelWidth(fmt0);
// 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 / minor_label_width); const int minor_per_major = (int)(max_density * pix_per_major_div / minor_label_width);
// the minor step size (level 0) // the minor step size (level 0)
@ -873,14 +876,25 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, ImPlotTickCollecti
double t1 = FloorTime(range.Min, unit1); double t1 = FloorTime(range.Min, unit1);
while (t1 < range.Max) { while (t1 < range.Max) {
if (range.Contains(t1)) { if (range.Contains(t1)) {
ImPlotTick tick_maj(t1,true,true); // minor level 0 tick
tick_maj.Level = 1;
LabelTickTime(tick_maj,ticks.Labels,TimeFormatLevel1[unit1]);
ticks.AddTick(tick_maj);
ImPlotTick tick_min(t1,true,true); ImPlotTick tick_min(t1,true,true);
tick_min.Level = 0; tick_min.Level = 0;
LabelTickTime(tick_min,ticks.Labels,TimeFormatLevel0[unit0]); LabelTickTime(tick_min,ticks.Labels,fmt0);
ticks.AddTick(tick_min); ticks.AddTick(tick_min);
// major level 1 tick
ImPlotTick tick_maj(t1,true,true);
tick_maj.Level = 1;
LabelTickTime(tick_maj,ticks.Labels,first ? fmtf : fmt1);
const char* this_major = ticks.Labels.Buf.Data + tick_maj.BufferOffset;
if (last_major == NULL)
last_major = this_major;
else if (strcmp(last_major,this_major) == 0)
tick_maj.ShowLabel = false;
else
last_major = this_major;
ticks.AddTick(tick_maj);
if (first) first = false;
} }
// add minor ticks up until next major // add minor ticks up until next major
const double t2 = AddTime(t1, unit1, 1); const double t2 = AddTime(t1, unit1, 1);
@ -892,8 +906,15 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, ImPlotTickCollecti
if (range.Contains(t12)) { if (range.Contains(t12)) {
ImPlotTick tick(t12,false,px_to_t2 >= minor_label_width); ImPlotTick tick(t12,false,px_to_t2 >= minor_label_width);
tick.Level = 0; tick.Level = 0;
LabelTickTime(tick,ticks.Labels,TimeFormatLevel0[unit0]); LabelTickTime(tick,ticks.Labels,fmt0);
ticks.AddTick(tick); ticks.AddTick(tick);
// if (first) {
// ImPlotTick tick_maj(t12,true,true);
// tick_maj.Level = 1;
// LabelTickTime(tick_maj,ticks.Labels,TimeFormatLevel1[unit1]);
// ticks.AddTick(tick_maj);
// first = false;
// }
} }
t12 = AddTime(t12, unit0, step); t12 = AddTime(t12, unit0, step);
} }

56
implot_internal.h
View File

@ -170,30 +170,33 @@ enum ImPlotScale_ {
ImPlotScale_LogLog // log x, log y ImPlotScale_LogLog // log x, log y
}; };
enum ImPlotTimeUnit_ { // primary enum ImPlotTimeUnit_ {
ImPlotTimeUnit_Us, // microsecond :29.428552 ImPlotTimeUnit_Us, // microsecond
ImPlotTimeUnit_Ms, // millisecond :29.428 ImPlotTimeUnit_Ms, // millisecond
ImPlotTimeUnit_S, // second :29 ImPlotTimeUnit_S, // second
ImPlotTimeUnit_Min, // minute 7:21pm ImPlotTimeUnit_Min, // minute
ImPlotTimeUnit_Hr, // hour 7pm ImPlotTimeUnit_Hr, // hour
ImPlotTimeUnit_Day, // day 10/3 ImPlotTimeUnit_Day, // day
ImPlotTimeUnit_Mo, // month Oct ImPlotTimeUnit_Mo, // month
ImPlotTimeUnit_Yr, // year 1991 ImPlotTimeUnit_Yr, // year
ImPlotTimeUnit_COUNT ImPlotTimeUnit_COUNT
}; };
enum ImPlotTimeFmt_ { enum ImPlotTimeFmt_ {
ImPlotTimeFmt_SUs, // :29.428552 ImPlotTimeFmt_Us, // .428552
ImPlotTimeFmt_SMs, // :29.428 ImPlotTimeFmt_SUs, // :29.428552
ImPlotTimeFmt_S, // :29 ImPlotTimeFmt_SMs, // :29.428
ImPlotTimeFmt_HrMin, // 7:21pm ImPlotTimeFmt_S, // :29
ImPlotTimeFmt_Hr, // 7pm ImPlotTimeFmt_HrMinS, // 7:21:29pm
ImPlotTimeFmt_DayMo, // 10/3 ImPlotTimeFmt_HrMin, // 7:21pm
ImPlotTimeFmt_DayMoHrMin, // 10/3 7:21pm ImPlotTimeFmt_Hr, // 7pm
ImPlotTimeFmt_DayMoYr, // 10/3/1991 ImPlotTimeFmt_DayMo, // 10/3
ImPlotTimeFmt_DayMoYrHrMin, // 10/3/1991 7:21pm ImPlotTimeFmt_DayMoHrMin, // 10/3 7:21pm
ImPlotTimeFmt_Mo, // Oct ImPlotTimeFmt_DayMoYr, // 10/3/91
ImPlotTimeFmt_Yr // 1991 ImPlotTimeFmt_DayMoYrHrMin, // 10/3/91 7:21pm
ImPlotTimeFmt_DayMoYrHrMinS, // 10/3/91 7:21:29pm
ImPlotTimeFmt_Mo, // Oct
ImPlotTimeFmt_Yr // 1991
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -570,6 +573,17 @@ struct ImPlotAxisScale
} }
}; };
/// Two part time struct.
struct ImPlotTime {
time_t S;
time_t Us;
ImPlotTime(time_t s, time_t us) { S = s; Us = us;}
ImPlotTime(double t) {
S = (time_t)t;
Us = (int)(t * 1000000 - floor(t) * 1000000);
}
};
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// [SECTION] Internal API // [SECTION] Internal API
// No guarantee of forward compatibility here! // No guarantee of forward compatibility here!
@ -771,7 +785,7 @@ int GetYear(double t);
double MakeYear(int year); double MakeYear(int year);
// Formates a timestamp t into a buffer according to fmt. // Formates a timestamp t into a buffer according to fmt.
void FormatTime(double t, char* buffer, int size, ImPlotTimeFmt fmt); int FormatTime(double t, char* buffer, int size, ImPlotTimeFmt fmt);
// Prints a timestamp to console // Prints a timestamp to console
void PrintTime(double t, ImPlotTimeFmt fmt); void PrintTime(double t, ImPlotTimeFmt fmt);