Commit 772e2f9f authored by Vladimír Ulman's avatar Vladimír Ulman
Browse files

ADD,WIP 2/3: NUCLEOLI_ID_MUL became effective for nuclei masks

parent 82505dcc

src/cell.cpp

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ void Cell<MV,PV>::GenerateDotDistributionInG2Phase() 


#ifdef GTGEN_WITH_NUCLEIMASKS

	 //write also the initial nucleus mask into the sceneNuclei

	 RenderBPListIntoMask(*(scheduler.sceneNuclei[timePoint]),(MV)this->ID,

	 RenderBPListIntoMask(*(scheduler.sceneNuclei[timePoint]),(MV)(this->ID*NUCLEOLI_ID_MUL),

		scmNucleusBPList,scmNucleusBPCentre,scmNucleusOuterBPNumber);

#endif

	/*

src/cellScm.cpp

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ void Cell<MV, PV>::ScmRenderCellIntoMask(i3d::Image3d<MV> &mask, 
	ReportCellPhaseID(scmCellBPCentre,this->ID,GetCurrentPhaseID(),mask,reportedTimePoint);



	//render also nuclei if it is present

	if (Nmask) RenderBPListIntoMask(*Nmask,(MV)this->ID,

	if (Nmask) RenderBPListIntoMask(*Nmask,(MV)(this->ID*NUCLEOLI_ID_MUL),

				scmNucleusBPList,scmNucleusBPCentre,scmNucleusOuterBPNumber);

}

src/cell_04_Telophase.cpp

+2 −2
Original line number Diff line number Diff line
@@ -446,12 +446,12 @@ void Cell<MV, PV>::DoTelophase(const size_t noFrames) 


#ifdef GTGEN_WITH_NUCLEIMASKS

		//render both nuclei as single one, we still have not split so far

		RenderBPListIntoMask(*scheduler.sceneNuclei[timePoint+1],this->ID,

		RenderBPListIntoMask(*scheduler.sceneNuclei[timePoint+1],(MV)(this->ID*NUCLEOLI_ID_MUL),

			duplicatedCell1->scmNucleusBPList,

			duplicatedCell1->scmNucleusBPCentre,

			duplicatedCell1->scmNucleusOuterBPNumber,

			slsFF);

		RenderBPListIntoMask(*scheduler.sceneNuclei[timePoint+1],this->ID,

		RenderBPListIntoMask(*scheduler.sceneNuclei[timePoint+1],(MV)(this->ID*NUCLEOLI_ID_MUL),

			duplicatedCell2->scmNucleusBPList,

			duplicatedCell2->scmNucleusBPCentre,

			duplicatedCell2->scmNucleusOuterBPNumber,

src/cell_05_Cytokinesis.cpp

+6 −6
Original line number Diff line number Diff line
@@ -517,9 +517,9 @@ void Cell<MV, PV>::DoCytokinesis(const size_t noFrames) 
										 duplicatedCell2->scmCellBPCentre,

										 duplicatedCell2->scmCellOuterBPNumber);

#ifdef GTGEN_WITH_NUCLEIMASKS

			RenderBPListIntoMask(*scheduler.sceneNuclei[timePoint+1],ID, duplicatedCell1->scmNucleusBPList,

			RenderBPListIntoMask(*scheduler.sceneNuclei[timePoint+1],(MV)(ID*NUCLEOLI_ID_MUL), duplicatedCell1->scmNucleusBPList,

				 duplicatedCell1->scmNucleusBPCentre, duplicatedCell1->scmNucleusOuterBPNumber,slsFF);

			RenderBPListIntoMask(*scheduler.sceneNuclei[timePoint+1],ID, duplicatedCell2->scmNucleusBPList,

			RenderBPListIntoMask(*scheduler.sceneNuclei[timePoint+1],(MV)(ID*NUCLEOLI_ID_MUL), duplicatedCell2->scmNucleusBPList,

				 duplicatedCell2->scmNucleusBPCentre, duplicatedCell2->scmNucleusOuterBPNumber,slsFF);

#endif

			//enables reporting of cell centres for MSD analysis
@@ -550,9 +550,9 @@ void Cell<MV, PV>::DoCytokinesis(const size_t noFrames) 
										 duplicatedCell2->scmCellBPCentre,

										 duplicatedCell2->scmCellOuterBPNumber);

#ifdef GTGEN_WITH_NUCLEIMASKS

			RenderBPListIntoMask(*scheduler.sceneNuclei[timePoint+1],daughter1->GetID(), duplicatedCell1->scmNucleusBPList,

			RenderBPListIntoMask(*scheduler.sceneNuclei[timePoint+1],(MV)(daughter1->GetID()*NUCLEOLI_ID_MUL), duplicatedCell1->scmNucleusBPList,

				 duplicatedCell1->scmNucleusBPCentre, duplicatedCell1->scmNucleusOuterBPNumber,slsFF);

			RenderBPListIntoMask(*scheduler.sceneNuclei[timePoint+1],daughter2->GetID(), duplicatedCell2->scmNucleusBPList,

			RenderBPListIntoMask(*scheduler.sceneNuclei[timePoint+1],(MV)(daughter2->GetID()*NUCLEOLI_ID_MUL), duplicatedCell2->scmNucleusBPList,

				 duplicatedCell2->scmNucleusBPCentre, duplicatedCell2->scmNucleusOuterBPNumber,slsFF);

#endif

			//enables reporting of cell centres for MSD analysis
@@ -568,8 +568,8 @@ void Cell<MV, PV>::DoCytokinesis(const size_t noFrames) 
				  << " POSY " << duplicatedCell2->scmCellBPCentre.y);

			}



			ReportCellPhaseID(duplicatedCell1->scmCellBPCentre,daughter1->ID,1,*scheduler.sceneMasks[timePoint+1],timePoint+1);

			ReportCellPhaseID(duplicatedCell2->scmCellBPCentre,daughter2->ID,1,*scheduler.sceneMasks[timePoint+1],timePoint+1);

			ReportCellPhaseID(duplicatedCell1->scmCellBPCentre,daughter1->ID,(MV)1,*scheduler.sceneMasks[timePoint+1],timePoint+1);

			ReportCellPhaseID(duplicatedCell2->scmCellBPCentre,daughter2->ID,(MV)1,*scheduler.sceneMasks[timePoint+1],timePoint+1);

			//NB: daughters are known to be at the beginning of their cell cycle but their internal structures assume

			//the start-of-simulation state (G2 phase) and so reporting is "hardcoded" here...

		}