From 2062504473b66d359b0b2aec99a33e6b8952d07c Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Mon, 23 Nov 2020 19:03:38 +0100 Subject: [PATCH] new options_dialog --- src/meshlab/CMakeLists.txt | 4 ++-- .../options_dialog.cpp} | 16 ++++++++-------- .../options_dialog.h} | 8 ++++---- src/meshlab/mainwindow_Init.cpp | 2 +- src/meshlab/mainwindow_RunTime.cpp | 4 ++-- src/meshlab/meshlab.pro | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) rename src/meshlab/{meshlab_settings/meshlabsettingsdialog.cpp => dialogs/options_dialog.cpp} (92%) rename src/meshlab/{meshlab_settings/meshlabsettingsdialog.h => dialogs/options_dialog.h} (94%) diff --git a/src/meshlab/CMakeLists.txt b/src/meshlab/CMakeLists.txt index b58b71533..a6de6f669 100644 --- a/src/meshlab/CMakeLists.txt +++ b/src/meshlab/CMakeLists.txt @@ -24,12 +24,12 @@ set(SOURCES savemaskexporter.cpp dialogs/about_dialog.cpp dialogs/congrats_dialog.cpp + dialogs/options_dialog.cpp dialogs/savesnapshot_dialog.cpp dialogs/setting_dialog.cpp rich_parameter_gui/richparameterlistdialog.cpp rich_parameter_gui/richparameterlistframe.cpp rich_parameter_gui/richparameterwidgets.cpp - meshlab_settings/meshlabsettingsdialog.cpp ${VCGDIR}/wrap/gui/trackball.cpp ${VCGDIR}/wrap/gui/trackmode.cpp ${VCGDIR}/wrap/gui/coordinateframe.cpp @@ -53,12 +53,12 @@ set(HEADERS snapshotsetting.h dialogs/about_dialog.h dialogs/congrats_dialog.h + dialogs/options_dialog.h dialogs/savesnapshot_dialog.h dialogs/setting_dialog.h rich_parameter_gui/richparameterlistdialog.h rich_parameter_gui/richparameterlistframe.h rich_parameter_gui/richparameterwidgets.h - meshlab_settings/meshlabsettingsdialog.h ${VCGDIR}/wrap/gui/trackball.h ${VCGDIR}/wrap/gui/trackmode.h ${VCGDIR}/wrap/gl/trimesh.h) diff --git a/src/meshlab/meshlab_settings/meshlabsettingsdialog.cpp b/src/meshlab/dialogs/options_dialog.cpp similarity index 92% rename from src/meshlab/meshlab_settings/meshlabsettingsdialog.cpp rename to src/meshlab/dialogs/options_dialog.cpp index 344cf4d07..421501f24 100644 --- a/src/meshlab/meshlab_settings/meshlabsettingsdialog.cpp +++ b/src/meshlab/dialogs/options_dialog.cpp @@ -21,16 +21,16 @@ * * ****************************************************************************/ -#include "meshlabsettingsdialog.h" +#include "options_dialog.h" -#include "dialogs/setting_dialog.h" +#include "setting_dialog.h" #include using namespace vcg; -MeshLabSettingsDialog::MeshLabSettingsDialog( +MeshLabOptionsDialog::MeshLabOptionsDialog( RichParameterList& curparset, const RichParameterList& defparset, QWidget * parent) : @@ -53,7 +53,7 @@ MeshLabSettingsDialog::MeshLabSettingsDialog( this->setWindowTitle(tr("Global Parameters Window")); } -MeshLabSettingsDialog::~MeshLabSettingsDialog() +MeshLabOptionsDialog::~MeshLabOptionsDialog() { } @@ -61,7 +61,7 @@ MeshLabSettingsDialog::~MeshLabSettingsDialog() * @brief This slot is executed when a setting is double clicked * @param itm */ -void MeshLabSettingsDialog::openSubDialog(QTableWidgetItem* itm) +void MeshLabOptionsDialog::openSubDialog(QTableWidgetItem* itm) { int rprow = tw->row(itm); const RichParameter& curPar = currentParameterList.at(rprow); @@ -74,7 +74,7 @@ void MeshLabSettingsDialog::openSubDialog(QTableWidgetItem* itm) delete setdial; } -void MeshLabSettingsDialog::updateSettings() +void MeshLabOptionsDialog::updateSettings() { QStringList slst; slst.push_back("Variable Name"); @@ -101,7 +101,7 @@ void MeshLabSettingsDialog::updateSettings() tw->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents); } -void MeshLabSettingsDialog::updateSingleSetting(const RichParameter& rp) +void MeshLabOptionsDialog::updateSingleSetting(const RichParameter& rp) { assert(currentParameterList.getParameterByName(rp.name()).stringType() == rp.stringType()); currentParameterList.setValue(rp.name(), rp.value()); @@ -109,7 +109,7 @@ void MeshLabSettingsDialog::updateSingleSetting(const RichParameter& rp) emit applyCustomSetting(); } -QTableWidgetItem* MeshLabSettingsDialog::createQTableWidgetItemFromRichParameter(const RichParameter& pd) +QTableWidgetItem* MeshLabOptionsDialog::createQTableWidgetItemFromRichParameter(const RichParameter& pd) { if (pd.value().isAbsPerc()){ return new QTableWidgetItem(QString::number(pd.value().getAbsPerc())); diff --git a/src/meshlab/meshlab_settings/meshlabsettingsdialog.h b/src/meshlab/dialogs/options_dialog.h similarity index 94% rename from src/meshlab/meshlab_settings/meshlabsettingsdialog.h rename to src/meshlab/dialogs/options_dialog.h index 1fc7126c7..d905b8bcd 100644 --- a/src/meshlab/meshlab_settings/meshlabsettingsdialog.h +++ b/src/meshlab/dialogs/options_dialog.h @@ -29,7 +29,7 @@ #include /** - * @brief This class describes the dialog of the meshlab settings. + * @brief This class describes the dialog of the meshlab general options. * It creates a QTableWidget starting from the given currentParameterList, * and allows to reset to default values using defaulParameterList. * Every time that the user selects a RichParameter list, a SettingDialog is @@ -37,15 +37,15 @@ * Every time the user modifies a RichParameter, the given currentParameterList * is modified, and a signal called applyCustomSetting is emitted. */ -class MeshLabSettingsDialog : public QDialog +class MeshLabOptionsDialog : public QDialog { Q_OBJECT public: - MeshLabSettingsDialog( + MeshLabOptionsDialog( RichParameterList& currentParameterList, const RichParameterList& defaultPrameterList, QWidget *parent = 0); - ~MeshLabSettingsDialog(); + ~MeshLabOptionsDialog(); signals: void applyCustomSetting(); diff --git a/src/meshlab/mainwindow_Init.cpp b/src/meshlab/mainwindow_Init.cpp index 680d4f293..420795e26 100644 --- a/src/meshlab/mainwindow_Init.cpp +++ b/src/meshlab/mainwindow_Init.cpp @@ -41,7 +41,7 @@ #include #include "mainwindow.h" #include "plugindialog.h" -#include "meshlab_settings/meshlabsettingsdialog.h" +#include "dialogs/options_dialog.h" #include "dialogs/savesnapshot_dialog.h" #include "dialogs/congrats_dialog.h" diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp index 7d8cf86f2..86fd444fc 100644 --- a/src/meshlab/mainwindow_RunTime.cpp +++ b/src/meshlab/mainwindow_RunTime.cpp @@ -26,7 +26,6 @@ #include "mainwindow.h" #include "plugindialog.h" #include "filterScriptDialog.h" -#include "meshlab_settings/meshlabsettingsdialog.h" #include "savemaskexporter.h" #include #include "ml_default_decorators.h" @@ -54,6 +53,7 @@ #include #include #include "dialogs/about_dialog.h" +#include "dialogs/options_dialog.h" #include "dialogs/savesnapshot_dialog.h" using namespace std; @@ -2695,7 +2695,7 @@ void MainWindow::showLayerDlg(bool visible) void MainWindow::setCustomize() { - MeshLabSettingsDialog dialog(currentGlobalParams,defaultGlobalParams, this); + MeshLabOptionsDialog dialog(currentGlobalParams,defaultGlobalParams, this); connect(&dialog, SIGNAL(applyCustomSetting()), this, SLOT(updateCustomSettings())); dialog.exec(); } diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro index dece24a0a..4230e52b4 100644 --- a/src/meshlab/meshlab.pro +++ b/src/meshlab/meshlab.pro @@ -30,9 +30,9 @@ HEADERS += \ glarea.h \ dialogs/about_dialog.h \ dialogs/congrats_dialog.h \ + dialogs/options_dialog.h \ dialogs/savesnapshot_dialog.h \ dialogs/setting_dialog.h \ - meshlab_settings/meshlabsettingsdialog.h \ multiViewer_Container.h \ glarea_setting.h \ plugindialog.h \ @@ -60,9 +60,9 @@ SOURCES += \ glarea.cpp \ dialogs/about_dialog.cpp \ dialogs/congrats_dialog.cpp \ + dialogs/options_dialog.cpp \ dialogs/savesnapshot_dialog.cpp \ dialogs/setting_dialog.cpp \ - meshlab_settings/meshlabsettingsdialog.cpp \ multiViewer_Container.cpp \ plugindialog.cpp \ filterScriptDialog.cpp \