chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Final mouse headaches, and some graph clipping stuff

Browse Source
This commit is contained in:
Mark Watkins 2011-06-09 20:25:26 +10:00
parent da9c465956
commit b861bf1543
5 changed files with 69 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8300,11 +8300,11 @@
<map> <map>
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1307586508 /home/mark/projects/git/sleepyhead/src/graphs/graph.h 1307612486 /home/mark/projects/git/sleepyhead/src/graphs/graph.h
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1307609269 /home/mark/projects/git/sleepyhead/src/version.h 1307614937 /home/mark/projects/git/sleepyhead/src/version.h
1307418393 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h 1307418393 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -8321,7 +8321,7 @@
"preferences.h" "preferences.h"
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1307597749 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp 1307614937 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
"wx_pch.h" "wx_pch.h"
"version.h" "version.h"
<wx/app.h> <wx/app.h>
@ -8341,7 +8341,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1307607607 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1307614762 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<wx/settings.h> <wx/settings.h>
<wx/dcbuffer.h> <wx/dcbuffer.h>
<wx/log.h> <wx/log.h>

6
src/SleepyHeadMain.cpp
View File

@ -647,7 +647,7 @@ Daily::Daily(wxWindow *win,Profile *p)
LEAK->AddLayer(new gXAxis(wxBLACK)); LEAK->AddLayer(new gXAxis(wxBLACK));
LEAK->AddLayer(new gYAxis(wxBLACK)); LEAK->AddLayer(new gYAxis(wxBLACK));
LEAK->AddLayer(new gFooBar()); LEAK->AddLayer(new gFooBar());
LEAK->AddLayer(new gLineChart(leakdata,wxPURPLE,4096,false,false,true)); LEAK->AddLayer(new gLineChart(leakdata,wxPURPLE,4096,false,false,false));
AddCPAPData(pressure_iap=new EventData(CPAP_IAP)); AddCPAPData(pressure_iap=new EventData(CPAP_IAP));
AddCPAPData(pressure_eap=new EventData(CPAP_EAP)); AddCPAPData(pressure_eap=new EventData(CPAP_EAP));
@ -657,7 +657,7 @@ Daily::Daily(wxWindow *win,Profile *p)
PRD->AddLayer(new gXAxis(wxBLACK)); PRD->AddLayer(new gXAxis(wxBLACK));
PRD->AddLayer(new gYAxis(wxBLACK)); PRD->AddLayer(new gYAxis(wxBLACK));
PRD->AddLayer(new gFooBar()); PRD->AddLayer(new gFooBar());
PRD->AddLayer(new gLineChart(prd,wxDARK_GREEN,4096,false,false,true)); PRD->AddLayer(new gLineChart(prd,wxDARK_GREEN,4096,false,false,false));
PRD->AddLayer(new gLineChart(pressure_iap,wxBLUE,4096,false,true,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 gLineChart(pressure_eap,wxRED,4096,false,true,true));
@ -708,7 +708,7 @@ Daily::Daily(wxWindow *win,Profile *p)
const int sfc=9; const int sfc=9;
SF->SetLeftMargin(70); SF->SetLeftMargin(SF->GetLeftMargin()+gYAxis::Margin);
SF->AddLayer(new gFlagsLine(flags[9],wxDARK_GREEN,wxT("U0E"),8,sfc)); 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[8],wxRED,wxT("VS2"),6,sfc));
SF->AddLayer(new gFlagsLine(flags[6],wxYELLOW,wxT("RE"),7,sfc)); SF->AddLayer(new gFlagsLine(flags[6],wxYELLOW,wxT("RE"),7,sfc));

111
src/graphs/graph.cpp
View File

