Add support for marker thickness

Author: MinyazevR

plugins/robots/common/twoDModel/include/twoDModel/engine/model/metricSystem.h

@@ -37,6 +37,7 @@ class TWO_D_MODEL_EXPORT SizeUnit
 
 	SizeUnit() = default;
 
+	// NOLINTNEXTLINE(google-explicit-constructor)
 	SizeUnit(twoDModel::model::SizeUnit::Unit unit);
 
 	/// The current pixel value in centimeters

plugins/robots/common/twoDModel/src/engine/items/colorFieldItem.cpp

@@ -77,12 +77,12 @@ void ColorFieldItem::setColor(const QColor &color)
 	update();
 }
 
-int ColorFieldItem::thickness() const
+qreal ColorFieldItem::thickness() const
 {
-	return pen().width();
+	return pen().widthF();
 }
 
-void ColorFieldItem::setThickness(int thickness)
+void ColorFieldItem::setThickness(qreal thickness)
 {
 	setPenWidth(thickness);
 	update();

plugins/robots/common/twoDModel/src/engine/items/colorFieldItem.h

@@ -24,7 +24,7 @@ class ColorFieldItem: public view::TwoDSceneItem
 	Q_OBJECT
 
 	Q_PROPERTY(QColor color READ color WRITE setColor)
-	Q_PROPERTY(int thickness READ thickness WRITE setThickness)
+	Q_PROPERTY(qreal thickness READ thickness WRITE setThickness)
 
 	Q_DISABLE_COPY(ColorFieldItem)
 
@@ -41,11 +41,11 @@ class ColorFieldItem: public view::TwoDSceneItem
 	void setColor(const QColor &color);
 
 	/// Returns a thickness of this item in px.
-	int thickness() const;
+	qreal thickness() const;
 
 	/// Sets a thickness of this item.
 	/// @param The thickness value in px.
-	void setThickness(int thickness);
+	void setThickness(qreal thickness);
 
 	/// Creates a copy of this graphical item. Transfers ownership to the caller.
 	virtual AbstractItem *clone() const = 0;

plugins/robots/common/twoDModel/src/engine/view/parts/colorItemPopup.cpp

@@ -74,7 +74,7 @@ bool ColorItemPopup::attachTo(const QList<QGraphicsItem *> &items)
 	mBrushPicker->setVisible(hasProperty("filled"));
 	mBrushPicker->setChecked(dominantPropertyValue("filled").toBool());
 	mSpinBox->setVisible(hasProperty("thickness"));
-	mSpinBox->setCurrentValue(dominantPropertyValue("thickness").toInt());
+	mSpinBox->setCurrentValue(dominantPropertyValue("thickness").toDouble());
 
 	// Restoring values that really were picked by user.
 	mLastColor = lastColorBackup;

plugins/robots/common/twoDModel/src/engine/view/parts/popupMetricWidget.cpp

@@ -24,7 +24,7 @@ using namespace twoDModel::view;
 
 namespace {
 constexpr auto pixelMinimalValue = 1;
-constexpr auto pixelMaximumValue = 30;
+constexpr auto pixelMaximumValue = 50;
 }
 
 PopupMetricWidget::~PopupMetricWidget() = default;
@@ -45,11 +45,11 @@ PopupMetricWidget::PopupMetricWidget(QWidget *parent): StackMetricWidget(parent)
 
 	createSpinBoxLambda(1, 0, twoDModel::model::SizeUnit::Unit::Pixels);
 	createSpinBoxLambda(1, 0, twoDModel::model::SizeUnit::Unit::Millimeters);
-	createSpinBoxLambda(0.1, 2, twoDModel::model::SizeUnit::Unit::Centimeters);
-	createSpinBoxLambda(0.05, 3, twoDModel::model::SizeUnit::Unit::Meters);
+	createSpinBoxLambda(0.1, 1, twoDModel::model::SizeUnit::Unit::Centimeters);
+	createSpinBoxLambda(0.05, 2, twoDModel::model::SizeUnit::Unit::Meters);
 }
 
