diff --git a/include/control.h b/include/control.h
index f1dd613dd3a3652691960d1fc49911beb9a032ae..f2511eb63b13420f9bf483a138f1e9ff075f15f4 100644
--- a/include/control.h
+++ b/include/control.h
@@ -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())
diff --git a/src/control.cpp b/src/control.cpp
index 50cde5844af0c9d5b9ff7502a858776cc253c569..41c4fbfc7c9298974a6face4078e01153a9c18fe 100644
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -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());
diff --git a/src/trackerItem.cpp b/src/trackerItem.cpp
index d57785dd7f0a0e18e70eda4d32a8426fed911805..98c157b9fcf9e2b406542f873a7bc71165c022cd 100644
--- a/src/trackerItem.cpp
+++ b/src/trackerItem.cpp
@@ -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);
}
diff --git a/ui/control.ui b/ui/control.ui
index 107709c0c86ff1d7ba036afcdfe2a744b42203a5..bd507fe59e4ea410fd1cf4f47134977eaebcaf71 100644
--- a/ui/control.ui
+++ b/ui/control.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>503</width>
+ <width>520</width>
<height>604</height>
</rect>
</property>
@@ -74,7 +74,7 @@
<enum>Qt::LeftToRight</enum>
</property>
<property name="currentIndex">
- <number>0</number>
+ <number>2</number>
</property>
<property name="tabsClosable">
<bool>false</bool>
@@ -135,8 +135,8 @@
<property name="geometry">
<rect>
<x>0</x>
- <y>-673</y>
- <width>476</width>
+ <y>0</y>
+ <width>482</width>
<height>1399</height>
</rect>
</property>
@@ -3502,7 +3502,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>465</width>
+ <width>482</width>
<height>993</height>
</rect>
</property>
@@ -4800,8 +4800,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>465</width>
- <height>1205</height>
+ <width>482</width>
+ <height>1283</height>
</rect>
</property>
<property name="sizePolicy">
@@ -5990,46 +5990,60 @@
<property name="verticalSpacing">
<number>0</number>
</property>
- <item row="2" column="0">
- <widget class="QCheckBox" name="trackShowPath">
+ <item row="6" column="2">
+ <widget class="PSpinBox" name="trackColorMarkerSize">
+ <property name="alignment">
+ <set>Qt::AlignRight</set>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <number>14</number>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="2">
+ <widget class="PSpinBox" name="trackColorMarkerLineWidth">
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="1">
+ <widget class="QLabel" name="label_48">
<property name="maximumSize">
<size>
- <width>999</width>
+ <width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
- <string>show path</string>
- </property>
- <property name="checked">
- <bool>true</bool>
+ <string>size:</string>
</property>
</widget>
</item>
- <item row="0" column="2">
- <widget class="PSpinBox" name="trackCurrentPointSize">
- <property name="enabled">
- <bool>false</bool>
- </property>
+ <item row="8" column="3">
+ <widget class="QCheckBox" name="trackNumberBold">
<property name="maximumSize">
<size>
- <width>16777215</width>
+ <width>999</width>
<height>16777215</height>
</size>
</property>
- <property name="alignment">
- <set>Qt::AlignRight</set>
- </property>
- <property name="minimum">
- <number>1</number>
+ <property name="text">
+ <string>bold</string>
</property>
- <property name="value">
- <number>60</number>
+ <property name="checked">
+ <bool>true</bool>
</property>
</widget>
</item>
- <item row="3" column="2">
- <widget class="PSpinBox" name="trackColColorSize">
+ <item row="2" column="2">
+ <widget class="PSpinBox" name="trackPointSize">
<property name="alignment">
<set>Qt::AlignRight</set>
</property>
@@ -6037,41 +6051,48 @@
<number>1</number>
</property>
<property name="value">
- <number>11</number>
+ <number>7</number>
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QCheckBox" name="trackShowCurrentPoint">
+ <item row="7" column="1">
+ <widget class="QLabel" name="label_69">
+ <property name="text">
+ <string>line width</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLabel" name="label_13">
<property name="maximumSize">
<size>
- <width>999</width>
+ <width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
- <string>show current point</string>
- </property>
- <property name="checked">
- <bool>true</bool>
+ <string>size:</string>
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QLabel" name="label_25">
+ <item row="8" column="0">
+ <widget class="QCheckBox" name="trackShowNumber">
<property name="maximumSize">
<size>
- <width>30</width>
+ <width>999</width>
<height>16777215</height>
</size>
</property>
<property name="text">
- <string>size:</string>
+ <string>show number</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
</property>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QLabel" name="label_36">
+ <item row="9" column="1">
+ <widget class="QLabel" name="label_67">
<property name="maximumSize">
<size>
<width>30</width>
@@ -6083,11 +6104,24 @@
</property>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QCheckBox" name="trackShowColColor">
+ <item row="8" column="2">
+ <widget class="PSpinBox" name="trackNumberSize">
+ <property name="alignment">
+ <set>Qt::AlignRight</set>
+ </property>
+ <property name="minimum">
+ <number>2</number>
+ </property>
+ <property name="value">
+ <number>14</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="trackShowPoints">
<property name="minimumSize">
<size>
- <width>124</width>
+ <width>90</width>
<height>0</height>
</size>
</property>
@@ -6098,31 +6132,41 @@
</size>
</property>
<property name="text">
- <string>show height/col. color</string>
+ <string>show points</string>
</property>
<property name="checked">
- <bool>true</bool>
+ <bool>false</bool>
</property>
</widget>
</item>
- <item row="4" column="0">
- <widget class="QCheckBox" name="trackShowColorMarker">
+ <item row="9" column="2">
+ <widget class="PSpinBox" name="trackGroundPositionSize">
+ <property name="alignment">
+ <set>Qt::AlignRight</set>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <number>1</number>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QLabel" name="label_25">
<property name="maximumSize">
<size>
- <width>999</width>
+ <width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
- <string>show color marker</string>
- </property>
- <property name="checked">
- <bool>true</bool>
+ <string>size:</string>
</property>
</widget>
</item>
- <item row="5" column="0">
- <widget class="QCheckBox" name="trackShowNumber">
+ <item row="0" column="3">
+ <widget class="QCheckBox" name="trackHeadSized">
<property name="maximumSize">
<size>
<width>999</width>
@@ -6130,57 +6174,44 @@
</size>
</property>
<property name="text">
- <string>show number</string>
+ <string>head size</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="5" column="1">
- <widget class="QLabel" name="label_48">
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="trackShowCurrentPoint">
<property name="maximumSize">
<size>
- <width>30</width>
+ <width>999</width>
<height>16777215</height>
</size>
</property>
<property name="text">
- <string>size:</string>
- </property>
- </widget>
- </item>
- <item row="5" column="2">
- <widget class="PSpinBox" name="trackNumberSize">
- <property name="alignment">
- <set>Qt::AlignRight</set>
- </property>
- <property name="minimum">
- <number>2</number>
+ <string>show current point</string>
</property>
- <property name="value">
- <number>14</number>
+ <property name="checked">
+ <bool>true</bool>
</property>
</widget>
</item>
- <item row="5" column="3">
- <widget class="QCheckBox" name="trackNumberBold">
+ <item row="0" column="1">
+ <widget class="QLabel" name="label_47">
<property name="maximumSize">
<size>
- <width>999</width>
+ <width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
- <string>bold</string>
- </property>
- <property name="checked">
- <bool>true</bool>
+ <string>size:</string>
</property>
</widget>
</item>
- <item row="0" column="3">
- <widget class="QCheckBox" name="trackHeadSized">
+ <item row="10" column="0">
+ <widget class="QCheckBox" name="trackShowGroundPath">
<property name="maximumSize">
<size>
<width>999</width>
@@ -6188,31 +6219,41 @@
</size>
</property>
<property name="text">
- <string>head size</string>
+ <string>show ground path</string>
</property>
<property name="checked">
- <bool>true</bool>
+ <bool>false</bool>
</property>
</widget>
</item>
- <item row="3" column="3">
- <widget class="QCheckBox" name="trackShowHeightIndividual">
+ <item row="10" column="1">
+ <widget class="QLabel" name="label_68">
<property name="maximumSize">
<size>
- <width>999</width>
+ <width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
- <string>individual</string>
+ <string>size:</string>
</property>
- <property name="checked">
- <bool>true</bool>
+ </widget>
+ </item>
+ <item row="5" column="2">
+ <widget class="PSpinBox" name="trackColColorSize">
+ <property name="alignment">
+ <set>Qt::AlignRight</set>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <number>11</number>
</property>
</widget>
</item>
- <item row="2" column="3">
- <widget class="QPushButton" name="trackPathColorButton">
+ <item row="10" column="3">
+ <widget class="QPushButton" name="trackGroundPathColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -6237,8 +6278,8 @@
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>255</red>
- <green>0</green>
+ <red>0</red>
+ <green>255</green>
<blue>0</blue>
</color>
</brush>
@@ -6246,8 +6287,8 @@
<colorrole role="Light">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>255</red>
- <green>127</green>
+ <red>127</red>
+ <green>255</green>
<blue>127</blue>
</color>
</brush>
@@ -6255,8 +6296,8 @@
<colorrole role="Midlight">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>255</red>
- <green>63</green>
+ <red>63</red>
+ <green>255</green>
<blue>63</blue>
</color>
</brush>
@@ -6264,8 +6305,8 @@
<colorrole role="Dark">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>127</red>
- <green>0</green>
+ <red>0</red>
+ <green>127</green>
<blue>0</blue>
</color>
</brush>
@@ -6273,8 +6314,8 @@
<colorrole role="Mid">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>170</red>
- <green>0</green>
+ <red>0</red>
+ <green>170</green>
<blue>0</blue>
</color>
</brush>
@@ -6282,8 +6323,8 @@
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>255</red>
- <green>0</green>
+ <red>0</red>
+ <green>255</green>
<blue>0</blue>
</color>
</brush>
@@ -6300,8 +6341,8 @@
<colorrole role="AlternateBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>255</red>
- <green>127</green>
+ <red>127</red>
+ <green>255</green>
<blue>127</blue>
</color>
</brush>
@@ -6320,8 +6361,8 @@
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>255</red>
- <green>0</green>
+ <red>0</red>
+ <green>255</green>
<blue>0</blue>
</color>
</brush>
@@ -6329,8 +6370,8 @@
<colorrole role="Light">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>255</red>
- <green>127</green>
+ <red>127</red>
+ <green>255</green>
<blue>127</blue>
</color>
</brush>
@@ -6338,8 +6379,8 @@
<colorrole role="Midlight">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>255</red>
- <green>63</green>
+ <red>63</red>
+ <green>255</green>
<blue>63</blue>
</color>
</brush>
@@ -6347,8 +6388,8 @@
<colorrole role="Dark">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>127</red>
- <green>0</green>
+ <red>0</red>
+ <green>127</green>
<blue>0</blue>
</color>
</brush>
@@ -6356,8 +6397,8 @@
<colorrole role="Mid">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>170</red>
- <green>0</green>
+ <red>0</red>
+ <green>170</green>
<blue>0</blue>
</color>
</brush>
@@ -6365,8 +6406,8 @@
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>255</red>
- <green>0</green>
+ <red>0</red>
+ <green>255</green>
<blue>0</blue>
</color>
</brush>
@@ -6383,8 +6424,8 @@
<colorrole role="AlternateBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>255</red>
- <green>127</green>
+ <red>127</red>
+ <green>255</green>
<blue>127</blue>
</color>
</brush>
@@ -6403,8 +6444,8 @@
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>255</red>
- <green>0</green>
+ <red>0</red>
+ <green>255</green>
<blue>0</blue>
</color>
</brush>
@@ -6412,8 +6453,8 @@
<colorrole role="Light">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>255</red>
- <green>127</green>
+ <red>127</red>
+ <green>255</green>
<blue>127</blue>
</color>
</brush>
@@ -6421,8 +6462,8 @@
<colorrole role="Midlight">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>255</red>
- <green>63</green>
+ <red>63</red>
+ <green>255</green>
<blue>63</blue>
</color>
</brush>
@@ -6430,8 +6471,8 @@
<colorrole role="Dark">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>127</red>
- <green>0</green>
+ <red>0</red>
+ <green>127</green>
<blue>0</blue>
</color>
</brush>
@@ -6439,8 +6480,8 @@
<colorrole role="Mid">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>170</red>
- <green>0</green>
+ <red>0</red>
+ <green>170</green>
<blue>0</blue>
</color>
</brush>
@@ -6448,8 +6489,8 @@
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>255</red>
- <green>0</green>
+ <red>0</red>
+ <green>255</green>
<blue>0</blue>
</color>
</brush>
@@ -6466,8 +6507,8 @@
<colorrole role="AlternateBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>255</red>
- <green>0</green>
+ <red>0</red>
+ <green>255</green>
<blue>0</blue>
</color>
</brush>
@@ -6489,197 +6530,7 @@
</property>
</widget>
</item>
- <item row="2" column="2">
- <widget class="PSpinBox" name="trackPathWidth">
- <property name="alignment">
- <set>Qt::AlignRight</set>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>20</number>
- </property>
- <property name="value">
- <number>2</number>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QCheckBox" name="trackShowPoints">
- <property name="minimumSize">
- <size>
- <width>90</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>999</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text">
- <string>show points</string>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="3">
- <widget class="QCheckBox" name="trackShowPointsColored">
- <property name="maximumSize">
- <size>
- <width>999</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text">
- <string>colored</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="label_13">
- <property name="maximumSize">
- <size>
- <width>30</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text">
- <string>size:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QLabel" name="label_41">
- <property name="maximumSize">
- <size>
- <width>30</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text">
- <string>size:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="2">
- <widget class="PSpinBox" name="trackColorMarkerSize">
- <property name="alignment">
- <set>Qt::AlignRight</set>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="value">
- <number>14</number>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="PSpinBox" name="trackPointSize">
- <property name="alignment">
- <set>Qt::AlignRight</set>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="value">
- <number>7</number>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="label_47">
- <property name="maximumSize">
- <size>
- <width>30</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text">
- <string>size:</string>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QCheckBox" name="trackShowGroundPosition">
- <property name="maximumSize">
- <size>
- <width>999</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text">
- <string>show ground position</string>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="6" column="1">
- <widget class="QLabel" name="label_67">
- <property name="maximumSize">
- <size>
- <width>30</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text">
- <string>size:</string>
- </property>
- </widget>
- </item>
- <item row="6" column="2">
- <widget class="PSpinBox" name="trackGroundPositionSize">
- <property name="alignment">
- <set>Qt::AlignRight</set>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="value">
- <number>1</number>
- </property>
- </widget>
- </item>
- <item row="7" column="0">
- <widget class="QCheckBox" name="trackShowGroundPath">
- <property name="maximumSize">
- <size>
- <width>999</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text">
- <string>show ground path</string>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="7" column="1">
- <widget class="QLabel" name="label_68">
- <property name="maximumSize">
- <size>
- <width>30</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text">
- <string>size:</string>
- </property>
- </widget>
- </item>
- <item row="7" column="2">
+ <item row="10" column="2">
<widget class="PSpinBox" name="trackGroundPathSize">
<property name="alignment">
<set>Qt::AlignRight</set>
@@ -6692,8 +6543,8 @@
</property>
</widget>
</item>
- <item row="7" column="3">
- <widget class="QPushButton" name="trackGroundPathColorButton">
+ <item row="4" column="3">
+ <widget class="QPushButton" name="trackPathColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -6718,8 +6569,8 @@
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>0</red>
- <green>255</green>
+ <red>255</red>
+ <green>0</green>
<blue>0</blue>
</color>
</brush>
@@ -6727,8 +6578,8 @@
<colorrole role="Light">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>127</red>
- <green>255</green>
+ <red>255</red>
+ <green>127</green>
<blue>127</blue>
</color>
</brush>
@@ -6736,8 +6587,8 @@
<colorrole role="Midlight">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>63</red>
- <green>255</green>
+ <red>255</red>
+ <green>63</green>
<blue>63</blue>
</color>
</brush>
@@ -6745,8 +6596,8 @@
<colorrole role="Dark">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>0</red>
- <green>127</green>
+ <red>127</red>
+ <green>0</green>
<blue>0</blue>
</color>
</brush>
@@ -6754,8 +6605,8 @@
<colorrole role="Mid">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>0</red>
- <green>170</green>
+ <red>170</red>
+ <green>0</green>
<blue>0</blue>
</color>
</brush>
@@ -6763,8 +6614,8 @@
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>0</red>
- <green>255</green>
+ <red>255</red>
+ <green>0</green>
<blue>0</blue>
</color>
</brush>
@@ -6781,8 +6632,8 @@
<colorrole role="AlternateBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>127</red>
- <green>255</green>
+ <red>255</red>
+ <green>127</green>
<blue>127</blue>
</color>
</brush>
@@ -6801,8 +6652,8 @@
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>0</red>
- <green>255</green>
+ <red>255</red>
+ <green>0</green>
<blue>0</blue>
</color>
</brush>
@@ -6810,8 +6661,8 @@
<colorrole role="Light">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>127</red>
- <green>255</green>
+ <red>255</red>
+ <green>127</green>
<blue>127</blue>
</color>
</brush>
@@ -6819,8 +6670,8 @@
<colorrole role="Midlight">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>63</red>
- <green>255</green>
+ <red>255</red>
+ <green>63</green>
<blue>63</blue>
</color>
</brush>
@@ -6828,8 +6679,8 @@
<colorrole role="Dark">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>0</red>
- <green>127</green>
+ <red>127</red>
+ <green>0</green>
<blue>0</blue>
</color>
</brush>
@@ -6837,8 +6688,8 @@
<colorrole role="Mid">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>0</red>
- <green>170</green>
+ <red>170</red>
+ <green>0</green>
<blue>0</blue>
</color>
</brush>
@@ -6846,8 +6697,8 @@
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>0</red>
- <green>255</green>
+ <red>255</red>
+ <green>0</green>
<blue>0</blue>
</color>
</brush>
@@ -6864,8 +6715,8 @@
<colorrole role="AlternateBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>127</red>
- <green>255</green>
+ <red>255</red>
+ <green>127</green>
<blue>127</blue>
</color>
</brush>
@@ -6884,8 +6735,8 @@
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>0</red>
- <green>255</green>
+ <red>255</red>
+ <green>0</green>
<blue>0</blue>
</color>
</brush>
@@ -6893,8 +6744,8 @@
<colorrole role="Light">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>127</red>
- <green>255</green>
+ <red>255</red>
+ <green>127</green>
<blue>127</blue>
</color>
</brush>
@@ -6902,8 +6753,8 @@
<colorrole role="Midlight">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>63</red>
- <green>255</green>
+ <red>255</red>
+ <green>63</green>
<blue>63</blue>
</color>
</brush>
@@ -6911,8 +6762,8 @@
<colorrole role="Dark">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>0</red>
- <green>127</green>
+ <red>127</red>
+ <green>0</green>
<blue>0</blue>
</color>
</brush>
@@ -6920,8 +6771,8 @@
<colorrole role="Mid">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>0</red>
- <green>170</green>
+ <red>170</red>
+ <green>0</green>
<blue>0</blue>
</color>
</brush>
@@ -6929,8 +6780,8 @@
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>0</red>
- <green>255</green>
+ <red>255</red>
+ <green>0</green>
<blue>0</blue>
</color>
</brush>
@@ -6947,8 +6798,8 @@
<colorrole role="AlternateBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
- <red>0</red>
- <green>255</green>
+ <red>255</red>
+ <green>0</green>
<blue>0</blue>
</color>
</brush>
@@ -6970,6 +6821,206 @@
</property>
</widget>
</item>
+ <item row="6" column="1">
+ <widget class="QLabel" name="label_41">
+ <property name="maximumSize">
+ <size>
+ <width>30</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>size:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="PSpinBox" name="trackCurrentPointLineWidth">
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="2">
+ <widget class="PSpinBox" name="trackPathWidth">
+ <property name="alignment">
+ <set>Qt::AlignRight</set>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>20</number>
+ </property>
+ <property name="value">
+ <number>2</number>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="0">
+ <widget class="QCheckBox" name="trackShowGroundPosition">
+ <property name="maximumSize">
+ <size>
+ <width>999</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>show ground position</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0">
+ <widget class="QCheckBox" name="trackShowColorMarker">
+ <property name="maximumSize">
+ <size>
+ <width>999</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>show color marker</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QCheckBox" name="trackShowPath">
+ <property name="maximumSize">
+ <size>
+ <width>999</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>show path</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="3">
+ <widget class="QCheckBox" name="trackShowHeightIndividual">
+ <property name="maximumSize">
+ <size>
+ <width>999</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>individual</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="3">
+ <widget class="QCheckBox" name="trackShowPointsColored">
+ <property name="maximumSize">
+ <size>
+ <width>999</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>colored</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="PSpinBox" name="trackCurrentPointSize">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight</set>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <number>60</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLabel" name="label_24">
+ <property name="text">
+ <string>line width</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QCheckBox" name="trackShowColColor">
+ <property name="minimumSize">
+ <size>
+ <width>124</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>999</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>show height/col. color</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QLabel" name="label_36">
+ <property name="maximumSize">
+ <size>
+ <width>30</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>size:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLabel" name="label_70">
+ <property name="text">
+ <string>line width:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2">
+ <widget class="PSpinBox" name="trackShowPointsLineWidth">
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
@@ -7275,7 +7326,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>479</width>
+ <width>496</width>
<height>553</height>
</rect>
</property>
@@ -7617,9 +7668,11 @@
<tabstop>trackShowCurrentPoint</tabstop>
<tabstop>trackCurrentPointSize</tabstop>
<tabstop>trackHeadSized</tabstop>
+ <tabstop>trackCurrentPointLineWidth</tabstop>
<tabstop>trackShowPoints</tabstop>
<tabstop>trackPointSize</tabstop>
<tabstop>trackShowPointsColored</tabstop>
+ <tabstop>trackShowPointsLineWidth</tabstop>
<tabstop>trackShowPath</tabstop>
<tabstop>trackPathWidth</tabstop>
<tabstop>trackPathColorButton</tabstop>
@@ -7628,6 +7681,7 @@
<tabstop>trackShowHeightIndividual</tabstop>
<tabstop>trackShowColorMarker</tabstop>
<tabstop>trackColorMarkerSize</tabstop>
+ <tabstop>trackColorMarkerLineWidth</tabstop>
<tabstop>trackShowNumber</tabstop>
<tabstop>trackNumberSize</tabstop>
<tabstop>trackNumberBold</tabstop>