Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • ped-dyn-emp/petrack
1 result
Select Git revision
Show changes
Commits on Source (4)
Expand all Hide whitespace changes
Inline Side-by-side
include/control.h
View file @ 61bab137
...@@ -100,9 +100,12 @@ public: ...@@ -100,9 +100,12 @@ public:
QColor getTrackGroundPathColor() const; QColor getTrackGroundPathColor() const;
void setTrackGroundPathColor(QColor col); void setTrackGroundPathColor(QColor col);
int getTrackCurrentPointSize() const; int getTrackCurrentPointSize() const;
int getTrackCurrentPointLineWidth() const;
int getTrackPointSize() const; int getTrackPointSize() const;
int getTrackShowPointsLineWidth() const;
int getTrackColColorSize() const; int getTrackColColorSize() const;
int getTrackColorMarkerSize() const; int getTrackColorMarkerSize() const;
int getTrackColorMarkerLineWidth() const;
int getTrackNumberSize() const; int getTrackNumberSize() const;
int getTrackGroundPositionSize() const; int getTrackGroundPositionSize() const;
int getTrackGroundPathSize() const; int getTrackGroundPathSize() const;
...@@ -459,6 +462,7 @@ private slots: ...@@ -459,6 +462,7 @@ private slots:
void on_trackHeadSized_stateChanged(int i); void on_trackHeadSized_stateChanged(int i);
void on_trackShowPoints_stateChanged(int /*i*/) void on_trackShowPoints_stateChanged(int /*i*/)
{ {
if(!isLoading()) if(!isLoading())
...@@ -538,6 +542,14 @@ private slots: ...@@ -538,6 +542,14 @@ private slots:
mScene->update(); mScene->update();
} }
} }
void on_trackCurrentPointLineWidth_valueChanged(int /*i*/)
{
if(!isLoading())
{
mScene->update();
}
}
void on_trackPointSize_valueChanged(int /*i*/) void on_trackPointSize_valueChanged(int /*i*/)
{ {
if(!isLoading()) if(!isLoading())
...@@ -545,6 +557,14 @@ private slots: ...@@ -545,6 +557,14 @@ private slots:
mScene->update(); mScene->update();
} }
} }
void on_trackShowPointsLineWidth_valueChanged(int /*i*/)
{
if(!isLoading())
{
mScene->update();
}
}
void on_trackPathWidth_valueChanged(int /*i*/) void on_trackPathWidth_valueChanged(int /*i*/)
{ {
if(!isLoading()) if(!isLoading())
...@@ -563,6 +583,13 @@ private slots: ...@@ -563,6 +583,13 @@ private slots:
{ {
mScene->update(); mScene->update();
} }
void on_trackColorMarkerLineWidth_valueChanged(int /*i*/)
{
if(!isLoading())
{
mScene->update();
}
}
void on_trackNumberSize_valueChanged(int /*i*/) void on_trackNumberSize_valueChanged(int /*i*/)
{ {
if(!isLoading()) if(!isLoading())
......
include/view.h
View file @ 61bab137
...@@ -55,7 +55,7 @@ public: ...@@ -55,7 +55,7 @@ public:
signals: signals:
void mouseDoubleClick(); void mouseDoubleClick();
void mouseAltDoubleClick(QPointF pos); void mouseCtrlAltDoubleClick(QPointF pos);
void mouseShiftControlDoubleClick(QPointF pos); void mouseShiftControlDoubleClick(QPointF pos);
void mouseShiftDoubleClick(QPointF pos); void mouseShiftDoubleClick(QPointF pos);
void mouseControlDoubleClick(QPointF pos); void mouseControlDoubleClick(QPointF pos);
......
src/control.cpp
View file @ 61bab137
...@@ -240,6 +240,7 @@ Control::Control( ...@@ -240,6 +240,7 @@ Control::Control(
mUi->scrollAreaWidgetContents_4->layout()->margin() * 2 + mUi->scrollAreaWidgetContents_4->layout()->margin() * 2 +
mUi->scrollAreaWidgetContents_4->layout()->spacing() * 2); mUi->scrollAreaWidgetContents_4->layout()->spacing() * 2);
connect(mUi->trackRoiFix, &QCheckBox::stateChanged, &trackRoiItem, &RoiItem::setFixed); connect(mUi->trackRoiFix, &QCheckBox::stateChanged, &trackRoiItem, &RoiItem::setFixed);
connect(mUi->recoRoiToFullImageSize, &QPushButton::clicked, &recoRoiItem, &RoiItem::setToFullImageSize); connect(mUi->recoRoiToFullImageSize, &QPushButton::clicked, &recoRoiItem, &RoiItem::setToFullImageSize);
connect( connect(
...@@ -432,22 +433,30 @@ int Control::getTrackCurrentPointSize() const ...@@ -432,22 +433,30 @@ int Control::getTrackCurrentPointSize() const
{ {
return mUi->trackCurrentPointSize->value(); return mUi->trackCurrentPointSize->value();
} }
int Control::getTrackCurrentPointLineWidth() const
{
return mUi->trackCurrentPointLineWidth->value();
}
int Control::getTrackPointSize() const int Control::getTrackPointSize() const
{ {
return mUi->trackPointSize->value(); return mUi->trackPointSize->value();
} }
int Control::getTrackShowPointsLineWidth() const
{
return mUi->trackShowPointsLineWidth->value();
}
int Control::getTrackColColorSize() const int Control::getTrackColColorSize() const
{ {
return mUi->trackColColorSize->value(); return mUi->trackColColorSize->value();
} }
int Control::getTrackColorMarkerSize() const int Control::getTrackColorMarkerSize() const
{ {
return mUi->trackColorMarkerSize->value(); return mUi->trackColorMarkerSize->value();
} }
int Control::getTrackColorMarkerLineWidth() const
{
return mUi->trackColorMarkerLineWidth->value();
}
int Control::getTrackNumberSize() const int Control::getTrackNumberSize() const
{ {
return mUi->trackNumberSize->value(); return mUi->trackNumberSize->value();
...@@ -3646,10 +3655,13 @@ void Control::setXml(QDomElement &elem) ...@@ -3646,10 +3655,13 @@ void Control::setXml(QDomElement &elem)
subSubElem.setAttribute("TRACK_GROUND_PATH_COLOR", getTrackGroundPathColor().name()); subSubElem.setAttribute("TRACK_GROUND_PATH_COLOR", getTrackGroundPathColor().name());
subSubElem.setAttribute("TRACK_PATH_COLOR", getTrackPathColor().name()); subSubElem.setAttribute("TRACK_PATH_COLOR", getTrackPathColor().name());
subSubElem.setAttribute("CURRENT_POINT_SIZE", mUi->trackCurrentPointSize->value()); subSubElem.setAttribute("CURRENT_POINT_SIZE", mUi->trackCurrentPointSize->value());
subSubElem.setAttribute("CURRENT_POINT_LINE_WIDTH", mUi->trackCurrentPointLineWidth->value());
subSubElem.setAttribute("POINTS_SIZE", mUi->trackPointSize->value()); subSubElem.setAttribute("POINTS_SIZE", mUi->trackPointSize->value());
subSubElem.setAttribute("SHOW_POINTS_LINE_WIDTH", mUi->trackShowPointsLineWidth->value());
subSubElem.setAttribute("PATH_SIZE", mUi->trackPathWidth->value()); subSubElem.setAttribute("PATH_SIZE", mUi->trackPathWidth->value());
subSubElem.setAttribute("COLLECTIVE_COLOR_SIZE", mUi->trackColColorSize->value()); subSubElem.setAttribute("COLLECTIVE_COLOR_SIZE", mUi->trackColColorSize->value());
subSubElem.setAttribute("COLOR_MARKER_SIZE", mUi->trackColorMarkerSize->value()); subSubElem.setAttribute("COLOR_MARKER_SIZE", mUi->trackColorMarkerSize->value());
subSubElem.setAttribute("COLOR_MARKER_LINE_WIDTH", mUi->trackColorMarkerLineWidth->value());
subSubElem.setAttribute("NUMBER_SIZE", mUi->trackNumberSize->value()); subSubElem.setAttribute("NUMBER_SIZE", mUi->trackNumberSize->value());
subSubElem.setAttribute("GROUND_POSITION_SIZE", mUi->trackGroundPositionSize->value()); subSubElem.setAttribute("GROUND_POSITION_SIZE", mUi->trackGroundPositionSize->value());
subSubElem.setAttribute("GROUND_PATH_SIZE", mUi->trackGroundPathSize->value()); subSubElem.setAttribute("GROUND_PATH_SIZE", mUi->trackGroundPathSize->value());
...@@ -4750,10 +4762,19 @@ void Control::getXml(QDomElement &elem) ...@@ -4750,10 +4762,19 @@ void Control::getXml(QDomElement &elem)
{ {
mUi->trackCurrentPointSize->setValue(subSubElem.attribute("CURRENT_POINT_SIZE").toInt()); mUi->trackCurrentPointSize->setValue(subSubElem.attribute("CURRENT_POINT_SIZE").toInt());
} }
if(subSubElem.hasAttribute("CURRENT_POINT_LINE_WIDTH"))
{
mUi->trackCurrentPointLineWidth->setValue(
subSubElem.attribute("CURRENT_POINT_LINE_WIDTH").toInt());
}
if(subSubElem.hasAttribute("POINTS_SIZE")) if(subSubElem.hasAttribute("POINTS_SIZE"))
{ {
mUi->trackPointSize->setValue(subSubElem.attribute("POINTS_SIZE").toInt()); mUi->trackPointSize->setValue(subSubElem.attribute("POINTS_SIZE").toInt());
} }
if(subSubElem.hasAttribute("SHOW_POINTS_LINE_WIDTH"))
{
mUi->trackShowPointsLineWidth->setValue(subSubElem.attribute("SHOW_POINTS_LINE_WIDTH").toInt());
}
if(subSubElem.hasAttribute("PATH_SIZE")) if(subSubElem.hasAttribute("PATH_SIZE"))
{ {
mUi->trackPathWidth->setValue(subSubElem.attribute("PATH_SIZE").toInt()); mUi->trackPathWidth->setValue(subSubElem.attribute("PATH_SIZE").toInt());
...@@ -4766,6 +4787,11 @@ void Control::getXml(QDomElement &elem) ...@@ -4766,6 +4787,11 @@ void Control::getXml(QDomElement &elem)
{ {
mUi->trackColorMarkerSize->setValue(subSubElem.attribute("COLOR_MARKER_SIZE").toInt()); mUi->trackColorMarkerSize->setValue(subSubElem.attribute("COLOR_MARKER_SIZE").toInt());
} }
if(subSubElem.hasAttribute("COLOR_MARKER_LINE_WIDTH"))
{
mUi->trackColorMarkerLineWidth->setValue(
subSubElem.attribute("COLOR_MARKER_LINE_WIDTH").toInt());
}
if(subSubElem.hasAttribute("NUMBER_SIZE")) if(subSubElem.hasAttribute("NUMBER_SIZE"))
{ {
mUi->trackNumberSize->setValue(subSubElem.attribute("NUMBER_SIZE").toInt()); mUi->trackNumberSize->setValue(subSubElem.attribute("NUMBER_SIZE").toInt());
......
src/petrack.cpp
View file @ 61bab137
...@@ -167,7 +167,7 @@ Petrack::Petrack() : ...@@ -167,7 +167,7 @@ Petrack::Petrack() :
connect(mView, &GraphicsView::mouseRightDoubleClick, this, &Petrack::deleteTrackPoint); connect(mView, &GraphicsView::mouseRightDoubleClick, this, &Petrack::deleteTrackPoint);
connect(mView, &GraphicsView::mouseMiddleDoubleClick, this, &Petrack::deleteTrackPointAll); connect(mView, &GraphicsView::mouseMiddleDoubleClick, this, &Petrack::deleteTrackPointAll);
connect(mView, &GraphicsView::mouseShiftWheel, this, &Petrack::skipToFrameWheel); connect(mView, &GraphicsView::mouseShiftWheel, this, &Petrack::skipToFrameWheel);
connect(mView, &GraphicsView::mouseAltDoubleClick, this, &Petrack::skipToFrameFromTrajectory); connect(mView, &GraphicsView::mouseCtrlAltDoubleClick, this, &Petrack::skipToFrameFromTrajectory);
connect(mView, &GraphicsView::mouseAltMoved, this, &Petrack::moveTrackPoint); connect(mView, &GraphicsView::mouseAltMoved, this, &Petrack::moveTrackPoint);
connect(mView, &GraphicsView::mouseAltPressed, this, &Petrack::selectPersonForMoveTrackPoint); connect(mView, &GraphicsView::mouseAltPressed, this, &Petrack::selectPersonForMoveTrackPoint);
connect(mView, &GraphicsView::altReleased, this, &Petrack::releaseTrackPoint); connect(mView, &GraphicsView::altReleased, this, &Petrack::releaseTrackPoint);
...@@ -1637,7 +1637,8 @@ void Petrack::keyBindings() ...@@ -1637,7 +1637,8 @@ void Petrack::keyBindings()
"<dt><kbd>Shift + t</kbd></dt><dd>toggles tracking online calculation</dd>" "<dt><kbd>Shift + t</kbd></dt><dd>toggles tracking online calculation</dd>"
"<dt><kbd>Shift + double-click left mouse button</kbd></dt><dd>inserts new or moves near trackpoint and " "<dt><kbd>Shift + double-click left mouse button</kbd></dt><dd>inserts new or moves near trackpoint and "
"enables showing only the modified trajectory</dd>" "enables showing only the modified trajectory</dd>"
"<dt><kbd>Alt + double-click left mouse button</kbd></dt><dd>jumps to frame of trackpoint under cursor</dd>" "<dt><kbd>Ctrl + Alt + double-click left mouse button</kbd></dt><dd>jumps to frame of trackpoint under "
"cursor</dd>"
"<dt><kbd>Alt + holding left mouse button</kbd></dt><dd>moves trackpoint under cursor</dd>" "<dt><kbd>Alt + holding left mouse button</kbd></dt><dd>moves trackpoint under cursor</dd>"
"<dt><kbd>Ctrl + E</kbd></dt><dd>export trajectories</dd>" "<dt><kbd>Ctrl + E</kbd></dt><dd>export trajectories</dd>"
"<dt><kbd>Ctrl + mouse scroll wheel</kbd></dt><dd>change the displayed person (if show only people " "<dt><kbd>Ctrl + mouse scroll wheel</kbd></dt><dd>change the displayed person (if show only people "
......
src/trackerItem.cpp
View file @ 61bab137
...@@ -317,6 +317,8 @@ void TrackerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op ...@@ -317,6 +317,8 @@ void TrackerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op
QPen numberPen; QPen numberPen;
QPen groundPositionPen; QPen groundPositionPen;
QPen groundPathPen; QPen groundPathPen;
QPen currentPointLineWidthPen;
QPen trackPointLineWidthPen;
double pSP = (double) mControlWidget->getTrackCurrentPointSize(); double pSP = (double) mControlWidget->getTrackCurrentPointSize();
double pS = (double) mControlWidget->getTrackPointSize(); double pS = (double) mControlWidget->getTrackPointSize();
double pSC = (double) mControlWidget->getTrackColColorSize(); double pSC = (double) mControlWidget->getTrackColColorSize();
...@@ -338,7 +340,7 @@ void TrackerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op ...@@ -338,7 +340,7 @@ void TrackerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op
linePen.setWidth(mControlWidget->getTrackPathWidth()); linePen.setWidth(mControlWidget->getTrackPathWidth());
ellipsePen.setWidth(3); ellipsePen.setWidth(3);
currentPointLineWidthPen.setWidth(mControlWidget->getTrackCurrentPointLineWidth());
if(mControlWidget->isTrackNumberBoldChecked()) if(mControlWidget->isTrackNumberBoldChecked())
{ {
font.setBold(true); font.setBold(true);
...@@ -403,13 +405,14 @@ void TrackerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op ...@@ -403,13 +405,14 @@ void TrackerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op
// Qt::Checked) // Qt::Checked)
{ {
painter->setBrush(Qt::NoBrush); painter->setBrush(Qt::NoBrush);
painter->setPen(currentPointLineWidthPen);
if(person.newReco()) if(person.newReco())
{ {
painter->setPen(Qt::green); currentPointLineWidthPen.setColor(Qt::green);
} }
else else
{ {
painter->setPen(Qt::blue); currentPointLineWidthPen.setColor(Qt::blue);
} }
rect.setRect(tp.x() - pSP / 2., tp.y() - pSP / 2., pSP, pSP); rect.setRect(tp.x() - pSP / 2., tp.y() - pSP / 2., pSP, pSP);
painter->drawEllipse(rect); // direkt waere nur int erlaubt tp.x()-5., tp.y()-5., 10., 10. painter->drawEllipse(rect); // direkt waere nur int erlaubt tp.x()-5., tp.y()-5., 10., 10.
...@@ -439,6 +442,7 @@ void TrackerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op ...@@ -439,6 +442,7 @@ void TrackerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op
{ {
painter->setBrush(Qt::NoBrush); painter->setBrush(Qt::NoBrush);
ellipsePen.setColor(tp.color()); ellipsePen.setColor(tp.color());
ellipsePen.setWidth(mControlWidget->getTrackColorMarkerLineWidth());
painter->setPen(ellipsePen); painter->setPen(ellipsePen);
rect.setRect(tp.colPoint().x() - pSM / 2., tp.colPoint().y() - pSM / 2., pSM, pSM); rect.setRect(tp.colPoint().x() - pSM / 2., tp.colPoint().y() - pSM / 2., pSM, pSM);
painter->drawEllipse(rect); painter->drawEllipse(rect);
...@@ -815,7 +819,10 @@ void TrackerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op ...@@ -815,7 +819,10 @@ void TrackerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op
} }
else else
{ {
painter->setPen(Qt::red); trackPointLineWidthPen.setColor(Qt::red);
trackPointLineWidthPen.setWidth(mControlWidget->getTrackShowPointsLineWidth());
painter->setPen(trackPointLineWidthPen);
painter->setBrush(Qt::NoBrush); painter->setBrush(Qt::NoBrush);
rect.setRect(person.at(j).x() - pS / 2., person.at(j).y() - pS / 2., pS, pS); rect.setRect(person.at(j).x() - pS / 2., person.at(j).y() - pS / 2., pS, pS);
} }
......
src/view.cpp
View file @ 61bab137
...@@ -96,11 +96,14 @@ void GraphicsView::mouseDoubleClickEvent(QMouseEvent *event) ...@@ -96,11 +96,14 @@ void GraphicsView::mouseDoubleClickEvent(QMouseEvent *event)
else if(event->modifiers() & Qt::ControlModifier) // mit & genuegt, dass unter anderem control gedrueckt wird else if(event->modifiers() & Qt::ControlModifier) // mit & genuegt, dass unter anderem control gedrueckt wird
// (zb mit shift) // (zb mit shift)
{ {
emit mouseControlDoubleClick(mapToScene(event->pos())); // const QPoint & //const QPointF &pos if(event->modifiers().testFlag(Qt::AltModifier))
} {
else if(event->modifiers() & Qt::AltModifier) emit mouseCtrlAltDoubleClick(mapToScene(event->pos()));
{ }
emit mouseAltDoubleClick(mapToScene(event->pos())); else
{
emit mouseControlDoubleClick(mapToScene(event->pos()));
}
} }
else else
{ {
...@@ -186,7 +189,8 @@ void GraphicsView::mousePressEvent(QMouseEvent *event) ...@@ -186,7 +189,8 @@ void GraphicsView::mousePressEvent(QMouseEvent *event)
emit colorSelected(); emit colorSelected();
} }
if(event->modifiers().testFlag(Qt::AltModifier) && event->button() == Qt::LeftButton) if(event->modifiers().testFlag(Qt::AltModifier) && !event->modifiers().testFlag(Qt::ControlModifier) &&
event->button() == Qt::LeftButton)
{ {
emit mouseAltPressed(mapToScene(event->pos())); emit mouseAltPressed(mapToScene(event->pos()));
} }
...@@ -195,7 +199,7 @@ void GraphicsView::mousePressEvent(QMouseEvent *event) ...@@ -195,7 +199,7 @@ void GraphicsView::mousePressEvent(QMouseEvent *event)
void GraphicsView::mouseReleaseEvent(QMouseEvent *event) void GraphicsView::mouseReleaseEvent(QMouseEvent *event)
{ {
if(event->modifiers().testFlag(Qt::AltModifier)) if(event->modifiers().testFlag(Qt::AltModifier) && !event->modifiers().testFlag(Qt::ControlModifier))
{ {
emit mouseAltReleased(mapToScene(event->pos())); emit mouseAltReleased(mapToScene(event->pos()));
} }
......
ui/control.ui
View file @ 61bab137
This diff is collapsed.