-void PopupMetricWidget::setCurrentValue(int currentValuePx)
+void PopupMetricWidget::setCurrentValue(qreal currentValuePx)
 {
 	mCurrentValuePx = currentValuePx;
 	sizeUnitHandler(currentWidget());

plugins/robots/common/twoDModel/src/engine/view/parts/popupMetricWidget.h

@@ -26,7 +26,7 @@ class PopupMetricWidget : public StackMetricWidget
 	explicit PopupMetricWidget(QWidget *parent = nullptr);
 	~PopupMetricWidget() override;
 	void sizeUnitHandler(QWidget *currentWidget) override;
-	void setCurrentValue(int currentValuePx);
+	void setCurrentValue(qreal currentValuePx);
 Q_SIGNALS:
 	void valueChanged(qreal value);
 private:

plugins/robots/common/twoDModel/src/engine/view/parts/robotItemPopup.cpp

@@ -19,7 +19,7 @@
 #include <QtWidgets/QSpinBox>
 #include <qrutils/graphicsUtils/abstractItem.h>
 #include <qrkernel/settingsManager.h>
-
+#include "popupMetricWidget.h"
 #include "src/engine/view/scene/robotItem.h"
 
 using namespace twoDModel::view;
@@ -30,19 +30,22 @@ RobotItemPopup::RobotItemPopup(graphicsUtils::AbstractScene &scene, QWidget *par
 	initWidget();
 }
 
-RobotItemPopup::~RobotItemPopup()
-{
-}
+RobotItemPopup::~RobotItemPopup() = default;
 
 bool RobotItemPopup::suits(QGraphicsItem *item)
 {
 	return dynamic_cast<RobotItem *>(item) != nullptr;
 }
 
+void RobotItemPopup::onSizeUnitChanged(const QSharedPointer<twoDModel::model::SizeUnit> &unit)
+{
+	mSpinBox->onSizeUnitChanged(unit);
+}
+
 bool RobotItemPopup::attachTo(QGraphicsItem *item)
 {
 	mCurrentItem = dynamic_cast<RobotItem *>(item);
-	mSpinBox->setValue(mCurrentItem->pen().width());
+	mSpinBox->setCurrentValue(mCurrentItem->pen().widthF());
 
 	const bool followingEnabled = qReal::SettingsManager::value("2dFollowingRobot").toBool();
 	mFollowButton->setChecked(followingEnabled);
@@ -57,7 +60,7 @@ bool RobotItemPopup::attachTo(const QList<QGraphicsItem *> &items)
 
 void RobotItemPopup::initWidget()
 {
-	QGridLayout * const layout = new QGridLayout(this);
+	auto * const layout = new QGridLayout(this);
 	layout->addWidget(initFollowButton(), 0, 0, Qt::AlignCenter);
 	layout->addWidget(initReturnButton(), 0, 1);
 	layout->addWidget(initSpinBox(), 1, 0);
@@ -94,7 +97,7 @@ QWidget *RobotItemPopup::initSetStartButton()
 
 QAbstractButton *RobotItemPopup::initButton(const QString &icon, const QString &toolTip)
 {
-	QPushButton * const result = new QPushButton(
+	auto * const result = new QPushButton(
 		graphicsUtils::AbstractItem::loadThemedIcon(icon, Qt::red), QString(), this
 	);
 	result->setToolTip(toolTip);
@@ -105,14 +108,13 @@ QAbstractButton *RobotItemPopup::initButton(const QString &icon, const QString &
 
 QWidget *RobotItemPopup::initSpinBox()
 {
-	QSpinBox * const spinBox = new QSpinBox(this);
-	spinBox->setRange(1, 30);
+	auto * const spinBox = new PopupMetricWidget(this);
 	spinBox->setToolTip(tr("Marker thickness"));
 	QPalette spinBoxPalette;
 	spinBoxPalette.setColor(QPalette::Window, Qt::transparent);
 	spinBoxPalette.setColor(QPalette::Base, Qt::transparent);
 	spinBox->setPalette(spinBoxPalette);
-	connect(spinBox, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, [=](int value) {
+	connect(spinBox, &PopupMetricWidget::valueChanged, this, [=](qreal value) {
 		mCurrentItem->setPenWidth(value);
 	});
 

plugins/robots/common/twoDModel/src/engine/view/parts/robotItemPopup.h

@@ -20,8 +20,14 @@ class QAbstractButton;
 class QSpinBox;
 
 namespace twoDModel {
+
+namespace model {
+class SizeUnit;
+}
+
 namespace view {
 
+class PopupMetricWidget;
 class RobotItem;
 
 /// A popup for RobotItem on 2D model scene.
@@ -32,8 +38,9 @@ class RobotItemPopup : public graphicsUtils::ItemPopup
 
 public:
 	explicit RobotItemPopup(graphicsUtils::AbstractScene &scene, QWidget *parent = nullptr);
-	~RobotItemPopup();
-
+	~RobotItemPopup() override;
+public Q_SLOTS:
+	void onSizeUnitChanged(const QSharedPointer<twoDModel::model::SizeUnit> &unit);
 Q_SIGNALS:
 	/// Emitted when user decides to follow or unfollow robot item.
 	void followingChanged(bool enabled);
@@ -58,7 +65,7 @@ class RobotItemPopup : public graphicsUtils::ItemPopup
 
 	QAbstractButton *mFollowButton {};  // Takes ownership
 	QAbstractButton *mReturnButton {};  // Takes ownership
-	QSpinBox *mSpinBox {};  // Takes ownership
+	PopupMetricWidget *mSpinBox {};  // Takes ownership
 	QAbstractButton *mSetStartButton {};  // Takes ownership
 	RobotItem *mCurrentItem {};  // Does not take ownership
 };

plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp

@@ -1110,6 +1110,7 @@ void TwoDModelWidget::connectMetricComboBoxes()
 		mUi->horizontalRuler->onSizeUnitChanged(unit);
 		mUi->verticalRuler->onSizeUnitChanged(unit);
 		mColorFieldItemPopup->onSizeUnitChanged(unit);
+		mRobotItemPopup->onSizeUnitChanged(unit);
 		updateRobotInfoWidget(unit);
 	};
 

qrgui/mainWindow/shapeEdit/scene.cpp

@@ -525,7 +525,7 @@ void Scene::changePenStyle(const QString &text)
 	update();
 }
 
-void Scene::changePenWidth(int width)
+void Scene::changePenWidth(qreal width)
 {
 	mPenWidthItems = width;
 	for (auto &&item : selectedSceneItems())