diff --git a/CMakeLists.txt b/CMakeLists.txt index 61f5c3da3d2130af0236b8bb570d1b3a4c43f240..b9a5b50cc9e0de8afbaf6a59c77215f230da5bcc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ IF(NOT CMAKE_BUILD_TYPE) # SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING # "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." # FORCE) - SET(CMAKE_BUILD_TYPE Debug CACHE STRING + SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) ENDIF(NOT CMAKE_BUILD_TYPE) @@ -34,7 +34,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") #depending on libpappsomspp version : -SET(LIBPAPPSOMSPP_VERSION "0.2.36-1") +SET(LIBPAPPSOMSPP_VERSION "0.2.37-1") configure_file (${CMAKE_SOURCE_DIR}/debian/control.cmake ${CMAKE_SOURCE_DIR}/debian/control @ONLY) @@ -42,7 +42,7 @@ SET(SOFTWARE_NAME "XTPcpp") SET(XTPCPP_VERSION_MAJOR "0") SET(XTPCPP_VERSION_MINOR "1") -SET(XTPCPP_VERSION_PATCH "15") +SET(XTPCPP_VERSION_PATCH "16") 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 diff --git a/debian/changelog b/debian/changelog index e698365b6269d69e7c95d2418b144dcf91d14417..ee4743b7cf27ce5d7a0f090cc10e2f0b65a49a16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xtpcpp (0.1.16-1) stretch; urgency=medium + + * qt5 switch + * about dialog window + * Tandem run window (local and HTCondor) + + -- Olivier Langella <olivier.langella@u-psud.fr> Mon, 18 Sep 2017 12:07:33 +0200 + xtpcpp (0.1.15-1) stretch; urgency=medium * ptm peptide list diff --git a/src/core/proteinxtp.cpp b/src/core/proteinxtp.cpp index dbb8fb362a7ff4ce8f25ceacd8890d7c261bbfad..a8a35a32be4440b78920da7112c6722013c05c8a 100644 --- a/src/core/proteinxtp.cpp +++ b/src/core/proteinxtp.cpp @@ -137,9 +137,10 @@ unsigned int ProteinXtp::countTrypticPeptidesForPAI() const { try { pappso::Enzyme kinase; kinase.setMiscleavage(0); + kinase.setTakeOnlyFirstWildcard(true); DigestionHandler digestion; - pappso::ProteinSp protein = std::make_shared<const pappso::Protein>(this->getDescription(),this->getOnlyAminoAcidSequence().replace("X","")); + pappso::ProteinSp protein = std::make_shared<const pappso::Protein>(*this); kinase.eat(0,protein,false,digestion); unsigned int count = 0; diff --git a/src/core/tandem_run/tandemcondorprocess.cpp b/src/core/tandem_run/tandemcondorprocess.cpp index 3a1542ab351f6f1359302c57fef7a7c304ecfdb9..07a7b30f32e7ff378331a6ae9c0e18657539c293 100644 --- a/src/core/tandem_run/tandemcondorprocess.cpp +++ b/src/core/tandem_run/tandemcondorprocess.cpp @@ -373,7 +373,7 @@ void TandemCondorProcess::parseCondorQueue(QString & condor_q_xml) { } else { qDebug() << parser->errorString(); - throw pappso::PappsoException(QObject::tr("Error reading condor_q xml string :\n %1").arg(condor_q_xml)); + throw pappso::PappsoException(QObject::tr("Error reading condor_q xml string :\n %1\n%2").arg(parser->errorString()).arg(condor_q_xml)); } delete parser; diff --git a/src/input/condorqxmlsaxhandler.cpp b/src/input/condorqxmlsaxhandler.cpp index 645239f85792a7a819304d573139200e4a49303a..74242691edaec3d678628e1215ef5c016e238e85 100644 --- a/src/input/condorqxmlsaxhandler.cpp +++ b/src/input/condorqxmlsaxhandler.cpp @@ -145,7 +145,7 @@ bool CondorQxmlSaxHandler::endDocument() { } _count_status[(std::int8_t) CondorJobStatus::Completed] = really_completed_jobs; - _tandem_condor_process->setCondorJobStatus(_count_status); + _tandem_condor_process->setCondorJobStatus(_count_status); /* xtandemCondorAnalysis.setJobCompleted(junexpanded, jidle, jrunning, jremoved, reallyCompletedJobs, jheld, jsubmission_error); @@ -227,6 +227,7 @@ bool CondorQxmlSaxHandler::endElement_c() { qDebug() << "currentRemoteHost:" << _current_remote_host << " currentLastRemoteHost" << _current_last_remote_host << " " << (std::int8_t)_condor_job_status; + return true; } /*