Update Sandbox Tool to generate proper codes for filters.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
BlueQuartzSoftware · Nov 1, 2019 · d82a62c · d82a62c
1 parent 0446b45
commit d82a62c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenRDFWidget.cpp b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenRDFWidget.cpp
@@ -381,7 +381,7 @@ void StatsGenRDFWidget::extractStatsData(int index, StatsData* statsData, PhaseT
       ui->BoxSizeYLE->setText(QString::number(boxDim[1]));
       ui->BoxSizeZLE->setText(QString::number(boxDim[2]));
 
-      std::array<float, 3> boxRes = rdf->getBoxResolution();
+      //  std::array<float, 3> boxRes = rdf->getBoxResolution();
       ui->minDistLE->setText(QString::number(rdf->getMinDistance()));
       ui->maxDistLE->setText(QString::number(rdf->getMaxDistance()));
       ui->numBinsLE->setText(QString::number(rdf->getNumberOfBins()));

diff --git a/Tools/SandboxTool.cpp b/Tools/SandboxTool.cpp
@@ -167,16 +167,15 @@ int main(int argc, char* argv[])
 #endif
 
   std::list<QDir> dirs;
-  #if 0
+#if 1
   // dirs.emplace_back(QDir(D3DTools::GetDREAM3DProjDir()));
   // dirs.emplace_back(QDir(D3DTools::GetDREAM3DProjDir() + "/../DREAM3D_Plugins"));
   // dirs.emplace_back(QDir(D3DTools::GetDREAM3DProjDir() + "/ExternalProjects/SIMPL/Source/SIMPLib/CoreFilters"));
   // dirs.emplace_back(QDir(D3DTools::GetDREAM3DProjDir() + "/../SIMPLView/Source"));
 
-
   //  dirs.emplace_back(QDir(D3DTools::GetDREAM3DProjDir() + "/ExternalProjects/SIMPLView/Source"));
   //  dirs.emplace_back(QDir(D3DTools::GetDREAM3DProjDir() + "/ExternalProjects/SIMPLVtkLib"));
-  // dirs.emplace_back(QDir(D3DTools::GetDREAM3DProjDir() + "/ExternalProjects/Plugins"));
+  dirs.emplace_back(QDir(D3DTools::GetDREAM3DProjDir() + "/ExternalProjects/Plugins/SimulationIO"));
   // dirs.emplace_back(QDir(D3DTools::GetDREAM3DProjDir() + "/ExternalProjects/Plugins/ITKImageProcessing"));
   // dirs.emplace_back(QDir(D3DTools::GetDREAM3DProjDir() + "/Source"));
   //  dirs.emplace_back(QDir(D3DTools::GetDREAM3DProjDir() + "/Test"));

diff --git a/Tools/SandboxTool/RemoveSIMPLMacros.h b/Tools/SandboxTool/RemoveSIMPLMacros.h
@@ -464,7 +464,8 @@ class RemoveSIMPLMacros : public Sandbox
       pubCodeOut << "    using Pointer = std::shared_ptr<Self>;\n";
       pubCodeOut << "    using ConstPointer = std::shared_ptr<const Self>;\n";
       pubCodeOut << "    using WeakPointer = std::weak_ptr<Self>;\n";
-      pubCodeOut << "    using ConstWeakPointer = std::weak_ptr<Self>;\n";
+      pubCodeOut << "    using ConstWeakPointer = std::weak_ptr<Self>;\n\n\n";
+
       pubCodeOut << "    static Pointer NullPointer();\n";
 
       pubCodeOut << "    Pointer NullPointer()\n";
@@ -582,7 +583,7 @@ class RemoveSIMPLMacros : public Sandbox
       // pubCodeOut << "    /**\n    * @brief Getter property for " << varName << "\n    * @return Value of " << varName << "\n    */\n";
 
       definitionCodeOut << "// -----------------------------------------------------------------------------\n";
-      definitionCodeOut << "const QString " << fi.baseName() << "::getNameOfClass() const\n";
+      definitionCodeOut << "QString " << fi.baseName() << "::getNameOfClass() const\n";
       definitionCodeOut << "{\n";
       definitionCodeOut << "  return QString(\"" << className << "\");\n";
       definitionCodeOut << "}\n\n";
@@ -629,7 +630,7 @@ class RemoveSIMPLMacros : public Sandbox
       // pubCodeOut << "    /**\n    * @brief Getter property for " << varName << "\n    * @return Value of " << varName << "\n    */\n";
 
       definitionCodeOut << "// -----------------------------------------------------------------------------\n";
-      definitionCodeOut << "const QString " << fi.baseName() << "::getNameOfClass() const\n";
+      definitionCodeOut << "QString " << fi.baseName() << "::getNameOfClass() const\n";
       definitionCodeOut << "{\n";
       definitionCodeOut << "  return QString(\"" << className << "\");\n";
       definitionCodeOut << "}\n\n";
@@ -668,8 +669,6 @@ class RemoveSIMPLMacros : public Sandbox
 
       QString className = tokens[0].trimmed();
 
-      pubCodeOut << "    /**\n    * @brief Returns the name of the class for " << className << "\n    */\n";
-
       pubCodeOut << "    /**\n    * @brief Returns the name of the class for " << className << "\n    */\n";
       pubCodeOut << "    QString getNameOfClass() const\n";
       pubCodeOut << "    {\n";