mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 18:51:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make the window configurator a bit more compact (closes #3607)

Browse Source
This commit is contained in:
Alexander Bock
2025-04-16 15:18:13 +02:00
parent 125f54aa0a
commit e7bc5a90a6
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp
View File

@@ -32,7 +32,7 @@ MonitorBox::MonitorBox(QRect widgetSize, const std::vector<QRect>& monitorResolu
QWidget* parent)
: QWidget(parent)
{
constexpr float MarginFractionWidgetSize = 0.05f;
constexpr float MarginFractionWidgetSize = 0.02f;
//
// Calculate the collective size of the monitors
@@ -132,7 +132,7 @@ void MonitorBox::paintEvent(QPaintEvent*) {
_monitorDimensionsScaled[i].top() + 24.0
);
QFont f = QFont("Arial");
f.setPixelSize(24);
f.setPixelSize(18);
painter.setFont(f);
painter.drawText(textPos, "Primary");
}
@@ -148,6 +148,9 @@ void MonitorBox::paintEvent(QPaintEvent*) {
std::clamp(x, 0.0, static_cast<double>(size().width()) - 10.0),
std::clamp(y, 20.0, static_cast<double>(size().height()))
);
QFont f = QFont("Arial");
f.setPixelSize(18);
painter.setFont(f);
painter.drawText(p, QString::number(i + 1));
}

29
apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
View File

@@ -103,7 +103,7 @@ SgctEdit::SgctEdit(sgct::config::Cluster cluster, std::string configName,
//
// Monitor widget at the top of the window
{
constexpr QRect MonitorWidgetSize = QRect(0, 0, 500, 500);
constexpr QRect MonitorWidgetSize = QRect(0, 0, 350, 350);
MonitorBox* monitorBox = new MonitorBox(MonitorWidgetSize, monitorSizes);
layout->addWidget(monitorBox, 0, Qt::AlignCenter);
@@ -131,6 +131,7 @@ SgctEdit::SgctEdit(sgct::config::Cluster cluster, std::string configName,
layout->addWidget(settingsContainer);
QBoxLayout* settingsLayout = new QVBoxLayout(settingsContainer);
settingsLayout->setContentsMargins(0, 0, 0, 0);
settingsLayout->setSpacing(0);
//
@@ -149,9 +150,6 @@ SgctEdit::SgctEdit(sgct::config::Cluster cluster, std::string configName,
//
// Orientation specification
QLabel* labelOrientation = new QLabel("Orientation");
settingsLayout->addWidget(labelOrientation);
QWidget* orientationContainer = new QWidget;
settingsLayout->addWidget(orientationContainer);
QGridLayout* layoutWindow = new QGridLayout(orientationContainer);
@@ -177,9 +175,6 @@ SgctEdit::SgctEdit(sgct::config::Cluster cluster, std::string configName,
validatorPitch->setNotation(QDoubleValidator::StandardNotation);
_linePitch->setValidator(validatorPitch);
layoutWindow->addWidget(_linePitch, 0, 1);
QLabel* range = new QLabel("Range [-90, 90] in degrees");
layoutWindow->addWidget(range, 0, 2);
}
{
const QString rollTip = "Roll or bank: negative numbers rotate the camera "
@@ -188,7 +183,7 @@ SgctEdit::SgctEdit(sgct::config::Cluster cluster, std::string configName,
QLabel* labelRoll = new QLabel("Roll");
labelRoll->setToolTip(rollTip);
layoutWindow->addWidget(labelRoll, 1, 0);
layoutWindow->addWidget(labelRoll, 0, 2);
_lineRoll = new QLineEdit;
_lineRoll->setText(QString::number(glm::degrees(glm::roll(q))));
@@ -196,10 +191,7 @@ SgctEdit::SgctEdit(sgct::config::Cluster cluster, std::string configName,
QDoubleValidator* validatorRoll = new QDoubleValidator(-360.0, 360.0, 15);
validatorRoll->setNotation(QDoubleValidator::StandardNotation);
_lineRoll->setValidator(validatorRoll);
layoutWindow->addWidget(_lineRoll, 1, 1);
QLabel* range = new QLabel("Range [-360, 360] in degrees");
layoutWindow->addWidget(range, 1, 2);
layoutWindow->addWidget(_lineRoll, 0, 3);
}
{
const QString yawTip = "Yaw, heading, or azimuth: negative numbers pan the "
@@ -209,7 +201,7 @@ SgctEdit::SgctEdit(sgct::config::Cluster cluster, std::string configName,
QLabel* labelYaw = new QLabel;
labelYaw->setText("Yaw");
labelYaw->setToolTip(yawTip);
layoutWindow->addWidget(labelYaw, 2, 0);
layoutWindow->addWidget(labelYaw, 0, 4);
_lineYaw = new QLineEdit;
_lineYaw->setText(QString::number(glm::degrees(glm::yaw(q))));
@@ -217,10 +209,15 @@ SgctEdit::SgctEdit(sgct::config::Cluster cluster, std::string configName,
QDoubleValidator* validatorYaw = new QDoubleValidator(-180.0, 180.0, 15, this);
validatorYaw->setNotation(QDoubleValidator::StandardNotation);
_lineYaw->setValidator(validatorYaw);
layoutWindow->addWidget(_lineYaw, 2, 1);
layoutWindow->addWidget(_lineYaw, 0, 5);
}
QLabel* range = new QLabel("Range [-180, 180] in degrees");
layoutWindow->addWidget(range, 2, 2);
{
QLabel* info = new QLabel(
"The allowed ranges for pitch is [-90, 90], for roll [-180, 180], and for "
"yaw [-360, 360]."
);
layoutWindow->addWidget(info, 1, 0, 1, 6);
}

6
apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
View File

@@ -162,7 +162,7 @@ WindowControl::WindowControl(int monitorIndex, int windowIndex,
_windowName = new QLineEdit;
_windowName->setToolTip(tip);
layout->addWidget(_windowName, 1, 1, 1, 7);
layout->addWidget(_windowName, 1, 1, 1, 3);
}
const QString tip = "The monitor where this window is located";
@@ -188,9 +188,9 @@ WindowControl::WindowControl(int monitorIndex, int windowIndex,
// potential nullpointer accesses elsewhere in the code
QLabel* labelLocation = new QLabel("Monitor");
labelLocation->setToolTip(tip);
layout->addWidget(labelLocation, 2, 0);
layout->addWidget(labelLocation, 1, 4);
layout->addWidget(_monitor, 2, 1, 1, 7);
layout->addWidget(_monitor, 1, 5, 1, 4);
}
//