Skip to content

Commit

Permalink
more work in TesselateFarFieldGrains
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Groeber committed Nov 27, 2014
1 parent 6719ee3 commit ff79afe
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 18 deletions.
67 changes: 49 additions & 18 deletions Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/TesselateFarFieldGrains.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ TesselateFarFieldGrains::TesselateFarFieldGrains() :
m_FeatureIdsArrayName(DREAM3D::CellData::FeatureIds),
m_CellPhasesArrayName(DREAM3D::CellData::Phases),
m_FeaturePhasesArrayName(DREAM3D::FeatureData::Phases),
m_SlabIdArrayName("BoxBeamID"),
m_FeatureEulerAnglesArrayName(DREAM3D::FeatureData::EulerAngles),
m_ElasticStrainsArrayName(DREAM3D::FeatureData::ElasticStrains),
m_CentroidsArrayName(DREAM3D::FeatureData::Centroids),
Expand All @@ -263,6 +264,7 @@ TesselateFarFieldGrains::TesselateFarFieldGrains() :
m_MaskArrayName(DREAM3D::CellData::GoodVoxels),
m_Mask(NULL),
m_FeaturePhases(NULL),
m_SlabId(NULL),
m_Centroids(NULL),
m_Volumes(NULL),
m_AxisLengths(NULL),
Expand Down Expand Up @@ -368,6 +370,8 @@ void TesselateFarFieldGrains::updateFeatureInstancePointers()

