Skip to content

Commit

Permalink
Refs #6315. More compiler issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Reuter committed Apr 26, 2013
1 parent 7cdc644 commit 1da6a83
Showing 1 changed file with 45 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,46 @@ class vtkDataSetToNonOrthogonalDataSetTest : public CxxTest::TestSuite
alg->setProperty("alpha", 90.0);
alg->setProperty("beta", 90.0);
alg->setProperty("gamma", 120.0);
std::vector<double> uVec {1*scale, 1, 0};
std::vector<double> vVec {0, 0, 1};
std::vector<double> uVec;
uVec.push_back(1*scale);
uVec.push_back(1);
uVec.push_back(0);
std::vector<double> vVec;
vVec.push_back(0);
vVec.push_back(0);
vVec.push_back(1);
alg->setProperty("u", uVec);
alg->setProperty("v", vVec);
alg->execute();

// Create the coordinate transformation information
std::vector<Mantid::coord_t> affMatVals {1, 0, 0, 0, 0,
0, 0, 1, 0, 0,
0, 0, 0, 1, 0,
0, 1, 0, 0, 0,
0, 0, 0, 0, 1};
std::vector<Mantid::coord_t> affMatVals;
affMatVals.push_back(1);
affMatVals.push_back(0);
affMatVals.push_back(0);
affMatVals.push_back(0);
affMatVals.push_back(0);
affMatVals.push_back(0);
affMatVals.push_back(0);
affMatVals.push_back(1);
affMatVals.push_back(0);
affMatVals.push_back(0);
affMatVals.push_back(0);
affMatVals.push_back(0);
affMatVals.push_back(0);
affMatVals.push_back(1);
affMatVals.push_back(0);
affMatVals.push_back(0);
affMatVals.push_back(1);
affMatVals.push_back(0);
affMatVals.push_back(0);
affMatVals.push_back(0);
affMatVals.push_back(0);
affMatVals.push_back(0);
affMatVals.push_back(0);
affMatVals.push_back(0);
affMatVals.push_back(1);

CoordTransformAffine affMat(4, 4);
affMat.setMatrix(Matrix<Mantid::coord_t>(affMatVals));
ws->setTransformToOriginal(affMat.clone(), 0);
Expand All @@ -74,7 +102,16 @@ class vtkDataSetToNonOrthogonalDataSetTest : public CxxTest::TestSuite
}
else
{
std::vector<double> trans {1, 1, 0, 1, -1, 0, 0, 0, 1};
std::vector<double> trans;
trans.push_back(1);
trans.push_back(1);
trans.push_back(0);
trans.push_back(1);
trans.push_back(-1);
trans.push_back(0);
trans.push_back(0);
trans.push_back(0);
trans.push_back(1);
DblMatrix temp(trans);
wMat = temp;
}
Expand Down

0 comments on commit 1da6a83

Please sign in to comment.