detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +02:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.1' into condatest

Browse Source
This commit is contained in:
Erik Frojdh
2018-02-08 10:36:06 +01:00
parent ee9996908a 94b61ea2c4
commit 23c5a73285
37 changed files with 1433 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorGui/src/qTabAdvanced.cpp
View File

@ -374,7 +374,7 @@ void qTabAdvanced::SetOutputFile(){
//gets the clean absolute path
dirPath = dir.absoluteFilePath(dirPath);
dirPath = dir.cleanPath(dirPath);
QString trimdir = QString(myDet->getSettingsFile()).section('/',0,-2,QString::SectionIncludeLeadingSep);
QString trimdir = QString::fromStdString(myDet->getSettingsFile()).section('/',0,-2,QString::SectionIncludeLeadingSep);
trimdir = dir.absoluteFilePath(trimdir);
trimdir = dir.cleanPath(trimdir);
if(!dirPath.compare(trimdir)){