if( NULL != m_FeaturePhasesPtr.lock().get() ) /* Validate the Weak Pointer wraps a non-NULL pointer to a DataArray<T> object */
{ m_FeaturePhases = m_FeaturePhasesPtr.lock()->getPointer(0); } /* Now assign the raw pointer to data from the DataArray<T> object */
if( NULL != m_SlabIdPtr.lock().get() ) /* Validate the Weak Pointer wraps a non-NULL pointer to a DataArray<T> object */
{ m_SlabId = m_SlabIdPtr.lock()->getPointer(0); } /* Now assign the raw pointer to data from the DataArray<T> object */
if( NULL != m_EquivalentDiametersPtr.lock().get() ) /* Validate the Weak Pointer wraps a non-NULL pointer to a DataArray<T> object */
{ m_EquivalentDiameters = m_EquivalentDiametersPtr.lock()->getPointer(0); } /* Now assign the raw pointer to data from the DataArray<T> object */
if( NULL != m_VolumesPtr.lock().get() ) /* Validate the Weak Pointer wraps a non-NULL pointer to a DataArray<T> object */
Expand Down Expand Up @@ -438,6 +442,10 @@ void TesselateFarFieldGrains::dataCheck()
m_FeaturePhasesPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter, int32_t>(this, tempPath, 0, dims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
if( NULL != m_FeaturePhasesPtr.lock().get() ) /* Validate the Weak Pointer wraps a non-NULL pointer to a DataArray<T> object */
{ m_FeaturePhases = m_FeaturePhasesPtr.lock()->getPointer(0); } /* Now assign the raw pointer to data from the DataArray<T> object */
tempPath.update(getOutputCellAttributeMatrixName().getDataContainerName(), getOutputCellFeatureAttributeMatrixName(), getSlabIdArrayName() );
m_SlabIdPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter, int32_t>(this, tempPath, 0, dims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
if( NULL != m_SlabIdPtr.lock().get() ) /* Validate the Weak Pointer wraps a non-NULL pointer to a DataArray<T> object */
{ m_SlabId = m_SlabIdPtr.lock()->getPointer(0); } /* Now assign the raw pointer to data from the DataArray<T> object */
tempPath.update(getOutputCellAttributeMatrixName().getDataContainerName(), getOutputCellFeatureAttributeMatrixName(), getEquivalentDiametersArrayName() );
m_EquivalentDiametersPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, tempPath, 0, dims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
if( NULL != m_EquivalentDiametersPtr.lock().get() ) /* Validate the Weak Pointer wraps a non-NULL pointer to a DataArray<T> object */
Expand Down Expand Up @@ -550,7 +558,7 @@ void TesselateFarFieldGrains::execute()
if (getCancel() == true) { return; }

notifyStatusMessage(getHumanLabel(), "Assigning Gaps");
// assign_gaps_only();
assign_gaps_only();
if (getCancel() == true) { return; }

VolumeDataContainer* m = getDataContainerArray()->getDataContainerAs<VolumeDataContainer>(getOutputCellAttributeMatrixName().getDataContainerName());
Expand Down Expand Up @@ -590,9 +598,17 @@ void TesselateFarFieldGrains::load_features()
m_FeatureInputFileListInfo.FileSuffix, m_FeatureInputFileListInfo.FileExtension,
m_FeatureInputFileListInfo.PaddingDigits); std::ifstream inFile;

int slabCount = 0;
size_t currentFeature = 1;
size_t xDim, yDim, zDim;
float xRes, yRes, zRes;
m->getDimensions(xDim, yDim, zDim);
m->getResolution(xRes, yRes, zRes);
float xShift = xRes*float(xDim/2.0);
float yShift = yRes*float(yDim/2.0);
for (QVector<QString>::iterator filepath = fileList.begin(); filepath != fileList.end(); ++filepath)
{
slabCount++;
QString fName = *filepath;
QString ss = QObject::tr("Importing file %1").arg(fName);
notifyStatusMessage(getMessagePrefix(), getHumanLabel(), ss);
Expand All @@ -608,11 +624,12 @@ void TesselateFarFieldGrains::load_features()
// variable for holding meta data
int numPhases = 1;
int numFeatures;
unsigned int cStruct = Ebsd::CrystalStructure::UnknownCrystalStructure;
float beamCenter, beamThickness, globalZPos;
std::string dummyStr, phaseName, crystruct;
std::string keywordStr, phaseName, crystruct;
float aRef, bRef, cRef, alphaRef, betaRef, gammaRef;

inFile >> dummyStr >> numFeatures;
inFile >> keywordStr >> numFeatures;
if (0 == numFeatures)
{
notifyErrorMessage(getHumanLabel(), "The number of features is Zero and should be greater than Zero", -600);
Expand All @@ -621,20 +638,25 @@ void TesselateFarFieldGrains::load_features()
cellFeatureAttrMat->setTupleDimensions(tDims);
updateFeatureInstancePointers();

inFile >> dummyStr >> beamCenter;
inFile >> dummyStr >> beamThickness;
inFile >> dummyStr >> globalZPos;
inFile >> keywordStr >> beamCenter;
inFile >> keywordStr >> beamThickness;
inFile >> keywordStr >> globalZPos;
inFile >> keywordStr >> numPhases;

bool keepGoing = true;
while(keepGoing == true)
tDims[0] = numPhases+1;
cellEnsembleAttrMat->setTupleDimensions(tDims);
updateEnsembleInstancePointers();
for(int i = 1; i <= numPhases; i++)
{
keepGoing = false;
inFile >> dummyStr >> phaseName >> crystruct >> aRef >> bRef >> cRef >> alphaRef >> betaRef >> gammaRef;
numPhases++;
tDims[0] = numPhases;
cellEnsembleAttrMat->setTupleDimensions(tDims);
updateEnsembleInstancePointers();
m_CrystalStructures[numPhases=1] = Ebsd::CrystalStructure::Cubic_High;
inFile >> phaseName >> crystruct >> aRef >> bRef >> cRef >> alphaRef >> betaRef >> gammaRef;
if(crystruct.compare("Cubic") == 0) cStruct = Ebsd::CrystalStructure::Cubic_High;
else if(crystruct.compare("Hexagonal") == 0) cStruct = Ebsd::CrystalStructure::Hexagonal_High;
else if(crystruct.compare("Tetragonal") == 0) cStruct = Ebsd::CrystalStructure::Tetragonal_High;
else if(crystruct.compare("Orthorhombic") == 0) cStruct = Ebsd::CrystalStructure::OrthoRhombic;
else if(crystruct.compare("Trigonal") == 0) cStruct = Ebsd::CrystalStructure::Trigonal_High;
else if(crystruct.compare("Monoclinic") == 0) cStruct = Ebsd::CrystalStructure::Monoclinic;
else if(crystruct.compare("Triclinic") == 0) cStruct = Ebsd::CrystalStructure::Triclinic;
m_CrystalStructures[i] = cStruct;
}

size_t fId;
Expand Down Expand Up @@ -667,10 +689,12 @@ void TesselateFarFieldGrains::load_features()
{
inFile >> fId >> phase >> mat[0][0] >> mat[0][1] >> mat[0][2] >> mat[1][0] >> mat[1][1] >> mat[1][2] >> mat[2][0] >> mat[2][1] >> mat[2][2] >> xC >> yC >> zC >> a >> b >> c >> alpha >> beta >> gamma >> dummy1 >> dummy2 >> dummy3 >> eqRad >> conf;

if(fabs(zC-beamCenter) <= (beamThickness/2.0))
// if(fabs(zC-beamCenter) <= (beamThickness/2.0))
{
m_Centroids[3* currentFeature + 0] = xC;
m_Centroids[3* currentFeature + 1] = yC;
m_SlabId[currentFeature] = slabCount;

m_Centroids[3* currentFeature + 0] = xC + xShift;
m_Centroids[3* currentFeature + 1] = yC + yShift;
m_Centroids[3* currentFeature + 2] = zC + (globalZPos-beamCenter);

vol = fourThirds * DREAM3D::Constants::k_Pi * eqRad * eqRad * eqRad;
Expand Down Expand Up @@ -720,6 +744,13 @@ void TesselateFarFieldGrains::load_features()
}
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
void TesselateFarFieldGrains::merge_twins()
{

}
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
Expand Down
4 changes: 4 additions & 0 deletions Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/TesselateFarFieldGrains.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ class TesselateFarFieldGrains : public AbstractFilter
DREAM3D_FILTER_PARAMETER(QString, CellPhasesArrayName)
Q_PROPERTY(QString CellPhasesArrayName READ getCellPhasesArrayName WRITE setCellPhasesArrayName)

DREAM3D_FILTER_PARAMETER(QString, SlabIdArrayName)

DREAM3D_FILTER_PARAMETER(QString, FeaturePhasesArrayName)
Q_PROPERTY(QString FeaturePhasesArrayName READ getFeaturePhasesArrayName WRITE setFeaturePhasesArrayName)

Expand Down Expand Up @@ -162,6 +164,7 @@ class TesselateFarFieldGrains : public AbstractFilter
TesselateFarFieldGrains();

void load_features();
void merge_twins();
void assign_voxels();
void assign_gaps_only();
void assign_orientations();
Expand All @@ -177,6 +180,7 @@ class TesselateFarFieldGrains : public AbstractFilter

// Feature Data - make sure these are all initialized to NULL in the constructor
DEFINE_CREATED_DATAARRAY_VARIABLE(int32_t, FeaturePhases)
DEFINE_CREATED_DATAARRAY_VARIABLE(int32_t, SlabId)
DEFINE_CREATED_DATAARRAY_VARIABLE(float, FeatureEulerAngles)
DEFINE_CREATED_DATAARRAY_VARIABLE(float, ElasticStrains)
DEFINE_CREATED_DATAARRAY_VARIABLE(float, Centroids)
Expand Down

0 comments on commit ff79afe

Please sign in to comment.