projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignalBase: Implement A2D conversions
[pulseview.git]
/
pv
/
view
/
viewport.cpp
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index ac494272de8705522a6c1ca43e073dbd3f9d23d0..2d10f2a054fadb31dc47783d3395460c54fb2c0a 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),
@@
-68,7
+70,7
@@
shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
void Viewport::item_hover(const shared_ptr<ViewItem> &item)
{
void Viewport::item_hover(const shared_ptr<ViewItem> &item)
{
- if (item)
+ if (item
&& item->is_draggable()
)
setCursor(dynamic_pointer_cast<RowItem>(item) ?
Qt::SizeVerCursor : Qt::SizeHorCursor);
else
setCursor(dynamic_pointer_cast<RowItem>(item) ?
Qt::SizeVerCursor : Qt::SizeHorCursor);
else
@@
-78,6
+80,7
@@
void Viewport::item_hover(const shared_ptr<ViewItem> &item)
void Viewport::drag()
{
drag_offset_ = view_.offset();
void Viewport::drag()
{
drag_offset_ = view_.offset();
+ drag_v_offset_ = view_.owner_visual_v_offset();
}
void Viewport::drag_by(const QPoint &delta)
}
void Viewport::drag_by(const QPoint &delta)
@@
-87,6
+90,8
@@
void Viewport::drag_by(const QPoint &delta)
view_.set_scale_offset(view_.scale(),
(*drag_offset_ - delta.x() * view_.scale()));
view_.set_scale_offset(view_.scale(),
(*drag_offset_ - delta.x() * view_.scale()));
+
+ view_.set_v_offset(-drag_v_offset_ - delta.y());
}
void Viewport::drag_release()
}
void Viewport::drag_release()
@@
-97,7
+102,7
@@
void Viewport::drag_release()
vector< shared_ptr<ViewItem> > Viewport::items()
{
vector< shared_ptr<ViewItem> > items;
vector< shared_ptr<ViewItem> > Viewport::items()
{
vector< shared_ptr<ViewItem> > items;
- const
std::
vector< shared_ptr<ViewItem> > view_items(
+ const vector< shared_ptr<ViewItem> > view_items(
view_.list_by_type<ViewItem>());
copy(view_items.begin(), view_items.end(), back_inserter(items));
const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
view_.list_by_type<ViewItem>());
copy(view_items.begin(), view_items.end(), back_inserter(items));
const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
@@
-199,29
+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 (event->orientation() == Qt::Vertical) {
+ if (event->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 (event->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