Skip to content

Commit d8610c3

Browse files
epezentepezent
committed
trim white space
1 parent 2b46c3e commit d8610c3

File tree

3 files changed

+90
-90
lines changed

3 files changed

+90
-90
lines changed

‎implot.cpp

+53-53
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ void PushLinkedAxis(ImPlotAxis& axis) {
422422

423423
void PullLinkedAxis(ImPlotAxis& axis) {
424424
if (axis.LinkedMin) { axis.SetMin(*axis.LinkedMin); }
425-
if (axis.LinkedMax) { axis.SetMax(*axis.LinkedMax); }
425+
if (axis.LinkedMax) { axis.SetMax(*axis.LinkedMax); }
426426
}
427427

428428
//-----------------------------------------------------------------------------
@@ -600,13 +600,13 @@ void AddTicksCustom(const double* values, const char** labels, int n, ImPlotTick
600600

601601
// this may not be thread safe?
602602
static const double TimeUnitSpans[ImPlotTimeUnit_COUNT] = {
603-
0.000001,
604-
0.001,
605-
1,
606-
60,
607-
3600,
608-
86400,
609-
2629800,
603+
0.000001,
604+
0.001,
605+
1,
606+
60,
607+
3600,
608+
86400,
609+
2629800,
610610
31557600
611611
};
612612

@@ -661,10 +661,10 @@ inline int GetTimeStep(int max_divs, ImPlotTimeUnit unit) {
661661
ImPlotTime MkGmtTime(struct tm *ptm) {
662662
time_t secs = 0;
663663
int year = ptm->tm_year + 1900;
664-
for (int y = 1970; y < year; ++y)
665-
secs += (IsLeapYear(y)? 366: 365) * 86400;
666-
for (int m = 0; m < ptm->tm_mon; ++m)
667-
secs += GetDaysInMonth(year, m) * 86400;
664+
for (int y = 1970; y < year; ++y)
665+
secs += (IsLeapYear(y)? 366: 365) * 86400;
666+
for (int m = 0; m < ptm->tm_mon; ++m)
667+
secs += GetDaysInMonth(year, m) * 86400;
668668
secs += (ptm->tm_mday - 1) * 86400;
669669
secs += ptm->tm_hour * 3600;
670670
secs += ptm->tm_min * 60;
@@ -727,12 +727,12 @@ ImPlotTime AddTime(const ImPlotTime& t, ImPlotTimeUnit unit, int count) {
727727
case ImPlotTimeUnit_Day: t_out.S += count * 86400; break;
728728
case ImPlotTimeUnit_Mo: for (int i = 0; i < count; ++i) { // this might have a bug
729729
GetTime(t_out, &Tm);
730-
t_out.S += 86400 * GetDaysInMonth(Tm.tm_year + 1900, Tm.tm_mon);
730+
t_out.S += 86400 * GetDaysInMonth(Tm.tm_year + 1900, Tm.tm_mon);
731731
}
732732
break;
733733
case ImPlotTimeUnit_Yr: for (int i = 0; i < count; ++i) {
734734
if (IsLeapYear(GetYear(t_out)))
735-
t_out.S += 366 * 86400;
735+
t_out.S += 366 * 86400;
736736
else
737737
t_out.S += 365 * 86400;
738738
}
@@ -809,31 +809,31 @@ int FormatTime(const ImPlotTime& t, char* buffer, int size, ImPlotTimeFmt fmt) {
809809

810810
static const char mnames[12][4] = {"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"};
811811

812-
switch(fmt) {
813-
case ImPlotTimeFmt_Us: return snprintf(buffer, size, ".%03d %03d", ms, us);
814-
case ImPlotTimeFmt_SUs: return snprintf(buffer, size, ":%02d.%03d %03d", sec, ms, us);
815-
case ImPlotTimeFmt_SMs: return snprintf(buffer, size, ":%02d.%03d", sec, ms);
816-
case ImPlotTimeFmt_S: return snprintf(buffer, size, ":%02d", sec);
817-
case ImPlotTimeFmt_HrMinS: return snprintf(buffer, size, "%d:%02d:%02d%s", hr, min, sec, ap);
818-
case ImPlotTimeFmt_HrMin: return snprintf(buffer, size, "%d:%02d%s", hr, min, ap);
819-
case ImPlotTimeFmt_Hr: return snprintf(buffer, size, "%d%s", hr, ap);
820-
case ImPlotTimeFmt_DayMo: return snprintf(buffer, size, "%d/%d", mon, day);
821-
case ImPlotTimeFmt_DayMoHr: return snprintf(buffer, size, "%d/%d %d%s", mon, day, hr, ap);
822-
case ImPlotTimeFmt_DayMoHrMin: return snprintf(buffer, size, "%d/%d %d:%02d%s", mon, day, hr, min, ap);
823-
case ImPlotTimeFmt_DayMoYr: return snprintf(buffer, size, "%d/%d/%02d", mon, day, yr);
824-
case ImPlotTimeFmt_DayMoYrHrMin: return snprintf(buffer, size, "%d/%d/%02d %d:%02d%s", mon, day, yr, hr, min, ap);
825-
case ImPlotTimeFmt_DayMoYrHrMinS: return snprintf(buffer, size, "%d/%d/%02d %d:%02d:%02d%s", mon, day, yr, hr, min, sec, ap);
812+
switch(fmt) {
813+
case ImPlotTimeFmt_Us: return snprintf(buffer, size, ".%03d %03d", ms, us);
814+
case ImPlotTimeFmt_SUs: return snprintf(buffer, size, ":%02d.%03d %03d", sec, ms, us);
815+
case ImPlotTimeFmt_SMs: return snprintf(buffer, size, ":%02d.%03d", sec, ms);
816+
case ImPlotTimeFmt_S: return snprintf(buffer, size, ":%02d", sec);
817+
case ImPlotTimeFmt_HrMinS: return snprintf(buffer, size, "%d:%02d:%02d%s", hr, min, sec, ap);
818+
case ImPlotTimeFmt_HrMin: return snprintf(buffer, size, "%d:%02d%s", hr, min, ap);
819+
case ImPlotTimeFmt_Hr: return snprintf(buffer, size, "%d%s", hr, ap);
820+
case ImPlotTimeFmt_DayMo: return snprintf(buffer, size, "%d/%d", mon, day);
821+
case ImPlotTimeFmt_DayMoHr: return snprintf(buffer, size, "%d/%d %d%s", mon, day, hr, ap);
822+
case ImPlotTimeFmt_DayMoHrMin: return snprintf(buffer, size, "%d/%d %d:%02d%s", mon, day, hr, min, ap);
823+
case ImPlotTimeFmt_DayMoYr: return snprintf(buffer, size, "%d/%d/%02d", mon, day, yr);
824+
case ImPlotTimeFmt_DayMoYrHrMin: return snprintf(buffer, size, "%d/%d/%02d %d:%02d%s", mon, day, yr, hr, min, ap);
825+
case ImPlotTimeFmt_DayMoYrHrMinS: return snprintf(buffer, size, "%d/%d/%02d %d:%02d:%02d%s", mon, day, yr, hr, min, sec, ap);
826826
case ImPlotTimeFmt_MoYr: return snprintf(buffer, size, "%s %d", mnames[Tm.tm_mon], year);
827-
case ImPlotTimeFmt_Mo: return snprintf(buffer, size, "%s", mnames[Tm.tm_mon]);
828-
case ImPlotTimeFmt_Yr: return snprintf(buffer, size, "%d", year);
829-
default: return 0;
827+
case ImPlotTimeFmt_Mo: return snprintf(buffer, size, "%s", mnames[Tm.tm_mon]);
828+
case ImPlotTimeFmt_Yr: return snprintf(buffer, size, "%d", year);
829+
default: return 0;
830830
}
831831
}
832832

833-
void PrintTime(const ImPlotTime& t, ImPlotTimeFmt fmt) {
834-
static char buff[32];
835-
FormatTime(t, buff, 32, fmt);
836-
printf("%s\n",buff);
833+
void PrintTime(const ImPlotTime& t, ImPlotTimeFmt fmt) {
834+
static char buff[32];
835+
FormatTime(t, buff, 32, fmt);
836+
printf("%s\n",buff);
837837
}
838838

839839
// Returns the nominally largest possible width for a time format
@@ -949,8 +949,8 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, ImPlotTickCollecti
949949
// generate ticks
950950
ImPlotTime t1 = FloorTime(ImPlotTime::FromDouble(range.Min), unit1);
951951
while (t1 < t_max) {
952-
// get next major
953-
const ImPlotTime t2 = AddTime(t1, unit1, 1);
952+
// get next major
953+
const ImPlotTime t2 = AddTime(t1, unit1, 1);
954954
// add major tick
955955
if (t1 >= t_min && t1 <= t_max) {
956956
// minor level 0 tick
@@ -961,12 +961,12 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, ImPlotTickCollecti
961961
// major level 1 tick
962962
ImPlotTick tick_maj(t1.ToDouble(),true,true);
963963
tick_maj.Level = 1;
964-
LabelTickTime(tick_maj,ticks.Labels,t1, last_major == NULL ? fmtf : fmt1);
964+
LabelTickTime(tick_maj,ticks.Labels,t1, last_major == NULL ? fmtf : fmt1);
965965
const char* this_major = ticks.Labels.Buf.Data + tick_maj.BufferOffset;
966-
if (last_major && TimeLabelSame(last_major,this_major))
967-
tick_maj.ShowLabel = false;
968-
last_major = this_major;
969-
ticks.AddTick(tick_maj);
966+
if (last_major && TimeLabelSame(last_major,this_major))
967+
tick_maj.ShowLabel = false;
968+
last_major = this_major;
969+
ticks.AddTick(tick_maj);
970970
}
971971
// add minor ticks up until next major
972972
if (minor_per_major > 1 && (t_min <= t2 && t1 <= t_max)) {
@@ -987,7 +987,7 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, ImPlotTickCollecti
987987
}
988988
}
989989
t12 = AddTime(t12, unit0, step);
990-
}
990+
}
991991
}
992992
t1 = t2;
993993
}
@@ -1033,8 +1033,8 @@ void UpdateAxisColors(int axis_flag, ImPlotAxisColor* col) {
10331033
// BeginPlot()
10341034
//-----------------------------------------------------------------------------
10351035

1036-
bool BeginPlot(const char* title, const char* x_label, const char* y_label, const ImVec2& size,
1037-
ImPlotFlags flags, ImPlotAxisFlags x_flags, ImPlotAxisFlags y_flags, ImPlotAxisFlags y2_flags, ImPlotAxisFlags y3_flags)
1036+
bool BeginPlot(const char* title, const char* x_label, const char* y_label, const ImVec2& size,
1037+
ImPlotFlags flags, ImPlotAxisFlags x_flags, ImPlotAxisFlags y_flags, ImPlotAxisFlags y2_flags, ImPlotAxisFlags y3_flags)
10381038
{
10391039
IM_ASSERT_USER_ERROR(GImPlot != NULL, "No current context. Did you call ImPlot::CreateContext() or ImPlot::SetCurrentContext()?");
10401040
ImPlotContext& gp = *GImPlot;
@@ -1115,14 +1115,14 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons
11151115
}
11161116

11171117
if (gp.NextPlotData.HasXRange) {
1118-
if (just_created || gp.NextPlotData.XRangeCond == ImGuiCond_Always)
1119-
plot.XAxis.SetRange(gp.NextPlotData.X);
1118+
if (just_created || gp.NextPlotData.XRangeCond == ImGuiCond_Always)
1119+
plot.XAxis.SetRange(gp.NextPlotData.X);
11201120
}
11211121

11221122
for (int i = 0; i < IMPLOT_Y_AXES; i++) {
11231123
if (gp.NextPlotData.HasYRange[i]) {
1124-
if (just_created || gp.NextPlotData.YRangeCond[i] == ImGuiCond_Always)
1125-
plot.YAxis[i].SetRange(gp.NextPlotData.Y[i]);
1124+
if (just_created || gp.NextPlotData.YRangeCond[i] == ImGuiCond_Always)
1125+
plot.YAxis[i].SetRange(gp.NextPlotData.Y[i]);
11261126
}
11271127
}
11281128

@@ -1195,8 +1195,8 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons
11951195
const float txt_height = ImGui::GetTextLineHeight();
11961196

11971197
const float pad_top = title_size.x > 0.0f ? txt_height + gp.Style.LabelPadding.y : 0;
1198-
const float pad_bot = (gp.X.HasLabels ? txt_height + gp.Style.LabelPadding.y + (gp.X.IsTime ? txt_height + gp.Style.LabelPadding.y : 0) : 0)
1199-
+ (x_label ? txt_height + gp.Style.LabelPadding.y : 0);
1198+
const float pad_bot = (gp.X.HasLabels ? txt_height + gp.Style.LabelPadding.y + (gp.X.IsTime ? txt_height + gp.Style.LabelPadding.y : 0) : 0)
1199+
+ (x_label ? txt_height + gp.Style.LabelPadding.y : 0);
12001200

12011201
const float plot_height = gp.BB_Canvas.GetHeight() - pad_top - pad_bot;
12021202

@@ -1605,7 +1605,7 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons
16051605
for (int t = 0; t < gp.XTicks.Size; t++) {
16061606
ImPlotTick *xt = &gp.XTicks.Ticks[t];
16071607
if (xt->ShowLabel && xt->PixelPos >= gp.BB_Plot.Min.x - 1 && xt->PixelPos <= gp.BB_Plot.Max.x + 1)
1608-
DrawList.AddText(ImVec2(xt->PixelPos - xt->LabelSize.x * 0.5f, gp.BB_Plot.Max.y + gp.Style.LabelPadding.y + xt->Level * (txt_height + gp.Style.LabelPadding.y)),
1608+
DrawList.AddText(ImVec2(xt->PixelPos - xt->LabelSize.x * 0.5f, gp.BB_Plot.Max.y + gp.Style.LabelPadding.y + xt->Level * (txt_height + gp.Style.LabelPadding.y)),
16091609
xt->Major ? gp.Col_X.MajTxt : gp.Col_X.MinTxt, gp.XTicks.GetLabel(t));
16101610
}
16111611
}
@@ -1817,7 +1817,7 @@ void EndPlot() {
18171817
if (!ImHasFlag(plot.XAxis.Flags, ImPlotAxisFlags_NoTickMarks)) {
18181818
for (int t = 0; t < gp.XTicks.Size; t++) {
18191819
ImPlotTick *xt = &gp.XTicks.Ticks[t];
1820-
if (xt->Level == 0)
1820+
if (xt->Level == 0)
18211821
DrawList.AddLine(ImVec2(xt->PixelPos, gp.BB_Plot.Max.y),
18221822
ImVec2(xt->PixelPos, gp.BB_Plot.Max.y - (xt->Major ? gp.Style.MajorTickLen.x : gp.Style.MinorTickLen.x)),
18231823
gp.Col_X.Major,

‎implot_demo.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ void ShowDemoWindow(bool* p_open) {
619619
"UNIX timestamps in seconds and axis labels are formated as date/time.");
620620
ImGui::BulletText("By default, labels are in UTC time but can be set to use local time instead.");
621621

622-
ImGui::Checkbox("Use Local Time",&ImPlot::GetStyle().UseLocalTime);
622+
ImGui::Checkbox("Use Local Time",&ImPlot::GetStyle().UseLocalTime);
623623

624624
static HugeTimeData* data = NULL;
625625
if (data == NULL) {
@@ -632,9 +632,9 @@ void ShowDemoWindow(bool* p_open) {
632632

633633
ImPlot::SetNextPlotLimits(t_min,t_max,0,1);
634634
if (ImPlot::BeginPlot("##Time", "Time", "Value", ImVec2(-1,0), 0, ImPlotAxisFlags_Time)) {
635-
if (data != NULL) {
636-
// downsample our data
637-
int downsample = (int)ImPlot::GetPlotLimits().X.Size() / 1000 + 1;
635+
if (data != NULL) {
636+
// downsample our data
637+
int downsample = (int)ImPlot::GetPlotLimits().X.Size() / 1000 + 1;
638638
int start = (int)(ImPlot::GetPlotLimits().X.Min - t_min);
639639
start = start < 0 ? 0 : start > HugeTimeData::Size - 1 ? HugeTimeData::Size - 1 : start;
640640
int end = (int)(ImPlot::GetPlotLimits().X.Max - t_min) + 1000;
@@ -701,14 +701,14 @@ void ShowDemoWindow(bool* p_open) {
701701
ImGui::SameLine();
702702
ImGui::Checkbox("Link Y", &linky);
703703
ImPlot::LinkNextPlotLimits(linkx ? &xmin : NULL , linkx ? &xmax : NULL, linky ? &ymin : NULL, linky ? &ymax : NULL);
704-
if (ImPlot::BeginPlot("Plot A")) {
704+
if (ImPlot::BeginPlot("Plot A")) {
705705
ImPlot::PlotLine("Line",data,2);
706-
ImPlot::EndPlot();
706+
ImPlot::EndPlot();
707707
}
708708
ImPlot::LinkNextPlotLimits(linkx ? &xmin : NULL , linkx ? &xmax : NULL, linky ? &ymin : NULL, linky ? &ymax : NULL);
709-
if (ImPlot::BeginPlot("Plot B")) {
709+
if (ImPlot::BeginPlot("Plot B")) {
710710
ImPlot::PlotLine("Line",data,2);
711-
ImPlot::EndPlot();
711+
ImPlot::EndPlot();
712712
}
713713
}
714714
//-------------------------------------------------------------------------
@@ -1339,7 +1339,7 @@ int BinarySearch(const T* arr, int l, int r, T x) {
13391339
}
13401340

13411341
void PlotCandlestick(const char* label_id, const double* xs, const double* opens, const double* closes, const double* lows, const double* highs, int count, bool tooltip, float width_percent, ImVec4 bullCol, ImVec4 bearCol) {
1342-
1342+
13431343
// get ImGui window DrawList
13441344
ImDrawList* draw_list = ImPlot::GetPlotDrawList();
13451345
// calc real value width

‎implot_internal.h

+28-28
Original file line numberDiff line numberDiff line change
@@ -170,15 +170,15 @@ enum ImPlotScale_ {
170170
ImPlotScale_LogLog // log x, log y
171171
};
172172

173-
enum ImPlotTimeUnit_ {
174-
ImPlotTimeUnit_Us, // microsecond
175-
ImPlotTimeUnit_Ms, // millisecond
176-
ImPlotTimeUnit_S, // second
177-
ImPlotTimeUnit_Min, // minute
178-
ImPlotTimeUnit_Hr, // hour
179-
ImPlotTimeUnit_Day, // day
180-
ImPlotTimeUnit_Mo, // month
181-
ImPlotTimeUnit_Yr, // year
173+
enum ImPlotTimeUnit_ {
174+
ImPlotTimeUnit_Us, // microsecond
175+
ImPlotTimeUnit_Ms, // millisecond
176+
ImPlotTimeUnit_S, // second
177+
ImPlotTimeUnit_Min, // minute
178+
ImPlotTimeUnit_Hr, // hour
179+
ImPlotTimeUnit_Day, // day
180+
ImPlotTimeUnit_Mo, // month
181+
ImPlotTimeUnit_Yr, // year
182182
ImPlotTimeUnit_COUNT
183183
};
184184

@@ -308,28 +308,28 @@ struct ImPlotAxis
308308
LinkedMin = LinkedMax = NULL;
309309
}
310310

311-
bool SetMin(double _min) {
311+
bool SetMin(double _min) {
312312
_min = ImConstrainNan(ImConstrainInf(_min));
313313
if (ImHasFlag(Flags, ImPlotAxisFlags_LogScale))
314314
_min = ImConstrainLog(_min);
315-
if (ImHasFlag(Flags, ImPlotAxisFlags_Time))
316-
_min = ImConstrainTime(_min);
317-
if (_min >= Range.Max)
315+
if (ImHasFlag(Flags, ImPlotAxisFlags_Time))
316+
_min = ImConstrainTime(_min);
317+
if (_min >= Range.Max)
318318
return false;
319319
Range.Min = _min;
320-
return true;
320+
return true;
321321
};
322322

323-
bool SetMax(double _max) {
323+
bool SetMax(double _max) {
324324
_max = ImConstrainNan(ImConstrainInf(_max));
325325
if (ImHasFlag(Flags, ImPlotAxisFlags_LogScale))
326326
_max = ImConstrainLog(_max);
327-
if (ImHasFlag(Flags, ImPlotAxisFlags_Time))
328-
_max = ImConstrainTime(_max);
329-
if (_max <= Range.Min)
327+
if (ImHasFlag(Flags, ImPlotAxisFlags_Time))
328+
_max = ImConstrainTime(_max);
329+
if (_max <= Range.Min)
330330
return false;
331331
Range.Max = _max;
332-
return true;
332+
return true;
333333
};
334334

335335
void SetRange(double _min, double _max) {
@@ -597,19 +597,19 @@ struct ImPlotTime {
597597
static ImPlotTime FromDouble(double t) { return ImPlotTime((time_t)t, (int)(t * 1000000 - floor(t) * 1000000)); }
598598
};
599599

600-
static inline ImPlotTime operator+(const ImPlotTime& lhs, const ImPlotTime& rhs)
600+
static inline ImPlotTime operator+(const ImPlotTime& lhs, const ImPlotTime& rhs)
601601
{ return ImPlotTime(lhs.S + rhs.S, lhs.Us + rhs.Us); }
602-
static inline ImPlotTime operator-(const ImPlotTime& lhs, const ImPlotTime& rhs)
602+
static inline ImPlotTime operator-(const ImPlotTime& lhs, const ImPlotTime& rhs)
603603
{ return ImPlotTime(lhs.S - rhs.S, lhs.Us - rhs.Us); }
604-
static inline bool operator==(const ImPlotTime& lhs, const ImPlotTime& rhs)
604+
static inline bool operator==(const ImPlotTime& lhs, const ImPlotTime& rhs)
605605
{ return lhs.S == rhs.S && lhs.Us == rhs.Us; }
606-
static inline bool operator<(const ImPlotTime& lhs, const ImPlotTime& rhs)
606+
static inline bool operator<(const ImPlotTime& lhs, const ImPlotTime& rhs)
607607
{ return lhs.S == rhs.S ? lhs.Us < rhs.Us : lhs.S < rhs.S; }
608-
static inline bool operator>(const ImPlotTime& lhs, const ImPlotTime& rhs)
608+
static inline bool operator>(const ImPlotTime& lhs, const ImPlotTime& rhs)
609609
{ return rhs < lhs; }
610-
static inline bool operator<=(const ImPlotTime& lhs, const ImPlotTime& rhs)
610+
static inline bool operator<=(const ImPlotTime& lhs, const ImPlotTime& rhs)
611611
{ return lhs < rhs || lhs == rhs; }
612-
static inline bool operator>=(const ImPlotTime& lhs, const ImPlotTime& rhs)
612+
static inline bool operator>=(const ImPlotTime& lhs, const ImPlotTime& rhs)
613613
{ return lhs > rhs || lhs == rhs; }
614614

615615
//-----------------------------------------------------------------------------
@@ -681,7 +681,7 @@ inline bool FitThisFrame() { return GImPlot->FitThisFrame; }
681681
void FitPoint(const ImPlotPoint& p);
682682

683683
// Returns true if two ranges overlap
684-
inline bool RangesOverlap(const ImPlotRange& r1, const ImPlotRange& r2)
684+
inline bool RangesOverlap(const ImPlotRange& r1, const ImPlotRange& r2)
685685
{ return r1.Min <= r2.Max && r2.Min <= r1.Max; }
686686

687687
// Updates pointers for linked axes from axis internal range.
@@ -816,7 +816,7 @@ ImPlotTime MkLocTime(struct tm *ptm);
816816
// Make a tm struct from a timestamp expressed as a local time.
817817
tm* GetLocTime(const ImPlotTime& t, tm* ptm);
818818

819-
// NB: These functions only work if there is a current ImPlotContext because the
819+
// NB: These functions only work if there is a current ImPlotContext because the
820820
// internal tm struct is owned by the context!
821821

822822
// Adds time to a timestamp. #count must be positive!

0 commit comments

Comments
 (0)