detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-20 02:40:03 +02:00
Code Issues Actions Packages Releases Activity

Fix gui browse (#662)

Browse Source 
Choosing file path in dialog should already set file path when returning from dialog, must not wait to press enter
This commit is contained in:
Dhanya Thattil 2023-02-20 15:20:02 +01:00 committed by GitHub
parent 4259d49b63
commit 878eab9fc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RELEASE.txt
View File

@ -890,6 +890,11 @@ This document describes the differences between v7.0.0.rc1 and v6.1.2
Additional locking Added 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 * X, Y, Z axis limits
Did not reflect on the current plot. Fixed. Did not reflect on the current plot. Fixed.

1
slsDetectorGui/include/qDrawPlot.h
View File

@ -68,7 +68,6 @@ class qDrawPlot : public QWidget, private Ui::PlotObject {
void Zoom1DGainPlot(const QRectF &rect); void Zoom1DGainPlot(const QRectF &rect);
void Zoom2DGainPlot(const QRectF &rect); void Zoom2DGainPlot(const QRectF &rect);
void SetSaveFileName(QString val); void SetSaveFileName(QString val);
// void UpdatePlot();
signals: signals:
void AcquireFinishedSignal(); void AcquireFinishedSignal();

4
slsDetectorGui/src/qTabDataOutput.cpp
View File

@ -182,8 +182,10 @@ void qTabDataOutput::BrowseOutputDir() {
LOG(logDEBUG) << "Browsing output directory"; LOG(logDEBUG) << "Browsing output directory";
QString directory = QFileDialog::getExistingDirectory( QString directory = QFileDialog::getExistingDirectory(
this, tr("Choose Output Directory "), dispOutputDir->text()); this, tr("Choose Output Directory "), dispOutputDir->text());
if (!directory.isEmpty()) if (!directory.isEmpty()) {
dispOutputDir->setText(directory); dispOutputDir->setText(directory);
ForceSetOutputDir();
}
} }
void qTabDataOutput::SetOutputDir(bool force) { void qTabDataOutput::SetOutputDir(bool force) {