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

Capped zoom out, and removed default half an hour zoom from fully expanded in event flags.

Browse Source
This commit is contained in:
Mark Watkins 2011-08-29 09:45:57 +10:00
parent d1067a57c0
commit 5d62b6d762
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Graphs/gGraphView.cpp
View File

@ -161,6 +161,7 @@ gGraph::gGraph(gGraphView *graphview,QString title,int height,short group) :
m_marginleft=5; m_marginleft=5;
m_marginright=10; m_marginright=10;
m_selecting_area=m_blockzoom=false; m_selecting_area=m_blockzoom=false;
m_lastx23=0;
} }
gGraph::~gGraph() gGraph::~gGraph()
{ {
@ -470,16 +471,16 @@ void gGraph::mouseReleaseEvent(QMouseEvent * event)
double xmult; double xmult;
double xx=max_x-min_x; double xx=max_x-min_x;
if (xx==qq) xx=1800000; //if (xx==qq) xx=1800000;
xmult=qq/double(w); xmult=qq/double(w);
static int lastx=0; if (x==m_lastx23) {
if (x==lastx) {
if (event->button() & Qt::RightButton) { if (event->button() & Qt::RightButton) {
xx*=1.33; xx*=1.33;
} else if (event->button() & Qt::LeftButton) { } else if (event->button() & Qt::LeftButton) {
xx*=0.75; xx*=0.75;
} }
if (xx>qq) xx=qq;
} }
double j1=xmult*x; double j1=xmult*x;
min_x=rmin_x+j1-(xx/2.0); min_x=rmin_x+j1-(xx/2.0);
@ -487,13 +488,13 @@ void gGraph::mouseReleaseEvent(QMouseEvent * event)
if (min_x<rmin_x) { if (min_x<rmin_x) {
min_x=rmin_x; min_x=rmin_x;
max_x=rmin_x+xx; max_x=rmin_x+xx;
} } else
if (max_x>rmax_x) { if (max_x>rmax_x) {
max_x=rmax_x; max_x=rmax_x;
min_x=rmax_x-xx; min_x=rmax_x-xx;
} }
m_graphview->SetXBounds(min_x,max_x,m_group); m_graphview->SetXBounds(min_x,max_x,m_group);
lastx=x; m_lastx23=x;
} }
} }
//m_graphview->updateGL(); //m_graphview->updateGL();

1
Graphs/gGraphView.h
View File

@ -194,6 +194,7 @@ protected:
bool m_selecting_area; bool m_selecting_area;
QPoint m_current; QPoint m_current;
short m_group; short m_group;
short m_lastx23;
}; };
class gGraphView : public QGLWidget class gGraphView : public QGLWidget