From d90f2f03cb453b2f88c684782a4c2931cb6037d8 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sat, 28 May 2011 19:36:42 +1000 Subject: [PATCH] Barchart fixes --- SleepyHead.depend | 8 ++++---- SleepyHeadMain.cpp | 2 +- graphs/graph.cpp | 20 ++++++++------------ graphs/graph.h | 6 +----- version.h | 12 ++++++------ 5 files changed, 20 insertions(+), 28 deletions(-) diff --git a/SleepyHead.depend b/SleepyHead.depend index fca40546..0f50a4d3 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -7866,11 +7866,11 @@ "tinyxml/tinyxml.h" -1306564125 /home/mark/projects/git/sleepyhead/graphs/graph.h +1306574943 /home/mark/projects/git/sleepyhead/graphs/graph.h -1306574097 /home/mark/projects/git/sleepyhead/version.h +1306575341 /home/mark/projects/git/sleepyhead/version.h 1306549105 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h "machine.h" @@ -7887,7 +7887,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1306573671 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp +1306575003 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -7902,7 +7902,7 @@ "SleepyHeadMain.h" "sleeplib/profiles.h" -1306574058 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp +1306574943 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index c9bb0259..055049e4 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -223,7 +223,7 @@ void SleepyHeadFrame::OnViewMenuSummary( wxCommandEvent& event ) Summary::Summary(wxWindow *win) :SummaryPanel(win) { - const int days_shown=30; + const int days_shown=60; machine=NULL; AddData(ahidata=new HistoryData(machine,days_shown)); diff --git a/graphs/graph.cpp b/graphs/graph.cpp index b94c2d2a..8707a2f7 100644 --- a/graphs/graph.cpp +++ b/graphs/graph.cpp @@ -672,8 +672,6 @@ void gCandleStick::Plot(wxDC & dc, gGraphWindow & w) gBarChart::gBarChart(gPointData *d,const wxColor *col,wxOrientation o) :gLayer(d),m_direction(o) { - m_yminor_ticks=2; - m_ymajor_ticks=10; m_show_grid=true; m_show_minor_grid=true; if (col) { @@ -761,6 +759,7 @@ void gBarChart::DrawYTicks(wxDC & dc,gGraphWindow &w) dc.DrawRotatedText(w.Title(), start_px-8-labelW - y, start_py+((height + x)>>1), 90); } + void gBarChart::Plot(wxDC & dc, gGraphWindow & w) { if (!m_visible) return; @@ -790,17 +789,16 @@ void gBarChart::Plot(wxDC & dc, gGraphWindow & w) for (int i=0;inp[0];i++) { if ((data->point[0][i].x > w.min_x) && (data->point[0][i].xnp[0];i++) { //if (data->point[0][i].x < w.min_x) continue; //if (data->point[0][i].x > w.max_x) break; dc.SetBrush(*wxTRANSPARENT_BRUSH); - t1=px+1; - px+=barwidth+2; + t1=px; + px+=barwidth+1; t2=px-t1-1; wxRect rect; @@ -853,6 +850,7 @@ void gBarChart::Plot(wxDC & dc, gGraphWindow & w) dc.DrawLine(start_px,start_py,start_px,start_py+height); dc.DrawLine(start_px,start_py+height,start_px+width,start_py+height); + // DrawXTicks(dc,w); } /*gBarChart::gBarChart(gGraphData *d,wxOrientation o) @@ -983,8 +981,6 @@ void gBarChart::Plot(wxDC & dc, gGraphWindow & w) gLineChart::gLineChart(gPointData *d,const wxColor * col,int dlsize,bool a) :gLayer(d),m_accelerate(a),m_drawlist_size(dlsize) { - m_yminor_ticks=0.5; - m_ymajor_ticks=1; m_drawlist=new wxPoint [dlsize]; color.clear(); color.push_back(col); @@ -1122,7 +1118,7 @@ void gLineChart::DrawXTicks(wxDC & dc,gGraphWindow &w) show_time=false; st=st2; min_tick=1; - double mtiks=(y+10)/width; + double mtiks=(y+20.0)/width; double mt=mtiks*xx; min_tick=mt; if (min_tick<1) min_tick=1; diff --git a/graphs/graph.h b/graphs/graph.h index 726e048e..aa31492b 100644 --- a/graphs/graph.h +++ b/graphs/graph.h @@ -321,8 +321,6 @@ class gLineChart:public gLayer virtual void DrawYTicks(wxDC & dc,gGraphWindow &w); protected: - float m_yminor_ticks; - float m_ymajor_ticks; bool m_accelerate; int m_drawlist_size; wxPoint *m_drawlist; @@ -368,11 +366,9 @@ class gBarChart:public gLayer virtual void Plot(wxDC & dc, gGraphWindow & w); protected: - void DrawYTicks(wxDC & dc,gGraphWindow &w); + virtual void DrawYTicks(wxDC & dc,gGraphWindow &w); wxOrientation m_direction; - float m_yminor_ticks; - float m_ymajor_ticks; // d.Set(i+2400000.5+.000001); // JDN vs MJD vs Rounding errors diff --git a/version.h b/version.h index 7654e510..911f0a64 100644 --- a/version.h +++ b/version.h @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 1522; - static const long REVISION = 2809; + static const long BUILD = 1537; + static const long REVISION = 2908; //Miscellaneous Version Types - static const long BUILDS_COUNT = 5452; - #define RC_FILEVERSION 0,7,1522,2809 - #define RC_FILEVERSION_STRING "0, 7, 1522, 2809\0" - static const char FULLVERSION_STRING[] = "0.7.1522.2809"; + static const long BUILDS_COUNT = 5486; + #define RC_FILEVERSION 0,7,1537,2908 + #define RC_FILEVERSION_STRING "0, 7, 1537, 2908\0" + static const char FULLVERSION_STRING[] = "0.7.1537.2908"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 62;