@ -140,6 +140,7 @@ BEGIN_EVENT_TABLE(gGraphWindow, wxWindow)
EVT_SIZE (gGraphWindow::OnSize) EVT_SIZE (gGraphWindow::OnSize)
EVT_MOTION (gGraphWindow::OnMouseMove ) EVT_MOTION (gGraphWindow::OnMouseMove )
EVT_LEFT_DOWN (gGraphWindow::OnMouseLeftDown) EVT_LEFT_DOWN (gGraphWindow::OnMouseLeftDown)
EVT_LEFT_DCLICK (gGraphWindow::OnMouseLeftDClick)
EVT_LEFT_UP (gGraphWindow::OnMouseLeftRelease) EVT_LEFT_UP (gGraphWindow::OnMouseLeftRelease)
EVT_RIGHT_DOWN (gGraphWindow::OnMouseRightDown) EVT_RIGHT_DOWN (gGraphWindow::OnMouseRightDown)
EVT_RIGHT_UP (gGraphWindow::OnMouseRightRelease) EVT_RIGHT_UP (gGraphWindow::OnMouseRightRelease)
@ -160,7 +161,7 @@ gGraphWindow::gGraphWindow(wxWindow *parent, wxWindowID id,const wxString & titl
SetBackgroundColour( *wxWHITE ); SetBackgroundColour( *wxWHITE );
m_bgColour = *wxWHITE; m_bgColour = *wxWHITE;
m_fgColour = *wxBLACK; m_fgColour = *wxBLACK;
SetMargins(5, 5, 0, 0); SetMargins(5, 15, 0, 0);
m_block_move=false; m_block_move=false;
m_block_zoom=false; m_block_zoom=false;
m_drag_foobar=false; m_drag_foobar=false;
@ -455,6 +456,14 @@ void gGraphWindow::OnMouseRightRelease(wxMouseEvent &event)
event.Skip(); event.Skip();
} }
void gGraphWindow::OnMouseLeftDClick(wxMouseEvent &event)
{
//wxLogMessage(wxT("WTF?? STUPID MOUSEz"));
OnMouseLeftDown(event);
}
void gGraphWindow::OnMouseLeftDown(wxMouseEvent &event) void gGraphWindow::OnMouseLeftDown(wxMouseEvent &event)
{ {
int y=event.GetY(); int y=event.GetY();
@ -465,14 +474,7 @@ void gGraphWindow::OnMouseLeftDown(wxMouseEvent &event)
m_mouseLClick.x = x; m_mouseLClick.x = x;
m_mouseLClick.y = y; m_mouseLClick.y = y;
if (foobar && (y>(m_scrY-GetBottomMargin())) && (y<(m_scrY-GetBottomMargin())+20) ) {
//if (LastGraphLDown) { // Windows retransmits this crap.
//return;
//}
if (hot1.Contains(x,y)) {
m_mouseLDown=true;
} else if (foobar && (y>(m_scrY-GetBottomMargin())) && (y<(m_scrY-GetBottomMargin())+20) ) {
double rx=RealMaxX()-RealMinX(); double rx=RealMaxX()-RealMinX();
double qx=double(width)/rx; double qx=double(width)/rx;
double minx=MinX()-RealMinX(); double minx=MinX()-RealMinX();
@ -485,12 +487,14 @@ void gGraphWindow::OnMouseLeftDown(wxMouseEvent &event)
x1+=GetLeftMargin(); x1+=GetLeftMargin();
x2+=GetLeftMargin(); x2+=GetLeftMargin();
if ((x>x1) && (x<x2)) { if ((x>x1) && (x<x2)) {
x-=x1; double xj=x-x1;
m_foobar_pos=(1.0/double(xw))*double(x); // where along the foobar the user clicked. m_foobar_pos=(1.0/double(xw))*xj; // where along the foobar the user clicked.
m_foobar_moved=0; m_foobar_moved=0;
m_drag_foobar=true; m_drag_foobar=true;
// wxLogMessage("Foobar Area Pushed"); // wxLogMessage("Foobar Area Pushed");
} } else m_drag_foobar=false;
} else if (hot1.Contains(x,y)) {
m_mouseLDown=true;
} }
LastGraphLDown=this; LastGraphLDown=this;
@ -500,8 +504,6 @@ void gGraphWindow::OnMouseLeftDown(wxMouseEvent &event)
void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event) void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
{ {
if (LastGraphLDown && (LastGraphLDown!=this)) { // Same graph that initiated the click?? if (LastGraphLDown && (LastGraphLDown!=this)) { // Same graph that initiated the click??
//m_mouseLDown=false;
//m_drag_foobar=false;
LastGraphLDown->OnMouseLeftRelease(event); // Nope.. Give it the event. LastGraphLDown->OnMouseLeftRelease(event); // Nope.. Give it the event.
return; return;
} }
@ -514,44 +516,27 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
bool zoom_in=false; bool zoom_in=false;
bool did_draw=false; bool did_draw=false;
// Finished Dragging the FooBar? // Finished Dragging the FooBar?
// if (foobar && m_drag_foobar) { if (foobar && m_drag_foobar) {
double rx=RealMaxX()-RealMinX(); if (m_foobar_moved<5) {
double qx=double(width)/rx; double zoom_fact=0.5;
double minx=MinX()-RealMinX(); if (event.ControlDown()) zoom_fact=0.25;
double maxx=MaxX()-RealMinX(); if (!m_block_zoom) {
ZoomX(zoom_fact,0);
int x1=(qx*minx); // First x pixel
int x2=(qx*maxx); // Last x pixel
int xw=x2-x1; // Length in pixels
x1+=GetLeftMargin();
x2+=GetLeftMargin();
if ((x>x1) && (x<x2)) {
if (foobar && m_foobar_moved<2) {
zoom_in=true;
m_foobar_moved=0;
} }
m_foobar_moved=0;
did_draw=true;
} }
}
// wxLogMessage("Foobar Released"); if (!did_draw && !zoom_in && m_mouseLDown) { // && !m_drag_foobar) {
//double min=MinX();
//double max=MaxX();
//for (list<gGraphWindow *>::iterator g=link_zoom.begin();g!=link_zoom.end();g++) {
// (*g)->SetXBounds(min,max);
// }
// did_draw=true;
// goto end;
//}
if (!zoom_in && m_mouseLDown) { // && !m_drag_foobar) {
wxPoint release(event.GetX(), m_scrY-m_marginBottom); wxPoint release(event.GetX(), m_scrY-m_marginBottom);
wxPoint press(m_mouseLClick.x, m_marginTop); wxPoint press(m_mouseLClick.x, m_marginTop);
int x1=m_mouseRBrect.x; int x1=m_mouseRBrect.x;
int x2=x1+m_mouseRBrect.width; int x2=x1+m_mouseRBrect.width;
if (m_mouseLDown && !m_drag_foobar) { //hot1.Contains(x,y) && //if (m_mouseLDown && !m_drag_foobar) { //hot1.Contains(x,y) &&
int t1=MIN(x1,x2); int t1=MIN(x1,x2);
int t2=MAX(x1,x2); int t2=MAX(x1,x2);
@ -561,12 +546,12 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
did_draw=true; did_draw=true;
} }
} //}
//goto end; //goto end;
} }
if ((!did_draw && hot1.Contains(x,y)) || zoom_in) { if (!did_draw && hot1.Contains(x,y) && !m_drag_foobar && m_mouseLDown) {
int xp=x; int xp=x;
if (zoom_in) xp=0; if (zoom_in) xp=0;
double zoom_fact=0.5; double zoom_fact=0.5;
@ -581,11 +566,14 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
//goto end; //goto end;
} }
m_drag_foobar=false;
wxRect r=m_mouseRBrect;
m_mouseRBrect=wxRect(0, 0, 0, 0); m_mouseRBrect=wxRect(0, 0, 0, 0);
m_mouseLDown=false; m_mouseLDown=false;
m_drag_foobar=false; m_drag_foobar=false;
if (!did_draw) { if (!did_draw) { // Should never happen.
Refresh(); if (r!=m_mouseRBrect)
Refresh();
} }
LastGraphLDown=NULL; LastGraphLDown=NULL;
event.Skip(); event.Skip();
@ -1163,12 +1151,18 @@ void gGraphTitle::Plot(wxDC & dc, gGraphWindow & w)
dc.SetFont(*m_font); dc.SetFont(*m_font);
dc.SetTextForeground(*m_color); dc.SetTextForeground(*m_color);
wxCoord x,y; wxCoord x,y;
wxAlignment m_alignment=wxALIGN_LEFT;
int xp;
if (m_orientation==wxHORIZONTAL) { if (m_orientation==wxHORIZONTAL) {
dc.DrawText(m_title,4,2); dc.DrawText(m_title,4,2);
} else { } else {
dc.GetTextExtent(m_title,&m_textwidth,&m_textheight); dc.GetTextExtent(m_title,&m_textwidth,&m_textheight);
dc.DrawRotatedText(m_title,4,scry/2+m_textwidth/2,90.0);
int xp=4;
if (m_alignment==wxALIGN_RIGHT) xp=scrx-4-m_textheight;
dc.DrawRotatedText(m_title,xp,scry/2+m_textwidth/2,90.0);
} }
} }
@ -1505,6 +1499,7 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
} }
} }
dc.SetClippingRegion(start_px+1,start_py,width,height);
for (int n=0;n<data->VC();n++) { for (int n=0;n<data->VC();n++) {
dp=0; dp=0;
@ -1566,12 +1561,12 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
py=height - ((point[i].y - miny) * ymult); py=height - ((point[i].y - miny) * ymult);
// Can't avoid this.. SetClippingRegion does not work without crashing.. need to find a workaround:( // Can't avoid this.. SetClippingRegion does not work without crashing.. need to find a workaround:(
if (px<0) { /* if (px<0) {
px=0; px=0;
} }
if (px>width) { if (px>width) {
px=width; px=width;
} } */
if (accel) { if (accel) {
int z=round(px); int z=round(px);
@ -1585,6 +1580,7 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
m_drawlist[dp].y=m_drawlist[dp-1].y; m_drawlist[dp].y=m_drawlist[dp-1].y;
if (++dp>=m_drawlist_size) { if (++dp>=m_drawlist_size) {
wxLogWarning(wxT("gLineChart: m_drawlist is too small")); wxLogWarning(wxT("gLineChart: m_drawlist is too small"));
done=true;
break; break;
} }
} }
@ -1592,23 +1588,24 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
m_drawlist[dp].y=start_py+py; m_drawlist[dp].y=start_py+py;
if (++dp>=m_drawlist_size) { if (++dp>=m_drawlist_size) {
wxLogWarning(wxT("gLineChart: m_drawlist is too small")); wxLogWarning(wxT("gLineChart: m_drawlist is too small"));
done=true;
break; break;
} }
} }
if (done) break; if (done) break;
} }
dc.SetClippingRegion(start_px+1,start_py-1,width,height+2);
if (accel) { if (accel) {
// dc.DrawLine(1, 1, 1, height); // dc.DrawLine(1, 1, 1, height);
dp=0; dp=0;
for (int i=minz;i<=maxz;i++) { for (int i=minz;i<maxz;i++) {
int y1=m_drawlist[i].x; int y1=m_drawlist[i].x;
int y2=m_drawlist[i].y; int y2=m_drawlist[i].y;
screen[dp].x=start_px+i; //if (i>width) break;
screen[dp].x=start_px+i+1;
screen[dp].y=start_py+y1; screen[dp].y=start_py+y1;
dp++; dp++;
screen[dp].x=start_px+i; screen[dp].x=start_px+i+1;
screen[dp].y=start_py+y2; screen[dp].y=start_py+y2;
dp++; dp++;
//dc.DrawLine(start_px+i, start_py+, start_px+i, start_py+m_drawlist[i].y); //dc.DrawLine(start_px+i, start_py+, start_px+i, start_py+m_drawlist[i].y);
@ -1620,9 +1617,6 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
} }
} }
dc.DestroyClippingRegion(); dc.DestroyClippingRegion();
//dc.SetClippingRegion(start_px-1,start_py+height,width+1,w.GetBottomMargin());
//dc.DestroyClippingRegion();
} }
gLineOverlayBar::gLineOverlayBar(gPointData *d,const wxColor * col,wxString _label,LO_Type _lot) gLineOverlayBar::gLineOverlayBar(gPointData *d,const wxColor * col,wxString _label,LO_Type _lot)
@ -1656,6 +1650,8 @@ void gLineOverlayBar::Plot(wxDC & dc, gGraphWindow & w)
int height=scry-(w.GetTopMargin()+w.GetBottomMargin()); int height=scry-(w.GetTopMargin()+w.GetBottomMargin());
dc.SetClippingRegion(start_px+1,start_py,width,height);
double xx=w.max_x-w.min_x; double xx=w.max_x-w.min_x;
if (xx<=0) return; if (xx<=0) return;
wxPen sfp3(*color[0], 4, wxSOLID); wxPen sfp3(*color[0], 4, wxSOLID);
@ -1718,6 +1714,7 @@ void gLineOverlayBar::Plot(wxDC & dc, gGraphWindow & w)
if (done) break; if (done) break;
} }
dc.DestroyClippingRegion();
} }
gFlagsLine::gFlagsLine(gPointData *d,const wxColor * col,wxString _label,int _line_num,int _total_lines) gFlagsLine::gFlagsLine(gPointData *d,const wxColor * col,wxString _label,int _line_num,int _total_lines)

