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

Oximeter Graph Bounds fixes, plus select glitch fixed

Browse Source
This commit is contained in:
Mark Watkins 2011-08-26 15:56:43 +10:00
parent a0235534e6
commit e241bf5677
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Graphs/gGraphView.cpp
View File

@ -330,7 +330,7 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
if (a1<m_marginleft+left) a1=m_marginleft+left; if (a1<m_marginleft+left) a1=m_marginleft+left;
if (a2>w) a2=w; if (a2>w) a2=w;
m_selecting_area=true; m_selecting_area=true;
m_selection=QRect(a1-m_marginleft,0,a2-a1,m_height); m_selection=QRect(a1-m_marginleft-1,0,a2-a1,m_height);
m_graphview->updateGL(); m_graphview->updateGL();
} else if (event->buttons() & Qt::RightButton) { } else if (event->buttons() & Qt::RightButton) {
m_graphview->setPointClicked(event->pos()); m_graphview->setPointClicked(event->pos());
@ -434,7 +434,9 @@ void gGraph::mouseReleaseEvent(QMouseEvent * event)
x2-=left+m_marginleft; x2-=left+m_marginleft;
y2-=top+m_margintop; y2-=top+m_margintop;
if (x<0) x=0; if (x<0) x=0;
if (x2<0) x2=0;
if (x>w) x=w; if (x>w) x=w;
if (x2>w) x2=w;
if (!m_blockzoom) { if (!m_blockzoom) {
double xx=max_x-min_x; double xx=max_x-min_x;
double xmult=xx/double(w); double xmult=xx/double(w);
@ -442,6 +444,7 @@ void gGraph::mouseReleaseEvent(QMouseEvent * event)
qint64 j2=min_x+xmult*x2; qint64 j2=min_x+xmult*x2;
qint64 a1=MIN(j1,j2) qint64 a1=MIN(j1,j2)
qint64 a2=MAX(j1,j2) qint64 a2=MAX(j1,j2)
//if (a1<rmin_x) a1=rmin_x;
if (a2>rmax_x) a2=rmax_x; if (a2>rmax_x) a2=rmax_x;
m_graphview->SetXBounds(a1,a2,m_group); m_graphview->SetXBounds(a1,a2,m_group);
} else { } else {
@ -451,6 +454,7 @@ void gGraph::mouseReleaseEvent(QMouseEvent * event)
qint64 j2=rmin_x+xmult*x2; qint64 j2=rmin_x+xmult*x2;
qint64 a1=MIN(j1,j2) qint64 a1=MIN(j1,j2)
qint64 a2=MAX(j1,j2) qint64 a2=MAX(j1,j2)
//if (a1<rmin_x) a1=rmin_x;
if (a2>rmax_x) a2=rmax_x; if (a2>rmax_x) a2=rmax_x;
m_graphview->SetXBounds(a1,a2,m_group); m_graphview->SetXBounds(a1,a2,m_group);
} }
@ -788,10 +792,10 @@ void gGraphView::scrollbarValueChanged(int val)
updateGL(); // do this on a timer? updateGL(); // do this on a timer?
} }
} }
void gGraphView::ResetBounds(short group) void gGraphView::ResetBounds() //short group)
{ {
for (int i=0;i<m_graphs.size();i++) { for (int i=0;i<m_graphs.size();i++) {
if (m_graphs[i]->group()==group) //if (m_graphs[i]->group()==group)
m_graphs[i]->ResetBounds(); m_graphs[i]->ResetBounds();
} }
updateScale(); updateScale();

2
Graphs/gGraphView.h
View File

@ -213,7 +213,7 @@ public:
float scaleY() { return m_scaleY; } float scaleY() { return m_scaleY; }
void ResetBounds(short group=0); void ResetBounds(); //short group=0);
void SetXBounds(qint64 minx, qint64 maxx, short group=0); void SetXBounds(qint64 minx, qint64 maxx, short group=0);
bool hasGraphs() { return m_graphs.size()>0; } bool hasGraphs() { return m_graphs.size()>0; }

1
daily.cpp
View File

@ -773,6 +773,7 @@ void Daily::Load(QDate date)
UpdateEventsTree(ui->treeWidget,cpap); UpdateEventsTree(ui->treeWidget,cpap);
GraphView->ResetBounds(); GraphView->ResetBounds();
//GraphView->ResetBounds(1);
GraphView->updateGL(); GraphView->updateGL();
if (!cpap && !oxi) { if (!cpap && !oxi) {