Commit 9f4e01f4 authored by Jan Burle's avatar Jan Burle
Browse files

This is release 2.0.3a

parent fc5e8dfa
ver. 2.0.3a (hotfix), released 2016.11.14
-----------------------------------------
Changes:
* fixed incorrect calculation of bin numbers for combined datasets
* non-used configuration entries (detector) temporarily hidden
ver. 2.0.3 (Armistice), released 2016.11.11
-------------------------------------------
......
......@@ -374,7 +374,7 @@ inten_vec Dataset::collectIntens(
if (1 < count()) { // combined datasets
auto one = first();
tth_t delta = one->rgeTth(session).width() / pixWidth;
numBins = to_u(qCeil(tthWdt / delta / 2));
numBins = to_u(qCeil(tthWdt / delta));
} else {
numBins = pixWidth; // simply match the pixels
}
......
......@@ -100,9 +100,10 @@ AboutBox::AboutBox(QWidget *parent) : super(parent, Qt::Dialog) {
auto g = gridLayout();
vb->addLayout(g);
g->addWidget(label("default det. distance"), 0, 0, Qt::AlignRight);
// TODO put back
// g->addWidget(label("default det. distance"), 0, 0, Qt::AlignRight);
g->addWidget((detDistance_ = spinDoubleCell(gui_cfg::em4_2, typ::Geometry::MIN_DETECTOR_DISTANCE)), 0, 1);
g->addWidget(label("default pixel size"), 1, 0, Qt::AlignRight);
// g->addWidget(label("default pixel size"), 1, 0, Qt::AlignRight);
g->addWidget((detPixelSize_ = spinDoubleCell(gui_cfg::em4_2, typ::Geometry::MIN_DETECTOR_PIXEL_SIZE)), 1, 1);
g->addColumnStretch();
......@@ -110,6 +111,10 @@ AboutBox::AboutBox(QWidget *parent) : super(parent, Qt::Dialog) {
detDistance_->setValue(s.readReal(config_key::DET_DISTANCE, typ::Geometry::DEF_DETECTOR_DISTANCE));
detPixelSize_->setValue(s.readReal(config_key::DET_PIX_SIZE, typ::Geometry::DEF_DETECTOR_PIXEL_SIZE));
// TODO put back
detDistance_->setVisible(false);
detPixelSize_->setVisible(false);
// buttons
vb->addWidget(hline());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment