From bdca5dcbd1d24df66440757c0e6834172b128d75 Mon Sep 17 00:00:00 2001
From: Mirko Waechter <mirko.waechter@kit.edu>
Date: Wed, 7 Jun 2017 15:28:22 +0200
Subject: [PATCH] adjusted to core changes
---
.../RobotUnitPluginWidgetController.cpp | 21 ++++++++++---------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPluginWidgetController.cpp b/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPluginWidgetController.cpp
index c54aacdb0..34f0bb7c6 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPluginWidgetController.cpp
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPluginWidgetController.cpp
@@ -96,20 +96,21 @@ RobotUnitPluginWidgetController::RobotUnitPluginWidgetController()
changeVisibleCount();
connect(widget.comboBoxPackage, SIGNAL(currentIndexChanged(QString)), this, SLOT(packageEditChanged()));
connect(widget.comboBoxPackage, SIGNAL(editTextChanged(QString)), this, SLOT(packageEditChanged()));
- widget.comboBoxPackage->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
+ widget.comboBoxPackage->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
widget.comboBoxPackage->setFixedWidth(300);
//get package hints
{
using namespace boost::filesystem;
std::string homeDir = QDir::homePath().toStdString();
- path p= path{homeDir}/".cmake"/"packages";
- if(is_directory(p))
+ path p = path {homeDir} / ".cmake" / "packages";
+ if (is_directory(p))
{
- for(const path& entry: boost::make_iterator_range(directory_iterator(p),{}))
+ for (const path & entry : boost::make_iterator_range(directory_iterator(p), {}))
{
const std::string pkg = entry.filename().string();
- if (CMakePackageFinder{pkg}.packageFound())
+ ARMARX_INFO << "Checking " << pkg;
+ if (CMakePackageFinder {pkg, "", true} .packageFound())
{
widget.comboBoxPackage->addItem(QString::fromStdString(pkg));
}
@@ -299,7 +300,7 @@ void RobotUnitPluginWidgetController::packageEditChanged()
widget.lineEditLibrary->setVisible(true);
widget.comboBoxLibrary->setVisible(false);
widget.pushButtonLoadLib->setEnabled(true);
- widget.labelPackageFound->setPixmap(QPixmap(":/icons/Blank.svg").scaled(16,16));
+ widget.labelPackageFound->setPixmap(QPixmap(":/icons/Blank.svg").scaled(16, 16));
widget.labelPackageFound->setToolTip("");
}
else
@@ -314,11 +315,11 @@ void RobotUnitPluginWidgetController::packageEditChanged()
if (pFinder.packageFound())
{
widget.pushButtonLoadLib->setEnabled(true);
- widget.labelPackageFound->setPixmap(QPixmap(":/icons/user-online.svg").scaled(16,16));
+ widget.labelPackageFound->setPixmap(QPixmap(":/icons/user-online.svg").scaled(16, 16));
widget.labelPackageFound->setToolTip("Found Package");
- for (const std::string& lib : Split(pFinder.getLibs(), ",; ", true))
+ for (const std::string & lib : Split(pFinder.getLibs(), ",; ", true))
{
- if(lib.empty())
+ if (lib.empty())
{
return;
}
@@ -334,7 +335,7 @@ void RobotUnitPluginWidgetController::packageEditChanged()
else
{
widget.pushButtonLoadLib->setEnabled(false);
- widget.labelPackageFound->setPixmap(QPixmap(":/icons/dialog-cancel-5.svg").scaled(16,16));
+ widget.labelPackageFound->setPixmap(QPixmap(":/icons/dialog-cancel-5.svg").scaled(16, 16));
widget.labelPackageFound->setToolTip("Cannot find Package");
}
}
--
GitLab