From 878eab9fc320db54575aa3fd680bbf820fff95ac Mon Sep 17 00:00:00 2001 From: Dhanya Thattil <33750417+thattil@users.noreply.github.com> Date: Mon, 20 Feb 2023 15:20:02 +0100 Subject: [PATCH] Fix gui browse (#662) Choosing file path in dialog should already set file path when returning from dialog, must not wait to press enter --- RELEASE.txt | 5 +++++ slsDetectorGui/include/qDrawPlot.h | 1 - slsDetectorGui/src/qTabDataOutput.cpp | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index 2e537b73d..8381d2d85 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -889,6 +889,11 @@ This document describes the differences between v7.0.0.rc1 and v6.1.2 * [Mythen3][Gotthard2] Crashes Additional locking Added + + * File path set in detector after choosing a directory in dialog (without + pressing enter). Before, it was only set in the display box, but lost + when switching tabs. + * X, Y, Z axis limits Did not reflect on the current plot. Fixed. diff --git a/slsDetectorGui/include/qDrawPlot.h b/slsDetectorGui/include/qDrawPlot.h index fc8a3d951..3dd42244e 100644 --- a/slsDetectorGui/include/qDrawPlot.h +++ b/slsDetectorGui/include/qDrawPlot.h @@ -68,7 +68,6 @@ class qDrawPlot : public QWidget, private Ui::PlotObject { void Zoom1DGainPlot(const QRectF &rect); void Zoom2DGainPlot(const QRectF &rect); void SetSaveFileName(QString val); - // void UpdatePlot(); signals: void AcquireFinishedSignal(); diff --git a/slsDetectorGui/src/qTabDataOutput.cpp b/slsDetectorGui/src/qTabDataOutput.cpp index cdedf42e4..99b5789cd 100644 --- a/slsDetectorGui/src/qTabDataOutput.cpp +++ b/slsDetectorGui/src/qTabDataOutput.cpp @@ -182,8 +182,10 @@ void qTabDataOutput::BrowseOutputDir() { LOG(logDEBUG) << "Browsing output directory"; QString directory = QFileDialog::getExistingDirectory( this, tr("Choose Output Directory "), dispOutputDir->text()); - if (!directory.isEmpty()) + if (!directory.isEmpty()) { dispOutputDir->setText(directory); + ForceSetOutputDir(); + } } void qTabDataOutput::SetOutputDir(bool force) {