jfjoch_viewer: Show angle as current image angle + wedge
This commit is contained in:
@@ -723,9 +723,14 @@ std::optional<GoniometerAxis> JFJochHDF5Reader::ReadAxis(HDF5Object *file, const
|
||||
if (angle.size() < 2)
|
||||
return {};
|
||||
|
||||
std::vector<double> end = file->ReadOptVector<double>(dname + "_end");
|
||||
|
||||
double start = angle[0];
|
||||
double incr = angle[1] - angle[0];
|
||||
|
||||
HDF5DataSet dataset_end(*file, dname + "_end");
|
||||
std::vector<double> angle_end;
|
||||
|
||||
if (dataset.ReadAttrStr("transformation_type") != "rotation")
|
||||
return {};
|
||||
|
||||
@@ -735,8 +740,11 @@ std::optional<GoniometerAxis> JFJochHDF5Reader::ReadAxis(HDF5Object *file, const
|
||||
dname + " Vector must have 3 elements");
|
||||
|
||||
Coord axis(axis_vec[0], axis_vec[1], axis_vec[2]);
|
||||
GoniometerAxis g_axis(name, start, incr, axis, {});
|
||||
if (!end.empty())
|
||||
g_axis.ScreeningWedge(end[0] - angle[0]);
|
||||
|
||||
return GoniometerAxis(name, start, incr, axis, {});
|
||||
return g_axis;
|
||||
}
|
||||
|
||||
CompressedImage JFJochHDF5Reader::ReadCalibration(std::vector<uint8_t> &tmp, const std::string &name) const {
|
||||
|
||||
Reference in New Issue
Block a user