2511-viewer-enh (#5)
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 11m52s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 12m47s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 12m58s
Build Packages / build:rpm (rocky8) (push) Successful in 12m13s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 12m34s
Build Packages / Unit tests (push) Has been skipped
Build Packages / Create release (push) Has been skipped
Build Packages / Generate python client (push) Successful in 23s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m33s
Build Packages / Build documentation (push) Successful in 42s
Build Packages / build:rpm (rocky9) (push) Successful in 9m57s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 7m9s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 6m34s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 11m52s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 12m47s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 12m58s
Build Packages / build:rpm (rocky8) (push) Successful in 12m13s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 12m34s
Build Packages / Unit tests (push) Has been skipped
Build Packages / Create release (push) Has been skipped
Build Packages / Generate python client (push) Successful in 23s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m33s
Build Packages / Build documentation (push) Successful in 42s
Build Packages / build:rpm (rocky9) (push) Successful in 9m57s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 7m9s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 6m34s
## 1.0.0-rc.100 This is an UNSTABLE release. * jfjoch_viewer: Fix dbus registration * jfjoch_viewer: Remove background slider for diffraction image * jfjoch_viewer: Adjustments for 2D azimuthal image viewer Reviewed-on: #5 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch> Co-committed-by: Filip Leonarski <filip.leonarski@psi.ch>
This commit was merged in pull request #5.
This commit is contained in:
@@ -22,7 +22,7 @@ JFJochViewerSidePanelChart::JFJochViewerSidePanelChart(QWidget *parent) : QWidge
|
||||
this, &JFJochViewerSidePanelChart::comboBoxSelected);
|
||||
|
||||
azint_plot = new JFJochSimpleChartView(this);
|
||||
azint_image = new JFJochAzIntImageView(this);
|
||||
azint_image = new JFJochAzIntImage(this);
|
||||
one_over_d_sq_plot = new JFJochOneOverResSqChartView(this);
|
||||
|
||||
stack = new QStackedWidget(this);
|
||||
@@ -33,6 +33,11 @@ JFJochViewerSidePanelChart::JFJochViewerSidePanelChart(QWidget *parent) : QWidge
|
||||
layout->addWidget(stack);
|
||||
|
||||
setLayout(layout);
|
||||
|
||||
connect(azint_image, &JFJochAzIntImage::writeStatusBar,
|
||||
[&](QString string, int timeout_ms) {
|
||||
emit writeStatusBar(string, timeout_ms);
|
||||
});
|
||||
}
|
||||
|
||||
void JFJochViewerSidePanelChart::comboBoxSelected(int val) {
|
||||
@@ -87,8 +92,8 @@ void JFJochViewerSidePanelChart::redrawPlot() {
|
||||
const auto &ds = image->Dataset();
|
||||
int az_bins = ds.azimuthal_bins;
|
||||
int q_bins = ds.q_bins;
|
||||
if (az_bins > 1 && q_bins > 0 && profile.size() == static_cast<size_t>(az_bins * q_bins)) {
|
||||
azint_image->SetData(profile, az_bins, q_bins);
|
||||
if (az_bins > 0 && q_bins > 0 && profile.size() == static_cast<size_t>(az_bins * q_bins)) {
|
||||
azint_image->SetData(profile, ds.az_int_bin_to_phi, ds.az_int_bin_to_q, az_bins);
|
||||
} else {
|
||||
azint_image->Clear();
|
||||
}
|
||||
@@ -103,3 +108,7 @@ void JFJochViewerSidePanelChart::loadImage(std::shared_ptr<const JFJochReaderIma
|
||||
image = in_image;
|
||||
redrawPlot();
|
||||
}
|
||||
|
||||
void JFJochViewerSidePanelChart::setColorMap(int color_map) {
|
||||
azint_image->setColorMap(color_map);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user