diff --git a/CMakeLists.txt b/CMakeLists.txt index 477412052e10a64c2b9ba6f9b8fb0e2e75132294..16af19c8c7fe55203fef3e09b67ddefdeb2609db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ SET(SOFTWARE_NAME "XTPcpp") SET(XTPCPP_VERSION_MAJOR "0") SET(XTPCPP_VERSION_MINOR "1") -SET(XTPCPP_VERSION_PATCH "18") +SET(XTPCPP_VERSION_PATCH "19") SET(XTPCPP_VERSION "${XTPCPP_VERSION_MAJOR}.${XTPCPP_VERSION_MINOR}.${XTPCPP_VERSION_PATCH}") # Set the CMAKE_PREFIX_PATH for the find_library fonction when using non @@ -102,7 +102,6 @@ SET(CPACK_SOURCE_IGNORE_FILES "debian/debhelper\\\\.log" "build/" "cbuild/" - "html" "Core.tag" "Testing" "build-stamp" @@ -188,7 +187,8 @@ SET(UPDATE_OPTIONS "") #ENDIF(BUILD_TESTING) configure_file (${CMAKE_SOURCE_DIR}/templates/share/applications/xtpcpp.desktop.cmake ${CMAKE_BINARY_DIR}/templates/share/applications/xtpcpp.desktop) -INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/src/xtpcpp DESTINATION bin) INSTALL(FILES ${CMAKE_BINARY_DIR}/templates/share/applications/xtpcpp.desktop DESTINATION share/applications) + +INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/src/xtpcpp DESTINATION bin) configure_file(${CMAKE_SOURCE_DIR}/src/resources/xtandempipeline_icon.svg ${CMAKE_BINARY_DIR}/src/resources/xtpcpp.svg COPYONLY) INSTALL(FILES ${CMAKE_BINARY_DIR}/src/resources/xtpcpp.svg DESTINATION share/icons/hicolor/scalable/apps) diff --git a/debian/changelog b/debian/changelog index 0d790e1aba003cd0a703b8e7fae67b28b79b17cf..454b761bf216f1a41eac4a9128879ec477d13adb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xtpcpp (0.1.19-1) stretch; urgency=medium + + * new preset window (for tandem parameters) + * divizion by zero fixed and exception added + + -- Olivier Langella <olivier.langella@u-psud.fr> Mon, 09 Oct 2017 09:03:30 +0200 + xtpcpp (0.1.18-1) stretch; urgency=medium * MS run and identification statistics diff --git a/src/core/tandem_run/tandemparameters.cpp b/src/core/tandem_run/tandemparameters.cpp index 67140d5bb7658e39c7b77a0675a2148489b5627e..c621155eea4e94a6d2da761d9adac3407b84ac25 100644 --- a/src/core/tandem_run/tandemparameters.cpp +++ b/src/core/tandem_run/tandemparameters.cpp @@ -95,12 +95,14 @@ void TandemParameters::setParamLabelValue(const QString & label, const QString & throw pappso::ExceptionNotPossible(QObject::tr("%1 value must be Daltons or ppm (not %2)").arg(label).arg(value)); } } - if ((label == "spectrum, parent monoisotopic mass isotope error") || (label == "spectrum, use neutral loss window") || (label == "spectrum, use contrast angle") || (label == "protein, cleavage semi")) { + if ((label == "spectrum, parent monoisotopic mass isotope error") || (label == "spectrum, use neutral loss window") || (label == "spectrum, use contrast angle") || (label == "protein, cleavage semi") || (label == "protein, quick acetyl") || (label == "protein, quick pyrolidone") || (label == "protein, stP bias") ) { if ((value != "yes") && (value != "no")) { throw pappso::ExceptionNotPossible(QObject::tr("%1 value must be yes or no (not %2)").arg(label).arg(value)); } } - + + + if ((label == "spectrum, parent monoisotopic mass error minus") || (label == "spectrum, parent monoisotopic mass error plus")|| (label == "spectrum, dynamic range") || (label == "spectrum, minimum parent m+h") || (label == "protein, cleavage C-terminal mass change")|| (label == "protein, cleavage N-terminal mass change") || (label == "protein, C-terminal residue modification mass") || (label == "protein, N-terminal residue modification mass")) { bool ok; value.toDouble(&ok); @@ -123,7 +125,7 @@ void TandemParameters::setParamLabelValue(const QString & label, const QString & } } - //text "protein, cleavage site" + //text "protein, cleavage site" "protein, modified residue mass file" _map_label_value.insert(label, value); }