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

Basic graph move.. not event flags yet

Browse Source
This commit is contained in:
Mark Watkins 2011-08-25 23:55:44 +10:00
parent 06d427b351
commit 5710351ad6
3 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Graphs/gGraphView.cpp
View File

@ -339,8 +339,10 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
int h=m_height-(bottom+m_marginbottom); int h=m_height-(bottom+m_marginbottom);
double xx=max_x-min_x; double xx=max_x-min_x;
double xmult=xx/w; double xmult=xx/w;
m_selecting_area=false;
if ((event->buttons() & Qt::LeftButton) && (m_graphview->m_selected_graph==this)) { if (m_graphview->m_selected_graph==this) {
if (event->buttons() & Qt::LeftButton) {
qDebug() << m_title << "Moved" << x << y << left << right << top << bottom << m_width << m_height; qDebug() << m_title << "Moved" << x << y << left << right << top << bottom << m_width << m_height;
int a1=MIN(x,x2); int a1=MIN(x,x2);
int a2=MAX(x,x2); int a2=MAX(x,x2);
@ -349,8 +351,29 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
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,0,a2-a1,m_height);
m_graphview->updateGL(); m_graphview->updateGL();
//repaint(); } else if (event->buttons() & Qt::RightButton) {
} else m_selecting_area=false; m_graphview->setPointClicked(event->pos());
x-=left+m_marginleft;
x2-=left+m_marginleft;
//int a1=MIN(x,x2);
//int a2=MAX(x,x2);
//if (a1<m_marginleft+left) a1=m_marginleft+left;
//if (a2>w) a2=w;
if (!m_blockzoom) {
xx=max_x-min_x;
w-=m_marginleft+left;
xmult=xx/double(w);
qint64 j1=xmult*x;
qint64 j2=xmult*x2;
qint64 jj=j2-j1;
min_x+=jj;
max_x+=jj;
//if (a2>rmax_x) a2=rmax_x;
m_graphview->SetXBounds(min_x,max_x);
}
}
}
if (x>left+m_marginleft && x<m_width-(m_graphview->titleWidth+right+m_marginright) && y>top+m_margintop && y<m_height-(bottom+m_marginbottom)) { // main area if (x>left+m_marginleft && x<m_width-(m_graphview->titleWidth+right+m_marginright) && y>top+m_margintop && y<m_height-(bottom+m_marginbottom)) { // main area
x-=left+m_marginleft; x-=left+m_marginleft;
@ -950,9 +973,9 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event)
if (py > height()) if (py > height())
break; // we are done.. can't draw anymore break; // we are done.. can't draw anymore
if ((py + h + graphSpacer) >= 0) { if (m_button_down || ((py + h + graphSpacer) >= 0)) {
if ((y >= py) && (y < py + h)) { if (m_button_down || ((y >= py) && (y < py + h))) {
if (x >= titleWidth) { if (m_button_down || (x >= titleWidth)) {
this->setCursor(Qt::ArrowCursor); this->setCursor(Qt::ArrowCursor);
QPoint p(x-titleWidth,y-py); QPoint p(x-titleWidth,y-py);
QMouseEvent e(event->type(),p,event->button(),event->buttons(),event->modifiers()); QMouseEvent e(event->type(),p,event->button(),event->buttons(),event->modifiers());

2
Graphs/gGraphView.h
View File

@ -205,6 +205,8 @@ public:
QPoint pointClicked() { return m_point_clicked; } QPoint pointClicked() { return m_point_clicked; }
QPoint globalPointClicked() { return m_global_point_clicked; } QPoint globalPointClicked() { return m_global_point_clicked; }
void setPointClicked(QPoint p) { m_point_clicked=p; }
void setGlobalPointClicked(QPoint p) { m_global_point_clicked=p; }
QPainter *painter; QPainter *painter;

2
daily.cpp
View File

@ -90,7 +90,7 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw)
SF->AddLayer(AddCPAP(fg)); SF->AddLayer(AddCPAP(fg));
SF->AddLayer(new gShadowArea()); SF->AddLayer(new gShadowArea());
SF->AddLayer(new gYSpacer(),LayerLeft,gYAxis::Margin); SF->AddLayer(new gYSpacer(),LayerLeft,gYAxis::Margin);
SF->AddLayer(new gFooBar(),LayerBottom,0,10); //SF->AddLayer(new gFooBar(),LayerBottom,0,10);
SF->AddLayer(new gXAxis(),LayerBottom,0,gXAxis::Margin); SF->AddLayer(new gXAxis(),LayerBottom,0,gXAxis::Margin);
PRD->AddLayer(new gXGrid()); PRD->AddLayer(new gXGrid());