Merge pull request #6 from dpscience/dpscience-local

dpscience · web-flow · commit 815d967ab126 · 2019-07-31T15:31:01.000+02:00
preparing release v4.1
diff --git a/DLib/DCompression/compressionwrapper.cpp b/DLib/DCompression/compressionwrapper.cpp
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DCompression/compressionwrapper.h b/DLib/DCompression/compressionwrapper.h
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DGUI/constantexplanations.cpp b/DLib/DGUI/constantexplanations.cpp
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DGUI/constantexplanations.h b/DLib/DGUI/constantexplanations.h
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DGUI/horizontalrangedoubleslider.cpp b/DLib/DGUI/horizontalrangedoubleslider.cpp
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DGUI/horizontalrangedoubleslider.h b/DLib/DGUI/horizontalrangedoubleslider.h
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DGUI/mathconsoletextbox.cpp b/DLib/DGUI/mathconsoletextbox.cpp
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DGUI/mathconsoletextbox.h b/DLib/DGUI/mathconsoletextbox.h
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DGUI/slider.cpp b/DLib/DGUI/slider.cpp
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DGUI/slider.h b/DLib/DGUI/slider.h
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DGUI/svgbutton.cpp b/DLib/DGUI/svgbutton.cpp
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DGUI/svgbutton.h b/DLib/DGUI/svgbutton.h
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DGUI/verticalrangedoubleslider.cpp b/DLib/DGUI/verticalrangedoubleslider.cpp
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DGUI/verticalrangedoubleslider.h b/DLib/DGUI/verticalrangedoubleslider.h
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DLib.h b/DLib/DLib.h
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DPlot/plot2DXAxis.cpp b/DLib/DPlot/plot2DXAxis.cpp
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DPlot/plot2DXAxis.h b/DLib/DPlot/plot2DXAxis.h
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DPlot/plot2DXCanvas.cpp b/DLib/DPlot/plot2DXCanvas.cpp
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DPlot/plot2DXCanvas.h b/DLib/DPlot/plot2DXCanvas.h
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DPlot/plot2DXCurve.cpp b/DLib/DPlot/plot2DXCurve.cpp
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DPlot/plot2DXCurve.h b/DLib/DPlot/plot2DXCurve.h
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DPlot/plot2DXWidget.cpp b/DLib/DPlot/plot2DXWidget.cpp
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DPlot/plot2DXWidget.h b/DLib/DPlot/plot2DXWidget.h
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DTypes/defines.cpp b/DLib/DTypes/defines.cpp
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DTypes/defines.h b/DLib/DTypes/defines.h
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DTypes/types.cpp b/DLib/DTypes/types.cpp
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DTypes/types.h b/DLib/DTypes/types.h
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DXML/simplexml.cpp b/DLib/DXML/simplexml.cpp
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DLib/DXML/simplexml.h b/DLib/DXML/simplexml.h
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/DQuickLTFit.pro b/DQuickLTFit.pro
@@ -12,7 +12,7 @@ macx {
 QMAKE_MAC_SDK = macosx10.11
 }
 
