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

Fix getRorationMatrix bug with 1 motor position.

Browse Source
This commit is contained in:
sunwen
2023-05-30 15:37:23 +08:00
parent 0d1ea2afe4
commit bb1774c1fb
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

@@ -98,7 +98,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 + 2]; double distance = movementsListReal.getData()[i + maxMotorPosNum];
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);
@@ -279,8 +279,8 @@ CEInfo Recon::getCEInfo(Parser* aParser, const MeasurementInfo aInfo)
} }
else else
{ {
double* ceData = new double[ceMeasuredLength]; double* ceData = new double[ceMeasuredLength * ceMeasuredPointer.getSize()];
std::copy(ceMeasuredData, ceMeasuredData + ceMeasuredLength, ceData); std::copy(ceMeasuredData, ceMeasuredData + ceMeasuredLength * ceMeasuredPointer.getSize(), ceData);
ce = Matrix::fromRawData(ceData, ceMeasuredLength, ceMeasuredPointer.getSize()); ce = Matrix::fromRawData(ceData, ceMeasuredLength, ceMeasuredPointer.getSize());
} }
if(aInfo.Bandpassundersampling) if(aInfo.Bandpassundersampling)