LMU/musrfit
5
1
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 4 Activity

some adaptation to the new Makefiles

Browse Source
This commit is contained in:
nemu
2009-06-16 06:21:02 +00:00
parent d21be88ad6
commit 11f34a21f6
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/musrgui/PAdmin.cpp
+9 -3
View File
@@ -228,11 +228,17 @@ bool PAdminXMLParser::endDocument()
}
if (fAdmin->getMsrDefaultFilePath().find('$') >= 0) {
expandPath(fAdmin->getMsrDefaultFilePath());
str = expandPath(fAdmin->getMsrDefaultFilePath());
if (!str.isEmpty())
fAdmin->setMsrDefaultFilePath(str);
}
if (fAdmin->getTheoFuncPixmapPath().find('$') >=0) {
str = expandPath(fAdmin->getTheoFuncPixmapPath());
if (!str.isEmpty())
fAdmin->setTheoFuncPixmapPath(str);
}
return true;
}
@@ -292,9 +298,9 @@ PAdmin::PAdmin()
QString fln = "./musrgui_startup.xml";
if (!QFile::exists(fln)) {
QString path = std::getenv("MUSRFITPATH");
QString home = std::getenv("HOME");
QString rootsys = std::getenv("ROOTSYS");
if (path.isEmpty())
path = home + "/analysis/bin";
path = rootsys + "/bin";
fln = path + "/musrgui_startup.xml";
}
if (QFile::exists(fln)) { // administration file present