diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index dcd096be..219bfcec 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8300,11 +8300,11 @@ "tinyxml/tinyxml.h" -1307549647 /home/mark/projects/git/sleepyhead/src/graphs/graph.h +1307586508 /home/mark/projects/git/sleepyhead/src/graphs/graph.h -1307550402 /home/mark/projects/git/sleepyhead/src/version.h +1307587520 /home/mark/projects/git/sleepyhead/src/version.h 1307418393 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h "machine.h" @@ -8321,7 +8321,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1307541070 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp +1307586473 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -8341,7 +8341,7 @@ "sleeplib/profiles.h" "sleeplib/machine_loader.h" -1307550289 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp +1307586493 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp @@ -8389,7 +8389,7 @@ "machine_loader.h" "tinyxml/tinyxml.h" -1307547046 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.cpp +1307585840 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.cpp diff --git a/Projects/CodeBlocks/SleepyHead.layout b/Projects/CodeBlocks/SleepyHead.layout index 947c3956..8af1c2e0 100644 --- a/Projects/CodeBlocks/SleepyHead.layout +++ b/Projects/CodeBlocks/SleepyHead.layout @@ -16,11 +16,11 @@ - - + + - + @@ -43,7 +43,7 @@ - - + + diff --git a/src/SleepyHeadMain.cpp b/src/SleepyHeadMain.cpp index 048d24f7..53789a11 100644 --- a/src/SleepyHeadMain.cpp +++ b/src/SleepyHeadMain.cpp @@ -70,6 +70,7 @@ wxString wxbuildinfo(wxbuildinfoformat format) SleepyHeadFrame::SleepyHeadFrame(wxFrame *frame) : GUIFrame(frame) { + GraphInit(); wxString title=wxTheApp->GetAppName()+wxT(" v")+wxString(AutoVersion::FULLVERSION_STRING,wxConvUTF8); SetTitle(title); @@ -104,6 +105,7 @@ SleepyHeadFrame::SleepyHeadFrame(wxFrame *frame) SleepyHeadFrame::~SleepyHeadFrame() { + GraphDone(); } void SleepyHeadFrame::UpdateProfiles() { @@ -349,6 +351,8 @@ Summary::Summary(wxWindow *win,Profile *_profile) AHI=new gGraphWindow(ScrolledWindow,-1,wxT("AHI"),wxPoint(0,0), wxSize(400,180), wxNO_BORDER); AHI->SetMargins(10,15,65,80); + AHI->AddLayer(new gFooBar()); + AHI->AddLayer(new gYAxis(wxBLACK)); AHI->AddLayer(new gBarChart(ahidata,wxRED)); // AHI->AddLayer(new gXAxis(NULL,wxBLACK)); //AHI->AddLayer(new gLineChart(ahidata,wxRED)); @@ -358,6 +362,8 @@ Summary::Summary(wxWindow *win,Profile *_profile) PRESSURE->SetMargins(10,15,65,80); PRESSURE->AddLayer(new gYAxis(wxBLACK)); PRESSURE->AddLayer(new gXAxis(wxBLACK)); + PRESSURE->AddLayer(new gFooBar()); + PRESSURE->AddLayer(prmax=new gLineChart(pressure_max,wxBLUE,6192,false,true,true)); PRESSURE->AddLayer(prmin=new gLineChart(pressure_min,wxRED,6192,false,true,true)); PRESSURE->AddLayer(eap=new gLineChart(pressure_eap,wxBLUE,6192,false,true,true)); @@ -370,12 +376,16 @@ Summary::Summary(wxWindow *win,Profile *_profile) LEAK->SetMargins(10,15,65,80); //LEAK->AddLayer(new gBarChart(leak,wxYELLOW)); LEAK->AddLayer(new gXAxis(wxBLACK)); + LEAK->AddLayer(new gYAxis(wxBLACK)); + LEAK->AddLayer(new gFooBar()); LEAK->AddLayer(new gLineChart(leak,wxPURPLE,6192,false,false,true)); fgSizer->Add(LEAK,1,wxEXPAND); USAGE=new gGraphWindow(ScrolledWindow,-1,wxT("Usage (Hours)"),wxPoint(0,0), wxSize(400,180), wxNO_BORDER); USAGE->SetMargins(10,15,65,80); + USAGE->AddLayer(new gFooBar()); + USAGE->AddLayer(new gYAxis(wxBLACK)); USAGE->AddLayer(new gBarChart(usage,wxGREEN)); //USAGE->AddLayer(new gXAxis(wxBLACK)); @@ -603,15 +613,19 @@ Daily::Daily(wxWindow *win,Profile *p) //pulse->ForceMaxY(120); PULSE=new gGraphWindow(ScrolledWindow,-1,wxT("Pulse"),wxPoint(0,0), wxSize(600,130), wxNO_BORDER); - PULSE->AddLayer(new gLineChart(pulse,wxRED,65536,false,false,true)); PULSE->AddLayer(new gXAxis(wxBLACK)); + PULSE->AddLayer(new gYAxis(wxBLACK)); + PULSE->AddLayer(new gFooBar()); + PULSE->AddLayer(new gLineChart(pulse,wxRED,65536,false,false,true)); AddOXIData(spo2=new EventData(OXI_SPO2,0,65536,true)); //spo2->ForceMinY(60); //spo2->ForceMaxY(100); SPO2=new gGraphWindow(ScrolledWindow,-1,wxT("SpO2"),wxPoint(0,0), wxSize(600,130), wxNO_BORDER); - SPO2->AddLayer(new gLineChart(spo2,wxBLUE,65536,false,false,true)); SPO2->AddLayer(new gXAxis(wxBLACK)); + SPO2->AddLayer(new gYAxis(wxBLACK)); + SPO2->AddLayer(new gFooBar()); + SPO2->AddLayer(new gLineChart(spo2,wxBLUE,65536,false,false,true)); SPO2->LinkZoom(PULSE); PULSE->LinkZoom(SPO2); @@ -620,25 +634,32 @@ Daily::Daily(wxWindow *win,Profile *p) //snore->ForceMaxY(15); SNORE=new gGraphWindow(ScrolledWindow,-1,wxT("Snore"),wxPoint(0,0), wxSize(600,130), wxNO_BORDER); - SNORE->AddLayer(new gLineChart(snore,wxDARK_GREY,4096,false,false,true)); SNORE->AddLayer(new gXAxis(wxBLACK)); + SNORE->AddLayer(new gYAxis(wxBLACK)); + SNORE->AddLayer(new gFooBar()); + SNORE->AddLayer(new gLineChart(snore,wxDARK_GREY,4096,false,false,true)); + AddCPAPData(leakdata=new EventData(CPAP_Leak,0)); //leakdata->ForceMinY(0); //leakdata->ForceMaxY(120); LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Leaks"),wxPoint(0,0), wxSize(600,130), wxNO_BORDER); - LEAK->AddLayer(new gLineChart(leakdata,wxPURPLE,4096,false,false,true)); LEAK->AddLayer(new gXAxis(wxBLACK)); + LEAK->AddLayer(new gYAxis(wxBLACK)); + LEAK->AddLayer(new gFooBar()); + LEAK->AddLayer(new gLineChart(leakdata,wxPURPLE,4096,false,false,true)); AddCPAPData(pressure_iap=new EventData(CPAP_IAP)); AddCPAPData(pressure_eap=new EventData(CPAP_EAP)); AddCPAPData(prd=new EventData(CPAP_Pressure)); - PRD=new gGraphWindow(ScrolledWindow,-1,wxT("Pressure"),wxPoint(0,0), wxSize(600,130), wxNO_BORDER); + PRD=new gGraphWindow(ScrolledWindow,-1,wxT("Pressure"),wxPoint(0,0), wxSize(600,130), wxNO_BORDER); + PRD->AddLayer(new gXAxis(wxBLACK)); + PRD->AddLayer(new gYAxis(wxBLACK)); + PRD->AddLayer(new gFooBar()); PRD->AddLayer(new gLineChart(prd,wxDARK_GREEN,4096,false,false,true)); PRD->AddLayer(new gLineChart(pressure_iap,wxBLUE,4096,false,true,true)); PRD->AddLayer(new gLineChart(pressure_eap,wxRED,4096,false,true,true)); - PRD->AddLayer(new gXAxis(wxBLACK)); AddCPAPData(frw=new WaveData(CPAP_FlowRate)); FRW=new gGraphWindow(ScrolledWindow,-1,wxT("Flow Rate"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER); @@ -655,6 +676,10 @@ Daily::Daily(wxWindow *win,Profile *p) AddCPAPData(flags[9]=new FlagData(PRS1_Unknown0E,1)); gLineChart *g; + FRW->AddLayer(new gYAxis(wxBLACK)); + FRW->AddLayer(new gXAxis(wxBLACK)); + FRW->AddLayer(new gFooBar()); + FRW->AddLayer(new gLineOverlayBar(flags[0],wxGREEN2,wxT("CSR"))); FRW->AddLayer(g=new gLineChart(frw,wxBLACK,200000,true)); g->ReportEmpty(true); @@ -666,7 +691,6 @@ 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(wxBLACK)); SF=new gGraphWindow(ScrolledWindow,-1,wxT("Event Flags"),wxPoint(0,0), wxSize(600,180), wxNO_BORDER); // SF->SetMargins(10,15,20,80); @@ -684,6 +708,7 @@ Daily::Daily(wxWindow *win,Profile *p) const int sfc=9; + SF->SetLeftMargin(70); SF->AddLayer(new gFlagsLine(flags[9],wxDARK_GREEN,wxT("U0E"),8,sfc)); SF->AddLayer(new gFlagsLine(flags[8],wxRED,wxT("VS2"),6,sfc)); SF->AddLayer(new gFlagsLine(flags[6],wxYELLOW,wxT("RE"),7,sfc)); diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index 82173a53..fbfdffc7 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -28,6 +28,29 @@ wxColor *wxDARK_GREEN=&zwxDARK_GREEN; wxColor zwxDARK_GREY(0xA0,0xA0,0xA0,0xA0); wxColor *wxDARK_GREY=&zwxDARK_GREY; +wxFont *smallfont=NULL,*bigfont=NULL,*boldfont=NULL; +bool gfont_init=false; + +// Must be called from a thread inside the application. +void GraphInit() +{ + if (!gfont_init) { + bigfont=new wxFont(32,wxFONTFAMILY_ROMAN,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL); + boldfont=new wxFont(12,wxFONTFAMILY_ROMAN,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_BOLD); + smallfont=new wxFont(10,wxFONTFAMILY_ROMAN,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL); + gfont_init=true; + } +} +void GraphDone() +{ + if (gfont_init) { + delete smallfont; + delete boldfont; + delete bigfont; + gfont_init=false; + } +} + const wxColor *gradient_start_color=wxWHITE, *gradient_end_color=wxLIGHT_YELLOW; wxDirection gradient_direction=wxEAST; @@ -130,18 +153,23 @@ END_EVENT_TABLE() gGraphWindow::gGraphWindow(wxWindow *parent, wxWindowID id,const wxString & title,const wxPoint &pos,const wxSize &size,long flags) : wxWindow( parent, id, pos, size, flags, title ) { + //GraphInit(); m_scrX = m_scrY = 64; m_title=title; m_mouseRDown=m_mouseLDown=false; SetBackgroundColour( *wxWHITE ); m_bgColour = *wxWHITE; m_fgColour = *wxBLACK; - SetMargins(10, 15, 46, 80); + SetMargins(5, 5, 0, 0); m_block_move=false; m_block_zoom=false; m_drag_foobar=false; m_foobar_pos=0; m_foobar_moved=0; + gtitle=foobar=xaxis=yaxis=NULL; + + AddLayer(new gGraphTitle(title,wxVERTICAL,boldfont)); + } gGraphWindow::~gGraphWindow() { @@ -152,6 +180,38 @@ gGraphWindow::~gGraphWindow() void gGraphWindow::AddLayer(gLayer *l) { if (l) { + if (dynamic_cast(l)) { + if (xaxis) { + wxLogError(wxT("Can only have one gXAxis per graph")); + return; + } + if (m_marginBottom(l)) { + if (foobar) { + wxLogError(wxT("Can only have one gFooBar per graph")); + return; + } + if (m_marginBottom(l)) { + if (yaxis) { + wxLogError(wxT("Can only have one gYAxis per graph")); + return; + } + if (m_marginLeft(l)) { + if (gtitle) { + wxLogError(wxT("Can only have one gGraphTitle per graph")); + return; + } + if (m_marginLeftNotifyGraphWindow(this); layers.push_back(l); } @@ -273,7 +333,7 @@ void gGraphWindow::OnMouseMove(wxMouseEvent &event) { // static bool first=true; static wxRect last; - if (m_drag_foobar) { + if (foobar && m_drag_foobar) { int y=event.GetY(); int x=event.GetX(); if (xm_scrY-GetBottomMargin()) { - // return; - //} + else if (event.GetY()>m_scrY-GetBottomMargin()) { + if (!foobar) return; + } if (event.ControlDown()) zoom_fact=5.0; if (abs(event.GetX()-m_mouseRClick_start.x)<3 && abs(event.GetY()-m_mouseRClick_start.y)<3) { @@ -401,7 +461,7 @@ void gGraphWindow::OnMouseLeftDown(wxMouseEvent &event) if (hot1.Contains(x,y)) { m_mouseLDown=true; - } else if ((y>(m_scrY-GetBottomMargin())) && (y<(m_scrY-GetBottomMargin())+20)) { + } else if (foobar && (y>(m_scrY-GetBottomMargin())) && (y<(m_scrY-GetBottomMargin())+20)) { double rx=RealMaxX()-RealMinX(); double qx=double(width)/rx; double minx=MinX()-RealMinX(); @@ -427,69 +487,69 @@ void gGraphWindow::OnMouseLeftDown(wxMouseEvent &event) } void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event) { - int y=event.GetY(); + int y=event.GetY(); int x=event.GetX(); int width=m_scrX-GetRightMargin()-GetLeftMargin(); int height=m_scrY-GetBottomMargin()-GetTopMargin(); wxRect hot1(GetLeftMargin(),GetTopMargin(),width,height); // Graph data area. bool zoom_in=false; - double rx=RealMaxX()-RealMinX(); - double qx=double(width)/rx; - double minx=MinX()-RealMinX(); - double maxx=MaxX()-RealMinX();; - int x1=(qx*minx); - int x2=(qx*maxx); // length in pixels - int xw=x2-x1; + if (foobar) { + double rx=RealMaxX()-RealMinX(); + double qx=double(width)/rx; + double minx=MinX()-RealMinX(); + double maxx=MaxX()-RealMinX();; - x1+=GetLeftMargin(); - x2+=GetLeftMargin(); - if ((x>x1) && (x::iterator g=link_zoom.begin();g!=link_zoom.end();g++) { - (*g)->SetXBounds(min,max); + x1+=GetLeftMargin(); + x2+=GetLeftMargin(); + if ((x>x1) && (x::iterator g=link_zoom.begin();g!=link_zoom.end();g++) { + (*g)->SetXBounds(min,max); + } } } - if ((!m_drag_foobar && hot1.Contains(x,y)) || zoom_in) { + if (!m_drag_foobar || zoom_in) { wxPoint release(event.GetX(), m_scrY-m_marginBottom); wxPoint press(m_mouseLClick.x, m_marginTop); - //wxDateTime a,b; int x1=m_mouseRBrect.x; int x2=x1+m_mouseRBrect.width; - int t1=MIN(x1,x2); - int t2=MAX(x1,x2); m_mouseLDown=false; m_mouseRBrect=wxRect(0, 0, 0, 0); - if ((t2-t1)>3) { - //if (hot1.Contains(x,y)) { - ZoomXPixels(t1,t2); - //} else { - //Refresh(); - //} + if (hot1.Contains(x,y) || zoom_in) { + int t1=MIN(x1,x2); + int t2=MAX(x1,x2); + if ((t2-t1)>3) { + ZoomXPixels(t1,t2); // Range Selected + } else { + double zoom_fact=0.5; + if (event.ControlDown()) zoom_fact=0.25; + for (list::iterator g=link_zoom.begin();g!=link_zoom.end();g++) { + (*g)->ZoomX(zoom_fact,event.GetX()); + } + if (!m_block_zoom) { + ZoomX(zoom_fact,event.GetX()); //event.GetX()); // adds origin to zoom out.. Doesn't look that cool. + } + } } else { - double zoom_fact=0.5; - if (event.ControlDown()) zoom_fact=0.25; - for (list::iterator g=link_zoom.begin();g!=link_zoom.end();g++) { - (*g)->ZoomX(zoom_fact,event.GetX()); - } - if (!m_block_zoom) { - ZoomX(zoom_fact,event.GetX()); //event.GetX()); // adds origin to zoom out.. Doesn't look that cool. - } - + Refresh(); } } - m_drag_foobar=false; event.Skip(); } @@ -831,6 +891,8 @@ void gXAxis::Plot(wxDC & dc, gGraphWindow & w) wxPen pen=wxPen(*wxBLACK,1,wxSOLID); //color[0] dc.SetPen(pen); + dc.SetFont(*smallfont); + dc.SetTextForeground(*wxBLACK); double xx=w.max_x-w.min_x; @@ -988,6 +1050,7 @@ void gYAxis::Plot(wxDC & dc,gGraphWindow &w) int height=scry-(w.GetTopMargin()+w.GetBottomMargin()); dc.SetPen(*wxBLACK_PEN); + dc.SetFont(*smallfont); wxString fd=wxT("0"); dc.GetTextExtent(fd,&x,&y); @@ -1041,17 +1104,45 @@ void gYAxis::Plot(wxDC & dc,gGraphWindow &w) 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); + //dc.GetTextExtent(w.Title(),&x,&y); + //dc.DrawRotatedText(w.Title(), start_px-8-labelW - y, start_py+((height + x)>>1), 90); } -gFooBar::gFooBar(const wxColor * col,const wxColor * col2) +gGraphTitle::gGraphTitle(const wxString & _title,wxOrientation o,const wxFont * font, const wxColor * color) +:gLayer(NULL),m_title(_title),m_orientation(o),m_font((wxFont*)font),m_color((wxColor *)color) +{ + m_textheight=m_textwidth=0; +} +gGraphTitle::~gGraphTitle() +{ +} +void gGraphTitle::Plot(wxDC & dc, gGraphWindow & w) +{ + if (!m_visible) return; + int scrx = w.GetScrX(); + int scry = w.GetScrY()-w.GetBottomMargin(); + + dc.SetFont(*m_font); + dc.SetTextForeground(*m_color); + wxCoord x,y; + + if (m_orientation==wxHORIZONTAL) { + dc.DrawText(m_title,4,2); + } else { + dc.GetTextExtent(m_title,&m_textwidth,&m_textheight); + dc.DrawRotatedText(m_title,4,scry/2+m_textwidth/2,90.0); + } + +} + + +gFooBar::gFooBar(const wxColor * col1,const wxColor * col2) :gLayer(NULL) { - if (col && col2) { + if (col1 && col2) { color.clear(); - color.push_back(col); color.push_back(col2); + color.push_back(col1); } } gFooBar::~gFooBar() @@ -1104,6 +1195,7 @@ void gCandleStick::Plot(wxDC & dc, gGraphWindow & w) int scrx = w.GetScrX(); int scry = w.GetScrY(); dc.SetPen( *wxBLACK_PEN ); + dc.SetFont(*smallfont); //wxString label=wxString::Format(wxT("%i %i"),scrx,scry); //dc.DrawText(label,0,0); @@ -1188,14 +1280,9 @@ gBarChart::gBarChart(gPointData *d,const wxColor *col,wxOrientation o) color.push_back(col); } Xaxis=new gXAxis(wxBLACK); - Yaxis=new gYAxis(wxBLACK); - foobar=new gFooBar(); - } gBarChart::~gBarChart() { - delete foobar; - delete Yaxis; delete Xaxis; } @@ -1223,9 +1310,6 @@ void gBarChart::Plot(wxDC & dc, gGraphWindow & w) } if (days==0) return; - Yaxis->Plot(dc,w); - foobar->Plot(dc,w); - dc.SetPen( *wxBLACK_PEN ); float barwidth,pxr; @@ -1299,16 +1383,16 @@ gLineChart::gLineChart(gPointData *d,const wxColor * col,int dlsize,bool _accele m_drawlist=new wxPoint [dlsize]; color.clear(); color.push_back(col); - foobar=new gFooBar(); + //foobar=new gFooBar(); m_report_empty=false; - Yaxis=new gYAxis(wxBLACK); - Yaxis->SetShowMajorLines(true); - Yaxis->SetShowMinorLines(true); + //Yaxis=new gYAxis(wxBLACK); + //Yaxis->SetShowMajorLines(true); + //Yaxis->SetShowMinorLines(true); } gLineChart::~gLineChart() { - delete Yaxis; - delete foobar; + //delete Yaxis; + //delete foobar; delete [] m_drawlist; } @@ -1353,11 +1437,11 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w) dc.DrawLine(start_px+width+1,start_py,start_px+width+1,start_py+height+1); - foobar->Plot(dc,w); + //foobar->Plot(dc,w); - if (!m_hide_axes) { + /*if (!m_hide_axes) { Yaxis->Plot(dc,w); - } + } */ wxPen pen(*color[0], 1, wxSOLID); dc.SetPen(pen); @@ -1373,9 +1457,9 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w) if (!cnt) { wxString msg=_("No Waveform Available"); wxCoord x,y; - static wxFont bigfont(32,wxFONTFAMILY_ROMAN,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL); dc.SetTextForeground(*wxDARK_GREY); - dc.SetFont(bigfont); + + dc.SetFont(*bigfont); dc.GetTextExtent(msg,&x,&y); dc.DrawText(msg,start_px+(width/2.0)-(x/2.0),start_py+(height/2.0)-(y/2.0)); dc.SetTextForeground(*wxBLACK); @@ -1385,11 +1469,12 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w) for (int n=0;nVC();n++) { - if (!data->np[n]) continue; dp=0; + int siz=data->np[n]; + if (!siz) continue; bool done=false; bool first=true; - wxRealPoint *point=data->point[n]; + wxRealPoint * point=data->point[n]; if (accel) { s1=point[0].x; s2=point[1].x; @@ -1409,7 +1494,6 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w) } else sam=1; - int siz=data->np[n]; if (accel) { for (int i=0;i0) dc.DrawLines(dp,screen); } else { - if (dp) dc.DrawLines(dp,m_drawlist); + if (dp>0) dc.DrawLines(dp,m_drawlist); } } dc.DestroyClippingRegion(); @@ -1635,6 +1719,7 @@ void gFlagsLine::Plot(wxDC & dc, gGraphWindow & w) wxPen sfp1(*color[0], 1, wxSOLID); wxBrush brush(*color[0],wxSOLID); //FDIAGONAL_HATCH); + dc.SetFont(*smallfont); double line_h=(height+1)/double(total_lines); @@ -1654,11 +1739,11 @@ void gFlagsLine::Plot(wxDC & dc, gGraphWindow & w) dc.GetTextExtent(label,&x,&y); dc.DrawText(label,start_px-x-6,line_top+(line_h/2)-(y/2)); - if (line_num==0) { // first lines responsibility to draw the title. + /*if (line_num==0) { // first lines responsibility to draw the title. int lw=x; dc.GetTextExtent(w.Title(),&x,&y); dc.DrawRotatedText(w.Title(), start_px-8-lw - y, start_py+((height + x)>>1), 90); - } + } */ dc.SetBrush(brush); int x1,x2; for (int n=0;nVC();n++) { diff --git a/src/graphs/graph.h b/src/graphs/graph.h index 32e219d1..010617d5 100644 --- a/src/graphs/graph.h +++ b/src/graphs/graph.h @@ -145,6 +145,10 @@ class gGraphWindow:public wxWindow // rename to gGraphWindow int GetBottomMargin(void) const { return m_marginBottom; }; int GetLeftMargin(void) const { return m_marginLeft; }; int GetRightMargin(void) const { return m_marginRight; }; + void SetTopMargin(int i) { m_marginTop=i; }; + void SetBottomMargin(int i) { m_marginBottom=i; }; + void SetLeftMargin(int i) { m_marginLeft=i; }; + void SetRightMargin(int i) { m_marginRight=i; }; inline int Width() { return m_scrX-m_marginLeft-m_marginRight; }; inline int Height() { return m_scrY-m_marginTop-m_marginBottom; }; @@ -233,6 +237,10 @@ class gGraphWindow:public wxWindow // rename to gGraphWindow wxRect m_mouseRBrect,m_mouseRBlast; bool m_mouseLDown,m_mouseRDown,m_datarefresh; + gLayer *foobar; + gLayer *xaxis; + gLayer *yaxis; + gLayer *gtitle; DECLARE_DYNAMIC_CLASS(gGraphWindow) DECLARE_EVENT_TABLE() }; @@ -309,6 +317,24 @@ class gLayer list m_graph; // notify list of graphs that attach this layer. }; +class gGraphTitle:public gLayer +{ + public: + gGraphTitle(const wxString & _title,wxOrientation o=wxVERTICAL,const wxFont * font=wxNORMAL_FONT,const wxColor * color=wxBLACK); + virtual ~gGraphTitle(); + virtual void Plot(wxDC & dc, gGraphWindow & w); + wxOrientation Orientation() { return m_orientation; }; + static const int Margin=20; + + protected: + wxOrientation m_orientation; + wxFont *m_font; + wxColor *m_color; + wxString m_title; + wxCoord m_textheight; + wxCoord m_textwidth; +}; + class gCandleStick:public gLayer { public: @@ -330,6 +356,7 @@ class gXAxis:public gLayer gXAxis(const wxColor * col=wxBLACK); virtual ~gXAxis(); virtual void Plot(wxDC & dc, gGraphWindow & w); + static const int Margin=40; // How much room does this take up. (Bottom margin) protected: // virtual const wxString & Format(double v) { static wxString t; wxDateTime d; d.Set(v); t=d.Format(wxT("%H:%M")); return t; }; }; @@ -344,7 +371,7 @@ class gYAxis:public gLayer 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; }; - + static const int Margin=50; // Left margin space protected: bool m_show_major_lines; bool m_show_minor_lines; @@ -353,9 +380,10 @@ class gYAxis:public gLayer class gFooBar:public gLayer { public: - gFooBar(const wxColor * col=wxDARK_GREY,const wxColor * col2=wxGREEN); + gFooBar(const wxColor * color1=wxGREEN,const wxColor * color2=wxDARK_GREY); virtual ~gFooBar(); virtual void Plot(wxDC & dc, gGraphWindow & w); + static const int Margin=15; protected: }; @@ -381,8 +409,8 @@ class gLineChart:public gLayer bool m_hide_axes; bool m_square_plot; wxPoint screen[4096]; // max screen pixel width for accelerated plot usage only. - gYAxis * Yaxis; - gFooBar *foobar; + //gYAxis * Yaxis; + //gFooBar *foobar; }; @@ -435,8 +463,6 @@ class gBarChart:public gLayer virtual const wxString & FormatY(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; }; gXAxis *Xaxis; - gYAxis *Yaxis; - gFooBar *foobar; }; class FlagData:public gPointData @@ -537,4 +563,7 @@ protected: T_UHD uhd; }; +void GraphInit(); +extern void GraphDone(); + #endif // GRAPH_H diff --git a/src/libs/sleeplib/prs1_loader.cpp b/src/libs/sleeplib/prs1_loader.cpp index e960028c..aec043b0 100644 --- a/src/libs/sleeplib/prs1_loader.cpp +++ b/src/libs/sleeplib/prs1_loader.cpp @@ -226,23 +226,24 @@ int PRS1Loader::OpenMachine(Machine *m,wxString path,Profile *profile) wxString ext_s=filename.AfterLast(wxChar('.')); wxString session_s=filename.BeforeLast(wxChar('.')); - if (!ext_s.IsNumber()) continue; - if (!session_s.IsNumber()) continue; + if (ext_s.IsNumber() && session_s.IsNumber()) { // Good catch Troy.. Pays not to skip the GetNext in a while loop - session_s.ToLong(&session); - ext_s.ToLong(&ext); - if (sessfiles[session].capacity()==0) sessfiles[session].resize(3); + session_s.ToLong(&session); + ext_s.ToLong(&ext); + if (sessfiles[session].capacity()==0) sessfiles[session].resize(3); - wxString fullname=*p+wxFileName::GetPathSeparator()+filename; - if (ext==1) { - sessfiles[session][0]=fullname; - } else if (ext==2) { - sessfiles[session][1]=fullname; - } else if (ext==5) { - sessfiles[session][2]=fullname; + wxString fullname=*p+wxFileName::GetPathSeparator()+filename; + if (ext==1) { + sessfiles[session][0]=fullname; + } else if (ext==2) { + sessfiles[session][1]=fullname; + } else if (ext==5) { + sessfiles[session][2]=fullname; + } + cnt++; } - cnt++; if (loader_progress) loader_progress->Pulse(); //Update((float(cnt)/float(size)*25)); + //if (loader_progress) loader_progress->Update((float(cnt)/float(size)*25.0)); cont=dir.GetNext(&filename); } diff --git a/src/version.h b/src/version.h index 08f8cf6c..bc5f40ce 100644 --- a/src/version.h +++ b/src/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 = 3843; - static const long REVISION = 4191; + static const long BUILD = 3942; + static const long REVISION = 4680; //Miscellaneous Version Types - static const long BUILDS_COUNT = 1848; - #define RC_FILEVERSION 0,7,3843,4191 - #define RC_FILEVERSION_STRING "0, 7, 3843, 4191\0" - static const char FULLVERSION_STRING[] = "0.7.3843.4191"; + static const long BUILDS_COUNT = 2043; + #define RC_FILEVERSION 0,7,3942,4680 + #define RC_FILEVERSION_STRING "0, 7, 3942, 4680\0" + static const char FULLVERSION_STRING[] = "0.7.3942.4680"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;