From e4e1d224e3f55a627ac3ce474c500da899d63f7d Mon Sep 17 00:00:00 2001 From: Matthew Marine Date: Mon, 26 Aug 2019 09:27:27 -0400 Subject: [PATCH] Feature/912 import ebsd montage (#913) * ImportEbsdMontage can now be updated from within the GUI. * EbsdMontageImportFilterParameter.h no longer has a type alias that had been interfering with QMetaType. All references of EbsdMontageListInfo_t were replaced with the target type EbsdMontageListInfo. fixes #912 Signed-off-by: Matthew Marine --- .../EbsdMontageImportFilterParameter.cpp | 6 +- .../EbsdMontageImportFilterParameter.h | 61 +------------------ .../EbsdMontageImportWidget.cpp | 4 +- .../ImportEbsdMontage.h | 6 +- 4 files changed, 11 insertions(+), 66 deletions(-) diff --git a/Source/Plugins/OrientationAnalysis/FilterParameters/EbsdMontageImportFilterParameter.cpp b/Source/Plugins/OrientationAnalysis/FilterParameters/EbsdMontageImportFilterParameter.cpp index 4f44fdd10c..9317a281f4 100644 --- a/Source/Plugins/OrientationAnalysis/FilterParameters/EbsdMontageImportFilterParameter.cpp +++ b/Source/Plugins/OrientationAnalysis/FilterParameters/EbsdMontageImportFilterParameter.cpp @@ -51,7 +51,7 @@ EbsdMontageImportFilterParameter::~EbsdMontageImportFilterParameter() = default; // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -EbsdMontageImportFilterParameter::Pointer EbsdMontageImportFilterParameter::New(const QString& humanLabel, const QString& propertyName, const EbsdMontageListInfo_t& defaultValue, +EbsdMontageImportFilterParameter::Pointer EbsdMontageImportFilterParameter::New(const QString& humanLabel, const QString& propertyName, const EbsdMontageListInfo& defaultValue, FilterParameter::Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback) { @@ -85,7 +85,7 @@ void EbsdMontageImportFilterParameter::readJson(const QJsonObject& json) if(!jsonValue.isUndefined() && m_SetterCallback) { QJsonObject jsonObj = jsonValue.toObject(); - EbsdMontageListInfo_t fileListInfo; + EbsdMontageListInfo fileListInfo; fileListInfo.readJson(jsonObj); m_SetterCallback(fileListInfo); } @@ -98,7 +98,7 @@ void EbsdMontageImportFilterParameter::writeJson(QJsonObject& json) { if(m_GetterCallback) { - EbsdMontageListInfo_t fileListInfo = m_GetterCallback(); + EbsdMontageListInfo fileListInfo = m_GetterCallback(); QJsonObject jsonObj; fileListInfo.writeJson(jsonObj); json[getPropertyName()] = jsonObj; diff --git a/Source/Plugins/OrientationAnalysis/FilterParameters/EbsdMontageImportFilterParameter.h b/Source/Plugins/OrientationAnalysis/FilterParameters/EbsdMontageImportFilterParameter.h index b98a1cadd7..1821d94fa9 100644 --- a/Source/Plugins/OrientationAnalysis/FilterParameters/EbsdMontageImportFilterParameter.h +++ b/Source/Plugins/OrientationAnalysis/FilterParameters/EbsdMontageImportFilterParameter.h @@ -44,61 +44,6 @@ #include "OrientationAnalysis/FilterParameters/EbsdMontageListInfo.h" -using EbsdMontageListInfo_t = EbsdMontageListInfo; - -#if 0 -typedef struct -{ - qint32 PaddingDigits = 3; - quint32 Ordering = 0; /* Ordering=0 = RowColumn, Ordering=1 = ColumnRow */ - qint32 RowStart = 0; - qint32 RowEnd = 2; - qint32 ColStart = 0; - qint32 ColEnd = 2; - qint32 IncrementIndex = 1; - QString InputPath; - QString FilePrefix; - QString FileSuffix; - QString FileExtension; - - void writeJson(QJsonObject& json) - { - json["PaddingDigits"] = static_cast(PaddingDigits); - json["Ordering"] = static_cast(Ordering); - json["RowStart"] = static_cast(RowStart); - json["ColStart"] = static_cast(ColStart); - json["RowEnd"] = static_cast(RowEnd); - json["ColEnd"] = static_cast(ColEnd); - json["IncrementIndex"] = static_cast(IncrementIndex); - json["InputPath"] = InputPath; - json["FilePrefix"] = FilePrefix; - json["FileSuffix"] = FileSuffix; - json["FileExtension"] = FileExtension; - } - - bool readJson(QJsonObject& json) - { - if(json["PaddingDigits"].isDouble() && json["Ordering"].isDouble() && json["RowStart"].isDouble() && json["ColStart"].isDouble() && json["IncrementIndex"].isDouble() && - json["InputPath"].isString() && json["FilePrefix"].isString() && json["FileSuffix"].isString() && json["FileExtension"].isString()) - { - PaddingDigits = static_cast(json["PaddingDigits"].toInt()); - Ordering = static_cast(json["Ordering"].toInt()); - RowStart = static_cast(json["RowStart"].toInt()); - ColStart = static_cast(json["ColStart"].toInt()); - RowEnd = static_cast(json["RowEnd"].toInt()); - ColEnd = static_cast(json["ColEnd"].toInt()); - IncrementIndex = static_cast(json["IncrementIndex"].toInt()); - InputPath = json["InputPath"].toString(); - FilePrefix = json["FilePrefix"].toString(); - FileSuffix = json["FileSuffix"].toString(); - FileExtension = json["FileExtension"].toString(); - return true; - } - return false; - } -}EbsdMontageListInfo_t; -#endif - /** * @brief SIMPL_NEW_EbsdMontageListInfo_FP This macro is a short-form way of instantiating an instance of * EbsdMontageImportFilterParameter. There are 4 required parameters that are always passed to this macro @@ -124,8 +69,8 @@ class EbsdMontageImportFilterParameter : public FilterParameter SIMPL_STATIC_NEW_MACRO(EbsdMontageImportFilterParameter) SIMPL_TYPE_MACRO_SUPER_OVERRIDE(EbsdMontageImportFilterParameter, FilterParameter) - using SetterCallbackType = std::function; - using GetterCallbackType = std::function; + using SetterCallbackType = std::function; + using GetterCallbackType = std::function; /** * @brief New This function instantiates an instance of the EbsdMontageImportFilterParameter. Although this @@ -143,7 +88,7 @@ class EbsdMontageImportFilterParameter : public FilterParameter * that this FilterParameter subclass represents. * @return */ - static Pointer New(const QString& humanLabel, const QString& propertyName, const EbsdMontageListInfo_t& defaultValue, Category category, SetterCallbackType setterCallback, + static Pointer New(const QString& humanLabel, const QString& propertyName, const EbsdMontageListInfo& defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback); ~EbsdMontageImportFilterParameter() override; diff --git a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdMontageImportWidget.cpp b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdMontageImportWidget.cpp index 7bd9e6ee25..8a16e06ec0 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdMontageImportWidget.cpp +++ b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdMontageImportWidget.cpp @@ -275,7 +275,7 @@ void EbsdMontageImportWidget::getGuiParametersFromFilter() { blockSignals(true); - EbsdMontageListInfo_t data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value(); + EbsdMontageListInfo data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value(); m_Ui->inputDir->setText(data.InputPath); setValidFilePath(data.InputPath); @@ -434,7 +434,7 @@ void EbsdMontageImportWidget::filterNeedsInputParameters(AbstractFilter* filter) SIMPLDataPathValidator* validator = SIMPLDataPathValidator::Instance(); QString inputPath = validator->convertToAbsolutePath(m_Ui->inputDir->text()); - EbsdMontageListInfo_t data; + EbsdMontageListInfo data; data.IncrementIndex = m_Ui->increment->value(); data.RowStart = m_Ui->rowStart->value(); data.RowEnd = m_Ui->rowEnd->value() + 1; diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportEbsdMontage.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportEbsdMontage.h index b98551108e..6a3b9b47ae 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportEbsdMontage.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportEbsdMontage.h @@ -56,7 +56,7 @@ class OrientationAnalysis_EXPORT ImportEbsdMontage : public AbstractFilter PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName) PYB11_PROPERTY(QString CellEnsembleAttributeMatrixName READ getCellEnsembleAttributeMatrixName WRITE setCellEnsembleAttributeMatrixName) PYB11_PROPERTY(QString CellAttributeMatrixName READ getCellAttributeMatrixName WRITE setCellAttributeMatrixName) - PYB11_PROPERTY(EbsdMontageListInfo_t InputFileListInfo READ getInputFileListInfo WRITE setInputFileListInfo) + PYB11_PROPERTY(EbsdMontageListInfo InputFileListInfo READ getInputFileListInfo WRITE setInputFileListInfo) PYB11_PROPERTY(bool GenerateIPFColorMap READ getGenerateIPFColorMap WRITE setGenerateIPFColorMap) PYB11_PROPERTY(QString CellIPFColorsArrayName READ getCellIPFColorsArrayName WRITE setCellIPFColorsArrayName) @@ -76,8 +76,8 @@ class OrientationAnalysis_EXPORT ImportEbsdMontage : public AbstractFilter SIMPL_FILTER_PARAMETER(QString, CellAttributeMatrixName) Q_PROPERTY(QString CellAttributeMatrixName READ getCellAttributeMatrixName WRITE setCellAttributeMatrixName) - SIMPL_FILTER_PARAMETER(EbsdMontageListInfo_t, InputFileListInfo) - Q_PROPERTY(EbsdMontageListInfo_t InputFileListInfo READ getInputFileListInfo WRITE setInputFileListInfo) + SIMPL_FILTER_PARAMETER(EbsdMontageListInfo, InputFileListInfo) + Q_PROPERTY(EbsdMontageListInfo InputFileListInfo READ getInputFileListInfo WRITE setInputFileListInfo) SIMPL_FILTER_PARAMETER(bool, GenerateIPFColorMap) Q_PROPERTY(bool GenerateIPFColorMap READ getGenerateIPFColorMap WRITE setGenerateIPFColorMap)