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

Merge branch 'master' of ssh://git.code.sf.net/p/sleepyhead/code

Browse Source
This commit is contained in:
Mark Watkins 2014-07-20 14:48:38 +10:00
commit 7c54c8d13b
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sleepyhead/Graphs/gGraph.cpp
View File

@ -761,7 +761,6 @@ void gGraph::mouseMoveEvent(QMouseEvent *event)
min_x = rmax_x - xx; min_x = rmax_x - xx;
} }
m_graphview->saveHistory();
m_graphview->SetXBounds(min_x, max_x, m_group, false); m_graphview->SetXBounds(min_x, max_x, m_group, false);
doredraw = true; doredraw = true;
} else { } else {
@ -785,7 +784,6 @@ void gGraph::mouseMoveEvent(QMouseEvent *event)
min_x = rmax_x - xx; min_x = rmax_x - xx;
} }
m_graphview->saveHistory();
m_graphview->SetXBounds(min_x, max_x, m_group, false); m_graphview->SetXBounds(min_x, max_x, m_group, false);
doredraw = true; doredraw = true;
} }
@ -891,7 +889,6 @@ void gGraph::mouseReleaseEvent(QMouseEvent *event)
} else { } else {
if (a2 - a1 < zoom_hard_limit) { a2 = a1 + zoom_hard_limit; } if (a2 - a1 < zoom_hard_limit) { a2 = a1 + zoom_hard_limit; }
m_graphview->saveHistory();
m_graphview->SetXBounds(a1, a2, m_group); m_graphview->SetXBounds(a1, a2, m_group);
} }
} else { } else {
@ -900,16 +897,15 @@ void gGraph::mouseReleaseEvent(QMouseEvent *event)
qint64 j1 = rmin_x + xmult * x; qint64 j1 = rmin_x + xmult * x;
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 (a1<rmin_x) a1=rmin_x;
if (a2 > rmax_x) { a2 = rmax_x; } if (a2 > rmax_x) { a2 = rmax_x; }
if (a1 <= rmin_x && a2 <= rmin_x) { if (a1 <= rmin_x && a2 <= rmin_x) {
qDebug() << "Foo2??"; qDebug() << "Foo2??";
} else { } else {
if (a2 - a1 < zoom_hard_limit) { a2 = a1 + zoom_hard_limit; } if (a2 - a1 < zoom_hard_limit) { a2 = a1 + zoom_hard_limit; }
m_graphview->saveHistory();
m_graphview->SetXBounds(a1, a2, m_group); m_graphview->SetXBounds(a1, a2, m_group);
} }
} }
@ -983,7 +979,6 @@ void gGraph::mouseReleaseEvent(QMouseEvent *event)
min_x = rmax_x - xx; min_x = rmax_x - xx;
} }
m_graphview->saveHistory();
m_graphview->SetXBounds(min_x, max_x, m_group); m_graphview->SetXBounds(min_x, max_x, m_group);
m_lastx23 = x; m_lastx23 = x;
} }
@ -1122,7 +1117,6 @@ void gGraph::ZoomX(double mult, int origin_px)
extern const int max_history; extern const int max_history;
m_graphview->saveHistory();
m_graphview->SetXBounds(min, max, m_group); m_graphview->SetXBounds(min, max, m_group);
//updateSelectionTime(max-min); //updateSelectionTime(max-min);
} }