From 187b3de3ce786b862a03c927c58d172ce467b080 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Thu, 26 Jan 2017 17:24:34 +0100
Subject: [PATCH] Removed qDebug() from everywhere
---
GUI/coregui/Models/BeamDistributionItem.cpp | 4 +-
GUI/coregui/Models/GUIObjectBuilder.cpp | 25 -----------
GUI/coregui/Models/GUIObjectBuilder.h | 2 -
GUI/coregui/Models/GroupItem.cpp | 3 --
GUI/coregui/Models/GroupProperty.cpp | 1 -
GUI/coregui/Models/ItemFactory.cpp | 4 +-
GUI/coregui/Models/JobModel.cpp | 2 -
GUI/coregui/Models/JobModelFunctions.cpp | 1 -
GUI/coregui/Models/JobQueueData.cpp | 4 +-
GUI/coregui/Models/JobWorker.cpp | 2 -
GUI/coregui/Models/MaterialModel.cpp | 2 -
GUI/coregui/Models/ParameterTuningModel.cpp | 2 -
.../Models/ParticleDistributionItem.cpp | 2 -
.../Models/RectangularDetectorItem.cpp | 3 --
GUI/coregui/Models/SessionItem.cpp | 5 ---
GUI/coregui/Models/SessionModel.cpp | 18 ++------
GUI/coregui/Models/SessionXML.cpp | 6 ---
GUI/coregui/Models/TransformFromDomain.cpp | 7 +--
GUI/coregui/Views/CommonWidgets/InfoPanel.cpp | 11 +----
.../Views/CommonWidgets/ItemComboWidget.cpp | 3 +-
.../Views/CommonWidgets/ItemStackPresenter.h | 3 --
.../Views/CommonWidgets/ItemStackWidget.cpp | 4 --
.../Views/FitWidgets/FitComparisonWidget.cpp | 3 --
.../Views/FitWidgets/FitParameterWidget.cpp | 4 --
.../Views/FitWidgets/FitSuiteWidget.cpp | 12 +----
.../Views/FitWidgets/GUIFitObserver.cpp | 2 -
.../Views/FitWidgets/RunFitControlWidget.cpp | 1 -
.../ImportDataWidgets/ImportDataToolBar.cpp | 6 ---
.../LinkInstrumentManager.cpp | 9 +---
GUI/coregui/Views/InfoWidgets/InfoWidget.cpp | 3 --
.../Views/InfoWidgets/PySampleWidget.cpp | 4 --
GUI/coregui/Views/InstrumentView.cpp | 21 +--------
.../DetectorEditorWidget.cpp | 4 --
.../InstrumentEditorWidget.cpp | 4 --
.../RectangularDetectorWidget.cpp | 1 -
.../SphericalDetectorWidget.cpp | 1 -
.../Views/InstrumentWidgets/columnresizer.cpp | 4 --
.../IntensityDataWidgets/ColorMapCanvas.cpp | 1 -
.../IntensityDataWidgets/ColorMapLabel.cpp | 2 -
.../IntensityDataWidgets/ColorMapPlot.cpp | 1 -
.../HorizontalSlicePlot.cpp | 3 --
.../VerticalSlicePlot.cpp | 3 --
.../Views/JobWidgets/JobSelectorActions.cpp | 1 -
GUI/coregui/Views/JobWidgets/JobViewDocks.cpp | 3 --
.../JobWidgets/ParameterTuningDelegate.cpp | 1 -
.../JobWidgets/ParameterTuningWidget.cpp | 5 ---
.../MaskWidgets/ColorMapSceneAdaptor.cpp | 2 -
GUI/coregui/Views/MaskWidgets/IMaskView.cpp | 4 +-
.../Views/MaskWidgets/MaskDrawingContext.cpp | 1 -
.../Views/MaskWidgets/MaskGraphicsProxy.cpp | 1 -
.../Views/MaskWidgets/MaskGraphicsScene.cpp | 8 +---
.../Views/MaskWidgets/MaskGraphicsView.cpp | 2 -
GUI/coregui/Views/MaskWidgets/PolygonView.cpp | 1 -
.../Views/MaterialEditor/MaterialSvc.cpp | 1 -
.../PropertyEditor/PropertyBrowserUtils.cpp | 7 ---
.../PropertyEditor/PropertyVariantFactory.cpp | 13 ------
.../PropertyEditor/PropertyVariantManager.cpp | 2 -
.../Views/SampleDesigner/ConnectableView.cpp | 1 -
.../Views/SampleDesigner/DesignerHelper.cpp | 1 -
.../Views/SampleDesigner/DesignerScene.cpp | 44 ++-----------------
.../Views/SampleDesigner/DesignerView.cpp | 7 +--
.../Views/SampleDesigner/ILayerView.cpp | 18 --------
.../Views/SampleDesigner/LayerView.cpp | 2 -
.../Views/SampleDesigner/MultiLayerView.cpp | 8 ----
.../ParticleCompositionView.cpp | 1 -
.../SampleDesigner/ParticleCoreShellView.cpp | 1 -
.../ParticleDistributionView.cpp | 1 -
.../SampleDesigner/ParticleLayoutView.cpp | 4 --
.../Views/SampleDesigner/SampleDesigner.cpp | 1 -
.../SampleDesigner/SamplePropertyWidget.cpp | 1 -
.../Views/SampleDesigner/SampleToolBar.cpp | 3 --
.../SampleDesigner/SampleViewFactory.cpp | 1 -
GUI/coregui/Views/SampleView.cpp | 1 -
.../SimulationWidgets/PythonScriptWidget.cpp | 1 -
GUI/coregui/Views/WelcomeView.cpp | 1 -
.../Views/widgetbox/widgetboxtreewidget.cpp | 1 -
GUI/coregui/mainwindow/actionmanager.cpp | 3 --
GUI/coregui/mainwindow/mainwindow.cpp | 3 --
GUI/coregui/mainwindow/projectdocument.cpp | 1 -
GUI/coregui/mainwindow/projectmanager.cpp | 2 -
GUI/coregui/mainwindow/tooltipdatabase.cpp | 2 -
Tests/UnitTests/GUI/TestFitParameterModel.h | 1 -
.../GUI/TestParticleDistributionItem.h | 1 -
Tests/UnitTests/GUI/TestSessionModel.h | 6 ---
84 files changed, 19 insertions(+), 353 deletions(-)
diff --git a/GUI/coregui/Models/BeamDistributionItem.cpp b/GUI/coregui/Models/BeamDistributionItem.cpp
index be5f0b8d16e..edd79d67e04 100644
--- a/GUI/coregui/Models/BeamDistributionItem.cpp
+++ b/GUI/coregui/Models/BeamDistributionItem.cpp
@@ -32,9 +32,8 @@ BeamDistributionItem::BeamDistributionItem(const QString name)
mapper()->setOnChildPropertyChange(
- [this](SessionItem* item, const QString &name)
+ [this](SessionItem* item, const QString &)
{
- qDebug() << "AAAAA" << item->modelType() << name;
if(item->modelType() == Constants::GroupItemType) {
initDistributionItem();
}
@@ -42,7 +41,6 @@ BeamDistributionItem::BeamDistributionItem(const QString name)
// && name == IntensityDataItem::P_AXES_UNITS) {
// auto intensityItem = dynamic_cast<IntensityDataItem *>(item);
// JobItemHelper::updateDataAxes(intensityItem, getInstrumentItem());
-// qDebug() << "QQQQ" << item->modelType() << name;
// }
});
diff --git a/GUI/coregui/Models/GUIObjectBuilder.cpp b/GUI/coregui/Models/GUIObjectBuilder.cpp
index 2c5d6bd8b90..6e85e677634 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.cpp
+++ b/GUI/coregui/Models/GUIObjectBuilder.cpp
@@ -141,7 +141,6 @@ SessionItem* GUIObjectBuilder::populateDocumentModel(DocumentModel* documentMode
void GUIObjectBuilder::visit(const ParticleLayout* sample)
{
- qDebug() << "GUIObjectBuilder::visit(const ParticleLayout*)" << depth();
SessionItem* parent = m_levelToParentItem[depth()-1];
SessionItem* item(0);
if (parent) {
@@ -175,7 +174,6 @@ void GUIObjectBuilder::visit(const ParticleLayout* sample)
void GUIObjectBuilder::visit(const Layer* sample)
{
- qDebug() << "GUIObjectBuilder::visit(const Layer*)" << depth();
SessionItem* parent = m_levelToParentItem[depth()-1];
Q_ASSERT(parent);
@@ -195,15 +193,8 @@ void GUIObjectBuilder::visit(const Layer* sample)
m_levelToParentItem[depth()] = layerItem;
}
-void GUIObjectBuilder::visit(const LayerInterface*)
-{
- qDebug() << "GUIObjectBuilder::visit(const LayerInterface*)" << depth();
-}
-
void GUIObjectBuilder::visit(const MultiLayer* sample)
{
- qDebug() << "GUIObjectBuilder::visit(const MultiLayer*)" << depth();
-
SessionItem* item =
m_sampleModel->insertNewItem(Constants::MultiLayerType);
item->setItemName(sample->getName().c_str());
@@ -214,8 +205,6 @@ void GUIObjectBuilder::visit(const MultiLayer* sample)
void GUIObjectBuilder::visit(const Particle* sample)
{
- qDebug() << "GUIObjectBuilder::visit(const Particle*)" << depth();
-
SessionItem* parent = m_levelToParentItem[depth() - 1];
Q_ASSERT(parent);
@@ -259,8 +248,6 @@ void GUIObjectBuilder::visit(const Particle* sample)
void GUIObjectBuilder::visit(const ParticleDistribution* sample)
{
- qDebug() << "GUIObjectBuilder::visit(const ParticleDistribution*)" << depth();
-
SessionItem* layoutItem = m_levelToParentItem[depth() - 1];
Q_ASSERT(layoutItem);
SessionItem* particle_distribution_item = m_sampleModel->insertNewItem(
@@ -275,8 +262,6 @@ void GUIObjectBuilder::visit(const ParticleDistribution* sample)
void GUIObjectBuilder::visit(const ParticleCoreShell* sample)
{
- qDebug() << "GUIObjectBuilder::visit(const ParticleCoreShell*)" << depth();
-
SessionItem* parent = m_levelToParentItem[depth() - 1];
Q_ASSERT(parent);
@@ -292,8 +277,6 @@ void GUIObjectBuilder::visit(const ParticleCoreShell* sample)
void GUIObjectBuilder::visit(const ParticleComposition* sample)
{
- qDebug() << "GUIObjectBuilder::visit(const ParticleComposition*)" << depth();
-
SessionItem* parent = m_levelToParentItem[depth() - 1];
Q_ASSERT(parent);
SessionItem* particle_composition_item = m_sampleModel->insertNewItem(
@@ -578,8 +561,6 @@ void GUIObjectBuilder::visit(const InterferenceFunction2DLattice* sample)
void GUIObjectBuilder::visit(const RotationX* sample)
{
- qDebug() << "GUIObjectBuilder::visit(const RotationX*)" << depth();
-
SessionItem* parent = m_levelToParentItem[depth()-1];
Q_ASSERT(parent);
@@ -595,8 +576,6 @@ void GUIObjectBuilder::visit(const RotationX* sample)
void GUIObjectBuilder::visit(const RotationY* sample)
{
- qDebug() << "GUIObjectBuilder::visit(const RotationY*)" << depth();
-
SessionItem* parent = m_levelToParentItem[depth() - 1];
Q_ASSERT(parent);
@@ -611,8 +590,6 @@ void GUIObjectBuilder::visit(const RotationY* sample)
void GUIObjectBuilder::visit(const RotationZ* sample)
{
- qDebug() << "GUIObjectBuilder::visit(const RotationZ*)" << depth();
-
SessionItem* parent = m_levelToParentItem[depth()-1];
Q_ASSERT(parent);
@@ -627,8 +604,6 @@ void GUIObjectBuilder::visit(const RotationZ* sample)
void GUIObjectBuilder::visit(const RotationEuler* sample)
{
- qDebug() << "GUIObjectBuilder::visit(const RotationEuler*)" << depth();
-
SessionItem* parent = m_levelToParentItem[depth()-1];
Q_ASSERT(parent);
diff --git a/GUI/coregui/Models/GUIObjectBuilder.h b/GUI/coregui/Models/GUIObjectBuilder.h
index d824a934075..2a0113b3240 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.h
+++ b/GUI/coregui/Models/GUIObjectBuilder.h
@@ -56,8 +56,6 @@ public:
void visit(const Layer*);
- void visit(const LayerInterface*);
-
void visit(const MultiLayer*);
void visit(const Particle*);
diff --git a/GUI/coregui/Models/GroupItem.cpp b/GUI/coregui/Models/GroupItem.cpp
index eaa451df9e7..f4173360081 100644
--- a/GUI/coregui/Models/GroupItem.cpp
+++ b/GUI/coregui/Models/GroupItem.cpp
@@ -27,11 +27,8 @@ GroupItem::GroupItem()
// mapper()->setOnChildPropertyChange(
// [this](SessionItem* item, const QString &name)
// {
-// qDebug() << "QQQQ" << item->itemLabel() << name;
// group()->setCurrentLabel(item->itemLabel());
-//// qDebug() << "emmiting..." << modelType();
//// emitDataChanged();
-//// qDebug() << "...emmited";
// });
}
diff --git a/GUI/coregui/Models/GroupProperty.cpp b/GUI/coregui/Models/GroupProperty.cpp
index fe608e7c900..98fadaceb10 100644
--- a/GUI/coregui/Models/GroupProperty.cpp
+++ b/GUI/coregui/Models/GroupProperty.cpp
@@ -27,7 +27,6 @@ GroupProperty::GroupProperty(QString group_name)
SessionItem *GroupProperty::getCurrentItem()
{
- qDebug() << "GroupProperty::getCurrentItem()" << m_groupItem;
if(m_groupItem) return m_groupItem->getChildByName(this->getCurrentType());
return 0;
}
diff --git a/GUI/coregui/Models/ItemFactory.cpp b/GUI/coregui/Models/ItemFactory.cpp
index abc169cb475..59c8f1baa16 100644
--- a/GUI/coregui/Models/ItemFactory.cpp
+++ b/GUI/coregui/Models/ItemFactory.cpp
@@ -225,8 +225,6 @@ ItemFactory::ItemMap_t ItemFactory::m_item_map = initializeItemMap();
SessionItem *ItemFactory::createItem(const QString &model_name,
SessionItem *parent)
{
- //qDebug() << "ItemFactory::createItem" << model_name;
-
if(!m_item_map.contains(model_name))
throw GUIHelpers::Error("ItemFactory::createItem() -> Error: Model name does not exist: "+model_name);
@@ -234,7 +232,7 @@ SessionItem *ItemFactory::createItem(const QString &model_name,
if(parent) {
parent->insertItem(-1, result);
}
- //qDebug() << " result:" << result;
+
return result;
}
diff --git a/GUI/coregui/Models/JobModel.cpp b/GUI/coregui/Models/JobModel.cpp
index 02037c4dfdc..5e6ab5545b6 100644
--- a/GUI/coregui/Models/JobModel.cpp
+++ b/GUI/coregui/Models/JobModel.cpp
@@ -163,13 +163,11 @@ void JobModel::runJob(const QModelIndex &index)
void JobModel::cancelJob(const QModelIndex &index)
{
- qDebug() << "JobModel::cancelJob(const QModelIndex &index)";
m_queue_data->cancelJob(getJobItemForIndex(index)->getIdentifier());
}
void JobModel::removeJob(const QModelIndex &index)
{
- qDebug() << "NJobModel::removeJob(const QModelIndex &index)";
JobItem *jobItem = getJobItemForIndex(index);
Q_ASSERT(jobItem);
m_queue_data->removeJob(jobItem->getIdentifier());
diff --git a/GUI/coregui/Models/JobModelFunctions.cpp b/GUI/coregui/Models/JobModelFunctions.cpp
index da7f24cb109..6d6d8d83f09 100644
--- a/GUI/coregui/Models/JobModelFunctions.cpp
+++ b/GUI/coregui/Models/JobModelFunctions.cpp
@@ -124,7 +124,6 @@ void JobModelFunctions::cropRealData(JobItem *jobItem) {
IDetector2D::EAxesUnits requested_units
= JobItemHelper::getAxesUnitsFromName(intensityItem->getSelectedAxesUnits());
- qDebug() << "AAAAAAa" << requested_units << intensityItem->getSelectedAxesUnits();
std::unique_ptr<OutputData<double>> adjustedData = DetectorFunctions::createDataSet(
*instrument.get(), *intensityItem->getOutputData(), true, requested_units);
diff --git a/GUI/coregui/Models/JobQueueData.cpp b/GUI/coregui/Models/JobQueueData.cpp
index 40480af0502..b5a1ed5a77d 100644
--- a/GUI/coregui/Models/JobQueueData.cpp
+++ b/GUI/coregui/Models/JobQueueData.cpp
@@ -73,10 +73,8 @@ bool JobQueueData::hasUnfinishedJobs()
void JobQueueData::runJob(JobItem *jobItem)
{
QString identifier = jobItem->getIdentifier();
- if(getThread(identifier)) {
- qDebug() << "JobQueueData::runInThread() -> Thread is already running";
+ if(getThread(identifier))
return;
- }
if(getSimulation(identifier))
throw GUIHelpers::Error("JobQueueData::runJob() -> Error. Simulation is already existing.");
diff --git a/GUI/coregui/Models/JobWorker.cpp b/GUI/coregui/Models/JobWorker.cpp
index 8ed14e07c50..baa5793f1e3 100644
--- a/GUI/coregui/Models/JobWorker.cpp
+++ b/GUI/coregui/Models/JobWorker.cpp
@@ -33,7 +33,6 @@ JobWorker::JobWorker(QString identifier, GISASSimulation *simulation)
void JobWorker::start()
{
- qDebug() << "JobRunner::start() " << m_simulation;
m_terminate_request_flag = false;
m_simulation_duration = 0;
emit started();
@@ -88,7 +87,6 @@ bool JobWorker::simulationInformsUs(int percentage_done)
//! set request for JobRunner to terminate underlying domain simulation
void JobWorker::terminate()
{
- qDebug() << "JobRunner::terminate()";
m_terminate_request_flag = true;
m_job_status = Constants::STATUS_CANCELED;
}
diff --git a/GUI/coregui/Models/MaterialModel.cpp b/GUI/coregui/Models/MaterialModel.cpp
index e24c132a2b6..a9d080ad5c9 100644
--- a/GUI/coregui/Models/MaterialModel.cpp
+++ b/GUI/coregui/Models/MaterialModel.cpp
@@ -65,7 +65,6 @@ MaterialItem *MaterialModel::getMaterial(const QModelIndex &index)
MaterialItem *MaterialModel::getMaterial(const MaterialProperty &property)
{
- qDebug() << "MaterialModel::getMaterial()";
QModelIndex parentIndex;
for( int i_row = 0; i_row < rowCount( parentIndex ); ++i_row) {
QModelIndex itemIndex = index( i_row, 0, parentIndex );
@@ -79,7 +78,6 @@ MaterialItem *MaterialModel::getMaterial(const MaterialProperty &property)
MaterialItem *MaterialModel::getMaterial(const QString &material_name)
{
- qDebug() << "MaterialModel::getMaterial()";
QModelIndex parentIndex;
for( int i_row = 0; i_row < rowCount( parentIndex ); ++i_row) {
QModelIndex itemIndex = index( i_row, 0, parentIndex );
diff --git a/GUI/coregui/Models/ParameterTuningModel.cpp b/GUI/coregui/Models/ParameterTuningModel.cpp
index db4a96e2858..c2de0031c9c 100644
--- a/GUI/coregui/Models/ParameterTuningModel.cpp
+++ b/GUI/coregui/Models/ParameterTuningModel.cpp
@@ -49,14 +49,12 @@ Qt::ItemFlags ParameterTuningModel::flags(const QModelIndex &proxyIndex) const
QMimeData *ParameterTuningModel::mimeData(const QModelIndexList &proxyIndexes) const
{
- qDebug() << "ParameterTuningModel::mimeData" << proxyIndexes;
QMimeData *mimeData = new QMimeData();
foreach(QModelIndex proxyIndex, proxyIndexes) {
if(ParameterItem *parameterItem = getParameterItem(proxyIndex)) {
QString path = FitParameterHelper::getParameterItemPath(parameterItem);
mimeData->setData(SessionXML::LinkMimeType, path.toLatin1());
- qDebug() << " FilterPropertyProxy::mimeData" << path;
break;
}
}
diff --git a/GUI/coregui/Models/ParticleDistributionItem.cpp b/GUI/coregui/Models/ParticleDistributionItem.cpp
index 829b3a13edf..79f09a0558d 100644
--- a/GUI/coregui/Models/ParticleDistributionItem.cpp
+++ b/GUI/coregui/Models/ParticleDistributionItem.cpp
@@ -126,8 +126,6 @@ QStringList ParticleDistributionItem::getChildParameterNames() const
QVector<SessionItem*> children = getItems();
if (children.size() > 1) {
Q_ASSERT(0);
- qDebug() << "ParticleDistributionItem::getChildParameterNames(): "
- << "More than one child item";
return result;
}
if (children.size() == 0) {
diff --git a/GUI/coregui/Models/RectangularDetectorItem.cpp b/GUI/coregui/Models/RectangularDetectorItem.cpp
index fa1c6843cb0..a4d8d79ec96 100644
--- a/GUI/coregui/Models/RectangularDetectorItem.cpp
+++ b/GUI/coregui/Models/RectangularDetectorItem.cpp
@@ -161,9 +161,6 @@ std::unique_ptr<IDetector2D> RectangularDetectorItem::createDetector() const
result->setPerpendicularToDirectBeam(distance, dbeam_u0, dbeam_v0);
} else if (alignment.getValue() == Constants::ALIGNMENT_TO_SAMPLE) {
- qDebug() << n_x << n_y << width << height << " xx " << distance << u0 << v0;
-// Q_ASSERT(0);
-
result->setPerpendicularToSampleX(distance, u0, v0);
} else if (alignment.getValue() == Constants::ALIGNMENT_TO_REFLECTED_BEAM) {
diff --git a/GUI/coregui/Models/SessionItem.cpp b/GUI/coregui/Models/SessionItem.cpp
index 0d99b714e57..f3600732ac1 100644
--- a/GUI/coregui/Models/SessionItem.cpp
+++ b/GUI/coregui/Models/SessionItem.cpp
@@ -350,7 +350,6 @@ bool SessionItem::insertItem(int row, SessionItem *item, const QString &tag)
if (item->parent() == nullptr) {
item->setParentAndModel(this, m_model);
} else {
- qDebug() << "Double insertion of item";
return false;
}
}
@@ -498,7 +497,6 @@ SessionItem *SessionItem::getGroupItem(const QString &name, const QString &type)
SessionItem *SessionItem::setGroupProperty(const QString &name, const QString &value) const
{
- qDebug() << "ParameterizedItem::setGroupProperty()" << name << value;
if (GroupItem *item = dynamic_cast<GroupItem *>(getItem(name))) {
GroupProperty_t group_property = item->group();
group_property->setCurrentType(value);
@@ -612,9 +610,6 @@ bool SessionItem::setValue(QVariant value)
QVariant previous_variant = this->value();
if (previous_variant.isValid() && GUIHelpers::getVariantType(previous_variant)
!= GUIHelpers::getVariantType(value)) {
- qDebug() << "ParameterizedItem::setRegisteredProperty() -> Error. Type of previous and new "
- "variant does not coincide.";
- qDebug() << "New variant" << value << ", previous " << previous_variant;
throw GUIHelpers::Error("ParameterizedItem::setRegisteredProperty() -> Error. Type of "
"previous and new variant does not coincide.");
}
diff --git a/GUI/coregui/Models/SessionModel.cpp b/GUI/coregui/Models/SessionModel.cpp
index 4295239179a..a6700e23d58 100644
--- a/GUI/coregui/Models/SessionModel.cpp
+++ b/GUI/coregui/Models/SessionModel.cpp
@@ -244,7 +244,6 @@ QModelIndex SessionModel::indexOfItem(SessionItem *item) const
if (!item || item == m_root_item || !item->parent())
return QModelIndex();
SessionItem *parent_item = item->parent();
-// qDebug() << "OOO indexOfItem:" << item << " parent_item" << parent_item << "m_root_item:" << m_root_item;
int row = parent_item->rowOfChild(item);
Q_ASSERT(row>=0); // FIXME For Debugging
return createIndex(row, 0, item);
@@ -263,10 +262,8 @@ SessionItem *SessionModel::insertNewItem(QString model_type, const QModelIndex &
tag = parent_item->defaultTag();
SessionTagInfo tagInfo = parent_item->getTagInfo(tag);
- if (!tagInfo.modelTypes.contains(model_type)) {
- qDebug() << "Child of type " << model_type << " not acceptable!\n";
+ if (!tagInfo.modelTypes.contains(model_type))
return nullptr;
- }
}
SessionItem *new_item = ItemFactory::createItem(model_type);
@@ -342,11 +339,8 @@ void SessionModel::readFrom(QXmlStreamReader *reader, WarningMessageService *mes
{
Q_ASSERT(reader);
- qDebug() << "SessionModel::readFrom()" << m_model_tag << reader->name() << m_root_item;
-
- if (reader->name() != m_model_tag) {
+ if (reader->name() != m_model_tag)
throw GUIHelpers::Error("SessionModel::readFrom() -> Format error in p1");
- }
beginResetModel();
clear();
@@ -374,9 +368,6 @@ void SessionModel::writeTo(QXmlStreamWriter *writer, SessionItem *parent)
SessionItem *SessionModel::moveParameterizedItem(SessionItem *item, SessionItem *new_parent,
int row, const QString &tag)
{
- qDebug() << "";
- qDebug() << "";
- qDebug() << "SessionModel::moveParameterizedItem() " << item << new_parent << row;
if (!new_parent)
new_parent = m_root_item;
const QString tagName = tag.isEmpty() ? new_parent->defaultTag() : tag;
@@ -391,8 +382,6 @@ SessionItem *SessionModel::moveParameterizedItem(SessionItem *item, SessionItem
// take care of indexes when moving item within same parent
int previousIndex = item->parent()->getItems(tagName).indexOf(item);
if (row==previousIndex) {
- qDebug()
- << "SessionModel::moveParameterizedItem() -> no need to move, same parent, same row. ";
return item;
} else if (previousIndex >= 0 && row>previousIndex) {
row--;
@@ -490,9 +479,8 @@ QStringList SessionModel::topItemNames(const QString &model_type, const QModelIn
return result;
}
-void SessionModel::initFrom(SessionModel *model, SessionItem *parent)
+void SessionModel::initFrom(SessionModel *model, SessionItem *)
{
- qDebug() << "SessionModel::initFrom() -> " << model->getModelTag() << parent;
QByteArray byte_array;
QXmlStreamWriter writer(&byte_array);
writer.setAutoFormatting(true);
diff --git a/GUI/coregui/Models/SessionXML.cpp b/GUI/coregui/Models/SessionXML.cpp
index b72e8d035f8..616c6b6c69b 100644
--- a/GUI/coregui/Models/SessionXML.cpp
+++ b/GUI/coregui/Models/SessionXML.cpp
@@ -150,8 +150,6 @@ void SessionReader::readItems(QXmlStreamReader *reader, SessionItem *item, const
WarningMessageService *messageService)
{
bool isTopItem = true;
- qDebug() << "SessionModel::readItems() item:" << item << "topTag:" << topTag;
- if(item) qDebug() << " item" << item->modelType();
const QString modelType = item->model()->getModelTag();
while (!reader->atEnd()) {
reader->readNext();
@@ -230,7 +228,6 @@ void SessionReader::readItems(QXmlStreamReader *reader, SessionItem *item, const
item = item->parent();
} else {
// handling the case when reading obsolete project file, when SubItem doesn't exist anymore
- qDebug() << "!!";
Q_ASSERT(0);
}
}
@@ -246,9 +243,6 @@ void SessionReader::readItems(QXmlStreamReader *reader, SessionItem *item, const
QString SessionReader::readProperty(QXmlStreamReader *reader,
SessionItem *item, WarningMessageService *messageService)
{
-// qDebug() << "SessionModel::readProperty() for" << item;
- if (item)
- qDebug() << item->modelType();
const QString parameter_name
= reader->attributes().value(SessionXML::ParameterNameAttribute).toString();
const QString parameter_type
diff --git a/GUI/coregui/Models/TransformFromDomain.cpp b/GUI/coregui/Models/TransformFromDomain.cpp
index 5d1ac3dbc52..f4dd81330e6 100644
--- a/GUI/coregui/Models/TransformFromDomain.cpp
+++ b/GUI/coregui/Models/TransformFromDomain.cpp
@@ -80,7 +80,6 @@ void TransformFromDomain::setItemFromSample(SessionItem* item,
const IFTDistribution1D* ipdf = sample->getProbabilityDistribution();
QString group_name = InterferenceFunctionRadialParaCrystalItem::P_PDF;
- qDebug() << " group_name" << group_name;
SetPDF1D(item, ipdf, group_name);
}
@@ -102,10 +101,8 @@ void TransformFromDomain::setItemFromSample(SessionItem* item,
QStringList group_names;
group_names << InterferenceFunction2DParaCrystalItem::P_PDF1
<< InterferenceFunction2DParaCrystalItem::P_PDF2;
- for (size_t i = 0; i < pdfs.size(); ++i) {
- qDebug() << " group_name" << group_names[i];
+ for (size_t i = 0; i < pdfs.size(); ++i)
setPDF2D(item, pdfs[i], group_names[i]);
- }
}
void TransformFromDomain::setItemFromSample(SessionItem* item,
@@ -119,7 +116,6 @@ void TransformFromDomain::setItemFromSample(SessionItem* item,
const IFTDecayFunction1D* pdf = sample->getDecayFunction();
QString group_name = InterferenceFunction1DLatticeItem::P_DECAY_FUNCTION;
- qDebug() << " group_name" << group_name;
SetDecayFunction1D(item, pdf, group_name);
}
@@ -130,7 +126,6 @@ void TransformFromDomain::setItemFromSample(SessionItem* item,
const IFTDecayFunction2D* p_pdf = sample->getDecayFunction();
QString group_name = InterferenceFunction2DLatticeItem::P_DECAY_FUNCTION;
- qDebug() << " group_name" << group_name;
SetDecayFunction2D(item, p_pdf, group_name);
}
diff --git a/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp b/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp
index 1f5aad2c61e..d3bc2579e77 100644
--- a/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp
+++ b/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp
@@ -57,32 +57,26 @@ QSize InfoPanel::sizeHint() const
} else {
result.setHeight(m_toolBar->height() );
}
- qDebug() << "SSSSSS InfoPanel::sizeHint()" << result;
return result;
}
QSize InfoPanel::minimumSizeHint() const
{
- qDebug() << "SSSSSS InfoPanel::minimumSizeHint()" << QSize(minimum_widget_height, minimum_widget_height);
return QSize(minimum_widget_height, minimum_widget_height);
}
void InfoPanel::onExpandButtonClicked()
{
- qDebug() << "InfoPanel::onExpandButtonClicked() isContentVisible()?" << isContentVisible();
setContentVisible(!isContentVisible(), true);
}
void InfoPanel::onCloseButtonClicked()
{
- qDebug() << "InfoPanel::onCloseButtonClicked()";
emit widgetCloseRequest();
}
void InfoPanel::setContentVisible(bool editor_status, bool dock_notify)
{
- qDebug() << "InfoPanel::setContentVisible" << editor_status << dock_notify;
-
m_toolBar->setExpandStatus(editor_status);
if(editor_status) {
if(m_cached_height)
@@ -105,11 +99,8 @@ void InfoPanel::setContentVisible(bool editor_status, bool dock_notify)
bool InfoPanel::isContentVisible()
{
- qDebug() << "InfoPanel::isContentVisible() m_stackedWidget->currentWidget()" << m_stackedWidget->currentWidget();
- if(m_stackedWidget->currentWidget()) {
- qDebug() << "m_stackedWidget->currentWidget()->isVisible()" << m_stackedWidget->currentWidget()->isVisible();
+ if(m_stackedWidget->currentWidget())
return m_stackedWidget->currentWidget()->isVisible();
- }
return false;
}
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
index 0dd60c028cc..277b949d136 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
@@ -116,9 +116,8 @@ QStringList ItemComboWidget::getValidPresentationList(SessionItem *item)
//}
-void ItemComboWidget::onComboChanged(const QString &name)
+void ItemComboWidget::onComboChanged(const QString &)
{
- qDebug() << "ItemComboWidget::onWidgetChangeRequest" << name;
setPresentation(currentPresentation());
}
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h b/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
index bfab617b8ff..2c3f459e490 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
@@ -77,8 +77,6 @@ protected:
T *widget = m_itemToWidget[item];
if(!widget) return;
- qDebug() << "ItemStackPresenter::removeWidgetForItem";
-
typename QMap<SessionItem *, T *>::iterator it = m_itemToWidget.begin();
while(it!=m_itemToWidget.end()) {
if(it.value() == widget) {
@@ -95,7 +93,6 @@ protected:
}
void removeWidgets() {
- qDebug() << "ItemStackPresenter::removeWidgets";
typename QMap<SessionItem *, T *>::iterator it = m_itemToWidget.begin();
while(it!=m_itemToWidget.end()) {
m_stackedWidget->removeWidget(it.value());
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
index 0d013076908..2675aba90ea 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
@@ -66,20 +66,17 @@ void ItemStackWidget::setSizeHint(const QSize &size_hint)
void ItemStackWidget::onModelAboutToBeReset()
{
- qDebug() << "ItemStackWidget::onModelAboutToBeReset()";
removeWidgets();
}
void ItemStackWidget::onRowsAboutToBeRemoved(const QModelIndex &parent, int first, int)
{
- qDebug() << "ItemStackWidget::onRowsAboutToBeRemoved()";
SessionItem *item = m_model->itemForIndex(m_model->index(first, 0, parent));
removeWidgetForItem(item);
}
void ItemStackWidget::onSelectionChanged(SessionItem *item)
{
- if(item) qDebug() << "ItemStackWidget::onSelectionChanged(SessionItem *item)" << item->displayName();
bool isNew(false);
setItem(item, isNew);
}
@@ -122,7 +119,6 @@ void ItemStackWidget::validateItem(SessionItem *item)
"Attempt to use items from different models.");
}
} else {
- qDebug() << "ItemStackPresenter::setItem() -> Warning, model is not initialized.";
setModel(item->model());
}
}
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
index 203b639d765..3745ba48d6b 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
@@ -125,7 +125,6 @@ void FitComparisonWidget::setJobItem(JobItem *jobItem)
void FitComparisonWidget::showEvent(QShowEvent *)
{
if(isVisible()) {
- qDebug() << "!!! visible";
removeLabels(m_realDataItem);
removeLabels(m_simulatedDataItem);
}
@@ -136,7 +135,6 @@ void FitComparisonWidget::showEvent(QShowEvent *)
void FitComparisonWidget::hideEvent(QHideEvent *)
{
if(isHidden()) {
- qDebug() << "!!! hidden";
restoreLabels(m_realDataItem);
restoreLabels(m_simulatedDataItem);
}
@@ -174,7 +172,6 @@ void FitComparisonWidget::processJobItemItem(JobItem *jobItem)
void FitComparisonWidget::onResetViewAction()
{
- qDebug() << "FitComparisonWidget::onResetViewAction()";
m_realDataItem->resetView();
m_simulatedDataItem->resetView();
m_relativeDiffItem->resetView();
diff --git a/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp b/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
index a7b7fc78143..d5ecdfaef33 100644
--- a/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
@@ -147,8 +147,6 @@ void FitParameterWidget::onTuningWidgetSelectionChanged(const QItemSelection &se
void FitParameterWidget::onFitParametersSelectionChanged(const QItemSelection &selection)
{
- Q_UNUSED(selection);
- qDebug() << "onFitParametersSelectionChanged ->";
if (selection.indexes().isEmpty())
return;
@@ -159,7 +157,6 @@ void FitParameterWidget::onFitParametersSelectionChanged(const QItemSelection &s
QString link = item->parent()->getItemValue(FitParameterLinkItem::P_LINK).toString();
m_tuningWidget->makeSelected(FitParameterHelper::getParameterItem(m_jobItem->fitParameterContainerItem(), link));
}
- qDebug() << "XXX index" << index << item->modelType();
}
@@ -225,7 +222,6 @@ void FitParameterWidget::onAddToFitParAction(int ipar)
void FitParameterWidget::onFitParameterModelChange()
{
- qDebug() << "FitParameterWidget::onFitParameterModelChange()";
spanParameters();
updateInfoLabel();
}
diff --git a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
index 7c35ee77990..a16369faee1 100644
--- a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
@@ -98,14 +98,12 @@ QSize FitSuiteWidget::minimumSizeHint() const
return QSize(25, 25);
}
-void FitSuiteWidget::onError(const QString &text)
+void FitSuiteWidget::onError(const QString &)
{
- qDebug() << "FitSuiteWidget::onError" << text;
}
void FitSuiteWidget::onPlotsUpdate()
{
- qDebug() << "FitSuiteWidget::onPlotsUpdate";
m_currentItem->intensityDataItem()->setRawDataVector(m_observer->simulationData());
m_observer->finishedPlotting();
}
@@ -129,7 +127,6 @@ void FitSuiteWidget::startFitting()
{
if(!m_currentItem)
return;
- qDebug() << "FitSuiteWidget::startFitting()";
m_currentItem->fitSuiteItem()->mapper()->setOnPropertyChange(
[this](const QString &name)
@@ -139,7 +136,6 @@ void FitSuiteWidget::startFitting()
try {
- qDebug() << " try run fitting";
m_observer->setInterval(m_currentItem->fitSuiteItem()->getItemValue(
FitSuiteItem::P_UPDATE_INTERVAL).toInt());
std::shared_ptr<FitSuite> fitSuite(DomainFittingBuilder::createFitSuite(m_currentItem));
@@ -147,7 +143,6 @@ void FitSuiteWidget::startFitting()
m_runFitManager->setFitSuite(fitSuite);
m_observer->finishedPlotting();
m_runFitManager->runFitting();
- qDebug() << " done";
} catch(std::exception& e) {
m_currentItem->setStatus(Constants::STATUS_FAILED);
m_currentItem->fitSuiteItem()->mapper()->unsubscribe(this);
@@ -160,9 +155,6 @@ void FitSuiteWidget::startFitting()
void FitSuiteWidget::stopFitting()
{
-// if(!m_currentItem)
-// return;
- qDebug() << "FitSuiteWidget::stopFitting()";
m_runFitManager->interruptFitting();
}
@@ -174,7 +166,6 @@ void FitSuiteWidget::onFittingStarted()
m_currentItem->setEndTime(QString());
m_currentItem->setDuration(0);
- qDebug() << "FitSuiteWidget::onFittingStarted()";
emit fittingStarted(m_currentItem);
}
@@ -185,7 +176,6 @@ void FitSuiteWidget::onFittingFinished()
m_currentItem->setEndTime(GUIHelpers::currentDateTime());
m_currentItem->setProgress(100);
m_currentItem->setDuration(m_runFitManager->getDuration());
- qDebug() << "FitSuiteWidget::onFittingFinished()";
m_currentItem->fitSuiteItem()->mapper()->unsubscribe(this);
emit fittingFinished(m_currentItem);
}
diff --git a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
index a89d490882b..a62f13f7311 100644
--- a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
+++ b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
@@ -49,7 +49,6 @@ void GUIFitObserver::update(FitSuite *subject)
// info.m_chi2 = subject->getChi2();
// info.m_iteration_count = (int)subject->getNumberOfIterations();
// info.m_values = GUIHelpers::fromStdVector(subject->getFitParameters()->getValues());
-// qDebug() << "Emitting progressInfoUpdate" << info.m_iteration_count;
// emit progressInfoUpdate(info);
// }
@@ -77,7 +76,6 @@ void GUIFitObserver::update(FitSuite *subject)
info.m_iteration_count = (int)subject->numberOfIterations();
info.m_values = GUIHelpers::fromStdVector(subject->fitParameters()->values());
- qDebug() << "Emitting progressInfoUpdate" << info.m_iteration_count;
emit progressInfoUpdate(info);
m_simData.reset(subject->getSimulationOutputData()->clone());
diff --git a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
index f3f27167cb3..d07b245073b 100644
--- a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
@@ -182,7 +182,6 @@ void RunFitControlWidget::setItem(JobItem *item)
void RunFitControlWidget::onSliderValueChanged(int value)
{
- qDebug() << "RunFitControlWidget::onSliderValueChanged(int value)";
int interval = sliderValueToUpdateInterval(value);
m_updateIntervalLabel->setText(QString::number(interval));
if(fitSuiteItem())
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp b/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp
index 055a27e3ad4..62ff7b8290b 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp
@@ -103,7 +103,6 @@ void ImportDataToolBar::setActionList(const QList<QAction *> &actionList)
void ImportDataToolBar::onImportDataAction()
{
- qDebug() << "ImportDataToolBar::onImportDataAction()";
Q_ASSERT(m_realDataModel);
ImportDataAssistant assistant;
QString baseNameOfImportedFile;
@@ -139,7 +138,6 @@ void ImportDataToolBar::onImportDataAction()
// intensityDataItem->setOutputData(data);
// m_selectionModel->clearSelection();
// m_selectionModel->select(realDataItem->index(), QItemSelectionModel::Select);
-// qDebug() << "baseNameOfImportedFile" << baseNameOfImportedFile;
// //matchAxesToInstrument(realDataItem);
// }
@@ -148,18 +146,14 @@ void ImportDataToolBar::onImportDataAction()
void ImportDataToolBar::onCloneDataAction()
{
- qDebug() << "ImportDataToolBar::onCloneDataAction()";
-
}
void ImportDataToolBar::onRemoveDataAction()
{
- qDebug() << "ImportDataToolBar::onRemoveDataAction()";
Q_ASSERT(m_realDataModel);
Q_ASSERT(m_selectionModel);
QModelIndex currentIndex = m_selectionModel->currentIndex();
- qDebug() << "InstrumentView::onRemoveInstrument()" << currentIndex;
if(currentIndex.isValid())
m_realDataModel->removeRows(currentIndex.row(), 1, currentIndex.parent());
diff --git a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
index c9fa2d28b93..b6a841c53a8 100644
--- a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
@@ -176,10 +176,6 @@ void LinkInstrumentManager::onInstrumentChildChange(InstrumentItem *instrument,
if(child == nullptr)
return;
- qDebug() << "SSS 1.1" << child->modelType() << child->itemName();
- qDebug() << "SSS 1.1" << child->parent()->modelType() << child->parent()->itemName();
-
-
if(child->itemName() == BasicAxisItem::P_NBINS ||
child->parent()->itemName() == DetectorItem::P_DETECTOR) {
onInstrumentBinningChange(instrument);
@@ -287,7 +283,6 @@ void LinkInstrumentManager::onInstrumentBinningChange(InstrumentItem *changedIns
{
foreach(RealDataItem *realDataItem, linkedItems(changedInstrument)) {
if(!ImportDataAssistant::hasSameDimensions(changedInstrument, realDataItem)) {
- qDebug() << "Breaking the link ";
realDataItem->setItemValue(RealDataItem::P_INSTRUMENT_ID, QString());
}
}
@@ -298,10 +293,8 @@ void LinkInstrumentManager::onInstrumentBinningChange(InstrumentItem *changedIns
void LinkInstrumentManager::onInstrumentLayoutChange(InstrumentItem *changedInstrument)
{
- foreach(RealDataItem *realDataItem, linkedItems(changedInstrument)) {
- qDebug() << "Changing layout";
+ foreach(RealDataItem *realDataItem, linkedItems(changedInstrument))
realDataItem->linkToInstrument(changedInstrument);
- }
}
//! Returns list of RealDataItem's linked to given instrument.
diff --git a/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp b/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
index 0c4f1249058..b7156342fcc 100644
--- a/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
@@ -75,7 +75,6 @@ QSize InfoWidget::sizeHint() const
} else {
result.setHeight(m_pySampleWidget->height() + m_infoToolBar->height() );
}
- qDebug() << "InfoWidget::sizeHint()" << result;
return result;
}
@@ -86,7 +85,6 @@ QSize InfoWidget::minimumSizeHint() const
void InfoWidget::onDockVisibilityChange(bool is_visible)
{
- qDebug() << "InfoWidget::onDockVisibilityChange(bool status)" << is_visible << isEditorVisible();
Q_ASSERT(m_pySampleWidget);
if(isEditorVisible()) {
if(!is_visible) {
@@ -104,7 +102,6 @@ void InfoWidget::onDockVisibilityChange(bool is_visible)
void InfoWidget::onExpandButtonClicked()
{
- qDebug() << "InfoWidget::onExpandButtonClicked()" << m_cached_height;
setEditorVisible(!isEditorVisible(), true);
}
diff --git a/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp b/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
index 0c144e6cd33..95d2c29ebcc 100644
--- a/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
@@ -130,7 +130,6 @@ void PySampleWidget::onDataChanged(const QModelIndex &, const QModelIndex &)
void PySampleWidget::scheduleUpdate()
{
m_n_of_sceduled_updates++;
- qDebug() << "PySampleWidget::scheduleUpdate()" << m_n_of_sceduled_updates;
if(!m_timer->isActive()) m_timer->start();
}
@@ -143,7 +142,6 @@ void PySampleWidget::updateEditor()
}
Q_ASSERT(!m_timer->isActive());
- qDebug() << "PySampleWidget::updateEditor() -> begin" << m_n_of_sceduled_updates;
m_n_of_sceduled_updates = 0;
const int old_scrollbar_value = m_textEdit->verticalScrollBar()->value();
@@ -200,8 +198,6 @@ void PySampleWidget::enableEditor()
//! Triggers the update of the editor
void PySampleWidget::onTimerTimeout()
{
- qDebug() << "PySampleWidget::onTimerTimeout()" << m_time_to_update
- << "scheduled updates" << m_n_of_sceduled_updates;
m_time_to_update -= timer_interval_msec;
if(m_time_to_update < 0) {
diff --git a/GUI/coregui/Views/InstrumentView.cpp b/GUI/coregui/Views/InstrumentView.cpp
index 4e92fed56a0..4489a0eafe2 100644
--- a/GUI/coregui/Views/InstrumentView.cpp
+++ b/GUI/coregui/Views/InstrumentView.cpp
@@ -64,15 +64,12 @@ InstrumentView::InstrumentView(MainWindow *mainWindow)
void InstrumentView::updateView()
{
- qDebug() << "InstrumentView::updateView()";
m_instrumentSelector->updateSelection();
}
void InstrumentView::resetView()
{
- qDebug() << "InstrumentView::resetView()";
-
QMap<SessionItem *, InstrumentEditorWidget *>::iterator it = m_instrumentToEditor.begin();
while(it!=m_instrumentToEditor.end()) {
m_stackWidget->removeWidget(it.value());
@@ -85,17 +82,12 @@ void InstrumentView::resetView()
void InstrumentView::onSelectionChanged(
- const QItemSelection &selected, const QItemSelection &deselected )
+ const QItemSelection &selected, const QItemSelection &)
{
- qDebug() << "InstrumentView::onSelectionChanged()" << selected << deselected;
- if(selected.indexes().isEmpty()) {
- qDebug() << " InstrumentView::onSelectionChanged() -> no selected"
- << selected << deselected;
+ if(selected.indexes().isEmpty())
return;
- }
SessionItem *instrument = m_instrumentModel->itemForIndex(selected.indexes().back());
- qDebug() << "InstrumentView::onSelectionChanged()" << instrument->itemName();
InstrumentEditorWidget *widget = m_instrumentToEditor[instrument];
@@ -118,7 +110,6 @@ void InstrumentView::onSelectionChanged(
void InstrumentView::onAddInstrument()
{
- qDebug() << "InstrumentView::onAddInstrument()";
SessionItem *instrument = m_instrumentModel->insertNewItem(Constants::InstrumentType);
instrument->setItemName(getNewInstrumentName("Default GISAS"));
m_instrumentModel->insertNewItem(
@@ -126,18 +117,14 @@ void InstrumentView::onAddInstrument()
m_instrumentModel->insertNewItem(
Constants::BeamType, m_instrumentModel->indexOfItem(instrument));
QModelIndex itemIndex = m_instrumentModel->indexOfItem(instrument);
- qDebug() << " InstrumentView::onAddInstrument() -> clearing selection";
m_instrumentSelector->getSelectionModel()->clearSelection();
- qDebug() << " InstrumentView::onAddInstrument() -> clearing selection -> done.";
m_instrumentSelector->getSelectionModel()->select(itemIndex, QItemSelectionModel::Select);
}
void InstrumentView::onRemoveInstrument()
{
- qDebug() << "InstrumentView::onRemoveInstrument()";
QModelIndex currentIndex = m_instrumentSelector->getSelectionModel()->currentIndex();
- qDebug() << "InstrumentView::onRemoveInstrument()" << currentIndex;
if(currentIndex.isValid())
m_instrumentModel->removeRows(currentIndex.row(), 1, QModelIndex());
}
@@ -145,7 +132,6 @@ void InstrumentView::onRemoveInstrument()
void InstrumentView::onRowsAboutToBeRemoved(QModelIndex parent, int first, int /* last */)
{
- qDebug() << "InstrumentView::onRowsAboutToBeRemoved()";
SessionItem *item = m_instrumentModel->itemForIndex(m_instrumentModel->index(first,0, parent));
Q_ASSERT(item);
InstrumentEditorWidget *widget = m_instrumentToEditor[item];
@@ -243,7 +229,6 @@ QString InstrumentView::getNewInstrumentName(const QString &name)
updateMapOfNames();
int ncopies = m_name_to_copy[name];
- qDebug() << " InstrumentView::getNewInstrumentName()" << ncopies;
if(ncopies == 0) {
m_name_to_copy[name]=1;
return name;
@@ -273,7 +258,5 @@ void InstrumentView::updateMapOfNames()
name.replace(regexp.cap(0),"");
name = name.trimmed();
m_name_to_copy[name] = ncopy;
-// qDebug() << " ";
-// qDebug() << "XXXXXXXXXXXXXXXX" << name << ncopy << regexp.cap(0);
}
}
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
index f2cee32bfd1..949b79aa97f 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
@@ -53,7 +53,6 @@ DetectorEditorWidget::DetectorEditorWidget(ColumnResizer *columnResizer, QWidget
DetectorEditorWidget::~DetectorEditorWidget()
{
- qDebug() << "DetectorEditorWidget::~DetectorEditorWidget()";
}
void DetectorEditorWidget::setDetectorItem(DetectorItem *detectorItem)
@@ -80,9 +79,6 @@ void DetectorEditorWidget::setDetectorItem(DetectorItem *detectorItem)
init_SubDetector_Widget();
}
-
-
-// qDebug() << "DetectorEditorWidget::setDetectorItem() -> XXX";
// m_detectorItem = detectorItem;
// if(!m_detectorItem) return;
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
index f9ef746ecc6..0b1288369fe 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
@@ -146,16 +146,13 @@ void InstrumentEditorWidget::setInstrumentItem(SessionItem *instrument)
void InstrumentEditorWidget::onChangedEditor(const QString &)
{
- qDebug() << "InstrumentEditorWidget::onChangedEditor() ->";
Q_ASSERT(m_currentItem);
if(m_block_signals) return;
- qDebug() << " InstrumentEditorWidget::onChangedEditor(): " << m_nameLineEdit->text();
m_currentItem->setItemName(m_nameLineEdit->text());
}
void InstrumentEditorWidget::onPropertyChanged(const QString &)
{
- qDebug() << "InstrumentEditorWidget::onPropertyChanged() ->";
}
//! top block with instrument name and type
@@ -179,7 +176,6 @@ QLayout *InstrumentEditorWidget::create_NameAndTypeLayout()
void InstrumentEditorWidget::updateWidgets()
{
- qDebug() << "InstrumentEditorWidget::updateWidgets() ->";
Q_ASSERT(m_currentItem);
m_block_signals = true;
m_nameLineEdit->setText(m_currentItem->itemName());
diff --git a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
index fb8e1af5b06..cebd1b66be4 100644
--- a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
@@ -82,7 +82,6 @@ void RectangularDetectorWidget::setDetectorItem(RectangularDetectorItem *detecto
void RectangularDetectorWidget::onPropertyChanged(const QString &propertyName)
{
- qDebug() << "RectangularDetectorWidget::onPropertyChanged()" << propertyName;
if(propertyName == RectangularDetectorItem::P_ALIGNMENT) {
init_alignment_editors();
}
diff --git a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
index c20de312aa1..6bb1508fc75 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
@@ -60,7 +60,6 @@ SphericalDetectorWidget::SphericalDetectorWidget(ColumnResizer *columnResizer,
SphericalDetectorWidget::~SphericalDetectorWidget()
{
- qDebug() << "SphericalDetectorWidget::~SphericalDetectorWidget()";
m_phiAxisEditor->clearEditor();
m_alphaAxisEditor->clearEditor();
m_resolutionFunctionEditor->clearEditor();
diff --git a/GUI/coregui/Views/InstrumentWidgets/columnresizer.cpp b/GUI/coregui/Views/InstrumentWidgets/columnresizer.cpp
index 8d00534681b..0d9d3858f86 100644
--- a/GUI/coregui/Views/InstrumentWidgets/columnresizer.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/columnresizer.cpp
@@ -129,7 +129,6 @@ ColumnResizer::ColumnResizer(QObject* parent)
ColumnResizer::~ColumnResizer()
{
- qDebug() << "ColumnResizer::~ColumnResizer() ->";
delete d;
}
@@ -144,10 +143,8 @@ void ColumnResizer::addWidget(QWidget* widget)
void ColumnResizer::updateWidth()
{
if(d->block_update) return;
- qDebug() << "ColumnResizer::updateWidth()";
int width = 0;
Q_FOREACH(QWidget* widget, d->m_widgets) {
- qDebug() << " ColumnResizer::updateWidth()" << widget;
width = qMax(widget->sizeHint().width(), width);
}
Q_FOREACH(FormLayoutWidgetItem* item, d->m_wrWidgetItemList) {
@@ -234,7 +231,6 @@ void ColumnResizer::addWidgetsFromFormLayout(QFormLayout* layout, QFormLayout::I
void ColumnResizer::dropWidgetsFromGridLayout(QGridLayout *layout)
{
- qDebug() << "ColumnResizer::dropWidgetsFromGridLayout";
// d->block_update = true;
// removing all widgets from being supervised
for (int row = 0; row < layout->rowCount(); ++row) {
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
index a73c89f4942..e2df1f928c2 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
@@ -63,7 +63,6 @@ void ColorMapCanvas::setItem(IntensityDataItem *intensityDataItem)
// onTitleChanged(intensityDataItem->getItemValue(IntensityDataItem::P_TITLE).toString());
// ("Monospace", default_text_size, QFont::Normal, false)
QFont font = m_colorMap->customPlot()->xAxis->labelFont();
- qDebug() << "FFFFF" << font;
// m_colorMap->customPlot()->xAxis->setLabelFont();
}
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.cpp
index 693b2a15739..7e15fdc2cdc 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.cpp
@@ -71,8 +71,6 @@ void ColorMapLabel::onColorMapStatusString(const QString &text)
//void ColorMapLabel::resizeEvent(QResizeEvent *event)
//{
-// qDebug() << "ColorMapLabel::resizeEvent(QResizeEvent *event)" << event->size();
-
//}
//! Enables/disables showing of label for given color map.
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp
index 2e9d60cae2b..34dd508134c 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp
@@ -168,7 +168,6 @@ void ColorMapPlot::showLinesOverTheMap(bool isVisible)
double ColorMapPlot::xAxisCoordToPixel(double axis_coordinate) const
{
double result = m_customPlot->xAxis->coordToPixel(axis_coordinate);
-// qDebug() << "ColorMapPlot::xAxisCoordToPixel axis_coordinate:" << axis_coordinate << "result:" << result;
return result;
}
diff --git a/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp b/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp
index f631da60cab..b3df4712150 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp
@@ -67,14 +67,12 @@ void HorizontalSlicePlot::setItem(IntensityDataItem *item)
void HorizontalSlicePlot::plotData(const QVector<double> &x, const QVector<double> &y)
{
- //qDebug() << "NHistogramPlot::plotData(const QVector<double> &x, const QVector<double> &y)";
m_bars->setData(x, y);
m_customPlot->replot();
}
void HorizontalSlicePlot::onSubItemPropertyChanged(const QString &property_group, const QString &property_name)
{
- qDebug() << "HorizontalSlicePlot::onSubItemPropertyChanged(const QString &property_name)" << property_group << property_name;
if(property_group == IntensityDataItem::P_XAXIS) {
if(property_name == BasicAxisItem::P_MIN) {
setXmin(m_item->getLowerX());
@@ -106,7 +104,6 @@ void HorizontalSlicePlot::onSubItemPropertyChanged(const QString &property_group
void HorizontalSlicePlot::plotItem(IntensityDataItem *intensityItem)
{
- //qDebug() << "NHistogramPlot::plotItem(NIntensityDataItem *intensityItem)";
Q_ASSERT(intensityItem);
const OutputData<double> *data = intensityItem->getOutputData();
diff --git a/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp b/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp
index c7ac75018a8..c0bee3177e5 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp
@@ -66,14 +66,12 @@ void VerticalSlicePlot::setItem(IntensityDataItem *item)
void VerticalSlicePlot::plotData(const QVector<double> &x, const QVector<double> &y)
{
- //qDebug() << "NHistogramPlot::plotData(const QVector<double> &x, const QVector<double> &y)";
m_bars->setData(x, y);
m_customPlot->replot();
}
void VerticalSlicePlot::onSubItemPropertyChanged(const QString &property_group, const QString &property_name)
{
- qDebug() << "HorizontalSlicePlot::onSubItemPropertyChanged(const QString &property_name)" << property_group << property_name;
if(property_group == IntensityDataItem::P_XAXIS) {
if(property_name == BasicAxisItem::P_MIN) {
setXmin(m_item->getLowerX());
@@ -106,7 +104,6 @@ void VerticalSlicePlot::onSubItemPropertyChanged(const QString &property_group,
void VerticalSlicePlot::plotItem(IntensityDataItem *intensityItem)
{
- //qDebug() << "NHistogramPlot::plotItem(NIntensityDataItem *intensityItem)";
Q_ASSERT(intensityItem);
const OutputData<double> *data = intensityItem->getOutputData();
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp b/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
index 230d2910fcf..a08daf4536d 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
@@ -67,7 +67,6 @@ void JobSelectorActions::onRunJob()
void JobSelectorActions::onRemoveJob()
{
- qDebug() << "JobSelectorActions::onRemoveJob()";
Q_ASSERT(m_selectionModel);
QModelIndexList indexList = m_selectionModel->selectedIndexes();
diff --git a/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp b/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
index 072e3a4c224..f95e2158c2e 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
@@ -116,8 +116,6 @@ void JobViewDocks::onToggleJobSelector()
void JobViewDocks::setDockHeightForWidget(int height)
{
- qDebug() << "JobViewDocks::setDockHeightForWidget(int)" << height;
-
QWidget *widget = qobject_cast<QWidget *>(sender());
Q_ASSERT(widget);
QDockWidget *dock = findDock(widget);
@@ -150,7 +148,6 @@ void JobViewDocks::setDockHeightForWidget(int height)
void JobViewDocks::onWidgetCloseRequest()
{
- qDebug() << "JobViewDocks::onWidgetCloseRequest()";
QWidget *widget = qobject_cast<QWidget *>(sender());
Q_ASSERT(widget);
QDockWidget *dock = findDock(widget);
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
index e7113a7fb48..201828f8385 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
@@ -243,7 +243,6 @@ void ParameterTuningDelegate::sliderValueChanged(int position)
void ParameterTuningDelegate::editorValueChanged(double value)
{
- qDebug() << "ModelTuningDelegate::editorValueChanged " << value;
disconnect(m_slider, SIGNAL(valueChanged(int)),this, SLOT(sliderValueChanged(int)));
updateSlider(value);
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
index 07de8276af7..02814d310a6 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
@@ -138,15 +138,12 @@ QVector<ParameterItem *> ParameterTuningWidget::getSelectedParameters()
void ParameterTuningWidget::onCurrentLinkChanged(SessionItem *item)
{
- qDebug() << "ModelTuningWidget::onCurrentLinkChanged";
Q_ASSERT(m_currentJobItem);
if(m_currentJobItem->isRunning())
return;
if (item) {
- qDebug() << "ModelTuningWidget::onCurrentLinkChanged() -> Starting to tune model";
-// << link.getItem()->modelType() << link.getPropertyName();
// link.updateItem();
m_jobModel->runJob(m_currentJobItem->index());
}
@@ -161,7 +158,6 @@ void ParameterTuningWidget::onLockZValueChanged(bool value)
{
if(!m_currentJobItem) return;
if(IntensityDataItem *intensityDataItem = m_currentJobItem->intensityDataItem()) {
- qDebug() << "ModelTuningWidget::onLockZValueChanged(bool value) ->" << value;
intensityDataItem->setZAxisLocked(value);
}
}
@@ -169,7 +165,6 @@ void ParameterTuningWidget::onLockZValueChanged(bool value)
void ParameterTuningWidget::updateParameterModel()
{
Q_ASSERT(m_jobModel);
- qDebug() << "ModelTuningWidget::updateParameterModel()";
if(!m_currentJobItem) return;
diff --git a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
index 1e9f5cbf3f9..3349d205e10 100644
--- a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
+++ b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
@@ -63,11 +63,9 @@ void ColorMapSceneAdaptor::setColorMapPlot(ColorMap *plot)
bool ColorMapSceneAdaptor::eventFilter(QObject *object, QEvent *event)
{
Q_UNUSED(object);
- qDebug() << "ColorMapSceneAdaptor::eventFilter" << event->type();
if (event->type() == QEvent::Resize || event->type() == QEvent::UpdateRequest) {
m_viewport_rectangle = m_plot->getViewportRectangleInWidgetCoordinates();
emit update_request();
- qDebug() << "ColorMapSceneAdaptor::eventFilter" << event->type();
return false;
}
// return QObject::eventFilter(object, event);
diff --git a/GUI/coregui/Views/MaskWidgets/IMaskView.cpp b/GUI/coregui/Views/MaskWidgets/IMaskView.cpp
index 8541b8d50da..631b2ee4c21 100644
--- a/GUI/coregui/Views/MaskWidgets/IMaskView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/IMaskView.cpp
@@ -149,10 +149,8 @@ void IMaskView::onChangedY()
void IMaskView::onPropertyChange(const QString &propertyName)
{
- qDebug() << "IMaskView::onPropertyChange ->" << propertyName;
- if(propertyName == MaskItem::P_MASK_VALUE) {
+ if(propertyName == MaskItem::P_MASK_VALUE)
update();
- }
emit propertyChanged();
}
diff --git a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
index 3f9e15b9c55..1916ef003e5 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
@@ -38,7 +38,6 @@ void MaskDrawingContext::setActivityType(MaskEditorFlags::Activity value)
void MaskDrawingContext::setMaskValue(MaskEditorFlags::MaskValue value)
{
- qDebug() << "MaskDrawingContext::setMaskValue" << value;
m_mask_value = value;
}
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
index 2661079f537..ae3250e2770 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
@@ -89,7 +89,6 @@ void MaskGraphicsProxy::wheelEvent(QGraphicsSceneWheelEvent *event)
void MaskGraphicsProxy::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
{
- qDebug() << "MaskGraphicsProxy::mouseMoveEvent(QGraphicsSceneMouseEvent *event)";
if(!m_send_signals_to_colormap) return;
QGraphicsProxyWidget::mouseMoveEvent(event);
}
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
index 8d1355686b8..fdcf7f0c6d4 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -127,7 +127,6 @@ void MaskGraphicsScene::onActivityModeChanged(MaskEditorFlags::Activity value)
if(!m_proxy)
return;
- qDebug() << "XXX MaskGraphicsScene::onActivityModeChanged";
if(m_context.isActivityRequiresDrawingCancel(value))
cancelCurrentDrawing();
@@ -293,7 +292,6 @@ void MaskGraphicsScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
void MaskGraphicsScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
- qDebug() << "MaskGraphicsScene::mouseReleaseEvent() -> before";
if(isDrawingInProgress()) {
if (m_context.isRectangleShapeMode()) {
clearSelection();
@@ -390,12 +388,8 @@ void MaskGraphicsScene::updateViews(const QModelIndex &parentIndex, IMaskView *p
childView = addViewForItem(item);
if (childView) {
- if (parentView) {
- qDebug() << " DesignerScene::updateViews() -> adding child "
- << item->modelType() << " to parent"
- << parentView->getParameterizedItem()->modelType();
+ if (parentView)
parentView->addView(childView, i_row);
- }
}
}
updateViews(itemIndex, childView);
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
index 03f7e744e0e..a628aa9a67a 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
@@ -76,7 +76,6 @@ void MaskGraphicsView::resizeEvent(QResizeEvent *event)
// proxy->resize(event->size());
// scene()->setSceneRect(0,0,event->size().width(),event->size().height());
// proxy->setPos(0,0);
-// qDebug() << "!!! Resizing" << this->size() << event->size();
// }
// }
}
@@ -158,7 +157,6 @@ void MaskGraphicsView::updateSize(const QSize &newSize)
proxy->resize(newSize);
scene()->setSceneRect(0, 0, newSize.width(), newSize.height());
proxy->setPos(0,0);
- qDebug() << "!!! Resizing" << this->size() << newSize;
}
}
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonView.cpp b/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
index fef267a7a07..cecdc6060f2 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
@@ -121,7 +121,6 @@ void PolygonView::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWi
QVariant PolygonView::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value)
{
- qDebug() << "PolygonView::itemChange" << change << value << this->isSelected();
if(change == QGraphicsItem::ItemSelectedHasChanged) {
if(this->isSelected()) {
setChildrenVisible(true);
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp b/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
index d2394ff111d..58419eaa992 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
@@ -54,7 +54,6 @@ MaterialSvc::selectMaterialProperty(const MaterialProperty &previousMaterial)
MaterialProperty
MaterialSvc::this_selectMaterialProperty(const MaterialProperty &previousMaterial)
{
- qDebug() << "MaterialEditor::this_getMaterialProperty()";
MaterialEditorDialog dialog(m_materialModel);
dialog.setInitialMaterialProperty(previousMaterial);
if(dialog.exec() == QDialog::Accepted) {
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp b/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp
index deba857736d..0d593c7af56 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp
@@ -107,7 +107,6 @@ GroupPropertyEdit::GroupPropertyEdit(QWidget *parent)
GroupPropertyEdit::~GroupPropertyEdit()
{
- qDebug() << "GroupPropertyEdit::~GroupPropertyEdit() -> destroyed" << this;
}
void GroupPropertyEdit::setGroupProperty(
@@ -121,7 +120,6 @@ void GroupPropertyEdit::setGroupProperty(
void GroupPropertyEdit::processGroup()
{
- qDebug() << "GroupPropertyEdit::processGroup()";
disconnect(m_box, SIGNAL(currentIndexChanged(int)),
this, SLOT(indexChanged(int)));
@@ -137,7 +135,6 @@ void GroupPropertyEdit::processGroup()
void GroupPropertyEdit::indexChanged(int index)
{
- qDebug() << "GroupPropertyEdit::textChanged() -> " << index;
m_groupProperty->setCurrentType(m_groupProperty->toString(index));
}
@@ -307,13 +304,11 @@ ComboPropertyEdit::ComboPropertyEdit(QWidget *parent)
//ComboPropertyEdit::~ComboPropertyEdit()
//{
-// qDebug() << "ComboPropertyEdit::~ComboPropertyEdit()" << this;
//}
void ComboPropertyEdit::setComboProperty(
const ComboProperty &combo_property)
{
- qDebug() << "ComboPropertyEdit::setComboProperty() this=" << this;
m_combo_property = combo_property;
// if (!m_comboBox) {
// m_comboBox = new QComboBox(this);
@@ -360,10 +355,8 @@ QString ComboPropertyEdit::comboValueText()
void ComboPropertyEdit::onCurrentIndexChanged(QString current_value)
{
- qDebug() << "ComboPropertyEdit::onCurrentIndexChanged(QString current_value)" << current_value;
m_combo_property.setValue(current_value);
m_combo_property.setCachedValue(current_value);
- qDebug() << " ComboPropertyEdit::onCurrentIndexChanged(QString current_value) -> emitting combo property";
emit comboPropertyChanged(m_combo_property);
}
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp b/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp
index c8ea57409ea..a1e9e08339a 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp
@@ -22,7 +22,6 @@
PropertyVariantFactory::~PropertyVariantFactory()
{
-// qDebug() << "PropertyVariantFactory::~PropertyVariantFactory()";
QList<MaterialPropertyEdit *> mat_editors =
m_material_editor_to_property.keys();
QListIterator<MaterialPropertyEdit *> mat_it(mat_editors);
@@ -71,7 +70,6 @@ void PropertyVariantFactory::connectPropertyManager(
QWidget *PropertyVariantFactory::createEditor(QtVariantPropertyManager *manager,
QtProperty *property, QWidget *parent)
{
-// qDebug() << "PropertyVariantFactory::createEditor()" << property->propertyName();
if (manager->propertyType(property) ==
PropertyVariantManager::materialTypeId()) {
MaterialPropertyEdit *editor = new MaterialPropertyEdit(parent);
@@ -146,7 +144,6 @@ QWidget *PropertyVariantFactory::createEditor(QtVariantPropertyManager *manager,
if (manager->propertyType(property) ==
PropertyVariantManager::comboPropertyTypeId()) {
ComboPropertyEdit *editor = new ComboPropertyEdit(parent);
-// qDebug() << " PropertyVariantFactory::createEditor() -> created ComboEditor" << editor;
QVariant var = manager->value(property);
ComboProperty combo = var.value<ComboProperty>();
@@ -182,7 +179,6 @@ void PropertyVariantFactory::disconnectPropertyManager(
void PropertyVariantFactory::slotPropertyChanged(QtProperty *property,
const QVariant &value)
{
-// qDebug() << "PropertyVariantFactory::slotPropertyChanged()" << property->propertyName() << value;
if (m_property_to_material_editors.contains(property)) {
QList<MaterialPropertyEdit *> editors =
m_property_to_material_editors[property];
@@ -216,7 +212,6 @@ void PropertyVariantFactory::slotPropertyChanged(QtProperty *property,
QListIterator<GroupPropertyEdit *> itEditor(editors);
while (itEditor.hasNext()) {
GroupProperty_t mat = value.value<GroupProperty_t>();
-// qDebug() << " PropertyVariantFactory::slotPropertyChanged() -> Setting editor";
itEditor.next()->setGroupProperty(mat);
}
}
@@ -225,7 +220,6 @@ void PropertyVariantFactory::slotPropertyChanged(QtProperty *property,
m_property_to_combo_editors[property];
QListIterator<ComboPropertyEdit *> itEditor(editors);
while (itEditor.hasNext()) {
-// qDebug() << " PropertyVariantFactory::slotPropertyChanged() -> Setting editor";
ComboProperty combo = value.value<ComboProperty>();
itEditor.next()->setComboProperty(combo);
}
@@ -235,7 +229,6 @@ void PropertyVariantFactory::slotPropertyChanged(QtProperty *property,
void PropertyVariantFactory::slotSetValue(const MaterialProperty &value)
{
-// qDebug() << "PropertyVariantFactory::slotSetValue(const MaterialProperty &value)";
QObject *object = sender();
QMap<MaterialPropertyEdit *, QtProperty *>::ConstIterator itEditor =
m_material_editor_to_property.constBegin();
@@ -297,7 +290,6 @@ void PropertyVariantFactory::slotSetValue(const ScientificDoubleProperty &value)
void PropertyVariantFactory::slotSetValue(const GroupProperty_t &value)
{
-// qDebug() << "PropertyVariantFactory::slotSetValue(const GroupProperty_t &value)";
QObject *object = sender();
QMap<GroupPropertyEdit *, QtProperty *>::ConstIterator itEditor =
m_fancygroup_editor_to_property.constBegin();
@@ -317,7 +309,6 @@ void PropertyVariantFactory::slotSetValue(const GroupProperty_t &value)
void PropertyVariantFactory::slotSetValue(const ComboProperty &value)
{
-// qDebug() << "PropertyVariantFactory::slotSetValue(const ComboProperty &value)";
QObject *object = sender();
QMap<ComboPropertyEdit *, QtProperty *>::ConstIterator itEditor =
m_combo_editor_to_property.constBegin();
@@ -339,7 +330,6 @@ void PropertyVariantFactory::slotSetValue(const ComboProperty &value)
void PropertyVariantFactory::slotEditorDestroyed(QObject *object)
{
-// qDebug() << "PropertyVariantFactory::slotEditorDestroyed(QObject *object)";
QMap<MaterialPropertyEdit *, QtProperty *>::ConstIterator mat_it_editor =
m_material_editor_to_property.constBegin();
while (mat_it_editor != m_material_editor_to_property.constEnd()) {
@@ -389,8 +379,6 @@ void PropertyVariantFactory::slotEditorDestroyed(QObject *object)
m_fancygroup_editor_to_property.constBegin();
while (fancygroup_editor_it != m_fancygroup_editor_to_property.constEnd()) {
if (fancygroup_editor_it.key() == object) {
- qDebug() << "PropertyVariantFactory::slotEditorDestroyed(QObject *object) -> fancy group editor";
-
GroupPropertyEdit *editor = fancygroup_editor_it.key();
QtProperty *property = fancygroup_editor_it.value();
m_fancygroup_editor_to_property.remove(editor);
@@ -420,7 +408,6 @@ void PropertyVariantFactory::slotEditorDestroyed(QObject *object)
void PropertyVariantFactory::slotPropertyAttributeChanged(QtProperty *, const QString &, const QVariant &)
{
-// qDebug() << "PropertyVariantFactory::slotPropertyAttributeChanged(QtProperty *, const QString &, const QVariant &) -> ???";
}
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp b/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp
index 2a551056394..4dab552531e 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp
@@ -155,7 +155,6 @@ QIcon PropertyVariantManager::valueIcon(const QtProperty *property) const
void PropertyVariantManager::setValue(QtProperty *property, const QVariant &val)
{
-// qDebug() << "PropertyVariantManager::setValue(QtProperty *property, const QVariant &val)";
if (m_theMaterialValues.contains(property)) {
if( val.userType() != materialTypeId() ) return;
MaterialProperty mat = val.value<MaterialProperty>();
@@ -213,7 +212,6 @@ void PropertyVariantManager::setValue(QtProperty *property, const QVariant &val)
void PropertyVariantManager::initializeProperty(QtProperty *property)
{
-// qDebug() << "PropertyVariantManager::initializeProperty(QtProperty *property)";
if (propertyType(property) == materialTypeId()) {
MaterialProperty m;
m_theMaterialValues[property] = m;
diff --git a/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp b/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
index 94cb0cad009..1da67014f35 100644
--- a/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
@@ -171,7 +171,6 @@ int ConnectableView::getNumberOfInputPorts()
void ConnectableView::update_appearance()
{
- qDebug() << "AAAA COnnectableView " << m_item->modelType() << m_item->displayName();
setLabel( hyphenate(m_item->displayName()) );
IView::update_appearance();
}
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp b/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
index 9d225f57213..a1043f39493 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
@@ -150,7 +150,6 @@ int DesignerHelper::nanometerToScreen(double nanometer)
QRectF DesignerHelper::getDefaultBoundingRect(const QString &name)
{
- qDebug() << " getDefaultBoundingRect " << name;
if (name == Constants::MultiLayerType) {
return QRectF(0, 0, getDefaultMultiLayerWidth(), getDefaultMultiLayerHeight());
} else if (name == Constants::LayerType) {
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
index 7a2a03549ae..785806c020a 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
@@ -129,7 +129,6 @@ IView *DesignerScene::getViewForItem(SessionItem *item)
void DesignerScene::resetScene()
{
- qDebug() << "DesignerScene::resetScene()";
clear();
m_ItemToView.clear();
m_layer_interface_line = QLineF();
@@ -137,7 +136,6 @@ void DesignerScene::resetScene()
void DesignerScene::updateScene()
{
- qDebug() << "DesignerScene::updateScene()";
updateViews();
alignViews();
}
@@ -145,20 +143,17 @@ void DesignerScene::updateScene()
void DesignerScene::onRowsInserted(const QModelIndex & /* parent */, int /* first */,
int /* last */)
{
- qDebug() << "DesignerScene::onRowsInserted";
updateScene();
}
void DesignerScene::onRowsRemoved(const QModelIndex & /* parent */, int /* first */, int /* last */)
{
- qDebug() << "DesignerScene::onRowsRemoved";
updateScene();
}
void DesignerScene::onRowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)
{
m_block_selection = true;
- qDebug() << "DesignerScene::onRowsAboutToBeRemoved()" << parent << first << last;
for (int irow = first; irow <= last; ++irow) {
QModelIndex itemIndex = m_sampleModel->index(irow, 0, parent);
deleteViews(itemIndex); // deleting all child items
@@ -173,7 +168,6 @@ void DesignerScene::onSessionSelectionChanged(const QItemSelection & /* selected
if (m_block_selection)
return;
- qDebug() << "DesignerScene::onSessionSelectionChanged()";
m_block_selection = true;
for (QMap<SessionItem *, IView *>::iterator it = m_ItemToView.begin();
@@ -194,7 +188,6 @@ void DesignerScene::onSessionSelectionChanged(const QItemSelection & /* selected
//! propagate selection from scene to model
void DesignerScene::onSceneSelectionChanged()
{
- qDebug() << "DesignerScene::onSceneSelectionChanged() 1.1";
if (m_block_selection)
return;
@@ -221,12 +214,6 @@ void DesignerScene::updateViews(const QModelIndex &parentIndex, IView *parentVie
{
Q_ASSERT(m_sampleModel);
- qDebug() << "DesignerScene::updateVIews()";
-
- if (!parentIndex.isValid()) {
- qDebug() << "Dumping model";
- }
-
IView *childView(0);
int childCount = 0;
for (int i_row = 0; i_row < m_sampleModel->rowCount(parentIndex); ++i_row) {
@@ -239,16 +226,10 @@ void DesignerScene::updateViews(const QModelIndex &parentIndex, IView *parentVie
childView = addViewForItem(item);
if (childView) {
- if (parentView) {
- qDebug() << " DesignerScene::updateViews() -> adding child "
- << item->modelType() << " to parent"
- << parentView->getItem()->modelType();
+ if (parentView)
parentView->addView(childView, childCount++);
- }
}
- } else {
- qDebug() << "not a parameterized graphics item";
}
updateViews(itemIndex, childView);
@@ -258,14 +239,11 @@ void DesignerScene::updateViews(const QModelIndex &parentIndex, IView *parentVie
//! adds view for item, if it doesn't exists
IView *DesignerScene::addViewForItem(SessionItem *item)
{
- qDebug() << "DesignerScene::addViewForItem() ->" << item->modelType();
Q_ASSERT(item);
IView *view = getViewForItem(item);
if (!view) {
- qDebug() << " DesignerScene::addViewForItem() -> Creating view for item"
- << item->modelType();
view = SampleViewFactory::createSampleView(item->modelType());
if (view) {
m_ItemToView[item] = view;
@@ -274,8 +252,7 @@ IView *DesignerScene::addViewForItem(SessionItem *item)
return view;
}
} else {
- qDebug() << " DesignerScene::addViewForItem() -> View for item exists."
- << item->modelType();
+ // view for item exists
}
return view;
}
@@ -289,17 +266,14 @@ void DesignerScene::alignViews()
//! runs recursively through model's item and schedules view removal
void DesignerScene::deleteViews(const QModelIndex &viewIndex)
{
- qDebug() << "DesignerScene::deleteViews()" << viewIndex;
-
for (int i_row = 0; i_row < m_sampleModel->rowCount(viewIndex); ++i_row) {
QModelIndex itemIndex = m_sampleModel->index(i_row, 0, viewIndex);
if (SessionItem *item = m_sampleModel->itemForIndex(itemIndex)) {
- qDebug() << " deleteViews" << item->modelType() << item->displayName();
removeItemViewFromScene(item);
} else {
- qDebug() << "not a parameterized graphics item";
+ // not a parameterized graphics item
}
deleteViews(itemIndex);
}
@@ -311,7 +285,6 @@ void DesignerScene::removeItemViewFromScene(SessionItem *item)
{
Q_ASSERT(item);
- qDebug() << "DesignerScene::removeItemFromScene()" << item->modelType() << item->displayName();
for (QMap<SessionItem *, IView *>::iterator it = m_ItemToView.begin();
it != m_ItemToView.end(); ++it) {
if (it.key() == item) {
@@ -330,8 +303,6 @@ void DesignerScene::removeItemViewFromScene(SessionItem *item)
//! propagates deletion of views on the scene to the model
void DesignerScene::deleteSelectedItems()
{
- qDebug() << "DesignerScene::deleteSelectedItems() 1.1" << selectedItems().size();
-
QModelIndexList indexes = m_selectionModel->selectedIndexes();
QList<IView *> views_which_will_be_deleted;
@@ -343,7 +314,6 @@ void DesignerScene::deleteSelectedItems()
// Since we don't know the order of items and their parent/child relationship, we need this
while (indexes.size()) {
QModelIndex current = m_proxy->mapToSource(indexes.back());
- qDebug() << " DesignerScene::deleteSelectedItems() current.selected" << current;
m_sampleModel->removeRows(current.row(), 1, current.parent());
indexes = m_selectionModel->selectedIndexes();
}
@@ -373,7 +343,6 @@ void DesignerScene::drawForeground(QPainter *painter, const QRectF & /* rect */)
//! propagates connection established by NodeEditor to the model
void DesignerScene::onEstablishedConnection(NodeEditorConnection *connection)
{
- qDebug() << "DesignerScene::onEstablishedConnection()";
ConnectableView *parentView = connection->getParentView();
ConnectableView *childView = connection->getChildView();
@@ -383,7 +352,6 @@ void DesignerScene::onEstablishedConnection(NodeEditorConnection *connection)
// connection->getInputPort());
// childView->getParameterizedItem()->setPort(input_port_index);
- qDebug() << parentView->getInputPortIndex(connection->inputPort());
QString tag;
if (connection->getParentView()->getItem()->modelType() == Constants::ParticleLayoutType) {
if (connection->inputPort()->getPortType() == NodeEditorPort::INTERFERENCE)
@@ -401,10 +369,8 @@ void DesignerScene::onEstablishedConnection(NodeEditorConnection *connection)
if (connection->inputPort()->getPortType() == NodeEditorPort::TRANSFORMATION)
tag = ParticleItem::T_TRANSFORMATION;
}
- qDebug() << "onEstablishedConnection deleting just created connection";
delete connection; // deleting just created connection because it will be recreated from the
// model
- qDebug() << "onEstablishedConnection preparing to move";
m_sampleModel->moveParameterizedItem(childView->getItem(),
parentView->getItem(), -1, tag);
}
@@ -412,7 +378,6 @@ void DesignerScene::onEstablishedConnection(NodeEditorConnection *connection)
//! propagates break of connection between views on scene to the model
void DesignerScene::removeConnection(NodeEditorConnection *connection)
{
- qDebug() << "DesignerScene::removeConnection()";
IView *childView = dynamic_cast<IView *>(connection->outputPort()->parentItem());
m_sampleModel->moveParameterizedItem(childView->getItem(), 0);
}
@@ -422,7 +387,6 @@ void DesignerScene::removeConnection(NodeEditorConnection *connection)
//! MultiLayerView can be dragged both, over the scene and over another MultiLayerView
void DesignerScene::dragMoveEvent(QGraphicsSceneDragDropEvent *event)
{
- qDebug() << "DesignerScene::dragMoveEvent()";
const DesignerMimeData *mimeData = checkDragEvent(event);
if(isAcceptedByMultiLayer(mimeData, event)) {
QGraphicsScene::dragMoveEvent(event);
@@ -436,7 +400,6 @@ void DesignerScene::dragMoveEvent(QGraphicsSceneDragDropEvent *event)
void DesignerScene::dropEvent(QGraphicsSceneDragDropEvent *event)
{
const DesignerMimeData *mimeData = checkDragEvent(event);
- qDebug() << "DesignerScene::dropEvent()" << mimeData;
if (mimeData) {
// to have possibility to drop MultiLayer on another MultiLayer
@@ -450,7 +413,6 @@ void DesignerScene::dropEvent(QGraphicsSceneDragDropEvent *event)
} else {
// other views can be dropped on canvas anywhere
- qDebug() << "DesignerScene::dropEvent() -> about to drop";
if (SampleViewFactory::isValidType(mimeData->getClassName())) {
SessionItem *new_item(0);
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerView.cpp b/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
index bf564cd7af6..b7d9fd3a085 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
@@ -79,7 +79,6 @@ void DesignerView::onCenterView()
void DesignerView::onChangeScale(double new_scale)
{
- qDebug() << "DesignerView::onScaleChanged()" << new_scale;
QMatrix oldMatrix = matrix();
resetMatrix();
translate(oldMatrix.dx(), oldMatrix.dy());
@@ -96,12 +95,10 @@ void DesignerView::deleteSelectedItems()
void DesignerView::zoomIn()
{
- qDebug() << "DesignerView::zoomIn() -> Not implemented";
}
void DesignerView::zoomOut()
{
- qDebug() << "DesignerView::zoomOut() -> Not implemented";
}
void DesignerView::keyPressEvent(QKeyEvent *event)
@@ -112,7 +109,6 @@ void DesignerView::keyPressEvent(QKeyEvent *event)
case Qt::Key_Space:
if (getSelectionMode() != HAND_DRAG && !event->isAutoRepeat()) {
onSelectionMode(HAND_DRAG);
- qDebug() << " space pressed" << event->isAutoRepeat();
}
break;
case Qt::Key_Delete:
@@ -132,8 +128,7 @@ void DesignerView::keyReleaseEvent(QKeyEvent *event)
case Qt::Key_Space:
if (getSelectionMode() != RUBBER_SELECTION && !event->isAutoRepeat()) {
- onSelectionMode(RUBBER_SELECTION);
- qDebug() << " space released" << event->isAutoRepeat();
+ onSelectionMode(RUBBER_SELECTION); // space released
}
break;
default:
diff --git a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
index 79d3cf8d5d4..5a883d7870e 100644
--- a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
@@ -116,9 +116,6 @@ void ILayerView::mousePressEvent(QGraphicsSceneMouseEvent *event)
//! request to SessionModel.
void ILayerView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
- qDebug() << "ILayerView::mouseReleaseEvent() this:" << this
- << getItem()->itemName() << " parentItem: " << parentItem();
-
DesignerScene *designerScene = dynamic_cast<DesignerScene *>(scene());
Q_ASSERT(designerScene);
designerScene->setLayerInterfaceLine(); // removing drop area hint from the scene
@@ -132,12 +129,8 @@ void ILayerView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
MultiLayerView *requested_parent = candidate.multilayer;
int requested_row = candidate.row;
-// qDebug() << "ILayerView::mouseReleaseEvent() requested_parent:" << requested_parent
-// << " requested_row:" << requested_row;
-
// Simple move of lonely layer across the scene: let it be.
if (requested_parent == 0 && parentItem() == 0) {
- qDebug() << "ILayerView::mouseReleaseEvent() simple move of lonely layer";
QGraphicsItem::mouseReleaseEvent(event);
return;
}
@@ -145,7 +138,6 @@ void ILayerView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
// Layer was moved on top of MultiLayer but not in the right drop area:
// returning layer back to starting position.
if (requested_parent && requested_row == -1) {
- qDebug() << "1.1 Layer->MultiLayer, wrong drop area.";
setPos(m_drag_start_position);
QGraphicsItem::mouseReleaseEvent(event);
return;
@@ -156,7 +148,6 @@ void ILayerView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
// Layer was moved only slightly, to the same row of his own MultiLayer: returning back.
if (requested_parent == parentItem()
&& requested_row == getItem()->parent()->getItems().indexOf(getItem())) {
- qDebug() << "1.2 Layer->MultiLayer (same), same drop area";
setPos(m_drag_start_position);
QGraphicsItem::mouseReleaseEvent(event);
return;
@@ -165,7 +156,6 @@ void ILayerView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
// Layer was moved from MultiLayer it belongs to, to an empty place of
// the scene: changing ownership.
if (parentItem() && !requested_parent) {
- qDebug() << "1.3 Layer->Scene";
QPointF newPos = mapToScene(event->pos()) - event->pos();
// setPos(newPos);
this->getItem()->setItemValue(SessionGraphicsItem::P_XPOS, newPos.x());
@@ -179,7 +169,6 @@ void ILayerView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
// Layer was moved either from one MultiLayer to another, or is moved inside
// one multilayer: changing ownership or row within same ownership.
if (requested_parent) {
- qDebug() << "1.4 ILayerView->MultiLayer";
model->moveParameterizedItem(this->getItem(),
requested_parent->getItem(), requested_row);
QGraphicsItem::mouseReleaseEvent(event);
@@ -205,8 +194,6 @@ void ILayerView::update_appearance()
//! to the distance between drop area and ILayerVIew center
MultiLayerCandidate ILayerView::getMultiLayerCandidate()
{
- // qDebug() << "ILayerView::getMultiLayerCandidate()";
-
QVector<MultiLayerCandidate> candidates;
QRectF layerRect = mapRectToScene(boundingRect());
@@ -233,11 +220,6 @@ MultiLayerCandidate ILayerView::getMultiLayerCandidate()
// sorting MultiLayerView candidates to find one whose drop area is closer
if (candidates.size()) {
qSort(candidates.begin(), candidates.end());
- // foreach(MultiLayerCandidate candidate, candidates) {
- // qDebug() << "ILayerView::getMultiLayerCandidate() -> " << candidate.multilayer <<
- // candidate.distance << candidate.row;
- //}
-
return candidates.back();
}
return MultiLayerCandidate();
diff --git a/GUI/coregui/Views/SampleDesigner/LayerView.cpp b/GUI/coregui/Views/SampleDesigner/LayerView.cpp
index 9d48eefb472..3b4b07a709c 100644
--- a/GUI/coregui/Views/SampleDesigner/LayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/LayerView.cpp
@@ -41,7 +41,6 @@ LayerView::LayerView(QGraphicsItem *parent)
LayerView::~LayerView()
{
- qDebug() << "LayerView::~LayerView()";
// FIXME replace with onChildrenChange callback from MultiLayerItem's model mapper.
// MultiLayerView *mlView = dynamic_cast<MultiLayerView *>(parentItem());
// if(mlView) {
@@ -65,7 +64,6 @@ void LayerView::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
void LayerView::addView(IView *childView, int /* row */)
{
- qDebug() << "LayerView::addView() " << m_item->itemName() << childView->getItem()->itemName();
ParticleLayoutView *layout = dynamic_cast<ParticleLayoutView *>(childView);
Q_ASSERT(layout);
connectInputPort(layout, 0);
diff --git a/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp b/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
index 3edb2fd2fcc..545f70aeb84 100644
--- a/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
@@ -57,7 +57,6 @@ void MultiLayerView::paint(QPainter *painter, const QStyleOptionGraphicsItem *op
void MultiLayerView::addView(IView *childView, int row)
{
- qDebug() << "MultiLayerView::addView() " << m_item->itemName() << childView->getItem()->itemName() << "row" << row;
ILayerView *layer = dynamic_cast<ILayerView *>(childView);
Q_ASSERT(layer);
@@ -75,7 +74,6 @@ void MultiLayerView::addView(IView *childView, int row)
void MultiLayerView::addNewLayer(ILayerView *layer, int row)
{
- qDebug() << "MultiLayerView::addNewLayer(), row" << row;
m_layers.insert(row, layer);
connect(layer, SIGNAL(heightChanged()), this, SLOT(updateHeight()), Qt::UniqueConnection);
connect(layer, SIGNAL(aboutToBeDeleted()), this, SLOT(onLayerAboutToBeDeleted()), Qt::UniqueConnection);
@@ -85,7 +83,6 @@ void MultiLayerView::addNewLayer(ILayerView *layer, int row)
void MultiLayerView::onLayerAboutToBeDeleted()
{
- qDebug() << "MultiLayerView::onLayerAboutToBeDeleted()";
ILayerView *layer = qobject_cast<ILayerView *>(sender());
Q_ASSERT(layer);
removeLayer(layer);
@@ -94,7 +91,6 @@ void MultiLayerView::onLayerAboutToBeDeleted()
void MultiLayerView::removeLayer(ILayerView *layer)
{
- qDebug() << "MultiLayerView::removeLayer()";
Q_ASSERT(m_layers.contains(layer));
disconnect(layer, SIGNAL(heightChanged()), this, SLOT(updateHeight()) );
disconnect(layer, SIGNAL(aboutToBeDeleted()), this, SLOT(onLayerAboutToBeDeleted()) );
@@ -114,8 +110,6 @@ void MultiLayerView::updateGeometry()
//! Updates MultiLayer height, sets y-positions of children, defines new drop areas.
void MultiLayerView::updateHeight()
{
- qDebug() << "MultiLayerView::updateHeight()";
-
// drop areas are rectangles covering the area of layer interfaces
m_drop_areas.clear();
m_interfaces.clear();
@@ -251,7 +245,6 @@ void MultiLayerView::dropEvent(QGraphicsSceneDragDropEvent *event)
if(designerScene) {
SampleModel *sampleModel = designerScene->getSampleModel();
- qDebug() << "\n XXX" << getDropArea(event->scenePos()) << event->scenePos();
sampleModel->insertNewItem(
mimeData->getClassName(),
sampleModel->indexOfItem(this->getItem()),
@@ -275,7 +268,6 @@ const DesignerMimeData *MultiLayerView::checkDragEvent(QGraphicsSceneDragDropEve
&& getItem()->acceptsAsDefaultItem(mimeData->getClassName())
&& row!=-1 ) {
- qDebug() << "MultiLayerView::checkDragEvent -> yes" << row << getDropAreaRectangle(row);
event->setAccepted(true);
} else {
event->setAccepted(false);
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
index 14ac8bf032b..82200fa804d 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
@@ -40,6 +40,5 @@ void ParticleCompositionView::addView(IView *childView, int /* row */)
// .toInt();
if (this->getItem()->tagFromItem(childView->getItem()) == ParticleItem::T_TRANSFORMATION)
index = 1;
- qDebug() << "ParticleCompositionView::addView()" << index;
connectInputPort(dynamic_cast<ConnectableView *>(childView), index);
}
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
index 7a2c0d403dd..733c28a099c 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
@@ -49,6 +49,5 @@ void ParticleCoreShellView::addView(IView *childView, int /* row */)
} else {
index = 2;
}
- qDebug() << "ParticleCoreShellView::addView()" << index;
connectInputPort(dynamic_cast<ConnectableView *>(childView), index);
}
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
index ee2af84263d..d105426fc47 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
@@ -37,6 +37,5 @@ void ParticleDistributionView::addView(IView *childView, int /* row */)
int index = 0;//int(childView->getParameterizedItem()->port());
// ->getRegisteredProperty(ParameterizedItem::OBSOLETE_P_PORT)
// .toInt();
- qDebug() << "ParticleDistributionType::addView()" << index;
connectInputPort(dynamic_cast<ConnectableView *>(childView), index);
}
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
index b7e4651b713..33722f1a461 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
@@ -36,14 +36,10 @@ ParticleLayoutView::ParticleLayoutView(QGraphicsItem *parent)
ParticleLayoutView::~ParticleLayoutView()
{
- qDebug() << "ParticleLayoutView::~ParticleLayoutView()";
}
void ParticleLayoutView::addView(IView *childView, int /* row */)
{
- qDebug() << "ParticleLayoutView::addView() xxx " << m_item->itemName()
- << childView->getItem()->itemName() << childView->type()
- << DesignerHelper::PARTICLE;
if(childView->type() == DesignerHelper::PARTICLE) {
connectInputPort(dynamic_cast<ConnectableView *>(childView), 0);
}
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
index 17b533f356f..59d0f8da89a 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
@@ -56,6 +56,5 @@ void SampleDesigner::setSelectionModel(QItemSelectionModel *model, FilterPropert
void SampleDesigner::onSmartAlign()
{
- qDebug() << "SampleDesigner::onSmartAlign()";
m_designerScene->onSmartAlign();
}
diff --git a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
index 26c916f1f2e..4e99bb9255d 100644
--- a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
@@ -67,7 +67,6 @@ void SamplePropertyWidget::setSelectionModel(QItemSelectionModel *selection_mode
void SamplePropertyWidget::selectionChanged(const QItemSelection & selected,
const QItemSelection & deselected)
{
- qDebug() << "SamplePropertyWidget::selectionChanged" << selected << deselected;
(void)deselected;
QModelIndexList indices = selected.indexes();
diff --git a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
index 01eb54ca522..0b37371b1cb 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
@@ -131,7 +131,6 @@ SampleToolBar::SampleToolBar(QWidget *parent)
void SampleToolBar::onViewSelectionMode(int mode)
{
- qDebug() << "SampleToolBar::onViewSelectionMode" << mode;
if(mode == DesignerView::RUBBER_SELECTION || mode == DesignerView::HAND_DRAG)
m_pointerModeGroup->button(mode)->setChecked(true);
}
@@ -145,6 +144,4 @@ void SampleToolBar::onScaleComboChanged(const QString &scale_string)
void SampleToolBar::onMaterialEditorCall()
{
MaterialProperty mp = MaterialSvc::selectMaterialProperty();
- qDebug() << "SampleToolBar::materialBrowserCall()" << mp.getName() << mp.getColor();
-
}
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
index c9a0d00158e..6050ddea35b 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
@@ -93,7 +93,6 @@ IView *SampleViewFactory::createSampleView(const QString &name)
return new InterferenceFunction2DLatticeView();
}
else {
- //qDebug() << "SampleViewFactory::createSampleView() -> Error! Can't create a view for" << name;
// throw GUIHelpers::Error("SampleViewFactory::createSampleView() -> Error! Can't create a view for " + name);
}
diff --git a/GUI/coregui/Views/SampleView.cpp b/GUI/coregui/Views/SampleView.cpp
index 23889bdf1bf..1ac102e9ab9 100644
--- a/GUI/coregui/Views/SampleView.cpp
+++ b/GUI/coregui/Views/SampleView.cpp
@@ -179,7 +179,6 @@ void SampleView::deleteItem()
//! functionality.
void SampleView::setDockHeightForWidget(int height)
{
- qDebug() << "SampleView::setDockHeightForWidget(int height)" << height;
QWidget *widget = qobject_cast<QWidget *>(sender());
Q_ASSERT(widget);
QDockWidget *dock = m_widget_to_dock[widget];
diff --git a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
index a15cf681329..46598cd1d1e 100644
--- a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
@@ -144,7 +144,6 @@ void PythonScriptWidget::onExportToFileButton()
QFile file(file_name);
if (!file.open(QIODevice::WriteOnly)) {
- qDebug() << "PythonScriptWidget::onExportToFileButton: Error! Can't save file";
QMessageBox warning_dialog(this);
warning_dialog.setIcon(QMessageBox::Warning);
warning_dialog.setText("File could not be opened for writing!");
diff --git a/GUI/coregui/Views/WelcomeView.cpp b/GUI/coregui/Views/WelcomeView.cpp
index 0461bb7eae0..9808f9da868 100644
--- a/GUI/coregui/Views/WelcomeView.cpp
+++ b/GUI/coregui/Views/WelcomeView.cpp
@@ -277,7 +277,6 @@ void WelcomeView::onNewUser()
void WelcomeView::updateRecentProjectPanel()
{
- qDebug() << "WelcomeView::updateRecentProjectPanel called";
this->clearLayout(m_recentProjectLayout);
this->generateRecentProjectList();
update();
diff --git a/GUI/coregui/Views/widgetbox/widgetboxtreewidget.cpp b/GUI/coregui/Views/widgetbox/widgetboxtreewidget.cpp
index 4a939f8d874..4b419d68be3 100644
--- a/GUI/coregui/Views/widgetbox/widgetboxtreewidget.cpp
+++ b/GUI/coregui/Views/widgetbox/widgetboxtreewidget.cpp
@@ -191,7 +191,6 @@ WidgetBoxCategoryListView* WidgetBoxTreeWidget::categoryViewAt(int idx) const
void WidgetBoxTreeWidget::saveExpandedState() const
{
- qDebug() << "WidgetBoxTreeWidget::saveExpandedState() -> XXX Not implemented.";
return;
// QStringList closedCategories;
diff --git a/GUI/coregui/mainwindow/actionmanager.cpp b/GUI/coregui/mainwindow/actionmanager.cpp
index 54b62cb51d7..10897e8b987 100644
--- a/GUI/coregui/mainwindow/actionmanager.cpp
+++ b/GUI/coregui/mainwindow/actionmanager.cpp
@@ -144,14 +144,11 @@ void ActionManager::createGlobalShortcuts()
void ActionManager::aboutToShowRecentProjects()
{
- qDebug() << "ActionManager::aboutToShowRecentProjects() ->"
- << m_mainWindow->projectManager()->getRecentProjects();
m_recentProjectsMenu->clear();
bool hasRecentProjects = false;
foreach(QString file, m_mainWindow->projectManager()->getRecentProjects() ) {
hasRecentProjects = true;
- qDebug() << file << QDir::toNativeSeparators(GUI_StringUtils::withTildeHomePath(file));
QAction *action = m_recentProjectsMenu->addAction(
QDir::toNativeSeparators(GUI_StringUtils::withTildeHomePath(file)));
action->setData(qVariantFromValue(file));
diff --git a/GUI/coregui/mainwindow/mainwindow.cpp b/GUI/coregui/mainwindow/mainwindow.cpp
index b936d10c653..97852221c50 100644
--- a/GUI/coregui/mainwindow/mainwindow.cpp
+++ b/GUI/coregui/mainwindow/mainwindow.cpp
@@ -148,7 +148,6 @@ void MainWindow::openRecentProject()
{
if (const QAction *action = qobject_cast<const QAction*>(sender())) {
QString file = action->data().value<QString>();
- qDebug() << "MainWindow::openRecentProject() -> " << file;
m_projectManager->openProject(file);
}
}
@@ -168,8 +167,6 @@ void MainWindow::onAboutApplication()
//! This SessionModelView will be known for the tab under MAXVIEWCOUNT id (so it is the last one)
void MainWindow::onSessionModelViewActive(bool isActive)
{
- qDebug() << "MainWindow::onSessionModelViewActive" << isActive;
-
if(isActive) {
if(m_sessionModelView)
return;
diff --git a/GUI/coregui/mainwindow/projectdocument.cpp b/GUI/coregui/mainwindow/projectdocument.cpp
index efa9f052dfb..ec7c87a0df9 100644
--- a/GUI/coregui/mainwindow/projectdocument.cpp
+++ b/GUI/coregui/mainwindow/projectdocument.cpp
@@ -100,7 +100,6 @@ bool ProjectDocument::save()
QFile file(filename);
if (!file.open(QFile::ReadWrite | QIODevice::Truncate | QFile::Text)) {
- qDebug() << "ProjectDocument::save() -> Error! Can't save file";
return false;
}
writeTo(&file);
diff --git a/GUI/coregui/mainwindow/projectmanager.cpp b/GUI/coregui/mainwindow/projectmanager.cpp
index df92d901b95..73094ba92d4 100644
--- a/GUI/coregui/mainwindow/projectmanager.cpp
+++ b/GUI/coregui/mainwindow/projectmanager.cpp
@@ -129,7 +129,6 @@ void ProjectManager::newProject()
bool ProjectManager::saveProject()
{
Q_ASSERT(m_project_document);
- qDebug() << "ProjectManager::saveProject()";
if(!m_project_document->hasValidNameAndPath()) {
NewProjectDialog dialog(m_mainWindow, getDefaultWorkingDirectory(), getUntitledProjectName());
@@ -177,7 +176,6 @@ bool ProjectManager::saveProjectAs()
//! Opens existing project. If fileName is empty, will popup file selection dialog
void ProjectManager::openProject(QString fileName)
{
- qDebug() << "ProjectManager::openProject()" << fileName;
if( !closeCurrentProject()) return;
if(fileName.isEmpty()) {
diff --git a/GUI/coregui/mainwindow/tooltipdatabase.cpp b/GUI/coregui/mainwindow/tooltipdatabase.cpp
index 7592b3f6d57..9967c49dc85 100644
--- a/GUI/coregui/mainwindow/tooltipdatabase.cpp
+++ b/GUI/coregui/mainwindow/tooltipdatabase.cpp
@@ -72,8 +72,6 @@ QString ToolTipDataBase::getSampleViewDesignerToolTip(const QString &className)
void ToolTipDataBase::initDataBase()
{
- qDebug() << "ToolTipDataBase::initDataBase() ";
-
QFile file(":/mainwindow/tooltips.xml");
if (!file.open(QIODevice::ReadOnly))
throw GUIHelpers::Error(file.errorString());
diff --git a/Tests/UnitTests/GUI/TestFitParameterModel.h b/Tests/UnitTests/GUI/TestFitParameterModel.h
index 756885bed72..a1b2d8094c6 100644
--- a/Tests/UnitTests/GUI/TestFitParameterModel.h
+++ b/Tests/UnitTests/GUI/TestFitParameterModel.h
@@ -223,7 +223,6 @@ inline void TestFitParameterModel::test_addTwoFitParameterAndLinks()
QModelIndex linkIndex1 = proxy.index(0, 0, index1);
QCOMPARE(linkIndex1.row(), 0);
QCOMPARE(linkIndex1.column(), 0);
- qDebug() << "AAA" << index1 << linkIndex1;
QCOMPARE(linkIndex1.parent(), index1);
QCOMPARE(proxy.rowCount(linkIndex1), 0);
QCOMPARE(proxy.columnCount(linkIndex1), 0);
diff --git a/Tests/UnitTests/GUI/TestParticleDistributionItem.h b/Tests/UnitTests/GUI/TestParticleDistributionItem.h
index db9cf1fecc4..46eb6292801 100644
--- a/Tests/UnitTests/GUI/TestParticleDistributionItem.h
+++ b/Tests/UnitTests/GUI/TestParticleDistributionItem.h
@@ -44,6 +44,5 @@ inline void TestParticleDistributionItem::test_AddParticle()
ComboProperty prop = item->getItemValue(ParticleDistributionItem::P_DISTRIBUTED_PARAMETER)
.value<ComboProperty>();
- qDebug() << prop.getValues();
}
diff --git a/Tests/UnitTests/GUI/TestSessionModel.h b/Tests/UnitTests/GUI/TestSessionModel.h
index d618d8d21d9..86ba3313aaa 100644
--- a/Tests/UnitTests/GUI/TestSessionModel.h
+++ b/Tests/UnitTests/GUI/TestSessionModel.h
@@ -35,13 +35,11 @@ inline void TestSessionModel::test_SampleModel_CreateCopy()
QString buffer1;
QXmlStreamWriter writer1(&buffer1);
model1->writeTo(&writer1);
- qDebug() << buffer1;
SampleModel *model2 = model1->createCopy();
QString buffer2;
QXmlStreamWriter writer2(&buffer2);
model2->writeTo(&writer2);
- qDebug() << buffer2;
QCOMPARE(buffer1, buffer2);
@@ -88,13 +86,11 @@ inline void TestSessionModel::test_InstrumentModel_CreateCopy()
QString buffer1;
QXmlStreamWriter writer1(&buffer1);
model1->writeTo(&writer1);
- qDebug() << buffer1;
InstrumentModel *model2 = model1->createCopy();
QString buffer2;
QXmlStreamWriter writer2(&buffer2);
model2->writeTo(&writer2);
- qDebug() << buffer2;
QCOMPARE(buffer1, buffer2);
@@ -118,7 +114,6 @@ inline void TestSessionModel::test_InstrumentModel_CreatePartialCopy()
// QString buffer1;
// QXmlStreamWriter writer1(&buffer1);
// model1->writeTo(&writer1);
-// qDebug() << buffer1;
// this method seems not implemented even before
InstrumentModel *model2 = model1->createCopy(instrument2);
@@ -126,7 +121,6 @@ inline void TestSessionModel::test_InstrumentModel_CreatePartialCopy()
// QString buffer2;
// QXmlStreamWriter writer2(&buffer2);
// model2->writeTo(&writer2);
-// qDebug() << buffer2;
SessionItem *result = model2->itemForIndex(model2->index(0,0,QModelIndex()));
--
GitLab