-TARGET = DQuickLTFit
+TARGET = DQuickLTFit_4_1
 TEMPLATE = app
 
 win32{
diff --git a/Fit/lifetimedecayfit.cpp b/Fit/lifetimedecayfit.cpp
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
@@ -1215,6 +1215,23 @@ void LifeTimeDecayFitEngine::createResultString(PALSDataStructure *dataStructure
 
     /*tau average:*/resultString = resultString % startRow % startContent % tauAverage % finishContent % startContent % tauAverageVal % finishContent % finishRow % lineBreak;
 
+    double effectiveFWHMIRF = 0.0;
+    double effectiveFWHMIRFError = 0.0;
+
+    for ( int i = 0 ; i < fitSet->getDeviceResolutionParamPtr()->getSize() ; i += 3 ) {
+        effectiveFWHMIRF += (fitSet->getDeviceResolutionParamPtr()->getParameterAt(i)->getFitValue()*fitSet->getDeviceResolutionParamPtr()->getParameterAt(i+2)->getFitValue());
+        effectiveFWHMIRFError += (fitSet->getDeviceResolutionParamPtr()->getParameterAt(i)->getFitValueError()*fitSet->getDeviceResolutionParamPtr()->getParameterAt(i)->getFitValueError());
+    }
+
+    if (!qFuzzyCompare(effectiveFWHMIRFError, 0.0)) {
+        effectiveFWHMIRFError = sqrt(effectiveFWHMIRFError);
+    }
+
+    const QString effectiveFWHM("<nobr><b>effect. FWHM:</b></nobr>");
+    const QString effectiveFWHMVal("<nobr><b>( " % QString::number(effectiveFWHMIRF, 'f', 4) % " &plusmn; " % QString::number(effectiveFWHMIRFError, 'f', 4) % " ) </b>ps</nobr>");
+
+    /*effect. FWHM:*/resultString = resultString % startRow % startContent % effectiveFWHM % finishContent % startContent % effectiveFWHMVal % finishContent % finishRow % lineBreak;
+
     resultString = resultString % tableEnd % lineBreak;
 
 
@@ -1367,7 +1384,6 @@ void LifeTimeDecayFitEngine::createResultString(PALSDataStructure *dataStructure
     resultString = resultString % tableBorderEnd;
     resultString = resultString % lineBreak % lineBreak;
 
-    /*IRF-Components:*/
     resultString = resultString % "<nobr><b><big>" % "IRF (Gaussian)-Components [" % QVariant(fitSet->getDeviceResolutionParamPtr()->getSize()).toString() % "/" % QVariant(fitSet->getComponentsCount()+fitSet->getDeviceResolutionParamPtr()->getSize()).toString() % "]</b></big>" % startContent % sumOfIRFIntensities % finishContent % startContent % sumOfIRFIntensitiesVal % finishContent % "</nobr>";
 
     resultString = resultString % tableBorderStart;
diff --git a/Fit/lifetimedecayfit.h b/Fit/lifetimedecayfit.h
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 ﻿# DQuickLTFit  <img src="https://github.com/dpscience/DQuickLTFit/blob/master/Images/IconPNGRounded.png" width="25" height="25">   
 
-Copyright (c) 2016-2018 Danny Petschke (danny.petschke@uni-wuerzburg.de) All rights reserved.<br><br>
+Copyright (c) 2016-2019 Danny Petschke (danny.petschke@uni-wuerzburg.de) All rights reserved.<br><br>
 <b>DQuickLTFit</b> - A Least-Square Fitting Tool for the Analysis of Positron-Lifetime Spectra consisting of discrete specific Lifetimes using the Levenberg-Marquardt Algorithm<br>
 
-#### We recommend the use of DQuickLTFit v4.0 and higher since this is the first stable version.
+#### We recommend the use of DQuickLTFit v4.0 or higher as this is the first stable version.
 
 <br>![DQuickLTFit](/TestData/Software.png)
 
@@ -14,6 +14,7 @@ You can cite all versions by using the <b>DOI 10.5281/zenodo.1168285</b>. This D
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1168285.svg)](https://doi.org/10.5281/zenodo.1168285)
 
 ## v4.x
+DQuickLTFit v4.1:<br>[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1414142.svg)](https://doi.org/10.5281/zenodo.1414142)<br>
 DQuickLTFit v4.0:<br>[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1414142.svg)](https://doi.org/10.5281/zenodo.1414142)<br>
 
 ## v3.x
@@ -30,7 +31,7 @@ MPFIT was ported from [MINPACK-1](http://www.netlib.org/minpack/) library [2,3].
 The disclaimer of MPFIT library can be found [here](/Fit/mpfit_DISCLAIMER).<br>
 
 # License (GNU General Public License)
-Copyright (c) 2016-2018 Danny Petschke (danny.petschke@uni-wuerzburg.de) All rights reserved.<br><br>
+Copyright (c) 2016-2019 Danny Petschke (danny.petschke@uni-wuerzburg.de) All rights reserved.<br><br>
 
 <p align="justify">This program is free software: you can redistribute it and/or modify<br>
 it under the terms of the GNU General Public License as published by<br>
@@ -43,7 +44,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.<br><br></p>
 
 For more details see [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0)
 
-# Setup
+# Run executable (*.exe)
+The executable (and binary files) can be either downloaded from <b>zenodo platform</b> by following the related DOI (see above) or from the corresponding release.
+
+# Setup from source files
 1. Download [Qt-framework](https://www.qt.io/download) (at least v5.x).
 2. Download and Setup MS Visual Studio Compiler 2013 (or any newer version) .
 3. Compile (x86/x64) and Run the code on your Machine.
@@ -58,4 +62,3 @@ For more details see [GNU General Public License v3](https://www.gnu.org/license
 
 
 
-
diff --git a/Settings/projectmanager.cpp b/Settings/projectmanager.cpp
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/Settings/projectmanager.h b/Settings/projectmanager.h
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/Settings/projectsettingsmanager.cpp b/Settings/projectsettingsmanager.cpp
@@ -4,7 +4,7 @@
 **  based on the Least-Square Optimization using the Levenberg-Marquardt
 **  Algorithm.
 **
-**  Copyright (C) 2016-2018 Danny Petschke
+**  Copyright (C) 2016-2019 Danny Petschke
 **
 **  This program is free software: you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License as published by
diff --git a/Settings/projectsettingsmanager.h b/Settings/projectsettingsmanager.h
diff --git a/Settings/settings.cpp b/Settings/settings.cpp
diff --git a/Settings/settings.h b/Settings/settings.h
diff --git a/ltcalculatordlg.cpp b/ltcalculatordlg.cpp
diff --git a/ltcalculatordlg.h b/ltcalculatordlg.h
diff --git a/ltdefines.h b/ltdefines.h
diff --git a/ltfitdlg.cpp b/ltfitdlg.cpp
diff --git a/ltfitdlg.h b/ltfitdlg.h
diff --git a/ltfitplotresidualview.cpp b/ltfitplotresidualview.cpp
diff --git a/ltfitplotresidualview.h b/ltfitplotresidualview.h
diff --git a/ltparameterlistview.cpp b/ltparameterlistview.cpp
diff --git a/ltparameterlistview.h b/ltparameterlistview.h
diff --git a/ltplotdlg.cpp b/ltplotdlg.cpp
diff --git a/ltplotdlg.h b/ltplotdlg.h
diff --git a/ltresultdlg.cpp b/ltresultdlg.cpp
diff --git a/ltresultdlg.h b/ltresultdlg.h
diff --git a/main.cpp b/main.cpp