3
src/graphs/graph.h
View File

@ -132,6 +132,7 @@ class gGraphWindow:public wxWindow // rename to gGraphWindow
//virtual void OnMouseWheel(wxMouseEvent &event); //virtual void OnMouseWheel(wxMouseEvent &event);
virtual void OnMouseMove(wxMouseEvent &event); virtual void OnMouseMove(wxMouseEvent &event);
virtual void OnMouseLeftDown(wxMouseEvent &event); virtual void OnMouseLeftDown(wxMouseEvent &event);
virtual void OnMouseLeftDClick(wxMouseEvent &event);
virtual void OnMouseLeftRelease (wxMouseEvent &event); virtual void OnMouseLeftRelease (wxMouseEvent &event);
virtual void OnMouseRightDown(wxMouseEvent &event); virtual void OnMouseRightDown(wxMouseEvent &event);
virtual void OnMouseRightRelease(wxMouseEvent &event); virtual void OnMouseRightRelease(wxMouseEvent &event);
@ -371,7 +372,7 @@ class gYAxis:public gLayer
bool ShowMinorLines() { return m_show_minor_lines; }; bool ShowMinorLines() { return m_show_minor_lines; };
bool ShowMajorLines() { return m_show_major_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; }; 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 static const int Margin=40; // Left margin space
protected: protected:
bool m_show_major_lines; bool m_show_major_lines;
bool m_show_minor_lines; bool m_show_minor_lines;

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long MAJOR = 0; static const long MAJOR = 0;
static const long MINOR = 7; static const long MINOR = 7;
static const long BUILD = 4058; static const long BUILD = 4129;
static const long REVISION = 5369; static const long REVISION = 5771;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 2363; static const long BUILDS_COUNT = 2508;
#define RC_FILEVERSION 0,7,4058,5369 #define RC_FILEVERSION 0,7,4129,5771
#define RC_FILEVERSION_STRING "0, 7, 4058, 5369\0" #define RC_FILEVERSION_STRING "0, 7, 4129, 5771\0"
static const char FULLVERSION_STRING[] = "0.7.4058.5369"; static const char FULLVERSION_STRING[] = "0.7.4129.5771";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0; static const long BUILD_HISTORY = 0;