From 4956784ee44fa86e0e98aace199b98d9ba3812c1 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 31 May 2011 08:53:48 +1000 Subject: [PATCH] Moved X/Y axes to their own layer --- SleepyHead.cbp | 2 +- SleepyHead.depend | 11 +- SleepyHead.layout | 35 +- SleepyHeadMain.cpp | 17 +- graphs/graph.cpp | 803 +++++++++++++++------------------------------ graphs/graph.h | 44 ++- version.h | 14 +- 7 files changed, 343 insertions(+), 583 deletions(-) diff --git a/SleepyHead.cbp b/SleepyHead.cbp index c8294d83..8bffa187 100644 --- a/SleepyHead.cbp +++ b/SleepyHead.cbp @@ -58,7 +58,7 @@ - + diff --git a/SleepyHead.depend b/SleepyHead.depend index ede03830..e562051d 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -7871,11 +7871,11 @@ "tinyxml/tinyxml.h" -1306761730 /home/mark/projects/git/sleepyhead/graphs/graph.h +1306795897 /home/mark/projects/git/sleepyhead/graphs/graph.h -1306762407 /home/mark/projects/git/sleepyhead/version.h +1306795962 /home/mark/projects/git/sleepyhead/version.h 1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h "machine.h" @@ -7892,10 +7892,11 @@ "preferences.h" "tinyxml/tinyxml.h" -1306761931 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp +1306794879 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp "wx_pch.h" "version.h" + @@ -7908,7 +7909,7 @@ "SleepyHeadMain.h" "sleeplib/profiles.h" -1306761778 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp +1306795843 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp @@ -8077,3 +8078,5 @@ "wx/hashmap.h" "wx/bitmap.h" +1306766429 /home/mark/Downloads/burn48.xpm + diff --git a/SleepyHead.layout b/SleepyHead.layout index b478eff2..50742373 100644 --- a/SleepyHead.layout +++ b/SleepyHead.layout @@ -4,20 +4,23 @@ + + + - - + + - + - + - + @@ -26,10 +29,10 @@ - + - + @@ -37,22 +40,22 @@ - - + + - - + + - - + + - - + + - + diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index ac5eb21b..63781994 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -17,6 +17,7 @@ #include "version.h" #include +#include #include #include #include @@ -28,11 +29,8 @@ #include - #include "SleepyHeadMain.h" #include "sleeplib/profiles.h" -//#include "graphs/sleepflagsgraph.h" -//#include "graphs/cpap_wavegraph.h" #if defined(__WXMSW__) extern "C" void *_GdipStringFormatCachedGenericTypographic = NULL; @@ -324,6 +322,7 @@ Summary::Summary(wxWindow *win,Profile *_profile) AHI=new gGraphWindow(ScrolledWindow,-1,wxT("AHI"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER); AHI->SetMargins(10,15,60,80); AHI->AddLayer(new gBarChart(ahidata,wxRED)); + // AHI->AddLayer(new gXAxis(NULL,wxBLACK)); //AHI->AddLayer(new gLineChart(ahidata,wxRED)); fgSizer->Add(AHI,1,wxEXPAND); @@ -333,18 +332,23 @@ Summary::Summary(wxWindow *win,Profile *_profile) PRESSURE->AddLayer(new gLineChart(pressure,wxBLUE,6192)); PRESSURE->AddLayer(new gLineChart(pressure_eap,wxRED,6192,false,true)); PRESSURE->AddLayer(new gLineChart(pressure_iap,wxGREEN,6192,false,true)); + PRESSURE->AddLayer(new gXAxis(NULL,wxBLACK)); + fgSizer->Add(PRESSURE,1,wxEXPAND); LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Mask Leak"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER); LEAK->SetMargins(10,15,60,80); //LEAK->AddLayer(new gBarChart(leak,wxYELLOW)); LEAK->AddLayer(new gLineChart(leak,wxYELLOW,6192)); + LEAK->AddLayer(new gXAxis(NULL,wxBLACK)); fgSizer->Add(LEAK,1,wxEXPAND); USAGE=new gGraphWindow(ScrolledWindow,-1,wxT("Usage (Hours)"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER); USAGE->SetMargins(10,15,60,80); USAGE->AddLayer(new gBarChart(usage,wxGREEN)); + //USAGE->AddLayer(new gXAxis(NULL,wxBLACK)); + //USAGE->AddLayer(new gLineChart(usage,wxGREEN)); fgSizer->Add(USAGE,1,wxEXPAND); @@ -506,6 +510,7 @@ Daily::Daily(wxWindow *win,Profile *p) AddData(leakdata=new PressureData(CPAP_Leak,0)); LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Mask Leaks"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER); LEAK->AddLayer(new gLineChart(leakdata,wxPURPLE,4096,false)); + LEAK->AddLayer(new gXAxis(NULL,wxBLACK)); AddData(pressure_iap=new PressureData(CPAP_IAP)); AddData(pressure_eap=new PressureData(CPAP_EAP)); @@ -514,6 +519,7 @@ Daily::Daily(wxWindow *win,Profile *p) PRD->AddLayer(new gLineChart(prd,wxDARK_GREEN,4096,false)); PRD->AddLayer(new gLineChart(pressure_iap,wxBLUE,4096,false,true)); PRD->AddLayer(new gLineChart(pressure_eap,wxRED,4096,false,true)); + PRD->AddLayer(new gXAxis(NULL,wxBLACK)); AddData(frw=new FlowData()); FRW=new gGraphWindow(ScrolledWindow,-1,wxT("Flow Rate"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER); @@ -539,9 +545,10 @@ Daily::Daily(wxWindow *win,Profile *p) FRW->AddLayer(new gLineOverlayBar(flags[3],wxBLUE,wxT("H"))); FRW->AddLayer(new gLineOverlayBar(flags[2],wxAQUA,wxT("OA"))); FRW->AddLayer(new gLineOverlayBar(flags[1],wxPURPLE,wxT("CA"))); + FRW->AddLayer(new gXAxis(NULL,wxBLACK)); SF=new gGraphWindow(ScrolledWindow,-1,wxT("Sleep Flags"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER); - SF->SetMargins(10,15,20,80); + // SF->SetMargins(10,15,20,80); SF->LinkZoom(FRW); #if defined(__UNIX__) @@ -560,6 +567,8 @@ Daily::Daily(wxWindow *win,Profile *p) SF->AddLayer(new gFlagsLine(flags[2],wxAQUA,wxT("OA"),2,sfc)); SF->AddLayer(new gFlagsLine(flags[1],wxPURPLE,wxT("CA"),1,sfc)); SF->AddLayer(new gFlagsLine(flags[0],wxGREEN2,wxT("CSR"),0,sfc)); + SF->AddLayer(new gXAxis(NULL,wxBLACK)); + fgSizer->Add(SF,1,wxEXPAND); fgSizer->Add(G_AHI,1,wxEXPAND); diff --git a/graphs/graph.cpp b/graphs/graph.cpp index 4654792e..aecb3fc1 100644 --- a/graphs/graph.cpp +++ b/graphs/graph.cpp @@ -346,7 +346,7 @@ gGraphWindow::gGraphWindow(wxWindow *parent, wxWindowID id,const wxString & titl SetBackgroundColour( *wxWHITE ); m_bgColour = *wxWHITE; m_fgColour = *wxBLACK; - SetMargins(10, 15, 30, 80); + SetMargins(10, 15, 32, 80); m_block_move=false; m_block_zoom=false; @@ -422,13 +422,17 @@ double gGraphWindow::MinX() //f=false; bool first=true; - double val; + double val,tmp; for (auto l=layers.begin();l!=layers.end();l++) { if (first) { val=(*l)->MinX(); - first=false; + if (!((val==(*l)->MaxX()) && (val==0))) + first=false; } else { - if ((*l)->MinX() < val) val = (*l)->MinX(); + tmp=(*l)->MinX(); + if (!((tmp==(*l)->MaxX()) && (tmp==0))) { + if (tmp < val) val = tmp; + } } } @@ -441,13 +445,18 @@ double gGraphWindow::MaxX() //f=false; bool first=true; - double val; + double val,tmp; for (auto l=layers.begin();l!=layers.end();l++) { if (first) { val=(*l)->MaxX(); - first=false; + if (!((val==(*l)->MinX()) && (val==0))) + first=false; + } else { - if ((*l)->MaxX() > val) val = (*l)->MaxX(); + tmp=(*l)->MaxX(); + if (!((tmp==(*l)->MinX()) && (tmp==0))) { + if (tmp > val) val = tmp; + } } } return max_x=val; @@ -504,13 +513,17 @@ double gGraphWindow::RealMinX() //f=false; bool first=true; - double val; + double val,tmp; for (auto l=layers.begin();l!=layers.end();l++) { if (first) { val=(*l)->RealMinX(); - first=false; + if (!((val==(*l)->RealMaxX()) && (val==0))) + first=false; } else { - if ((*l)->RealMinX() < val) val = (*l)->RealMinX(); + tmp=(*l)->RealMinX(); + if (!((tmp==(*l)->RealMaxX()) && (tmp==0))) { // Ignore this layer if both are 0 + if (tmp < val) val = tmp; + } } } return rmin_x=val; @@ -522,13 +535,17 @@ double gGraphWindow::RealMaxX() //f=false; bool first=true; - double val; + double val,tmp; for (auto l=layers.begin();l!=layers.end();l++) { if (first) { val=(*l)->RealMaxX(); - first=false; + if (!((val==(*l)->RealMinX()) && (val==0))) + first=false; } else { - if ((*l)->RealMaxX() > val) val = (*l)->RealMaxX(); + tmp=(*l)->RealMaxX(); + if (!((tmp==(*l)->RealMinX()) && (tmp==0))) { // Ignore this layer if both are 0 + if (tmp > val) val = tmp; + } } } return rmax_x=val; @@ -619,6 +636,226 @@ void gGraphWindow::DataChanged(gLayer *layer) } +gXAxis::gXAxis(gPointData *d,const wxColor * col) +:gLayer(d) +{ + if (col) { + color.clear(); + color.push_back(col); + } +} +gXAxis::~gXAxis() +{ +} +void gXAxis::Plot(wxDC & dc, gGraphWindow & w) +{ + float px,py; + wxCoord x,y; + + int scrx = w.GetScrX(); + int scry = w.GetScrY(); + //wxString label=wxString::Format(wxT("%i %i"),scrx,scry); + //dc.DrawText(label,0,0); + + int start_px=w.GetLeftMargin(); + int start_py=w.GetTopMargin(); + int width=scrx-(start_px+w.GetRightMargin()); + int height=scry-(start_py+w.GetBottomMargin()); + + dc.SetPen(*color[0]); + + //wxDateTime d; + wxString fd=wxT("00:00:00:0000"); + dc.GetTextExtent(fd,&x,&y); + double max_ticks=(x+25.0)/width; // y+50 for rotated text + double jj=1/max_ticks; + double xx=w.max_x-w.min_x; + double minor_tick=max_ticks*xx; + double st2=w.min_x; //double(int(frac*1440.0))/1440.0; + double st,q; + + bool show_seconds=false; + bool show_milliseconds=false; + bool show_time=true; + + double min_tick; + if (xx<1.5) { + int rounding[16]={12,24,48,72,96,144,288,720,1440,2880,5760,8640,17280,86400,172800,345600}; // time rounding + + int ri; + for (ri=0;ri<16;ri++) { + st=round(st2*rounding[ri])/rounding[ri]; + min_tick=round(minor_tick*rounding[ri])/rounding[ri]; + q=xx/min_tick; // number of ticks that fits in range + if (q<=jj) break; // compared to number of ticks that fit on screen. + } + if (ri>8) show_seconds=true; + if (ri>=14) show_milliseconds=true; + + if (min_tick<=0.25/86400.0) + min_tick=0.25/86400; + } else { // Day ticks.. + show_time=false; + st=st2; + min_tick=1; + double mtiks=(x+20.0)/width; + double mt=mtiks*xx; + min_tick=mt; + if (min_tick<1) min_tick=1; + if (min_tick>10) min_tick=10; + } + + // dc.SetPen(*wxBLACK_PEN); + + double st3=st; + while (st3>w.min_x) { + st3-=min_tick/10.0; + } + st3+=min_tick/10.0; + + py=start_py+height; + + for (double i=st3; i<=w.max_x; i+=min_tick/10.0) { + if (i=0) { + int yrounding[9]={1,2,5,10,20,30,40,50,100}; // time rounding + int ry; + for (ry=0;ry<9;ry++) { + // st=round(st2*rounding[ry])/rounding[ry]; + min_ytick=round(major_ytick*yrounding[ry])/yrounding[ry]; + q=yy/min_ytick; // number of ticks that fits in range + if (q<=max_yticks) break; // compared to number of ticks that fit on screen. + } + } else { + min_ytick=60; + } + if (min_ytick<=0.25) + min_ytick=0.25; + + int ty,h; + for (float i=w.min_y; i w.min_y)) + dc.DrawLine(start_px+1,h,start_px+width,h); + } + + for (double i=w.min_y; i<=w.max_y; i+=min_ytick) { + ty=(i - w.min_y) * ymult; + fd=Format(i); // Override this as a function. + dc.GetTextExtent(fd,&x,&y); + if (x>labelW) labelW=x; + h=(start_py+height)-ty; + dc.DrawText(fd,start_px-8-x,h - (y / 2)); + dc.SetPen(*wxBLACK_PEN); + dc.DrawLine(start_px-6,h,start_px,h); + dc.SetPen(pen2); + if (m_show_major_lines && (i > w.min_y)) + dc.DrawLine(start_px+1,h,start_px+width,h); + } + dc.GetTextExtent(w.Title(),&x,&y); + dc.DrawRotatedText(w.Title(), start_px-8-labelW - y, start_py+((height + x)>>1), 90); +} + + gCandleStick::gCandleStick(gPointData *d,wxOrientation o) :gLayer(d) { @@ -709,211 +946,18 @@ void gCandleStick::Plot(wxDC & dc, gGraphWindow & w) gBarChart::gBarChart(gPointData *d,const wxColor *col,wxOrientation o) :gLayer(d),m_direction(o) { - m_show_grid=true; - m_show_minor_grid=true; if (col) { color.clear(); color.push_back(col); } + Xaxis=new gXAxis(NULL,wxBLACK); + Yaxis=new gYAxis(NULL,wxBLACK); } gBarChart::~gBarChart() { + delete Yaxis; + delete Xaxis; } -void gBarChart::DrawYTicks(wxDC & dc,gGraphWindow &w) -{ - static wxColor wxDARK_GREY(0xA0,0xA0,0xA0,0xA0); - static wxPen pen1(*wxLIGHT_GREY, 1, wxDOT); - static wxPen pen2(wxDARK_GREY, 1, wxDOT); - wxCoord x,y,labelW=0; - - int scrx = w.GetScrX(); - int scry = w.GetScrY(); - //wxString label=wxString::Format(wxT("%i %i"),scrx,scry); - //dc.DrawText(label,0,0); - - int start_px=w.GetLeftMargin(); - int start_py=w.GetTopMargin(); - int width=scrx-(w.GetLeftMargin()+w.GetRightMargin()); - int height=scry-(w.GetTopMargin()+w.GetBottomMargin()); - - dc.SetPen(*wxBLACK_PEN); - - wxString fd=wxT("0"); - dc.GetTextExtent(fd,&x,&y); - double max_yticksdiv=(y+15.0)/(height); // y+50 for rotated text - double max_yticks=1/max_yticksdiv; - double miny=w.min_y; - double maxy=w.max_y; - double yy=w.max_y-w.min_y; - double ymult=height/yy; - double major_ytick=max_yticksdiv*yy; - - double min_ytick,q; - - if (w.min_y>=0) { - int yrounding[9]={1,2,5,10,20,30,40,50,100}; // time rounding - int ry; - for (ry=0;ry<9;ry++) { - // st=round(st2*rounding[ry])/rounding[ry]; - min_ytick=round(major_ytick*yrounding[ry])/yrounding[ry]; - q=yy/min_ytick; // number of ticks that fits in range - if (q<=max_yticks) break; // compared to number of ticks that fit on screen. - } - } else { - min_ytick=60; - } - if (min_ytick<=0.25) - min_ytick=0.25; - - int ty,h; - for (float i=w.min_y; i w.min_y)) - dc.DrawLine(start_px+1,h,start_px+width,h); - } - - for (double i=w.min_y; i<=w.max_y; i+=min_ytick) { - ty=(i - w.min_y) * ymult; - fd=FormatY(i); // Override this as a function. - dc.GetTextExtent(fd,&x,&y); - if (x>labelW) labelW=x; - h=(start_py+height)-ty; - dc.DrawText(fd,start_px-8-x,h - (y / 2)); - dc.SetPen(*wxBLACK_PEN); - dc.DrawLine(start_px-6,h,start_px,h); - dc.SetPen(pen2); - if (m_show_grid && (i > w.min_y)) - dc.DrawLine(start_px+1,h,start_px+width,h); - } - dc.GetTextExtent(w.Title(),&x,&y); - dc.DrawRotatedText(w.Title(), start_px-8-labelW - y, start_py+((height + x)>>1), 90); -} - -void gBarChart::DrawXTicks(wxDC & dc,gGraphWindow &w) -{ - float px,py; - wxCoord x,y; - - int scrx = w.GetScrX(); - int scry = w.GetScrY(); - //wxString label=wxString::Format(wxT("%i %i"),scrx,scry); - //dc.DrawText(label,0,0); - - int start_px=w.GetLeftMargin(); - int start_py=w.GetTopMargin(); - int width=scrx-(start_px+w.GetRightMargin()); - int height=scry-(start_py+w.GetBottomMargin()); - - dc.SetPen(*wxBLACK_PEN); - - //wxDateTime d; - wxString fd=wxT("00:00:00:0000"); - dc.GetTextExtent(fd,&x,&y); - double max_ticks=(x+25.0)/width; // y+50 for rotated text - double jj=1/max_ticks; - double xx=w.max_x-w.min_x; - double minor_tick=max_ticks*xx; - double st2=w.min_x; //double(int(frac*1440.0))/1440.0; - double st,q; - - bool show_seconds=false; - bool show_milliseconds=false; - bool show_time=true; - - double min_tick; - if (xx<1.5) { - int rounding[16]={12,24,48,72,96,144,288,720,1440,2880,5760,8640,17280,86400,172800,345600}; // time rounding - - int ri; - for (ri=0;ri<16;ri++) { - st=round(st2*rounding[ri])/rounding[ri]; - min_tick=round(minor_tick*rounding[ri])/rounding[ri]; - q=xx/min_tick; // number of ticks that fits in range - if (q<=jj) break; // compared to number of ticks that fit on screen. - } - if (ri>8) show_seconds=true; - if (ri>=14) show_milliseconds=true; - - if (min_tick<=0.25/86400.0) - min_tick=0.25/86400; - } else { // Day ticks.. - show_time=false; - st=st2; - min_tick=1; - double mtiks=(x+20.0)/width; - double mt=mtiks*xx; - min_tick=mt; - if (min_tick<1) min_tick=1; - if (min_tick>10) min_tick=10; - } - - dc.SetPen(*wxBLACK_PEN); - - double st3=st; - while (st3>w.min_x) { - st3-=min_tick/10.0; - } - st3+=min_tick/10.0; - - py=start_py+height; - - for (double i=st3; i<=w.max_x; i+=min_tick/10.0) { - if (ipoint[0][i].x >= w.min_x) && (data->point[0][i].xPlot(dc,w); + dc.SetPen( *wxBLACK_PEN ); - //wxString label=wxString::Format(wxT("%i %i"),scrx,scry); - //dc.DrawText(label,0,0); float barwidth,pxr; float px,py; @@ -1003,137 +1044,13 @@ void gBarChart::Plot(wxDC & dc, gGraphWindow & w) } else draw_xticks_instead=true; } - if (draw_xticks_instead) DrawXTicks(dc,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) -:gLayer(d),m_direction(o) -{ - m_yminor_ticks=2; - m_ymajor_ticks=10; -} -gBarChart::~gBarChart() -{ -} -void gBarChart::Plot(wxDC & dc, gGraphWindow & w) -{ - if (!m_visible) return; - if (!data) return; - if (!data->NP(0)) return; - - int scrx = w.GetScrX(); - int scry = w.GetScrY(); - dc.SetPen( *wxBLACK_PEN ); - //wxString label=wxString::Format(wxT("%i %i"),scrx,scry); - //dc.DrawText(label,0,0); - - int start_px=w.GetLeftMargin(); - int start_py=w.GetTopMargin(); - int width=scrx-(w.GetLeftMargin()+w.GetRightMargin()); - int height=scry-(w.GetTopMargin()+w.GetBottomMargin()); - - double max=0; - - for (int i=0;iNP(0);i++) { - if (data->vpoint[0][i].y>max) max=data->vpoint[0][i].y; - } - - float barwidth,pxr; - int px,py; - - if (m_direction==wxVERTICAL) { - barwidth=(height-data->NP(0)*2)/data->NP(0); - pxr=width/max; - px=start_py; - } else { - barwidth=(width-data->NP(0)*2)/data->NP(0); - pxr=(height)/max; - px=start_px; - } - px+=1; - int t1,t2; - int u1,u2; - int textX, textY; - - wxString str; - const wxColor *colors[6]={wxRED, wxBLUE, wxGREEN, wxCYAN , wxBLACK, wxLIGHT_GREY }; - - for (int i=0;iNP(0);i++) { - dc.SetBrush(*wxTRANSPARENT_BRUSH); - t1=px+1; - px+=barwidth+2; - t2=px-t1-1; - - wxRect rect; - wxDirection dir; - - if (data->Type()==gDT_Stacked) { - py=start_py+height; - for (size_t j=0;jyaxis[i].size();j++) { - u1=(data->yaxis[i][j]*pxr); // height of section in pixels - u2=height-u1; - - //if (m_direction==wxVERTICAL) { - // rect=wxRect(start_px+u1,t1,u2,t2); - // dir=wxSOUTH; - //} else { - rect=wxRect(t1,py-u1,t2,u1); - dir=wxEAST; - dc.GradientFillLinear(rect,*colors[j%6],*wxLIGHT_GREY,dir); - dc.DrawRectangle(rect); - py-=u1; - } - } else if (data->Type()==gDT_Point) { - u2=data->vpoint[0][i].y*pxr; - u1=(start_py+height)-u2; - rect=wxRect(t1,u1,t2,u2); - dir=wxEAST; - dc.GradientFillLinear(rect,*colors[0],*wxLIGHT_GREY,dir); - dc.DrawRectangle(rect); - } - - str=FormatX(data->vpoint[0][i].x); - dc.GetTextExtent(str, &textX, &textY); - if (t2>textY) { - int j=t1+((t2/2)-(textY/2)); - if (m_direction==wxVERTICAL) { - dc.DrawRotatedText(str,start_px+barwidth+2+textY,j,270); - } else { - dc.DrawRotatedText(str,j,start_py+height+8+textX,90); - } - } - - } + if (draw_xticks_instead) + Xaxis->Plot(dc,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); - - - wxCoord x,y; - wxString S; - wxCoord labelW=0; - for (float i=0;i<=max;i+=1) { - int s=4; - if (i/m_yminor_ticks!=0) continue; - if (i/m_ymajor_ticks==0) { - s=6; - S=FormatY(i); // Override this as a function. - dc.GetTextExtent(S,&x,&y); - if (x>labelW) labelW=x; - dc.DrawText(S,start_px-8-x,start_py+height-(i*pxr)-y/2); - } - dc.DrawLine(start_px-s,start_py+height-(i*pxr),start_px,start_py+height-(i*pxr)); - } - dc.GetTextExtent(w.Title(),&x,&y); - dc.DrawRotatedText(w.Title(), start_px-8-labelW - y, start_py+((height + x)>>1), 90); - } -*/ gLineChart::gLineChart(gPointData *d,const wxColor * col,int dlsize,bool a,bool _hide_axes) :gLayer(d),m_accelerate(a),m_drawlist_size(dlsize),m_hide_axes(_hide_axes) @@ -1141,206 +1058,15 @@ gLineChart::gLineChart(gPointData *d,const wxColor * col,int dlsize,bool a,bool m_drawlist=new wxPoint [dlsize]; color.clear(); color.push_back(col); - m_show_grid=true; - m_show_minor_grid=true; - + Yaxis=new gYAxis(NULL,wxBLACK); + Yaxis->SetShowMajorLines(true); + Yaxis->SetShowMinorLines(true); } gLineChart::~gLineChart() { + delete Yaxis; delete [] m_drawlist; } -void gLineChart::DrawYTicks(wxDC & dc,gGraphWindow &w) -{ - static wxColor wxDARK_GREY(0xA0,0xA0,0xA0,0xA0); - static wxPen pen1(*wxLIGHT_GREY, 1, wxDOT); - static wxPen pen2(wxDARK_GREY, 1, wxDOT); - wxCoord x,y,labelW=0; - - int scrx = w.GetScrX(); - int scry = w.GetScrY(); - //wxString label=wxString::Format(wxT("%i %i"),scrx,scry); - //dc.DrawText(label,0,0); - - int start_px=w.GetLeftMargin(); - int start_py=w.GetTopMargin(); - int width=scrx-(w.GetLeftMargin()+w.GetRightMargin()); - int height=scry-(w.GetTopMargin()+w.GetBottomMargin()); - - dc.SetPen(*wxBLACK_PEN); - - wxString fd=wxT("0"); - dc.GetTextExtent(fd,&x,&y); - double max_yticksdiv=(y+15.0)/(height); // y+50 for rotated text - double max_yticks=1/max_yticksdiv; - double yy=w.max_y-w.min_y; - double ymult=height/yy; - double major_ytick=max_yticksdiv*yy; - - double min_ytick,q; - - if (w.min_y>=0) { - int yrounding[9]={1,2,5,10,20,30,40,60,120}; // time rounding - int ry; - for (ry=0;ry<3;ry++) { - // st=round(st2*rounding[ry])/rounding[ry]; - min_ytick=round(major_ytick*yrounding[ry])/yrounding[ry]; - q=yy/min_ytick; // number of ticks that fits in range - if (q<=max_yticks) break; // compared to number of ticks that fit on screen. - } - } else { - min_ytick=60; - } - if (min_ytick<=1) - min_ytick=1; - - int ty,h; - for (float i=w.min_y; i w.min_y)) - dc.DrawLine(start_px+1,h,start_px+width,h); - } - - for (double i=w.min_y; i<=w.max_y; i+=min_ytick) { - ty=(i - w.min_y) * ymult; - fd=FormatY(i); // Override this as a function. - dc.GetTextExtent(fd,&x,&y); - if (x>labelW) labelW=x; - h=(start_py+height)-ty; - dc.DrawText(fd,start_px-8-x,h - (y / 2)); - dc.SetPen(*wxBLACK_PEN); - dc.DrawLine(start_px-6,h,start_px,h); - dc.SetPen(pen2); - if (m_show_grid && (i > w.min_y)) - dc.DrawLine(start_px+1,h,start_px+width,h); - } - dc.GetTextExtent(w.Title(),&x,&y); - dc.DrawRotatedText(w.Title(), start_px-8-labelW - y, start_py+((height + x)>>1), 90); -} - -void gLineChart::DrawXTicks(wxDC & dc,gGraphWindow &w) -{ - float px,py; - wxCoord x,y; - - int scrx = w.GetScrX(); - int scry = w.GetScrY(); - //wxString label=wxString::Format(wxT("%i %i"),scrx,scry); - //dc.DrawText(label,0,0); - - int start_px=w.GetLeftMargin(); - int start_py=w.GetTopMargin(); - int width=scrx-(start_px+w.GetRightMargin()); - int height=scry-(start_py+w.GetBottomMargin()); - - dc.SetPen(*wxBLACK_PEN); - - //wxDateTime d; - wxString fd=wxT("00:00:00:0000"); - dc.GetTextExtent(fd,&x,&y); - double max_ticks=(x+25.0)/width; // y+50 for rotated text - double jj=1/max_ticks; - double xx=w.max_x-w.min_x; - double minor_tick=max_ticks*xx; - double st2=w.min_x; //double(int(frac*1440.0))/1440.0; - double st,q; - - bool show_seconds=false; - bool show_milliseconds=false; - bool show_time=true; - - double min_tick; - if (xx<1.5) { - int rounding[16]={12,24,48,72,96,144,288,720,1440,2880,5760,8640,17280,86400,172800,345600}; // time rounding - - int ri; - for (ri=0;ri<16;ri++) { - st=round(st2*rounding[ri])/rounding[ri]; - min_tick=round(minor_tick*rounding[ri])/rounding[ri]; - q=xx/min_tick; // number of ticks that fits in range - if (q<=jj) break; // compared to number of ticks that fit on screen. - } - if (ri>8) show_seconds=true; - if (ri>=14) show_milliseconds=true; - - if (min_tick<=0.25/86400.0) - min_tick=0.25/86400; - } else { // Day ticks.. - show_time=false; - st=st2; - min_tick=1; - double mtiks=(x+20.0)/width; - double mt=mtiks*xx; - min_tick=mt; - if (min_tick<1) min_tick=1; - if (min_tick>10) min_tick=10; - } - - dc.SetPen(*wxBLACK_PEN); - - double st3=st; - while (st3>w.min_x) { - st3-=min_tick/10.0; - } - st3+=min_tick/10.0; - - py=start_py+height; - - for (double i=st3; i<=w.max_x; i+=min_tick/10.0) { - if (iPlot(dc,w); } wxPen pen(*color[0], 1, wxSOLID); diff --git a/graphs/graph.h b/graphs/graph.h index 8b1e7ff0..5065583c 100644 --- a/graphs/graph.h +++ b/graphs/graph.h @@ -309,6 +309,34 @@ class gCandleStick:public gLayer }; +class gXAxis:public gLayer +{ + public: + gXAxis(gPointData *d=NULL,const wxColor * col=wxBLACK); + virtual ~gXAxis(); + virtual void Plot(wxDC & dc, gGraphWindow & w); + protected: +// virtual const wxString & Format(double v) { static wxString t; wxDateTime d; d.Set(v); t=d.Format(wxT("%H:%M")); return t; }; +}; +class gYAxis:public gLayer +{ + public: + gYAxis(gPointData *d=NULL,const wxColor * col=wxBLACK); + virtual ~gYAxis(); + virtual void Plot(wxDC & dc, gGraphWindow & w); + void SetShowMinorLines(bool b) { m_show_minor_lines=b; }; + void SetShowMajorLines(bool b) { m_show_major_lines=b; }; + bool ShowMinorLines() { return m_show_minor_lines; }; + bool ShowMajorLines() { return m_show_major_lines; }; + virtual const wxString & Format(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; }; + + protected: + bool m_show_major_lines; + bool m_show_minor_lines; + // virtual const wxString & Format(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; }; +}; + + class gLineChart:public gLayer { public: @@ -316,22 +344,15 @@ class gLineChart:public gLayer virtual ~gLineChart(); virtual void Plot(wxDC & dc, gGraphWindow & w); - virtual const wxString & FormatX(double v) { static wxString t; wxDateTime d; d.Set(v); t=d.Format(wxT("%H:%M")); return t; }; - //virtual const wxString & FormatX(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; }; - virtual const wxString & FormatY(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; }; - virtual void DrawXTicks(wxDC & dc,gGraphWindow &w); - virtual void DrawYTicks(wxDC & dc,gGraphWindow &w); protected: bool m_accelerate; int m_drawlist_size; wxPoint *m_drawlist; - bool m_show_grid; - bool m_show_minor_grid; bool m_hide_axes; wxPoint screen[4096]; // max screen pixel width for accelerated plot usage only. - + gYAxis * Yaxis; }; @@ -372,8 +393,7 @@ class gBarChart:public gLayer virtual void Plot(wxDC & dc, gGraphWindow & w); protected: - virtual void DrawYTicks(wxDC & dc,gGraphWindow &w); - virtual void DrawXTicks(wxDC & dc,gGraphWindow &w); + //virtual void DrawYTicks(wxDC & dc,gGraphWindow &w); wxOrientation m_direction; @@ -385,8 +405,8 @@ class gBarChart:public gLayer //virtual const wxString & FormatX(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; }; virtual const wxString & FormatY(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; }; - bool m_show_grid; - bool m_show_minor_grid; + gXAxis *Xaxis; + gYAxis *Yaxis; }; diff --git a/version.h b/version.h index eef630f0..b3a93d5c 100644 --- a/version.h +++ b/version.h @@ -4,7 +4,7 @@ namespace AutoVersion{ //Date Version Types - static const char DATE[] = "30"; + static const char DATE[] = "31"; static const char MONTH[] = "05"; static const char YEAR[] = "2011"; static const char UBUNTU_VERSION_STYLE[] = "11.05"; @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 2260; - static const long REVISION = 7026; + static const long BUILD = 2313; + static const long REVISION = 7342; //Miscellaneous Version Types - static const long BUILDS_COUNT = 7109; - #define RC_FILEVERSION 0,7,2260,7026 - #define RC_FILEVERSION_STRING "0, 7, 2260, 7026\0" - static const char FULLVERSION_STRING[] = "0.7.2260.7026"; + static const long BUILDS_COUNT = 7196; + #define RC_FILEVERSION 0,7,2313,7342 + #define RC_FILEVERSION_STRING "0, 7, 2313, 7342\0" + static const char FULLVERSION_STRING[] = "0.7.2313.7342"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 62;