From e3526467c71f0a315bedceda2df854175932de43 Mon Sep 17 00:00:00 2001 From: bwent Date: Thu, 25 Jun 2015 16:04:02 -0700 Subject: [PATCH] Revert changes to ModelPropertiesDialog --- interface/src/ModelPropertiesDialog.cpp | 28 ++----------------------- interface/src/ModelPropertiesDialog.h | 2 -- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/interface/src/ModelPropertiesDialog.cpp b/interface/src/ModelPropertiesDialog.cpp index 49bc042e94..8e0541518a 100644 --- a/interface/src/ModelPropertiesDialog.cpp +++ b/interface/src/ModelPropertiesDialog.cpp @@ -76,16 +76,13 @@ _geometry(geometry) connect(newFreeJoint, SIGNAL(clicked(bool)), SLOT(createNewFreeJoint())); } } - _printButton = new QPushButton(tr("&Print Mapping")); - + QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Reset); - buttons->addButton(_printButton, QDialogButtonBox::ActionRole); connect(buttons, SIGNAL(accepted()), SLOT(accept())); connect(buttons, SIGNAL(rejected()), SLOT(reject())); connect(buttons->button(QDialogButtonBox::Reset), SIGNAL(clicked(bool)), SLOT(reset())); - connect(_printButton, SIGNAL(clicked(bool)), SLOT(printJointMapping())); - + form->addRow(buttons); // reset to initialize the fields @@ -149,29 +146,8 @@ QVariantHash ModelPropertiesDialog::getMapping() const { } return mapping; - } - -void ModelPropertiesDialog::printJointMapping() const { - QVariantHash jointHash = getMapping(); - QHashIterator i(getMapping()); - qDebug() << "STARTING..."; - while (i.hasNext()) { - i.next(); - if(i.key() == "joint" || i.key() == "jointIndex") { - QHashIterator j(i.value().toHash()); - while(j.hasNext()) { - j.next(); - qDebug() << j.key() << ": " << j.value().toString(); - } - } else { - qDebug() << i.key() << ": " << i.value().toString(); - } - } -} - - static void setJointText(QComboBox* box, const QString& text) { box->setCurrentIndex(qMax(box->findText(text), 0)); } diff --git a/interface/src/ModelPropertiesDialog.h b/interface/src/ModelPropertiesDialog.h index cce210f67d..11abc5ab54 100644 --- a/interface/src/ModelPropertiesDialog.h +++ b/interface/src/ModelPropertiesDialog.h @@ -39,7 +39,6 @@ private slots: void chooseTextureDirectory(); void updatePivotJoint(); void createNewFreeJoint(const QString& joint = QString()); - void printJointMapping() const; private: QComboBox* createJointBox(bool withNone = true) const; @@ -53,7 +52,6 @@ private: FBXGeometry _geometry; QLineEdit* _name = nullptr; QPushButton* _textureDirectory = nullptr; - QPushButton* _printButton = nullptr; QDoubleSpinBox* _scale = nullptr; QDoubleSpinBox* _translationX = nullptr; QDoubleSpinBox* _translationY = nullptr;