Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 11:42:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert changes to ModelPropertiesDialog

Browse source
This commit is contained in:
bwent 2015-06-25 16:04:02 -07:00
parent aa865680ab
commit e3526467c7
2 changed files with 2 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
interface/src/ModelPropertiesDialog.cpp
View file

@ -76,16 +76,13 @@ _geometry(geometry)
connect(newFreeJoint, SIGNAL(clicked(bool)), SLOT(createNewFreeJoint())); connect(newFreeJoint, SIGNAL(clicked(bool)), SLOT(createNewFreeJoint()));
} }
} }
_printButton = new QPushButton(tr("&Print Mapping"));
QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok |
QDialogButtonBox::Cancel | QDialogButtonBox::Reset); QDialogButtonBox::Cancel | QDialogButtonBox::Reset);
buttons->addButton(_printButton, QDialogButtonBox::ActionRole);
connect(buttons, SIGNAL(accepted()), SLOT(accept())); connect(buttons, SIGNAL(accepted()), SLOT(accept()));
connect(buttons, SIGNAL(rejected()), SLOT(reject())); connect(buttons, SIGNAL(rejected()), SLOT(reject()));
connect(buttons->button(QDialogButtonBox::Reset), SIGNAL(clicked(bool)), SLOT(reset())); connect(buttons->button(QDialogButtonBox::Reset), SIGNAL(clicked(bool)), SLOT(reset()));
connect(_printButton, SIGNAL(clicked(bool)), SLOT(printJointMapping()));
form->addRow(buttons); form->addRow(buttons);
// reset to initialize the fields // reset to initialize the fields
@ -149,29 +146,8 @@ QVariantHash ModelPropertiesDialog::getMapping() const {
} }
return mapping; return mapping;
} }
void ModelPropertiesDialog::printJointMapping() const {
QVariantHash jointHash = getMapping();
QHashIterator<QString, QVariant> i(getMapping());
qDebug() << "STARTING...";
while (i.hasNext()) {
i.next();
if(i.key() == "joint" || i.key() == "jointIndex") {
QHashIterator<QString, QVariant> 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) { static void setJointText(QComboBox* box, const QString& text) {
box->setCurrentIndex(qMax(box->findText(text), 0)); box->setCurrentIndex(qMax(box->findText(text), 0));
} }

2
interface/src/ModelPropertiesDialog.h
View file

@ -39,7 +39,6 @@ private slots:
void chooseTextureDirectory(); void chooseTextureDirectory();
void updatePivotJoint(); void updatePivotJoint();
void createNewFreeJoint(const QString& joint = QString()); void createNewFreeJoint(const QString& joint = QString());
void printJointMapping() const;
private: private:
QComboBox* createJointBox(bool withNone = true) const; QComboBox* createJointBox(bool withNone = true) const;
@ -53,7 +52,6 @@ private:
FBXGeometry _geometry; FBXGeometry _geometry;
QLineEdit* _name = nullptr; QLineEdit* _name = nullptr;
QPushButton* _textureDirectory = nullptr; QPushButton* _textureDirectory = nullptr;
QPushButton* _printButton = nullptr;
QDoubleSpinBox* _scale = nullptr; QDoubleSpinBox* _scale = nullptr;
QDoubleSpinBox* _translationX = nullptr; QDoubleSpinBox* _translationX = nullptr;
QDoubleSpinBox* _translationY = nullptr; QDoubleSpinBox* _translationY = nullptr;