Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions packages/imu/plugins/imuanalyzer/src/imuanalyzerinterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,16 @@

#include "imuanalyzerinterface.hpp"

#include <pluginbase/preferences.h>

using namespace scopy;

Q_DECLARE_METATYPE(data3P)

IMUAnalyzerInterface::IMUAnalyzerInterface(QString uri, QWidget *parent)
: QWidget{parent}
, m_sceneRender(nullptr)
, m_rstView(nullptr)
{
qRegisterMetaType<data3P>("data3P");

Expand Down Expand Up @@ -60,20 +64,27 @@ IMUAnalyzerInterface::IMUAnalyzerInterface(QString uri, QWidget *parent)
m_runBtn = new RunBtn(this);
m_tool->addWidgetToTopContainerHelper(m_runBtn, TTA_RIGHT);

bool useOpenGL = Preferences::get("general_use_opengl").toBool();

QTabWidget *tabWidget = new QTabWidget(this);
m_tool->addWidgetToCentralContainerHelper(tabWidget);

m_sceneRender = new SceneRenderer();
tabWidget->addTab(m_sceneRender, "3D View");

m_rstView = new MenuControlButton(this);
m_rstView->setName("Reset View");
m_rstView->checkBox()->setVisible(false);
m_rstView->button()->setVisible(false);
m_rstView->setCheckable(false);
m_tool->addWidgetToBottomContainerHelper(m_rstView, TTA_LEFT);

connect(m_rstView, &QPushButton::clicked, m_sceneRender, &SceneRenderer::resetView);
if(useOpenGL) {
m_sceneRender = new SceneRenderer();
tabWidget->addTab(m_sceneRender, "3D View");

m_rstView = new MenuControlButton(this);
m_rstView->setName("Reset View");
m_rstView->checkBox()->setVisible(false);
m_rstView->button()->setVisible(false);
m_rstView->setCheckable(false);
m_tool->addWidgetToBottomContainerHelper(m_rstView, TTA_LEFT);

connect(m_rstView, &QPushButton::clicked, m_sceneRender, &SceneRenderer::resetView);
connect(this, &IMUAnalyzerInterface::generateRot, m_sceneRender, &SceneRenderer::setRot);
connect(tabWidget, &QTabWidget::currentChanged, this,
[=, this](int index) { m_rstView->setVisible(index == 0); });
}

m_measureBtn = new MenuControlButton(this);
m_measureBtn->setName("Measure");
Expand All @@ -90,8 +101,6 @@ IMUAnalyzerInterface::IMUAnalyzerInterface(QString uri, QWidget *parent)
m_dataV->hide();
});

connect(this, &IMUAnalyzerInterface::generateRot, m_sceneRender, &SceneRenderer::setRot);

connect(m_runBtn, &QPushButton::toggled, [=, this](bool toggled) {
m_runThread = !m_runThread;
if(toggled) {
Expand Down Expand Up @@ -127,13 +136,6 @@ IMUAnalyzerInterface::IMUAnalyzerInterface(QString uri, QWidget *parent)

m_tool->openRightContainerHelper(toggled);
});

connect(tabWidget, &QTabWidget::currentChanged, [=, this](int index) {
if(index == 0)
m_rstView->show();
else
m_rstView->hide();
});
}

IMUAnalyzerInterface::~IMUAnalyzerInterface()
Expand Down
57 changes: 31 additions & 26 deletions packages/imu/plugins/imuanalyzer/src/imuanalyzersettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,30 +60,35 @@ ImuAnalyzerSettings::ImuAnalyzerSettings(SceneRenderer *scRend, BubbleLevelRende

bubbleLevelSettingsWidget->contentLayout()->addWidget(displayPoints);

MenuSectionWidget *sceneRendererSettings = new MenuSectionWidget(this);
MenuCollapseSection *sceneRendererSettingsWidget =
new MenuCollapseSection("3D Settings", MenuCollapseSection::MHCW_ARROW,
MenuCollapseSection::MHW_BASEWIDGET, sceneRendererSettings);

QPushButton *cubeColorButton = new QPushButton("Select New Cube Color");
sceneRendererSettingsWidget->contentLayout()->addWidget(cubeColorButton);

connect(this, &ImuAnalyzerSettings::updateCubeColor, scRend, &SceneRenderer::updateCubeColor);
connect(cubeColorButton, &QPushButton::clicked, [&]() {
QColor color = QColorDialog::getColor(Qt::white, this, "Choose a Color");
if(color.isValid())
emit updateCubeColor(color);
});

QPushButton *planeColorButton = new QPushButton("Select New Plane Color");
sceneRendererSettingsWidget->contentLayout()->addWidget(planeColorButton);

connect(this, &ImuAnalyzerSettings::updatePlaneColor, scRend, &SceneRenderer::updatePlaneColor);
connect(planeColorButton, &QPushButton::clicked, [&]() {
QColor color = QColorDialog::getColor(Qt::white, this, "Choose a Color");
if(color.isValid())
emit updatePlaneColor(color);
});
MenuSectionWidget *sceneRendererSettings = nullptr;
if(scRend) {
sceneRendererSettings = new MenuSectionWidget(this);
MenuCollapseSection *sceneRendererSettingsWidget =
new MenuCollapseSection("3D Settings", MenuCollapseSection::MHCW_ARROW,
MenuCollapseSection::MHW_BASEWIDGET, sceneRendererSettings);

QPushButton *cubeColorButton = new QPushButton("Select New Cube Color");
sceneRendererSettingsWidget->contentLayout()->addWidget(cubeColorButton);

connect(this, &ImuAnalyzerSettings::updateCubeColor, scRend, &SceneRenderer::updateCubeColor);
connect(cubeColorButton, &QPushButton::clicked, [&]() {
QColor color = QColorDialog::getColor(Qt::white, this, "Choose a Color");
if(color.isValid())
emit updateCubeColor(color);
});

QPushButton *planeColorButton = new QPushButton("Select New Plane Color");
sceneRendererSettingsWidget->contentLayout()->addWidget(planeColorButton);

connect(this, &ImuAnalyzerSettings::updatePlaneColor, scRend, &SceneRenderer::updatePlaneColor);
connect(planeColorButton, &QPushButton::clicked, [&]() {
QColor color = QColorDialog::getColor(Qt::white, this, "Choose a Color");
if(color.isValid())
emit updatePlaneColor(color);
});

sceneRendererSettings->layout()->addWidget(sceneRendererSettingsWidget);
}

QList<IIOWidget *> attributeWidget = IIOWidgetBuilder(nullptr).device(m_device).buildAll();
for(auto widget : attributeWidget) {
Expand All @@ -92,12 +97,12 @@ ImuAnalyzerSettings::ImuAnalyzerSettings(SceneRenderer *scRend, BubbleLevelRende

generalSettings->layout()->addWidget(generalSettingsWidget);
bubbleLevelSettings->layout()->addWidget(bubbleLevelSettingsWidget);
sceneRendererSettings->layout()->addWidget(sceneRendererSettingsWidget);

lay->addWidget(header);
lay->addWidget(generalSettings);
lay->addWidget(bubbleLevelSettings);
lay->addWidget(sceneRendererSettings);
if(sceneRendererSettings)
lay->addWidget(sceneRendererSettings);

lay->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding));
}
Loading