Commit 1e88db37 authored by Vladimír Ulman's avatar Vladimír Ulman
Browse files

FIX: Filopodia masks use the same color as is their composed unique IDs.

parent 549506fa

src/main_Generator.cpp

+15 −5
Original line number Original line Diff line number Diff line
@@ -287,8 +287,13 @@ int RenderMesh(const char* path,const int ID,int fileNo) 
	//renders the isotropic mask into the image

	//renders the isotropic mask into the image

	std::cout << "rendering mask #" << fileNo << "\n";

	std::cout << "rendering mask #" << fileNo << "\n";

	mesh.RenderMask_bodyVol(mask); //full volume

	mesh.RenderMask_bodyVol(mask); //full volume

	for (unsigned int i=0; i < mesh.GetFilopodiaNumber(); ++i)

	std::map<int,timeVector>::iterator tipIter=tipOffsets.begin();

		mesh.RenderMask_filo(mask,i);

	while (tipIter != tipOffsets.end())

	{

		if (tipIter->second.at((unsigned)fileNo) > -1)

			mesh.RenderMask_filo(mask,(unsigned)tipIter->second.at((unsigned)fileNo),(unsigned short)tipIter->first);

		++tipIter;

	}





	std::cout << "exporting isotropic mask #" << fileNo << "\n";

	std::cout << "exporting isotropic mask #" << fileNo << "\n";

	char fileName[1024];

	char fileName[1024];
@@ -424,8 +429,13 @@ int RenderMesh(const char* path,const int ID,int fileNo) 
	//re-render

	//re-render

	mask.GetVoxelData()=0;

	mask.GetVoxelData()=0;

	mesh.RenderMask_bodyVol(mask); //full volume

	mesh.RenderMask_bodyVol(mask); //full volume

	for (unsigned int i=0; i < mesh.GetFilopodiaNumber(); ++i)

	tipIter=tipOffsets.begin();

		mesh.RenderMask_filo(mask,i);

	while (tipIter != tipOffsets.end())

	{

		if (tipIter->second.at((unsigned)fileNo) > -1)

			mesh.RenderMask_filo(mask,(unsigned)tipIter->second.at((unsigned)fileNo),(unsigned short)tipIter->first);

		++tipIter;

	}

 #endif

 #endif

#endif

#endif

	//save the mask image

	//save the mask image
@@ -440,7 +450,7 @@ int RenderMesh(const char* path,const int ID,int fileNo) 
	const float zOff=mask.GetOffset().z;

	const float zOff=mask.GetOffset().z;





	//scan over all branches we recognize at this time-point

	//scan over all branches we recognize at this time-point

	std::map<int,timeVector>::iterator tipIter=tipOffsets.begin();

	tipIter=tipOffsets.begin();

	while (tipIter != tipOffsets.end())

	while (tipIter != tipOffsets.end())

	{

	{

		//if there is a record for the present time-point, translate it

		//if there is a record for the present time-point, translate it