sunwen/UR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert movement listreal usage.

Browse Source
This commit is contained in:
sunwen
2023-06-28 16:49:18 +08:00
parent fad9168527
commit 45edfcd974
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/getMeasurementMetaData.cpp
View File

@@ -89,6 +89,7 @@ TransFormInfo Recon::getTransformationMatrix(Parser* aParser, const Matrix& aMot
{ {
movementRealAvailable = false; movementRealAvailable = false;
} }
//movementRealAvailable=false;
if(movementRealAvailable) if(movementRealAvailable)
{ {
int maxMotorPosNum = motorPosList.getDimSize(0); int maxMotorPosNum = motorPosList.getDimSize(0);
@@ -98,7 +99,7 @@ TransFormInfo Recon::getTransformationMatrix(Parser* aParser, const Matrix& aMot
for(int i=0; i<maxMotorPosNum; ++i) for(int i=0; i<maxMotorPosNum; ++i)
{ {
double rotation = movementsListReal.getData()[i]; double rotation = movementsListReal.getData()[i];
double distance = movementsListReal.getData()[i + maxMotorPosNum]; double distance = movementsListReal.getData()[i + aParser->getMetaData().getAperturePositionNumber()];
transformationMatrixListData[16*i + 0] = cos(rotation*PI/180); transformationMatrixListData[16*i + 0] = cos(rotation*PI/180);
transformationMatrixListData[16*i + 1] = sin(rotation*PI/180); transformationMatrixListData[16*i + 1] = sin(rotation*PI/180);
transformationMatrixListData[16*i + 4] = -sin(rotation*PI/180); transformationMatrixListData[16*i + 4] = -sin(rotation*PI/180);
@@ -112,7 +113,7 @@ TransFormInfo Recon::getTransformationMatrix(Parser* aParser, const Matrix& aMot
else else
{ {
auto rotationMatrix = aParser->getMovementData().getRotationMatrix(); auto rotationMatrix = aParser->getMovementData().getRotationMatrix();
size_t maxMotorPosNum = rotationMatrix.size(); int maxMotorPosNum = motorPosList.getDimSize(0);
double* transformationMatrixListData = new double[16*maxMotorPosNum]; double* transformationMatrixListData = new double[16*maxMotorPosNum];
for(size_t i=0; i<maxMotorPosNum; ++i) for(size_t i=0; i<maxMotorPosNum; ++i)
{ {
@@ -121,7 +122,6 @@ TransFormInfo Recon::getTransformationMatrix(Parser* aParser, const Matrix& aMot
transformationMatrixList = Matrix::fromRawData(transformationMatrixListData, 4, 4, maxMotorPosNum); transformationMatrixList = Matrix::fromRawData(transformationMatrixListData, 4, 4, maxMotorPosNum);
} }
result.rotationMatrix = transformationMatrixList; result.rotationMatrix = transformationMatrixList;
return result; return result;
} }