Skip to content

Q
qgroundcontrol
Commit c67c91a7 authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

silenced settings load

parent e0534e82
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
src/ui/designer/QGCCommandButton.cc
View file @ c67c91a7
......@@ -118,7 +118,7 @@ void QGCCommandButton::sendCommand()
int component = ui->editComponentSpinBox->value();
QGCToolWidgetItem::uas->executeCommand(command, confirm, param1, param2, param3, param4, param5, param6, param7, component);
qDebug() << __FILE__ << __LINE__ << "SENDING COMMAND" << index;
//qDebug() << __FILE__ << __LINE__ << "SENDING COMMAND" << index;
}
}
}
......@@ -226,7 +226,7 @@ void QGCCommandButton::endEditMode()
void QGCCommandButton::writeSettings(QSettings& settings)
{
qDebug() << "COMMAND BUTTON WRITING SETTINGS";
//qDebug() << "COMMAND BUTTON WRITING SETTINGS";
settings.setValue("TYPE", "COMMANDBUTTON");
settings.setValue("QGC_COMMAND_BUTTON_DESCRIPTION", ui->nameLabel->text());
settings.setValue("QGC_COMMAND_BUTTON_BUTTONTEXT", ui->commandButton->text());
......
src/ui/designer/QGCToolWidget.cc
View file @ c67c91a7
......@@ -28,7 +28,7 @@ QGCToolWidget::QGCToolWidget(const QString& title, QWidget *parent, QSettings* s
{
widgetTitle = QString("%1 %2").arg(title).arg(QGCToolWidget::instances()->count());
}
qDebug() << "WidgetTitle" << widgetTitle;
//qDebug() << "WidgetTitle" << widgetTitle;
setObjectName(widgetTitle);
createActions();
......@@ -99,12 +99,12 @@ QList<QGCToolWidget*> QGCToolWidget::createWidgetsFromSettings(QWidget* parent,
if (!settingsFile.isEmpty())
{
settings = new QSettings(settingsFile, QSettings::IniFormat);
qDebug() << "LOADING SETTINGS FROM" << settingsFile;
//qDebug() << "LOADING SETTINGS FROM" << settingsFile;
}
else
{
settings = new QSettings();
qDebug() << "LOADING SETTINGS FROM DEFAULT" << settings->fileName();
//qDebug() << "LOADING SETTINGS FROM DEFAULT" << settings->fileName();
}
QList<QGCToolWidget*> newWidgets;
......@@ -116,7 +116,7 @@ QList<QGCToolWidget*> QGCToolWidget::createWidgetsFromSettings(QWidget* parent,
if (!instances()->contains(name) && name.length() != 0)
{
qDebug() << "CREATED WIDGET:" << name;
//qDebug() << "CREATED WIDGET:" << name;
QGCToolWidget* tool = new QGCToolWidget(name, parent, settings);
newWidgets.append(tool);
}
......@@ -127,12 +127,12 @@ QList<QGCToolWidget*> QGCToolWidget::createWidgetsFromSettings(QWidget* parent,
}
else
{
qDebug() << "WIDGET" << name << "DID ALREADY EXIST, REJECTING";
//qDebug() << "WIDGET" << name << "DID ALREADY EXIST, REJECTING";
}
}
settings->endArray();
qDebug() << "NEW WIDGETS: " << newWidgets.size();
//qDebug() << "NEW WIDGETS: " << newWidgets.size();
// Load individual widget items
for (int i = 0; i < newWidgets.size(); i++)
......@@ -158,7 +158,7 @@ bool QGCToolWidget::loadSettings(const QString& settings, bool singleinstance)
// Do not use setTitle() here,
// interferes with loading settings
widgetTitle = widgetName;
qDebug() << "WIDGET TITLE LOADED: " << widgetName;
//qDebug() << "WIDGET TITLE LOADED: " << widgetName;
loadSettings(set);
return true;
}
......@@ -172,9 +172,9 @@ void QGCToolWidget::loadSettings(QSettings& settings)
{
QString widgetName = getTitle();
settings.beginGroup(widgetName);
qDebug() << "LOADING FOR" << widgetName;
//qDebug() << "LOADING FOR" << widgetName;
int size = settings.beginReadArray("QGC_TOOL_WIDGET_ITEMS");
qDebug() << "CHILDREN SIZE:" << size;
//qDebug() << "CHILDREN SIZE:" << size;
for (int j = 0; j < size; j++)
{
settings.setArrayIndex(j);
......@@ -185,12 +185,12 @@ void QGCToolWidget::loadSettings(QSettings& settings)
if (type == "COMMANDBUTTON")
{
item = new QGCCommandButton(this);
qDebug() << "CREATED COMMANDBUTTON";
//qDebug() << "CREATED COMMANDBUTTON";
}
else if (type == "SLIDER")
{
item = new QGCParamSlider(this);
qDebug() << "CREATED PARAM SLIDER";
//qDebug() << "CREATED PARAM SLIDER";
}
if (item)
......@@ -199,12 +199,12 @@ void QGCToolWidget::loadSettings(QSettings& settings)
addToolWidget(item);
item->readSettings(settings);
qDebug() << "Created tool widget";
//qDebug() << "Created tool widget";
}
}
else
{
qDebug() << "UNKNOWN TOOL WIDGET TYPE";
//qDebug() << "UNKNOWN TOOL WIDGET TYPE";
}
}
settings.endArray();
......@@ -218,12 +218,12 @@ void QGCToolWidget::storeWidgetsToSettings(QString settingsFile)
if (!settingsFile.isEmpty())
{
settings = new QSettings(settingsFile, QSettings::IniFormat);
qDebug() << "STORING SETTINGS TO" << settings->fileName();
//qDebug() << "STORING SETTINGS TO" << settings->fileName();
}
else
{
settings = new QSettings();
qDebug() << "STORING SETTINGS TO DEFAULT" << settings->fileName();
//qDebug() << "STORING SETTINGS TO DEFAULT" << settings->fileName();
}
int preArraySize = settings->beginReadArray("QGC_TOOL_WIDGET_NAMES");
......@@ -237,7 +237,7 @@ void QGCToolWidget::storeWidgetsToSettings(QString settingsFile)
{
// Updating value
settings->setValue("TITLE", instances()->values().at(i)->getTitle());
qDebug() << "WRITING TITLE" << instances()->values().at(i)->getTitle();
//qDebug() << "WRITING TITLE" << instances()->values().at(i)->getTitle();
}
else
{
......@@ -269,7 +269,7 @@ void QGCToolWidget::storeSettings(const QString& settingsFile)
void QGCToolWidget::storeSettings(QSettings& settings)
{
qDebug() << "WRITING WIDGET" << widgetTitle << "TO SETTINGS";
//qDebug() << "WRITING WIDGET" << widgetTitle << "TO SETTINGS";
settings.beginGroup(widgetTitle);
settings.beginWriteArray("QGC_TOOL_WIDGET_ITEMS");
int k = 0; // QGCToolItem counter
......@@ -285,7 +285,7 @@ void QGCToolWidget::storeSettings(QSettings& settings)
item->writeSettings(settings);
}
}
qDebug() << "WROTE" << k << "SUB-WIDGETS TO SETTINGS";
//qDebug() << "WROTE" << k << "SUB-WIDGETS TO SETTINGS";
settings.endArray();
settings.endGroup();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment