mirror of
https://github.com/gwm17/implot.git
synced 2024-11-23 02:38:53 -05:00
add option for 24 hour clock
This commit is contained in:
epezent
parent
5e0e60b969
commit
117816d4e1
148
implot.cpp
148
implot.cpp
|
|
@ -123,6 +123,7 @@ ImPlotStyle::ImPlotStyle() {
|
|||
|
||||
AntiAliasedLines = false;
|
||||
UseLocalTime = false;
|
||||
Use24HourClock = false;
|
||||
}
|
||||
|
||||
namespace ImPlot {
|
||||
|
|
@ -820,7 +821,11 @@ ImPlotTime CombineDateTime(const ImPlotTime& date_part, const ImPlotTime& tod_pa
|
|||
return t;
|
||||
}
|
||||
|
||||
int FormatTime(const ImPlotTime& t, char* buffer, int size, ImPlotTimeFmt fmt) {
|
||||
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* 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) {
|
||||
tm& Tm = GImPlot->Tm;
|
||||
GetTime(t, &Tm);
|
||||
|
||||
|
|
@ -835,8 +840,6 @@ int FormatTime(const ImPlotTime& t, char* buffer, int size, ImPlotTimeFmt fmt) {
|
|||
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) {
|
||||
case ImPlotTimeFmt_Us: return snprintf(buffer, size, ".%03d %03d", ms, us);
|
||||
case ImPlotTimeFmt_SUs: return snprintf(buffer, size, ":%02d.%03d %03d", sec, ms, us);
|
||||
|
|
@ -852,21 +855,51 @@ int FormatTime(const ImPlotTime& t, char* buffer, int size, ImPlotTimeFmt fmt) {
|
|||
case ImPlotTimeFmt_DayMoYrHrMin: return snprintf(buffer, size, "%d/%d/%02d %d:%02d%s", mon, day, yr, hr, min, ap);
|
||||
case ImPlotTimeFmt_DayMoYrHrMinS: return snprintf(buffer, size, "%d/%d/%02d %d:%02d:%02d%s", mon, day, yr, hr, min, sec, ap);
|
||||
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_MoYr: return snprintf(buffer, size, "%s %d", mnames[Tm.tm_mon], year);
|
||||
case ImPlotTimeFmt_Mo: return snprintf(buffer, size, "%s", mnames[Tm.tm_mon]);
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
void PrintTime(const ImPlotTime& t, ImPlotTimeFmt fmt) {
|
||||
static char buff[32];
|
||||
FormatTime(t, buff, 32, fmt);
|
||||
printf("%s\n",buff);
|
||||
int FormatTime24(const ImPlotTime& t, char* buffer, int size, ImPlotTimeFmt fmt) {
|
||||
tm& Tm = GImPlot->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 mon = Tm.tm_mon + 1;
|
||||
const int year = Tm.tm_year + 1900;
|
||||
const int yr = year % 100;
|
||||
|
||||
switch(fmt) {
|
||||
case ImPlotTimeFmt_Us: return snprintf(buffer, size, ".%03d %03d", ms, us);
|
||||
case ImPlotTimeFmt_SUs: return snprintf(buffer, size, ":%02d.%03d %03d", sec, ms, us);
|
||||
case ImPlotTimeFmt_SMs: return snprintf(buffer, size, ":%02d.%03d", sec, ms);
|
||||
case ImPlotTimeFmt_S: return snprintf(buffer, size, ":%02d", sec);
|
||||
case ImPlotTimeFmt_HrMinS: return snprintf(buffer, size, "%02d:%02d:%02d", hr, min, sec);
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
// Returns the nominally largest possible width for a time format
|
||||
inline float GetTimeLabelWidth(ImPlotTimeFmt fmt) {
|
||||
inline float GetTimeLabelWidth12(ImPlotTimeFmt fmt) {
|
||||
switch (fmt) {
|
||||
case ImPlotTimeFmt_Us: return ImGui::CalcTextSize(".888 888").x; // .428 552
|
||||
case ImPlotTimeFmt_SUs: return ImGui::CalcTextSize(":88.888 888").x; // :29.428 552
|
||||
|
|
@ -889,11 +922,41 @@ inline float GetTimeLabelWidth(ImPlotTimeFmt fmt) {
|
|||
}
|
||||
}
|
||||
|
||||
inline void LabelTickTime(ImPlotTick& tick, ImGuiTextBuffer& buffer, const ImPlotTime& t, ImPlotTimeFmt fmt) {
|
||||
// Returns the nominally largest possible width for a time format
|
||||
inline float GetTimeLabelWidth24(ImPlotTimeFmt fmt) {
|
||||
switch (fmt) {
|
||||
case ImPlotTimeFmt_Us: return ImGui::CalcTextSize(".888 888").x; // .428 552
|
||||
case ImPlotTimeFmt_SUs: return ImGui::CalcTextSize(":88.888 888").x; // :29.428 552
|
||||
case ImPlotTimeFmt_SMs: return ImGui::CalcTextSize(":88.888").x; // :29.428
|
||||
case ImPlotTimeFmt_S: return ImGui::CalcTextSize(":88").x; // :29
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
void PrintTime(const ImPlotTime& t, ImPlotTimeFmt fmt) {
|
||||
static char buff[32];
|
||||
FormatTime12(t, buff, 32, fmt);
|
||||
printf("%s\n",buff);
|
||||
}
|
||||
|
||||
inline void LabelTickTime(ImPlotTick& tick, ImGuiTextBuffer& buffer, const ImPlotTime& t, ImPlotTimeFmt fmt, bool hour24) {
|
||||
char temp[32];
|
||||
if (tick.ShowLabel) {
|
||||
tick.BufferOffset = buffer.size();
|
||||
FormatTime(t, temp, 32, fmt);
|
||||
hour24 ? FormatTime24(t, temp, 32, fmt) : FormatTime12(t, temp, 32, fmt);
|
||||
buffer.append(temp, temp + strlen(temp) + 1);
|
||||
tick.LabelSize = ImGui::CalcTextSize(buffer.Buf.Data + tick.BufferOffset);
|
||||
}
|
||||
|
|
@ -950,7 +1013,7 @@ static const ImPlotTimeFmt TimeFormatMouseCursor[ImPlotTimeUnit_COUNT] = {
|
|||
ImPlotTimeFmt_MoYr
|
||||
};
|
||||
|
||||
void AddTicksTime(const ImPlotRange& range, float plot_width, ImPlotTickCollection& ticks) {
|
||||
void AddTicksTime(const ImPlotRange& range, float plot_width, bool hour24, ImPlotTickCollection& ticks) {
|
||||
// get units for level 0 and level 1 labels
|
||||
const ImPlotTimeUnit unit0 = GetUnitForRange(range.Size() / (plot_width / 100)); // level = 0 (top)
|
||||
const ImPlotTimeUnit unit1 = unit0 + 1; // level = 1 (bottom)
|
||||
|
|
@ -969,9 +1032,9 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, ImPlotTickCollecti
|
|||
// pixels per major (level 1) division
|
||||
const float pix_per_major_div = plot_width / (float)(range.Size() / TimeUnitSpans[unit1]);
|
||||
// nominal pixels taken up by labels
|
||||
const float fmt0_width = GetTimeLabelWidth(fmt0);
|
||||
const float fmt1_width = GetTimeLabelWidth(fmt1);
|
||||
const float fmtf_width = GetTimeLabelWidth(fmtf);
|
||||
const float fmt0_width = hour24 ? GetTimeLabelWidth24(fmt0) : GetTimeLabelWidth12(fmt0);
|
||||
const float fmt1_width = hour24 ? GetTimeLabelWidth24(fmt1) : GetTimeLabelWidth12(fmt1);
|
||||
const float fmtf_width = hour24 ? GetTimeLabelWidth24(fmtf) : GetTimeLabelWidth12(fmtf);
|
||||
// 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);
|
||||
// the minor step size (level 0)
|
||||
|
|
@ -986,12 +1049,12 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, ImPlotTickCollecti
|
|||
// minor level 0 tick
|
||||
ImPlotTick tick_min(t1.ToDouble(),true,true);
|
||||
tick_min.Level = 0;
|
||||
LabelTickTime(tick_min,ticks.Labels,t1,fmt0);
|
||||
LabelTickTime(tick_min,ticks.Labels,t1,fmt0,hour24);
|
||||
ticks.AddTick(tick_min);
|
||||
// major level 1 tick
|
||||
ImPlotTick tick_maj(t1.ToDouble(),true,true);
|
||||
tick_maj.Level = 1;
|
||||
LabelTickTime(tick_maj,ticks.Labels,t1, last_major == NULL ? fmtf : fmt1);
|
||||
LabelTickTime(tick_maj,ticks.Labels,t1, last_major == NULL ? fmtf : fmt1,hour24);
|
||||
const char* this_major = ticks.Labels.Buf.Data + tick_maj.BufferOffset;
|
||||
if (last_major && TimeLabelSame(last_major,this_major))
|
||||
tick_maj.ShowLabel = false;
|
||||
|
|
@ -1006,12 +1069,12 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, ImPlotTickCollecti
|
|||
if (t12 >= t_min && t12 <= t_max) {
|
||||
ImPlotTick tick(t12.ToDouble(),false,px_to_t2 >= fmt0_width);
|
||||
tick.Level = 0;
|
||||
LabelTickTime(tick,ticks.Labels,t12,fmt0);
|
||||
LabelTickTime(tick,ticks.Labels,t12,fmt0,hour24);
|
||||
ticks.AddTick(tick);
|
||||
if (last_major == NULL && px_to_t2 >= fmt0_width && px_to_t2 >= (fmt1_width + fmtf_width) / 2) {
|
||||
ImPlotTick tick_maj(t12.ToDouble(),true,true);
|
||||
tick_maj.Level = 1;
|
||||
LabelTickTime(tick_maj,ticks.Labels,t12,fmtf);
|
||||
LabelTickTime(tick_maj,ticks.Labels,t12,fmtf,hour24);
|
||||
last_major = ticks.Labels.Buf.Data + tick_maj.BufferOffset;
|
||||
ticks.AddTick(tick_maj);
|
||||
}
|
||||
|
|
@ -1023,7 +1086,8 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, ImPlotTickCollecti
|
|||
}
|
||||
}
|
||||
else {
|
||||
const float label_width = GetTimeLabelWidth(TimeFormatLevel0[ImPlotTimeUnit_Yr]);
|
||||
const float label_width = hour24 ? GetTimeLabelWidth24(TimeFormatLevel0[ImPlotTimeUnit_Yr]) :
|
||||
GetTimeLabelWidth12(TimeFormatLevel0[ImPlotTimeUnit_Yr]);
|
||||
const int max_labels = (int)(max_density * plot_width / label_width);
|
||||
const int year_min = GetYear(t_min);
|
||||
const int year_max = GetYear(CeilTime(t_max, ImPlotTimeUnit_Yr));
|
||||
|
|
@ -1038,7 +1102,7 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, ImPlotTickCollecti
|
|||
if (t >= t_min && t <= t_max) {
|
||||
ImPlotTick tick(t.ToDouble(), true, true);
|
||||
tick.Level = 0;
|
||||
LabelTickTime(tick, ticks.Labels, t, TimeFormatLevel0[ImPlotTimeUnit_Yr]);
|
||||
LabelTickTime(tick, ticks.Labels, t, TimeFormatLevel0[ImPlotTimeUnit_Yr], hour24);
|
||||
ticks.AddTick(tick);
|
||||
}
|
||||
}
|
||||
|
|
@ -1252,7 +1316,7 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons
|
|||
// (4) get x ticks
|
||||
if (gp.RenderX && gp.NextPlotData.ShowDefaultTicksX) {
|
||||
if (gp.X.IsTime)
|
||||
AddTicksTime(plot.XAxis.Range, plot_width, gp.XTicks);
|
||||
AddTicksTime(plot.XAxis.Range, plot_width, gp.Style.Use24HourClock, gp.XTicks);
|
||||
else if (ImHasFlag(plot.XAxis.Flags, ImPlotAxisFlags_LogScale))
|
||||
AddTicksLogarithmic(plot.XAxis.Range, (int)IM_ROUND(plot_width * 0.01f), gp.XTicks);
|
||||
else
|
||||
|
|
@ -1714,7 +1778,7 @@ void ShowAxisContextMenu(ImPlotAxisState& state, bool time_allowed) {
|
|||
ImGui::SameLine();
|
||||
BeginDisabledControls(state.LockMin);
|
||||
if (ImGui::BeginMenu("Min Time")) {
|
||||
if (ShowTimePicker("mintime", &tmin)) {
|
||||
if (ShowTimePicker("mintime", &tmin, GImPlot->Style.Use24HourClock)) {
|
||||
if (tmin >= tmax)
|
||||
tmax = AddTime(tmin, ImPlotTimeUnit_S, 1);
|
||||
axis.SetRange(tmin.ToDouble(),tmax.ToDouble());
|
||||
|
|
@ -1737,7 +1801,7 @@ void ShowAxisContextMenu(ImPlotAxisState& state, bool time_allowed) {
|
|||
ImGui::SameLine();
|
||||
BeginDisabledControls(state.LockMax);
|
||||
if (ImGui::BeginMenu("Max Time")) {
|
||||
if (ShowTimePicker("maxtime", &tmax)) {
|
||||
if (ShowTimePicker("maxtime", &tmax, GImPlot->Style.Use24HourClock)) {
|
||||
if (tmax <= tmin)
|
||||
tmin = AddTime(tmax, ImPlotTimeUnit_S, -1);
|
||||
axis.SetRange(tmin.ToDouble(),tmax.ToDouble());
|
||||
|
|
@ -2097,7 +2161,8 @@ void EndPlot() {
|
|||
}
|
||||
else if (ImHasFlag(plot.XAxis.Flags, ImPlotAxisFlags_Time)) {
|
||||
ImPlotTimeUnit unit = GetUnitForRange(plot.XAxis.Range.Size() / (gp.BB_Plot.GetWidth() / 100));
|
||||
const int written = FormatTime(ImPlotTime::FromDouble(gp.MousePos[0].x), &writer.Buffer[writer.Pos], writer.Size - writer.Pos - 1, TimeFormatMouseCursor[unit]);
|
||||
const int written = gp.Style.Use24HourClock ? FormatTime24(ImPlotTime::FromDouble(gp.MousePos[0].x), &writer.Buffer[writer.Pos], writer.Size - writer.Pos - 1, TimeFormatMouseCursor[unit])
|
||||
: FormatTime12(ImPlotTime::FromDouble(gp.MousePos[0].x), &writer.Buffer[writer.Pos], writer.Size - writer.Pos - 1, TimeFormatMouseCursor[unit]);
|
||||
if (written > 0)
|
||||
writer.Pos += ImMin(written, writer.Size - writer.Pos - 1);
|
||||
}
|
||||
|
|
@ -3198,10 +3263,6 @@ bool ShowDatePicker(const char* id, int* level, ImPlotTime* t, const ImPlotTime*
|
|||
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0,0,0,0));
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0,0));
|
||||
|
||||
static const char* names_mo[] = {"January","February","March","April","May","June","July","August","September","October","November","December"};
|
||||
static const char* abrvs_mo[] = {"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"};
|
||||
static const char* abrvs_wd[] = {"Su","Mo","Tu","We","Th","Fr","Sa"};
|
||||
|
||||
ImGuiStyle& style = ImGui::GetStyle();
|
||||
ImVec4 col_txt = style.Colors[ImGuiCol_Text];
|
||||
ImVec4 col_dis = style.Colors[ImGuiCol_TextDisabled];
|
||||
|
|
@ -3248,7 +3309,7 @@ bool ShowDatePicker(const char* id, int* level, ImPlotTime* t, const ImPlotTime*
|
|||
GetTime(t_first_mo,&Tm);
|
||||
const int first_wd = Tm.tm_wday;
|
||||
// month year
|
||||
snprintf(buff, 32, "%s %d", names_mo[this_mon], this_year);
|
||||
snprintf(buff, 32, "%s %d", MONTH_NAMES[this_mon], this_year);
|
||||
if (ImGui::Button(buff))
|
||||
*level = 1;
|
||||
ImGui::SameLine(5*cell_size.x);
|
||||
|
|
@ -3264,7 +3325,7 @@ bool ShowDatePicker(const char* id, int* level, ImPlotTime* t, const ImPlotTime*
|
|||
// render weekday abbreviations
|
||||
ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true);
|
||||
for (int i = 0; i < 7; ++i) {
|
||||
ImGui::Button(abrvs_wd[i],cell_size);
|
||||
ImGui::Button(WD_ABRVS[i],cell_size);
|
||||
if (i != 6) { ImGui::SameLine(); }
|
||||
}
|
||||
ImGui::PopItemFlag();
|
||||
|
|
@ -3341,7 +3402,7 @@ bool ShowDatePicker(const char* id, int* level, ImPlotTime* t, const ImPlotTime*
|
|||
(t2 != NULL && t2_yr == this_yr && t2_mo == mo);
|
||||
if (t1_or_t2)
|
||||
ImGui::PushStyleColor(ImGuiCol_Button, col_dis);
|
||||
if (ImGui::Button(abrvs_mo[mo],cell_size) && !clk) {
|
||||
if (ImGui::Button(MONTH_ABRVS[mo],cell_size) && !clk) {
|
||||
*t = MakeTime(this_yr, mo);
|
||||
*level = 0;
|
||||
}
|
||||
|
|
@ -3402,7 +3463,7 @@ bool ShowDatePicker(const char* id, int* level, ImPlotTime* t, const ImPlotTime*
|
|||
return clk;
|
||||
}
|
||||
|
||||
bool ShowTimePicker(const char* id, ImPlotTime* t) {
|
||||
bool ShowTimePicker(const char* id, ImPlotTime* t, bool hour24) {
|
||||
ImGui::PushID(id);
|
||||
tm& Tm = GImPlot->Tm;
|
||||
GetTime(*t,&Tm);
|
||||
|
|
@ -3416,7 +3477,7 @@ bool ShowTimePicker(const char* id, ImPlotTime* t) {
|
|||
|
||||
static const char* am_pm[] = {"am","pm"};
|
||||
|
||||
int hr = (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 sec = Tm.tm_sec;
|
||||
int ap = Tm.tm_hour < 12 ? 0 : 1;
|
||||
|
|
@ -3436,7 +3497,9 @@ bool ShowTimePicker(const char* id, ImPlotTime* t) {
|
|||
|
||||
ImGui::SetNextItemWidth(width);
|
||||
if (ImGui::BeginCombo("##hr",nums[hr],ImGuiComboFlags_NoArrowButton)) {
|
||||
for (int i = 1; i < 13; ++i) {
|
||||
const int ia = hour24 ? 0 : 1;
|
||||
const int ib = hour24 ? 24 : 13;
|
||||
for (int i = ia; i < ib; ++i) {
|
||||
if (ImGui::Selectable(nums[i],i==hr)) {
|
||||
hr = i;
|
||||
changed = true;
|
||||
|
|
@ -3470,10 +3533,12 @@ bool ShowTimePicker(const char* id, ImPlotTime* t) {
|
|||
}
|
||||
ImGui::EndCombo();
|
||||
}
|
||||
ImGui::SameLine();
|
||||
if (ImGui::Button(am_pm[ap],ImVec2(height,height))) {
|
||||
ap = 1 - ap;
|
||||
changed = true;
|
||||
if (!hour24) {
|
||||
ImGui::SameLine();
|
||||
if (ImGui::Button(am_pm[ap],ImVec2(height,height))) {
|
||||
ap = 1 - ap;
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
|
||||
ImGui::PopStyleColor(3);
|
||||
|
|
@ -3481,7 +3546,8 @@ bool ShowTimePicker(const char* id, ImPlotTime* t) {
|
|||
ImGui::PopID();
|
||||
|
||||
if (changed) {
|
||||
hr = hr % 12 + ap * 12;
|
||||
if (!hour24)
|
||||
hr = hr % 12 + ap * 12;
|
||||
Tm.tm_hour = hr;
|
||||
Tm.tm_min = min;
|
||||
Tm.tm_sec = sec;
|
||||
|
|
|
|||
1
implot.h
1
implot.h
|
|
@ -243,6 +243,7 @@ struct ImPlotStyle {
|
|||
// settings/flags
|
||||
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 Use24HourClock; // = false, hours will be formatted for 24 hour clock
|
||||
IMPLOT_API ImPlotStyle();
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -610,6 +610,8 @@ void ShowDemoWindow(bool* p_open) {
|
|||
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::SameLine();
|
||||
ImGui::Checkbox("Use 24 Hour Clock",&ImPlot::GetStyle().Use24HourClock);
|
||||
|
||||
static HugeTimeData* data = NULL;
|
||||
if (data == NULL) {
|
||||
|
|
@ -1367,7 +1369,7 @@ void PlotCandlestick(const char* label_id, const double* xs, const double* opens
|
|||
if (idx != -1) {
|
||||
ImGui::BeginTooltip();
|
||||
char buff[32];
|
||||
ImPlot::FormatTime(ImPlotTime::FromDouble(xs[idx]),buff,32,ImPlotTimeFmt_DayMoYr);
|
||||
ImPlot::FormatTime12(ImPlotTime::FromDouble(xs[idx]),buff,32,ImPlotTimeFmt_DayMoYr);
|
||||
ImGui::Text("Day: %s", buff);
|
||||
ImGui::Text("Open: $%.2f", opens[idx]);
|
||||
ImGui::Text("Close: $%.2f", closes[idx]);
|
||||
|
|
|
|||
|
|
@ -187,16 +187,16 @@ enum ImPlotTimeFmt_ {
|
|||
ImPlotTimeFmt_SUs, // :29.428 552
|
||||
ImPlotTimeFmt_SMs, // :29.428
|
||||
ImPlotTimeFmt_S, // :29
|
||||
ImPlotTimeFmt_HrMinS, // 7:21:29pm
|
||||
ImPlotTimeFmt_HrMin, // 7:21pm
|
||||
ImPlotTimeFmt_Hr, // 7pm
|
||||
ImPlotTimeFmt_HrMinS, // 7:21:29pm (19:21:29)
|
||||
ImPlotTimeFmt_HrMin, // 7:21pm (19:21)
|
||||
ImPlotTimeFmt_Hr, // 7pm (19:00)
|
||||
ImPlotTimeFmt_DayMo, // 10/3
|
||||
ImPlotTimeFmt_DayMoHr, // 10/3 7pm
|
||||
ImPlotTimeFmt_DayMoHrMin, // 10/3 7:21pm
|
||||
ImPlotTimeFmt_DayMoHr, // 10/3 7pm (10/3 19:00)
|
||||
ImPlotTimeFmt_DayMoHrMin, // 10/3 7:21pm (10/3 19:21)
|
||||
ImPlotTimeFmt_DayMoYr, // 10/3/91
|
||||
ImPlotTimeFmt_DayMoYrHrMin, // 10/3/91 7:21pm
|
||||
ImPlotTimeFmt_DayMoYrHrMinS, // 10/3/91 7:21:29pm
|
||||
ImPlotTimeFmt_DayMoYrHrMinSUs, // 10/3/1991 7:21:29.123456pm
|
||||
ImPlotTimeFmt_DayMoYrHrMin, // 10/3/91 7:21pm (10/3/91 19:21)
|
||||
ImPlotTimeFmt_DayMoYrHrMinS, // 10/3/91 7:21:29pm (10/3/91 19:21:29)
|
||||
ImPlotTimeFmt_DayMoYrHrMinSUs, // 10/3/1991 7:21:29.123456pm (10/3/1991 19:21:29.123456)
|
||||
ImPlotTimeFmt_MoYr, // Oct 1991
|
||||
ImPlotTimeFmt_Mo, // Oct
|
||||
ImPlotTimeFmt_Yr // 1991
|
||||
|
|
@ -720,14 +720,14 @@ IMPLOT_API void LabelTickDefault(ImPlotTick& tick, ImGuiTextBuffer& buffer);
|
|||
// Label a tick with scientific formating.
|
||||
IMPLOT_API void LabelTickScientific(ImPlotTick& tick, ImGuiTextBuffer& buffer);
|
||||
// Label a tick with time formatting.
|
||||
IMPLOT_API void LabelTickTime(ImPlotTick& tick, ImGuiTextBuffer& buffer, const ImPlotTime& t, ImPlotTimeFmt fmt);
|
||||
IMPLOT_API void LabelTickTime(ImPlotTick& tick, ImGuiTextBuffer& buffer, const ImPlotTime& t, ImPlotTimeFmt fmt, bool hour24);
|
||||
|
||||
// Populates a list of ImPlotTicks with normal spaced and formatted 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
|
||||
IMPLOT_API void AddTicksLogarithmic(const ImPlotRange& range, int nMajor, ImPlotTickCollection& ticks);
|
||||
// Populates a list of ImPlotTicks with time formatted ticks.
|
||||
IMPLOT_API void AddTicksTime(const ImPlotRange& range, int nMajor, ImPlotTickCollection& ticks);
|
||||
IMPLOT_API void AddTicksTime(const ImPlotRange& range, int nMajor, bool hour24, ImPlotTickCollection& 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);
|
||||
|
||||
|
|
@ -844,8 +844,10 @@ IMPLOT_API ImPlotTime RoundTime(const ImPlotTime& t, ImPlotTimeUnit unit);
|
|||
// 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);
|
||||
|
||||
// Formulates a timestamp t into a buffer according to fmt.
|
||||
IMPLOT_API int FormatTime(const ImPlotTime& t, char* buffer, int size, ImPlotTimeFmt fmt);
|
||||
// Formulates a timestamp t into a buffer according to fmt for 12 hour clock
|
||||
IMPLOT_API int FormatTime12(const ImPlotTime& t, char* buffer, int size, ImPlotTimeFmt fmt);
|
||||
// Formulates a timestamp t into a buffer according to fmt for 24 hur clock.
|
||||
IMPLOT_API int FormatTime24(const ImPlotTime& t, char* buffer, int size, ImPlotTimeFmt fmt);
|
||||
// Prints a timestamp to console
|
||||
IMPLOT_API void PrintTime(const ImPlotTime& t, ImPlotTimeFmt fmt = ImPlotTimeFmt_DayMoYrHrMinSUs);
|
||||
|
||||
|
|
@ -856,7 +858,7 @@ IMPLOT_API void PrintTime(const ImPlotTime& t, ImPlotTimeFmt fmt = ImPlotTimeFmt
|
|||
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).
|
||||
// #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);
|
||||
IMPLOT_API bool ShowTimePicker(const char* id, ImPlotTime* t, bool hour24);
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// [SECTION] Internal / Experimental Plotters
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user