diff --git a/src/fgt/edit_quality/TO DO.txt b/src/fgt/edit_quality/TO DO.txt index 8e57a182a..752797a5e 100644 --- a/src/fgt/edit_quality/TO DO.txt +++ b/src/fgt/edit_quality/TO DO.txt @@ -1 +1,2 @@ -12.45 15/01/2008 aggiungere i riferimenti ai nuovi files del progetto al file .pro MAL \ No newline at end of file +12.45 15/01/2008 aggiungere i riferimenti ai nuovi files del progetto al file .pro MAL +22.44 15/01/2008 convertire le QSpinBox per la TranferFunction in double ones \ No newline at end of file diff --git a/src/fgt/edit_quality/qualitymapper.cpp b/src/fgt/edit_quality/qualitymapper.cpp index 7d02f000c..5afdc1cd7 100644 --- a/src/fgt/edit_quality/qualitymapper.cpp +++ b/src/fgt/edit_quality/qualitymapper.cpp @@ -55,6 +55,8 @@ QualityMapperPlugin::QualityMapperPlugin() QAction *editAction; foreach(editAction, actionList) editAction->setCheckable(true); + + _qualityMapperDialog = 0; } QList QualityMapperPlugin::actions() const @@ -90,7 +92,26 @@ void QualityMapperPlugin::Decorate(QAction * /*ac*/, MeshModel &m, GLArea * gla) void QualityMapperPlugin::StartEdit(QAction * /*mode*/, MeshModel &/*m*/, GLArea *gla ) { - gla->setCursor(QCursor(QPixmap(":/images/cur_info.png"),1,1)); +// gla->setCursor(QCursor(QPixmap(":/images/cur_info.png"),1,1)); + + + + if(_qualityMapperDialog==0) + { + //_qualityMapperDialog=new _qualityMapperDialog(gla->parentWidget()->parentWidget()); + _qualityMapperDialog = new QualityMapperDialog(gla->window()); +// connect(_qualityMapperDialog->ui.icpParamButton,SIGNAL(clicked()),this,SLOT(alignParam())); +// connect(_qualityMapperDialog->ui.icpButton,SIGNAL(clicked()),this,SLOT(process())); +// connect(_qualityMapperDialog->ui.manualAlignButton,SIGNAL(clicked()),this,SLOT(glueManual())); +// connect(_qualityMapperDialog->ui.pointBasedAlignButton,SIGNAL(clicked()),this,SLOT(glueByPicking())); +// connect(_qualityMapperDialog->ui.glueHereButton,SIGNAL(clicked()),this,SLOT(glueHere())); +// connect(_qualityMapperDialog->ui.glueHereAllButton,SIGNAL(clicked()),this,SLOT(glueHereAll())); +// connect(_qualityMapperDialog->ui.falseColorCB, SIGNAL(clicked(bool)) , _gla->window(), SLOT(updateGL() ) ); + + } +// _qualityMapperDialog->edit=this; +// _qualityMapperDialog->setTree(& meshTree, meshTree.nodeList.front()); + _qualityMapperDialog->show(); } diff --git a/src/fgt/edit_quality/qualitymapper.h b/src/fgt/edit_quality/qualitymapper.h index 5041811fa..9773f9c81 100644 --- a/src/fgt/edit_quality/qualitymapper.h +++ b/src/fgt/edit_quality/qualitymapper.h @@ -46,22 +46,25 @@ Beginning //#include #include //<-- contains VertexQuality method +#include "qualitymapperdialog.h" + class QualityMapperPlugin : public QObject, public MeshEditInterface { Q_OBJECT Q_INTERFACES(MeshEditInterface) - QList actionList; - private: + QualityMapperDialog *_qualityMapperDialog; + + QList actionList; Histogramf _histogram; public: QualityMapperPlugin(); ~QualityMapperPlugin(){}; - virtual const QString Info(QAction *); + const QString Info(QAction *); // Generic Info about the plug in version and author. const PluginInfo &Info(); QList actions() const ; diff --git a/src/fgt/edit_quality/qualitymapperdialog.ui b/src/fgt/edit_quality/qualitymapperdialog.ui index 59da2c7a0..2d6e7e48c 100644 --- a/src/fgt/edit_quality/qualitymapperdialog.ui +++ b/src/fgt/edit_quality/qualitymapperdialog.ui @@ -5,13 +5,31 @@ 0 0 - 502 - 607 + 500 + 600 + + + 500 + 600 + + + + + 500 + 600 + + Quality Mapper Dialog + + :/images/qualitymapper.png + + + gne gne gne! + @@ -93,7 +111,11 @@ - + + + 1 + + @@ -387,7 +409,6 @@ - @@ -397,12 +418,12 @@ showMenu() - 584 - 188 + 466 + 152 - 555 - 186 + 466 + 152 diff --git a/src/fgt/edit_quality/ui_qualitymapperdialog.h b/src/fgt/edit_quality/ui_qualitymapperdialog.h index c286e764b..e784cb4a6 100644 --- a/src/fgt/edit_quality/ui_qualitymapperdialog.h +++ b/src/fgt/edit_quality/ui_qualitymapperdialog.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading ui file 'qualitymapperdialog.ui' ** -** Created: Tue 15. Jan 17:45:53 2008 +** Created: Tue 15. Jan 23:05:07 2008 ** by: Qt User Interface Compiler version 4.3.2 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! @@ -86,7 +86,10 @@ public: { if (QualityMapperDialogClass->objectName().isEmpty()) QualityMapperDialogClass->setObjectName(QString::fromUtf8("QualityMapperDialogClass")); - QualityMapperDialogClass->resize(502, 607); + QualityMapperDialogClass->resize(500, 600); + QualityMapperDialogClass->setMinimumSize(QSize(500, 600)); + QualityMapperDialogClass->setMaximumSize(QSize(500, 600)); + QualityMapperDialogClass->setWindowIcon(QIcon(QString::fromUtf8(":/images/qualitymapper.png"))); layoutWidget = new QWidget(QualityMapperDialogClass); layoutWidget->setObjectName(QString::fromUtf8("layoutWidget")); layoutWidget->setGeometry(QRect(10, 10, 482, 585)); @@ -159,6 +162,7 @@ public: xSpinBox = new QSpinBox(selectedPointBox); xSpinBox->setObjectName(QString::fromUtf8("xSpinBox")); + xSpinBox->setMaximum(1); gridLayout1->addWidget(xSpinBox, 0, 1, 1, 1); @@ -359,6 +363,7 @@ public: void retranslateUi(QDialog *QualityMapperDialogClass) { QualityMapperDialogClass->setWindowTitle(QApplication::translate("QualityMapperDialogClass", "Quality Mapper Dialog", 0, QApplication::UnicodeUTF8)); + QualityMapperDialogClass->setToolTip(QApplication::translate("QualityMapperDialogClass", "gne gne gne!", 0, QApplication::UnicodeUTF8)); transferFunctionGroupBox->setTitle(QApplication::translate("QualityMapperDialogClass", "Transfer Function", 0, QApplication::UnicodeUTF8)); transferFunctionEditBox->setTitle(QApplication::translate("QualityMapperDialogClass", "Transfer Function Edit", 0, QApplication::UnicodeUTF8)); channelBox->setToolTip(QApplication::translate("QualityMapperDialogClass", "Choose the channel to edit", 0, QApplication::UnicodeUTF8));