LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit

Browse Source
This commit is contained in:
salman 2017-09-20 14:26:09 +02:00
commit 96d15f027a
4 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure.ac
View File

@ -1,7 +1,7 @@
AC_REVISION([m4_esyscmd_s([git describe --always])])
AC_PREREQ(2.63)
AC_INIT([musrfit],[1.0.0],[andreas.suter@psi.ch])
AC_INIT([musrfit],[1.1.0],[andreas.suter@psi.ch])
AC_CONFIG_AUX_DIR(admin)
AC_CANONICAL_HOST
#AC_MSG_RESULT([${host} ${host_cpu} ${host_vendor} ${host_os}])
@ -35,7 +35,7 @@ dnl -----------------------------------------------
#release versioning
MUSR_MAJOR_VERSION=1
MUSR_MINOR_VERSION=0
MUSR_MINOR_VERSION=1
MUSR_MICRO_VERSION=0
#release versioning
@ -421,7 +421,7 @@ dnl -----------------------------------------------
dnl Check for ROOT
dnl -----------------------------------------------
ROOT_PATH([5.22/00], [], AC_MSG_ERROR([Either ROOT is not installed correctly or the version is too old... please check!]))
ROOT_PATH([6.06/00], [], AC_MSG_ERROR([Either ROOT is not installed correctly or the version is too old... please check!]))
ROOT_LIBS="-L${ROOTLIBDIR} ${ROOTGLIBS} ${ROOTAUXLIBS} -lMinuit2 -lMathMore -lXMLParser"
ROOT_CFLAGS="-I${ROOTINCDIR} ${ROOTCFLAGS} ${ROOTAUXCFLAGS}"
@ -1000,6 +1000,14 @@ if test "x$enable_editor" != "xno"; then
[PKG_CHECK_MODULES(QT3MT, qt-mt >= 3.3.0 qt-mt < 4.0, [QT3MT_FOUND=yes], [QT3MT_FOUND=no])]
)]
)
fi
if test "x${QT5_FOUND}" != "xyes"; then
PKG_CHECK_MODULES(QT5, Qt5WebEngine >= $QT5MINVER Qt5Xml >= $QT5MINVER, [QT5_FOUND=yes],
[AC_MSG_NOTICE([Qt5 (including Qt5WebEngine and Qt5Xml) not found!])
PKG_CHECK_MODULES(QT3, qt >= 3.3.0 qt < 4.0, [QT3_FOUND=yes],
[PKG_CHECK_MODULES(QT3MT, qt-mt >= 3.3.0 qt-mt < 4.0, [QT3MT_FOUND=yes], [QT3MT_FOUND=no])]
)]
)
fi]
)
@ -1024,6 +1032,12 @@ if test "x$enable_editor" != "xno"; then
QTEDITOR=musrgui
fi
dnl if Qt5 but Qt5WebEngine instead of Qt5WebKit
if test "x$QTPATH" = "x"; then
QTPATH=$(pkg-config --variable=prefix Qt5WebEngine)
QTEDITOR=musredit_qt5
fi
AC_MSG_CHECKING([for qmake])
if test "x${QTPATH}" != "xnone"; then
if test "x$QTEDITOR" = "xmusredit_qt5"; then
@ -1147,6 +1161,7 @@ case "$host" in
*-*-darwin*)
ARCH=DARWIN
LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D_Darwin_"
LOCAL_BIN_LDFLAGS="${LOCAL_BIN_LDFLAGS} -Wl,-rpath ${ROOTLIBDIR}"
;;
*)
ARCH=OTHERUNIX

11
doc/musrfit_dox.cfg
View File

@ -23,7 +23,7 @@ PROJECT_NAME = musrfit
# This could be handy for archiving the generated documentation or
# if some version control system is used.
PROJECT_NUMBER = 0.14.0
PROJECT_NUMBER = 1.1.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
@ -462,8 +462,9 @@ WARN_LOGFILE =
INPUT = musrfit.dox \
../src/include/PFitterFcn.h \
../src/include/PFitter.h \
../src/include/PFourier.h \
../src/include/PFourierCanvas.h \
../src/include/PFourierCanvasLinkDef.h \
../src/include/PFourier.h \
../src/include/PFunctionGrammar.h \
../src/include/PFunction.h \
../src/include/PFunctionHandler.h \
@ -476,12 +477,14 @@ INPUT = musrfit.dox \
../src/include/PMusrT0LinkDef.h \
../src/include/PPrepFourier.h \
../src/include/PRunAsymmetry.h \
../src/include/PRunAsymmetryRRF.h \
../src/include/PRunBase.h \
../src/include/PRunDataHandler.h \
../src/include/PRunListCollection.h \
../src/include/PRunMuMinus.h \
../src/include/PRunNonMusr.h \
../src/include/PRunSingleHisto.h \
../src/include/PRunSingleHistoRRF.h \
../src/include/PStartupHandler.h \
../src/include/PStartupHandlerLinkDef.h \
../src/include/PTheory.h \
@ -490,8 +493,8 @@ INPUT = musrfit.dox \
../src/include/PUserFcn.h \
../src/classes/PFitter.cpp \
../src/classes/PFitterFcn.cpp \
../src/classes/PFourier.cpp \
../src/classes/PFourierCanvas.cpp \
../src/classes/PFourier.cpp \
../src/classes/PFunction.cpp \
../src/classes/PFunctionHandler.cpp \
../src/classes/PMsr2Data.cpp \
@ -501,12 +504,14 @@ INPUT = musrfit.dox \
../src/classes/PMusrT0.cpp \
../src/classes/PPrepFourier.cpp \
../src/classes/PRunAsymmetry.cpp \
../src/classes/PRunAsymmetryRRF.cpp \
../src/classes/PRunBase.cpp \
../src/classes/PRunDataHandler.cpp \
../src/classes/PRunListCollection.cpp \
../src/classes/PRunMuMinus.cpp \
../src/classes/PRunNonMusr.cpp \
../src/classes/PRunSingleHisto.cpp \
../src/classes/PRunSingleHistoRRF.cpp \
../src/classes/PStartupHandler.cpp \
../src/classes/PTheory.cpp \
../src/classes/PUserFcnBase.cpp \

2
src/classes/PStartupHandler.cpp
View File

@ -629,8 +629,6 @@ Bool_t PStartupHandler::WriteDefaultStartupFile()
fout << " <comment>" << endl;
fout << " Defines default settings for the musrfit package" << endl;
fout << " </comment>" << endl;
fout << " <data_path>/mnt/data/nemu/his</data_path>" << endl;
fout << " <data_path>/mnt/data/nemu/wkm</data_path>" << endl;
fout << " <data_path>/afs/psi.ch/project/nemu/data/his</data_path>" << endl;
fout << " <data_path>/afs/psi.ch/project/nemu/data/wkm</data_path>" << endl;
fout << " <data_path>/afs/psi.ch/project/bulkmusr/data/gps</data_path>" << endl;

5
src/musredit_qt5/musredit/PTextEdit.cpp
View File

@ -3027,10 +3027,15 @@ void PTextEdit::getTheme()
QString str = QIcon::themeName();
qDebug() << "debug> str=" << str << endl;
if (str.contains("dark", Qt::CaseInsensitive)) {
fDarkTheme = true;
if (str.contains("ubuntu", Qt::CaseInsensitive)) {
fDarkToolBarIcon = false;
} else if (str.contains("xfce", Qt::CaseInsensitive)) {
fDarkTheme = false;
fDarkToolBarIcon = false;
} else {
fDarkToolBarIcon = true;
}