projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch segment storage from single vector to vector of arrays
[pulseview.git]
/
pv
/
view
/
viewport.cpp
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index 9e136664f5078b1510dbef92d57c972b61d981ba..1504f482ca3915d605ff9a09d66e6c1584ab7362 100644
(file)
--- a/
pv/view/viewport.cpp
+++ b/
pv/view/viewport.cpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <cassert>
*/
#include <cassert>
@@
-32,6
+31,8
@@
#include <QMouseEvent>
#include <QMouseEvent>
+#include <QDebug>
+
using std::abs;
using std::back_inserter;
using std::copy;
using std::abs;
using std::back_inserter;
using std::copy;
@@
-45,7
+46,8
@@
using std::stable_sort;
using std::vector;
namespace pv {
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
Viewport::Viewport(View &parent) :
ViewWidget(parent),
Viewport::Viewport(View &parent) :
ViewWidget(parent),
@@
-202,26
+204,27
@@
void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
view_.zoom(-2.0, event->x());
}
view_.zoom(-2.0, event->x());
}
-void Viewport::wheelEvent(QWheelEvent *e)
+void Viewport::wheelEvent(QWheelEvent *e
vent
)
{
{
- assert(e);
+ assert(e
vent
);
- if (e->orientation() == Qt::Vertical) {
- if (e->modifiers() & Qt::ControlModifier) {
+ if (e
vent
->orientation() == Qt::Vertical) {
+ if (e
vent
->modifiers() & Qt::ControlModifier) {
// Vertical scrolling with the control key pressed
// is intrepretted as vertical scrolling
view_.set_v_offset(-view_.owner_visual_v_offset() -
// Vertical scrolling with the control key pressed
// is intrepretted as vertical scrolling
view_.set_v_offset(-view_.owner_visual_v_offset() -
- (e->delta() * height()) / (8 * 120));
+ (e
vent
->delta() * height()) / (8 * 120));
} else {
// Vertical scrolling is interpreted as zooming in/out
} else {
// Vertical scrolling is interpreted as zooming in/out
- view_.zoom(e
->delta() / 120, e
->x());
+ view_.zoom(e
vent->delta() / 120, event
->x());
}
}
- } else if (e->orientation() == Qt::Horizontal) {
+ } else if (e
vent
->orientation() == Qt::Horizontal) {
// Horizontal scrolling is interpreted as moving left/right
view_.set_scale_offset(view_.scale(),
// Horizontal scrolling is interpreted as moving left/right
view_.set_scale_offset(view_.scale(),
- e->delta() * view_.scale() + view_.offset());
+ e
vent
->delta() * view_.scale() + view_.offset());
}
}
}
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv