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

Target

Select target project
  • ped-dyn-emp/petrack
1 result
Show changes
Commits on Source (2)
Expand all Hide whitespace changes
Inline Side-by-side
include/control.h
View file @ b0eb653a
......@@ -100,9 +100,12 @@ public:
QColor getTrackGroundPathColor() const;
void setTrackGroundPathColor(QColor col);
int getTrackCurrentPointSize() const;
int getTrackCurrentPointLineWidth() const;
int getTrackPointSize() const;
int getTrackShowPointsLineWidth() const;
int getTrackColColorSize() const;
int getTrackColorMarkerSize() const;
int getTrackColorMarkerLineWidth() const;
int getTrackNumberSize() const;
int getTrackGroundPositionSize() const;
int getTrackGroundPathSize() const;
......@@ -459,6 +462,7 @@ private slots:
void on_trackHeadSized_stateChanged(int i);
void on_trackShowPoints_stateChanged(int /*i*/)
{
if(!isLoading())
......@@ -538,6 +542,14 @@ private slots:
mScene->update();
}
}
void on_trackCurrentPointLineWidth_valueChanged(int /*i*/)
{
if(!isLoading())
{
mScene->update();
}
}
void on_trackPointSize_valueChanged(int /*i*/)
{
if(!isLoading())
......@@ -545,6 +557,14 @@ private slots:
mScene->update();
}
}
void on_trackShowPointsLineWidth_valueChanged(int /*i*/)
{
if(!isLoading())
{
mScene->update();
}
}
void on_trackPathWidth_valueChanged(int /*i*/)
{
if(!isLoading())
......@@ -563,6 +583,13 @@ private slots:
{
mScene->update();
}
void on_trackColorMarkerLineWidth_valueChanged(int /*i*/)
{
if(!isLoading())
{
mScene->update();
}
}
void on_trackNumberSize_valueChanged(int /*i*/)
{
if(!isLoading())
......
src/control.cpp
View file @ b0eb653a
......@@ -240,6 +240,7 @@ Control::Control(
mUi->scrollAreaWidgetContents_4->layout()->margin() * 2 +
mUi->scrollAreaWidgetContents_4->layout()->spacing() * 2);
connect(mUi->trackRoiFix, &QCheckBox::stateChanged, &trackRoiItem, &RoiItem::setFixed);
connect(mUi->recoRoiToFullImageSize, &QPushButton::clicked, &recoRoiItem, &RoiItem::setToFullImageSize);
connect(
......@@ -432,22 +433,30 @@ int Control::getTrackCurrentPointSize() const
{
return mUi->trackCurrentPointSize->value();
}
int Control::getTrackCurrentPointLineWidth() const
{
return mUi->trackCurrentPointLineWidth->value();
}
int Control::getTrackPointSize() const
{
return mUi->trackPointSize->value();
}
int Control::getTrackShowPointsLineWidth() const
{
return mUi->trackShowPointsLineWidth->value();
}
int Control::getTrackColColorSize() const
{
return mUi->trackColColorSize->value();
}
int Control::getTrackColorMarkerSize() const
{
return mUi->trackColorMarkerSize->value();
}
int Control::getTrackColorMarkerLineWidth() const
{
return mUi->trackColorMarkerLineWidth->value();
}
int Control::getTrackNumberSize() const
{
return mUi->trackNumberSize->value();
......@@ -3646,10 +3655,13 @@ void Control::setXml(QDomElement &elem)
subSubElem.setAttribute("TRACK_GROUND_PATH_COLOR", getTrackGroundPathColor().name());
subSubElem.setAttribute("TRACK_PATH_COLOR", getTrackPathColor().name());
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("SHOW_POINTS_LINE_WIDTH", mUi->trackShowPointsLineWidth->value());
subSubElem.setAttribute("PATH_SIZE", mUi->trackPathWidth->value());
subSubElem.setAttribute("COLLECTIVE_COLOR_SIZE", mUi->trackColColorSize->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("GROUND_POSITION_SIZE", mUi->trackGroundPositionSize->value());
subSubElem.setAttribute("GROUND_PATH_SIZE", mUi->trackGroundPathSize->value());
......@@ -4750,10 +4762,19 @@ void Control::getXml(QDomElement &elem)
{
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"))
{
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"))
{
mUi->trackPathWidth->setValue(subSubElem.attribute("PATH_SIZE").toInt());
......@@ -4766,6 +4787,11 @@ void Control::getXml(QDomElement &elem)
{
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"))
{
mUi->trackNumberSize->setValue(subSubElem.attribute("NUMBER_SIZE").toInt());
......
src/trackerItem.cpp
View file @ b0eb653a
......@@ -317,6 +317,8 @@ void TrackerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op
QPen numberPen;
QPen groundPositionPen;
QPen groundPathPen;
QPen currentPointLineWidthPen;
QPen trackPointLineWidthPen;
double pSP = (double) mControlWidget->getTrackCurrentPointSize();
double pS = (double) mControlWidget->getTrackPointSize();
double pSC = (double) mControlWidget->getTrackColColorSize();
......@@ -338,7 +340,7 @@ void TrackerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op
linePen.setWidth(mControlWidget->getTrackPathWidth());
ellipsePen.setWidth(3);
currentPointLineWidthPen.setWidth(mControlWidget->getTrackCurrentPointLineWidth());
if(mControlWidget->isTrackNumberBoldChecked())
{
font.setBold(true);
......@@ -403,13 +405,14 @@ void TrackerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op
// Qt::Checked)
{
painter->setBrush(Qt::NoBrush);
painter->setPen(currentPointLineWidthPen);
if(person.newReco())
{
painter->setPen(Qt::green);
currentPointLineWidthPen.setColor(Qt::green);
}
else
{
painter->setPen(Qt::blue);
currentPointLineWidthPen.setColor(Qt::blue);
}
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.
......@@ -439,6 +442,7 @@ void TrackerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op
{
painter->setBrush(Qt::NoBrush);
ellipsePen.setColor(tp.color());
ellipsePen.setWidth(mControlWidget->getTrackColorMarkerLineWidth());
painter->setPen(ellipsePen);
rect.setRect(tp.colPoint().x() - pSM / 2., tp.colPoint().y() - pSM / 2., pSM, pSM);
painter->drawEllipse(rect);
......@@ -815,7 +819,10 @@ void TrackerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op
}
else
{
painter->setPen(Qt::red);
trackPointLineWidthPen.setColor(Qt::red);
trackPointLineWidthPen.setWidth(mControlWidget->getTrackShowPointsLineWidth());
painter->setPen(trackPointLineWidthPen);
painter->setBrush(Qt::NoBrush);
rect.setRect(person.at(j).x() - pS / 2., person.at(j).y() - pS / 2., pS, pS);
}
......
ui/control.ui
View file @ b0eb653a
This diff is collapsed.