Permalink
Browse files

Merge pull request #745 from joeykleingers/develop

Fixing compilation errors and documentation
  • Loading branch information...
joeykleingers committed Oct 4, 2017
2 parents a4e9a0f + 0d772f8 commit 9792ca9fe1bc3ae33bc47de6941d327a8ebfb5d4
Showing with 23 additions and 24 deletions.
  1. +0 −1 Documentation/ReferenceManual/Developer/SDKInstall.md
  2. +2 −2 Documentation/ReferenceManual/Developer/Windows_Configuring_and_Building_DREAM3D.md
  3. +1 −1 Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgCAxes.cpp
  4. +1 −1 Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgOrientations.cpp
  5. +1 −1 Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBasalLoadingFactor.cpp
  6. +1 −1 Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBoundaryStrengths.cpp
  7. +1 −1 Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindCAxisLocations.cpp
  8. +1 −1 .../Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureNeighborCAxisMisalignments.cpp
  9. +1 −1 ...ugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceCAxisMisorientations.cpp
  10. +1 −1 ...ce/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceMisorientations.cpp
  11. +1 −1 Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindKernelAvgMisorientations.cpp
  12. +1 −1 Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindLocalAverageCAxisMisalignments.cpp
  13. +1 −1 Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindMisorientations.cpp
  14. +1 −1 Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindOrientationFieldCurl.cpp
  15. +1 −1 Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSchmids.cpp
  16. +1 −1 Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSlipTransmissionMetrics.cpp
  17. +1 −1 Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundaries.cpp
  18. +1 −1 Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundarySchmidFactors.cpp
  19. +1 −1 Source/Plugins/Statistics/StatisticsFilters/CorrelateValuesWithVectorDirection.cpp
  20. +1 −1 Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindDistsToCharactGBs.cpp
  21. +1 −1 Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindGBCD.cpp
  22. +1 −1 Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindGBCDMetricBased.cpp
  23. +1 −1 Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindGBPDMetricBased.cpp
