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

Fixed mouse zoom glitch

Browse Source
This commit is contained in:
Mark Watkins 2011-08-26 14:09:56 +10:00
parent 07b2eb7481
commit cab5ff3e33
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Graphs/gGraphView.cpp
View File

@ -415,21 +415,16 @@ void gGraph::mouseReleaseEvent(QMouseEvent * event)
qDebug() << m_title << "Released" << min_x << max_x << x << y << x2 << y2 << left << right << top << bottom << m_width << m_height; qDebug() << m_title << "Released" << min_x << max_x << x << y << x2 << y2 << left << right << top << bottom << m_width << m_height;
if (x>left+m_marginleft && x<w+m_marginleft+left && y>top+m_margintop && y<h) { // main area
if ((m_graphview->horizTravel()<4) && (x>left+m_marginleft && x<w+m_marginleft+left && y>top+m_margintop && y<h)) { // normal click in main area
if (event->button() & Qt::RightButton) { if (event->button() & Qt::RightButton) {
if (abs(x-x2)<4) { ZoomX(2,x); // Zoon out
ZoomX(2,x);
return; return;
}
// zoom out.
} else if (event->button() & Qt::LeftButton) { } else if (event->button() & Qt::LeftButton) {
if (abs(x-x2)<4) { ZoomX(0.5,x); // zoom in.
ZoomX(0.5,x);
return; return;
} }
} }
// qDebug() << m_title << "Released" << event->pos() << m_graphview->pointClicked() << left << top;
}
if (m_selecting_area) { if (m_selecting_area) {
m_selecting_area=false; m_selecting_area=false;
m_selection.setWidth(0); m_selection.setWidth(0);
@ -477,10 +472,10 @@ void gGraph::wheelEvent(QWheelEvent * event)
} }
void gGraph::mouseDoubleClickEvent(QMouseEvent * event) void gGraph::mouseDoubleClickEvent(QMouseEvent * event)
{ {
mousePressEvent(event); //mousePressEvent(event);
mouseReleaseEvent(event);
mousePressEvent(event);
mouseReleaseEvent(event); mouseReleaseEvent(event);
//mousePressEvent(event);
//mouseReleaseEvent(event);
qDebug() << m_title << "Double Clicked" << event->x() << event->y(); qDebug() << m_title << "Double Clicked" << event->x() << event->y();
} }
void gGraph::keyPressEvent(QKeyEvent * event) void gGraph::keyPressEvent(QKeyEvent * event)
@ -659,6 +654,8 @@ gGraphView::gGraphView(QWidget *parent) :
m_sizer_index=m_graph_index=0; m_sizer_index=m_graph_index=0;
m_textque_items=0; m_textque_items=0;
m_button_down=m_graph_dragging=m_sizer_dragging=false; m_button_down=m_graph_dragging=m_sizer_dragging=false;
m_lastxpos=0;
m_horiz_travel=0;
this->setMouseTracking(true); this->setMouseTracking(true);
InitGraphs(); InitGraphs();
} }
@ -1030,6 +1027,8 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event)
if (m_button_down || ((y >= py) && (y < py + h))) { if (m_button_down || ((y >= py) && (y < py + h))) {
if (m_button_down || (x >= titleWidth)) { if (m_button_down || (x >= titleWidth)) {
this->setCursor(Qt::ArrowCursor); this->setCursor(Qt::ArrowCursor);
m_horiz_travel+=abs(x-m_lastxpos);
m_lastxpos=x;
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());
@ -1082,6 +1081,7 @@ void gGraphView::mousePressEvent(QMouseEvent * event)
QMouseEvent e(event->type(),m_point_clicked,event->button(),event->buttons(),event->modifiers()); QMouseEvent e(event->type(),m_point_clicked,event->button(),event->buttons(),event->modifiers());
m_graph_index=i; m_graph_index=i;
m_button_down=true; m_button_down=true;
m_horiz_travel=0;
m_graphs[i]->mousePressEvent(&e); m_graphs[i]->mousePressEvent(&e);
} }
} else if ((y >= py + h) && (y <= py + h + graphSpacer + 1)) { } else if ((y >= py + h) && (y <= py + h + graphSpacer + 1)) {

5
Graphs/gGraphView.h
View File

@ -14,7 +14,7 @@
class gGraphView; class gGraphView;
class gGraph; class gGraph;
const int textque_max=2048; const int textque_max=512;
struct TextQue struct TextQue
{ {
@ -226,6 +226,7 @@ public:
gGraph *m_selected_graph; gGraph *m_selected_graph;
void AddTextQue(QString & text, short x, short y, float angle, QColor & color, QFont * font); void AddTextQue(QString & text, short x, short y, float angle, QColor & color, QFont * font);
int horizTravel() { return m_horiz_travel; }
protected: protected:
void DrawTextQue(); void DrawTextQue();
@ -263,6 +264,7 @@ protected:
QPoint m_point_clicked; QPoint m_point_clicked;
QPoint m_global_point_clicked; QPoint m_global_point_clicked;
QPoint m_sizer_point; QPoint m_sizer_point;
int m_horiz_travel;
MyScrollBar * m_scrollbar; MyScrollBar * m_scrollbar;
@ -271,6 +273,7 @@ protected:
TextQue m_textque[textque_max]; TextQue m_textque[textque_max];
int m_textque_items; int m_textque_items;
int m_lastxpos;
signals: signals: