From cba879d0fc5878d6505eb2a6658316ee7f6ed28f Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Fri, 4 Sep 2020 11:03:49 +1200 Subject: [PATCH] Some minor cleaning up. --- .../src/cellmlzincmappingviewwidget.cpp | 43 +++++++++---------- .../src/cellmlzincmappingviewwidget.h | 2 +- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewwidget.cpp b/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewwidget.cpp index 6f5cfae98e..2bfe826722 100644 --- a/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewwidget.cpp +++ b/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewwidget.cpp @@ -27,9 +27,6 @@ along with this program. If not, see . //============================================================================== #include -#include -#include -#include #include //============================================================================== @@ -54,51 +51,51 @@ CellMLZincMappingViewWidget::~CellMLZincMappingViewWidget() void CellMLZincMappingViewWidget::retranslateUi() { - // Update ourself too since some widgets will have been reset following the - // retranslation (e.g. mGui->fileNameValue) + // Retranslate our editing widgets - for(auto editingWidget : mEditingWidgets) { + for (auto editingWidget : mEditingWidgets) { editingWidget->retranslateUi(); } } //============================================================================== -static const char *SettingsEditingHoriontalSizes = "EditingHoriontalSizes"; -static const char *SettingsEditingVerticalSizes = "EditingVerticalSizes"; -static const char *SettingsMeshFile = "MeshFile"; - +static const char *SettingsCellmlZincMappingViewEditingWidgetHorizontalSizes = "CellmlZincMappingViewEditingWidgetHorizontalSizes"; +static const char *SettingsCellmlZincMappingViewEditingWidgetVerticalSizes = "CellmlZincMappingViewEditingWidgetVerticalSizes"; +static const char *SettingsCellmlZincMappingViewMeshFileNames = "CellmlZincMappingViewMeshFileNames"; //============================================================================== void CellMLZincMappingViewWidget::loadSettings(QSettings &pSettings) { - static const QStringList DefaultMeshFileNames = {}; + // Retrieve the sizes of our editing widget and of the mesh file names static const QRect AvailableGeometry = qApp->primaryScreen()->availableGeometry(); static const int AvailableGeometryHeight = AvailableGeometry.height(); static const int AvailableGeometryWidth = AvailableGeometry.width(); - static const QVariantList DefaultEditingWidgetHorizontalSizes = { 0.20*AvailableGeometryWidth, - 0.80*AvailableGeometryWidth }; + 0.80*AvailableGeometryWidth }; static const QVariantList DefaultEditingWidgetVerticalSizes = { 0.87*AvailableGeometryHeight, - 0.1*AvailableGeometryHeight, - 0.12*AvailableGeometryHeight}; + 0.10*AvailableGeometryHeight, + 0.13*AvailableGeometryHeight}; + static const QStringList DefaultMeshFileNames = {}; - mEditingWidgetHorizontalSizes = qVariantListToIntList(pSettings.value(SettingsEditingHoriontalSizes, DefaultEditingWidgetHorizontalSizes).toList()); - mEditingWidgetVerticalSizes = qVariantListToIntList(pSettings.value(SettingsEditingVerticalSizes, DefaultEditingWidgetVerticalSizes).toList()); + mEditingWidgetHorizontalSizes = qVariantListToIntList(pSettings.value(SettingsCellmlZincMappingViewEditingWidgetHorizontalSizes, DefaultEditingWidgetHorizontalSizes).toList()); + mEditingWidgetVerticalSizes = qVariantListToIntList(pSettings.value(SettingsCellmlZincMappingViewEditingWidgetVerticalSizes, DefaultEditingWidgetVerticalSizes).toList()); - mZincMeshFileNames= pSettings.value(SettingsMeshFile,DefaultMeshFileNames).toStringList(); + mMeshFileNames= pSettings.value(SettingsCellmlZincMappingViewMeshFileNames, DefaultMeshFileNames).toStringList(); } //============================================================================== void CellMLZincMappingViewWidget::saveSettings(QSettings &pSettings) const { - pSettings.setValue(SettingsEditingHoriontalSizes, qIntListToVariantList(mEditingWidgetHorizontalSizes)); - pSettings.setValue(SettingsEditingVerticalSizes, qIntListToVariantList(mEditingWidgetVerticalSizes)); + // Keep track of the sizes of our editing widget and of the mesh file names + + pSettings.setValue(SettingsCellmlZincMappingViewEditingWidgetHorizontalSizes, qIntListToVariantList(mEditingWidgetHorizontalSizes)); + pSettings.setValue(SettingsCellmlZincMappingViewEditingWidgetVerticalSizes, qIntListToVariantList(mEditingWidgetVerticalSizes)); - pSettings.setValue(SettingsMeshFile,mZincMeshFileNames); + pSettings.setValue(SettingsCellmlZincMappingViewMeshFileNames, mMeshFileNames); } //============================================================================== @@ -112,7 +109,7 @@ void CellMLZincMappingViewWidget::initialize(const QString &pFileName) if (mEditingWidget == nullptr) { // No editing widget exists for the given file, so create one - mEditingWidget = new CellMLZincMappingViewEditingWidget(pFileName, mZincMeshFileNames,this, this); + mEditingWidget = new CellMLZincMappingViewEditingWidget(pFileName, mMeshFileNames,this, this); mEditingWidgets.insert(pFileName, mEditingWidget); @@ -229,7 +226,7 @@ void CellMLZincMappingViewWidget::fileRenamed(const QString &pOldFileName, const void CellMLZincMappingViewWidget::setDefaultMeshFiles(const QStringList &pFileNames) { - mZincMeshFileNames = pFileNames; + mMeshFileNames = pFileNames; } diff --git a/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewwidget.h b/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewwidget.h index 0b02cd4893..ff9e53e9e6 100644 --- a/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewwidget.h +++ b/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewwidget.h @@ -82,7 +82,7 @@ class CellMLZincMappingViewWidget : public Core::ViewWidget CellMLZincMappingViewEditingWidget *mEditingWidget = nullptr; QMap mEditingWidgets; - QStringList mZincMeshFileNames; + QStringList mMeshFileNames; private slots: void EditingWidgetHorizontalSplitterMoved(const QIntList &pSizes);