From 1ae0b284b4b44f8fb27909949f77f1cd7e443d4c Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Wed, 16 Aug 2017 20:59:29 +0200 Subject: [PATCH 1/4] proper minimal ROOT version number check. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index e590b29b..244ffebb 100644 --- a/configure.ac +++ b/configure.ac @@ -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}" From 455129be6b1b80f2efcdac9558bea35e233a5d85 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Mon, 28 Aug 2017 10:47:39 +0200 Subject: [PATCH 2/4] updated the musrfit_dox.cfg file. --- doc/musrfit_dox.cfg | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/musrfit_dox.cfg b/doc/musrfit_dox.cfg index 83c10d9d..dc45cd0c 100644 --- a/doc/musrfit_dox.cfg +++ b/doc/musrfit_dox.cfg @@ -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 \ From 462119dd352b249189a3801ab562bd3943081d65 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Tue, 29 Aug 2017 07:58:55 +0200 Subject: [PATCH 3/4] adopted dark scheme for 'elementary-xfce-darker' --- src/musredit_qt5/musredit/PTextEdit.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/musredit_qt5/musredit/PTextEdit.cpp b/src/musredit_qt5/musredit/PTextEdit.cpp index 199d40be..45f52b9d 100644 --- a/src/musredit_qt5/musredit/PTextEdit.cpp +++ b/src/musredit_qt5/musredit/PTextEdit.cpp @@ -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; } From bb5f502398eb8078392dc72b596dff1b34d74a7b Mon Sep 17 00:00:00 2001 From: nemu Date: Wed, 30 Aug 2017 16:12:29 +0200 Subject: [PATCH 4/4] deal with run-time-path for macOS. --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 244ffebb..46c508fe 100644 --- a/configure.ac +++ b/configure.ac @@ -1147,6 +1147,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