@@ -96,7 +96,6 @@ DREAM.3D depends on several 3rd party libraries to be installed and ready to lin
| CMake | 3.5.1 | [http://www.cmake.org/cmake/resources/software.html](http://www.cmake.org/cmake/resources/software.html) |
| Doxygen | 1.8.11 | [http://www.stack.nl/~dimitri/doxygen/download.html](http://www.stack.nl/~dimitri/doxygen/download.html) |
| HDF5 | 1.8.16 | [http://www.hdfgroup.org/HDF5/release/obtain5.html](http://www.hdfgroup.org/HDF5/release/obtain5.html) |
| Boost | 1.60.0 | [http://www.boost.org](http://www.boost.org) |
| Eigen | 3.2.9 | [Eigen Home Page](http://eigen.tuxfamily.org/index.php?title=Main_Page) |
| Intel Threading Building Blocks | tbb44\_20160526oss | [http://threadingbuildingblocks.org/download](http://threadingbuildingblocks.org/download) |
| Qt | 5.6.2 (Qt 4.x will NOT work) | The developer should obtain a precompiled package from [http://www.qt.io](http://www.qt.io) and install that version rather than trying to compile Qt itself. Visual Studio uses should get Qt 5.6.2 at the minimum. |
@@ -69,14 +69,14 @@ Open the **DREAM3D_SDK.cmake** file in the **DREAM3D_SDK** folder. Check that t
Make sure **Use default native compilers** is checked.
![](Images/Win_Generator.png)
8. When the configuration is finished, make sure that **CMAKE_BUILD_TYPE** is set to *Debug*.
8. When the configuration is finished, make sure that **BUILD_TYPE** is set to *Debug*.
9. Press the **Configure** button in CMake again. You may need to click **Configure** a few times until all the red highlights are gone.
![](Images/Win_CmakeAfterConfig.png)
10. Press the **Generate** button in CMake to generate the build files.
11. Repeat steps 1-10, except use path *C:\\[YOUR-USER-FOLDER]\\Workspace\\Builds\\DREAM3D-Build\\Release* for step 2 and set **CMAKE_BUILD_TYPE** to *Release* in step 9.
11. Repeat steps 1-10, except use path *C:\\[YOUR-USER-FOLDER]\\Workspace\\Builds\\DREAM3D-Build\\Release* for step 2 and set **BUILD_TYPE** to *Release* in step 9.
## Building DREAM.3D ##
Once you have configured DREAM.3D, simply build DREAM.3D in your preferred IDE, or open the Windows Command Line and build DREAM.3D without an IDE.
@@ -306,7 +306,7 @@ const QString FindAvgCAxes::getGroupName()
// -----------------------------------------------------------------------------
const QString FindAvgCAxes::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -337,7 +337,7 @@ const QString FindAvgOrientations::getGroupName()
// -----------------------------------------------------------------------------
const QString FindAvgOrientations::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -263,7 +263,7 @@ const QString FindBasalLoadingFactor::getGroupName()
// -----------------------------------------------------------------------------
const QString FindBasalLoadingFactor::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -411,7 +411,7 @@ const QString FindBoundaryStrengths::getGroupName()
// -----------------------------------------------------------------------------
const QString FindBoundaryStrengths::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -245,7 +245,7 @@ const QString FindCAxisLocations::getGroupName()
// -----------------------------------------------------------------------------
const QString FindCAxisLocations::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -401,7 +401,7 @@ const QString FindFeatureNeighborCAxisMisalignments::getGroupName()
// -----------------------------------------------------------------------------
const QString FindFeatureNeighborCAxisMisalignments::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -416,7 +416,7 @@ const QString FindFeatureReferenceCAxisMisorientations::getGroupName()
// -----------------------------------------------------------------------------
const QString FindFeatureReferenceCAxisMisorientations::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -448,7 +448,7 @@ const QString FindFeatureReferenceMisorientations::getGroupName()
// -----------------------------------------------------------------------------
const QString FindFeatureReferenceMisorientations::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -383,7 +383,7 @@ const QString FindKernelAvgMisorientations::getGroupName()
// -----------------------------------------------------------------------------
const QString FindKernelAvgMisorientations::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -397,7 +397,7 @@ const QString FindLocalAverageCAxisMisalignments::getGroupName()
// -----------------------------------------------------------------------------
const QString FindLocalAverageCAxisMisalignments::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -363,7 +363,7 @@ const QString FindMisorientations::getGroupName()
// -----------------------------------------------------------------------------
const QString FindMisorientations::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -540,7 +540,7 @@ const QString FindOrientationFieldCurl::getGroupName()
// -----------------------------------------------------------------------------
const QString FindOrientationFieldCurl::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -423,7 +423,7 @@ const QString FindSchmids::getGroupName()
// -----------------------------------------------------------------------------
const QString FindSchmids::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -374,7 +374,7 @@ const QString FindSlipTransmissionMetrics::getGroupName()
// -----------------------------------------------------------------------------
const QString FindSlipTransmissionMetrics::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -529,7 +529,7 @@ const QString FindTwinBoundaries::getGroupName()
// -----------------------------------------------------------------------------
const QString FindTwinBoundaries::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -565,7 +565,7 @@ const QString FindTwinBoundarySchmidFactors::getGroupName()
// -----------------------------------------------------------------------------
const QString FindTwinBoundarySchmidFactors::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -754,7 +754,7 @@ const QString CorrelateValuesWithVectorDirection::getGroupName()
// -----------------------------------------------------------------------------
const QString CorrelateValuesWithVectorDirection::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -590,7 +590,7 @@ const QString FindDistsToCharactGBs::getGroupName()
// -----------------------------------------------------------------------------
const QString FindDistsToCharactGBs::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -856,7 +856,7 @@ const QString FindGBCD::getGroupName()
// -----------------------------------------------------------------------------
const QString FindGBCD::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -1153,7 +1153,7 @@ const QString FindGBCDMetricBased::getGroupName()
// -----------------------------------------------------------------------------
const QString FindGBCDMetricBased::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------
@@ -1254,7 +1254,7 @@ const QString FindGBPDMetricBased::getGroupName()
// -----------------------------------------------------------------------------
const QString FindGBPDMetricBased::getSubGroupName()
{
return SIMPL::FilterSubGroups::CrystallographicFilters;
return SIMPL::FilterSubGroups::CrystallographyFilters;
}
// -----------------------------------------------------------------------------

0 comments on commit 9792ca9

Please sign in to comment.