Merge pull request #123 from trikset/motors-widget-fix

Motors widget fix

Author: yurii-litvinov

trikGui/motorLever.cpp

@@ -37,7 +37,6 @@ MotorLever::MotorLever(const QString &port, trikControl::MotorInterface &motor,
 	, mPowerStep(10)
 	, mPower(0)
 	, mNameLabel(port)
-	, mPowerLabel("0")
 	, mOnOffLabel(tr("off"))
 {
 	mMotor.powerOff();
@@ -46,27 +45,24 @@ MotorLever::MotorLever(const QString &port, trikControl::MotorInterface &motor,
 	mPowerBar.setMinimum(mMinPower);
 	mPowerBar.setMaximum(mMaxPower);
 	mPowerBar.setValue(0);
-	mPowerBar.setTextVisible(false);
+	mPowerBar.setTextVisible(true);
+	mPowerBar.setFormat("%v");
 
 	mNameLabel.setAlignment(Qt::AlignCenter);
 	mPowerBar.setAlignment(Qt::AlignCenter);
-	mPowerLabel.setAlignment(Qt::AlignCenter);
 	mOnOffLabel.setAlignment(Qt::AlignCenter);
 
-	// mPowerLabel and mOnOffLabel can change their widths during work. It will cause mPowerBar
-	// width change. To prevent it, we set fixed widths for mPowerLabel and mOnOffLabel.
-	// They are equal to maximum widths of the widgets. For mPowerLabel it is when the label text
-	// is "-100", for mOnOffLabel - "off".
-	mPowerLabel.setFixedWidth(40);
+	// mOnOffLabel can change its width during work. It will cause mPowerBar
+	// width change. To prevent it, we set fixed width it.
 	mOnOffLabel.setFixedWidth(48);
 
 	mLayout.addWidget(&mNameLabel);
 	mLayout.addWidget(&mPowerBar);
-	mLayout.addWidget(&mPowerLabel);
 	mLayout.addWidget(&mOnOffLabel);
 	setLayout(&mLayout);
 
 	setFocusPolicy(Qt::StrongFocus);
+	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::QSizePolicy::MinimumExpanding);
 }
 
 MotorLever::~MotorLever()
@@ -116,7 +112,6 @@ void MotorLever::setPower(int power)
 
 	mPower = power;
 	mPowerBar.setValue(power);
-	mPowerLabel.setText(QString::number(power));
 	if (mIsOn) {
 		mMotor.setPower(power);
 	}

trikGui/motorLever.h

@@ -72,7 +72,6 @@ class MotorLever : public QWidget
 	QHBoxLayout mLayout;
 	QLabel mNameLabel;
 	QProgressBar mPowerBar;
-	QLabel mPowerLabel;
 	QLabel mOnOffLabel;
 };
 

trikGui/motorsWidget.cpp

@@ -14,8 +14,17 @@
 
 #include "motorsWidget.h"
 
+#include <QtCore/QTimer>
 #include <QtGui/QKeyEvent>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+	#include <QtGui/QVBoxLayout>
+	#include <QtGui/QScrollArea>
+#else
+	#include <QtWidgets/QVBoxLayout>
+	#include <QtWidgets/QScrollArea>
+#endif
+
 #include "motorLever.h"
 
 using namespace trikGui;
@@ -28,17 +37,34 @@ MotorsWidget::MotorsWidget(trikControl::BrickInterface &brick
 	, mPorts(mBrick.motorPorts(type))
 	, mLevers(mPorts.size())
 {
+	const auto scrollArea = new QScrollArea(this);
+	scrollArea->setFrameStyle(QFrame::NoFrame);
+	scrollArea->setWidgetResizable(true);
+	scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+	scrollArea->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+
+	const auto leversWidget = new QWidget(this);
+	const auto innerLayout = new QVBoxLayout(this);
+	const auto outerLayout = new QHBoxLayout(this);
+
 	mPorts.sort();
 
 	int i = 0;
 	for (const QString &port : mPorts) {
 		MotorLever *lever = new MotorLever(port, *mBrick.motor(port), this);
-		mLayout.addWidget(lever);
+		innerLayout->addWidget(lever);
 		mLevers[i] = lever;
 		++i;
 	}
 
-	setLayout(&mLayout);
+	leversWidget->setLayout(innerLayout);
+
+	outerLayout->addWidget(scrollArea);
+	delete this->layout();
+	this->setLayout(outerLayout);
+	scrollArea->setWidget(leversWidget);
+
+	QTimer::singleShot(0, this, SLOT(fixLeversPosition()));
 }
 
 MotorsWidget::~MotorsWidget()
@@ -84,3 +110,9 @@ void MotorsWidget::keyPressEvent(QKeyEvent *event)
 		}
 	}
 }
+
+void MotorsWidget::fixLeversPosition()
+{
+	focusNextChild();
+	focusPreviousChild();
+}

trikGui/motorsWidget.h

@@ -19,9 +19,11 @@
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 	#include <QtGui/QWidget>
 	#include <QtGui/QVBoxLayout>
+	#include <QtGui/QScrollArea>
 #else
 	#include <QtWidgets/QWidget>
 	#include <QtWidgets/QVBoxLayout>
+	#include <QtWidgets/QScrollArea>
 #endif
 
 #include <QtCore/QString>
@@ -61,9 +63,12 @@ class MotorsWidget : public TrikGuiDialog
 protected:
 	void keyPressEvent(QKeyEvent *event) override;
 
-private:
-	QVBoxLayout mLayout;
+private slots:
+	/// Hack to work around odd QScrollArea behavior which incorrectly positions inner widget when there is no need for
+	/// vertical scrollbar.
+	void fixLeversPosition();
 
+private:
 	trikControl::BrickInterface &mBrick;
 	QStringList mPorts;
 	QVector<MotorLever *> mLevers; // Has ownership.

trikGui/trikGui.pro

@@ -22,7 +22,9 @@ HEADERS += \
 	$$PWD/controller.h \
 	$$PWD/digitSelector.h \
 	$$PWD/encoderIndicator.h \
+	$$PWD/fileManagerMessageBox.h \
 	$$PWD/fileManagerWidget.h \
+	$$PWD/informationWidget.h \
 	$$PWD/languageSelectionWidget.h \
 	$$PWD/lazyMainWidget.h \
 	$$PWD/lazyMainWidgetWrapper.h \
@@ -37,17 +39,15 @@ HEADERS += \
 	$$PWD/sensorsSelectionWidget.h \
 	$$PWD/sensorsWidget.h \
 	$$PWD/startWidget.h \
+	$$PWD/systemSettingsWidget.h \
 	$$PWD/trikGuiApplication.h \
 	$$PWD/trikGuiDialog.h \
 	$$PWD/trikGuiMessageBox.h \
+	$$PWD/updateWidget.h \
 	$$PWD/wiFiAPWidget.h \
 	$$PWD/wiFiClientWidget.h \
 	$$PWD/wiFiInitWidget.h \
 	$$PWD/wiFiModeWidget.h \
-	$$PWD/informationWidget.h \
-	$$PWD/fileManagerMessageBox.h \
-	$$PWD/updateWidget.h \
-	$$PWD/systemSettingsWidget.h \
 
 SOURCES += \
 	$$PWD/backgroundWidget.cpp \