Commit fd702168 authored by Langella Olivier's avatar Langella Olivier
Browse files

masschroq (2.2.29-1~buster+1) buster

parent cc85e740
......@@ -19,7 +19,7 @@ project(masschroq CXX C)
SET (MASSCHROQ_MAJOR_VERSION 2)
SET (MASSCHROQ_MINOR_VERSION 2)
SET (MASSCHROQ_PATCH_LEVEL 28)
SET (MASSCHROQ_PATCH_LEVEL 29)
SET (MASSCHROQ_VERSION
"${MASSCHROQ_MAJOR_VERSION}.${MASSCHROQ_MINOR_VERSION}.${MASSCHROQ_PATCH_LEVEL}")
SET (MASSCHROQ_LIB_NAME "masschroq")
......@@ -28,7 +28,7 @@ SET (MASSCHROQ_LIB_SOVERSION ${MASSCHROQ_MAJOR_VERSION})
SET (MASSCHROQ_SCHEMA_VERSION "${MASSCHROQ_MAJOR_VERSION}.2")
#SET (masschroq_BINARY_DIR "bin")
SET(VERSION 2.2.28)
SET(VERSION 2.2.29)
# Add folder where are supportive functions
......
masschroq (2.2.29-1~buster+1) buster; urgency=medium
* MXE cross compilation is OK
-- Olivier Langella <olivier.langella@u-psud.fr> Thu, 04 Mar 2021 13:35:27 +0100
masschroq (2.2.28-1~buster+1) buster; urgency=medium
* create output directory for time values if needed #8
......
......@@ -4,7 +4,7 @@ set (QT_USE_QTXMLPATTERNS true)
set(masschroq_RCCS resources.qrc)
find_package( Qt5 COMPONENTS Core Gui Xml XmlPatterns Widgets Concurrent PrintSupport REQUIRED )
find_package( Qt5 COMPONENTS Core Gui Xml XmlPatterns Widgets Concurrent PrintSupport Xml REQUIRED )
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/modules)
......@@ -206,18 +206,30 @@ set_target_properties(${MASSCHROQ_LIB_NAME} PROPERTIES
if (MXE)
add_executable(masschroq_main main.cpp ${MASSCHROQ_LIB_SRCS} ${MASSCHROQ_LIB_MOC_SRCS}
${SAXLIB_SRCS} ${MASSCHROQ_RCC_SRCS_QT5})
target_link_libraries(masschroq_main
PappsoMSpp::Core
PappsoMSpp::Widget
OdsStream::Core
Qt5::Core
Qt5::Gui
Qt5::Concurrent
Qt5::Xml
Qt5::Widgets
Qt5::XmlPatterns
)
else (MXE)
add_executable(masschroq_main main.cpp)
endif (MXE)
target_link_libraries(masschroq_main ${MASSCHROQ_LIB_NAME}
PappsoMSpp::Core
PappsoMSpp::Widget
OdsStream::Core
Qt5::Core
)
endif (MXE)
target_link_libraries(masschroq_main ${MASSCHROQ_LIB_NAME}
PappsoMSpp::Core
PappsoMSpp::Widget
OdsStream::Core
Qt5::Core
)
set_target_properties(masschroq_main PROPERTIES OUTPUT_NAME masschroq)
target_include_directories (masschroq_main PUBLIC
......@@ -229,8 +241,40 @@ else (NOGUI)
if (MXE)
add_executable(masschroq_gui gui/mcqgui/launcherGui.cpp ${GUI_SRCS} ${GUI_MOC_SRCS} ${GUI_UI_HDRS} ${MASSCHROQ_LIB_SRCS} ${MASSCHROQ_LIB_MOC_SRCS}
${SAXLIB_SRCS} ${MASSCHROQ_RCC_SRCS_QT5})
target_link_libraries(masschroq_gui
PappsoMSpp::Core
PappsoMSpp::Widget
OdsStream::Core
Qt5::Core
Qt5::Gui
Qt5::Widgets
Qt5::Xml
Qt5::Concurrent
Quazip5::Quazip5
Qt5::XmlPatterns
)
add_executable(masschroq_studio gui/parameterGui.cpp ${STUDIO_SRCS} ${STUDIO_MOC_SRCS} ${MASSCHROQ_LIB_SRCS} ${MASSCHROQ_LIB_MOC_SRCS}
${SAXLIB_SRCS} ${MASSCHROQ_RCC_SRCS_QT5})
target_link_libraries(masschroq_studio
PappsoMSpp::Core
PappsoMSpp::Widget
OdsStream::Core
Qt5::Core
Qt5::Gui
Qt5::Widgets
Qt5::PrintSupport
Qt5::Xml
Qt5::Concurrent
Quazip5::Quazip5
QCustomPlot::QCustomPlot
Qt5::XmlPatterns
)
else (MXE)
add_executable(masschroq_gui gui/mcqgui/launcherGui.cpp ${GUI_SRCS} ${GUI_MOC_SRCS} ${GUI_UI_HDRS})
target_link_libraries(masschroq_gui ${MASSCHROQ_LIB_NAME}
......
......@@ -2,7 +2,7 @@
#define _CONFIG_H
#define SOFTWARE_NAME "MassChroQ"
#define MASSCHROQ_VERSION "2.2.28"
#define MASSCHROQ_VERSION "2.2.29"
#define MASSCHROQ_XSD "masschroq-2.2.xsd"
#define MASSCHROQ_SCHEMA_VERSION "2.2"
#define MASSCHROQ_SCHEMA_FILE \
......
......@@ -52,8 +52,8 @@ LauncherMainWindow::LauncherMainWindow(QWidget *parent)
{
qDebug();
mcqerr() << "Oops! an error occurred in MassChroQ. Dont Panic :"
<< Qt::endl;
mcqerr() << error.qwhat() << Qt::endl;
<< endl;
mcqerr() << error.qwhat() << endl;
}
this->initialiseMassChroqRunningThread();
ui->actionQuit->setShortcuts(QKeySequence::Quit);
......@@ -65,7 +65,7 @@ LauncherMainWindow::LauncherMainWindow(QWidget *parent)
ConsoleOut::setCerr(new QTextStream(logQIODevice));
// setCentralWidget(_logQTextEdit);
mcqout() << "Initialising logger" << Qt::endl;
mcqout() << "Initialising logger" << endl;
ui->tempDirLineEdit->setText(McqSession::getInstance().getTmpDirName());
// ui->cpuNumberSpinBox->se
......@@ -309,13 +309,13 @@ LauncherMainWindow::finishRunningMassChroq()
Duration dur = Utilities::getDurationFromDates(_dt_begin, dt_end);
mcqout() << "MassChroQ finished" << Qt::endl;
mcqout() << "MassChroQ finished" << endl;
mcqout() << "MassChroQ execution time : "
<< Utilities::getDaysFromDuration(dur) << " days, "
<< Utilities::getHoursFromDuration(dur) << " hours, "
<< Utilities::getMinutesFromDuration(dur) << " minutes, "
<< Utilities::getSecondsFromDuration(dur) << " seconds." << Qt::endl
<< Qt::endl;
<< Utilities::getSecondsFromDuration(dur) << " seconds." << endl
<< endl;
// Button pas to stop
ui->startPushButton->show();
......
......@@ -43,7 +43,7 @@ Quantificator::setCpuNumber(uint cpu_number)
QThreadPool::globalInstance()->setMaxThreadCount(cpu_number);
}
Quantificator::_cpu_number = cpu_number;
mcqout() << QObject::tr("%1 CPUs used").arg(cpu_number) << Qt::endl;
mcqout() << QObject::tr("%1 CPUs used").arg(cpu_number) << endl;
}
Quantificator::Quantificator(const QString &xml_id,
......@@ -262,7 +262,7 @@ Quantificator::add_peptide_quanti_items(
<< isotope_average_sp.get()->getIsotopeNumber()
<< " rank="
<< isotope_average_sp.get()->getIsotopeRank()
<< Qt::endl;
<< endl;
quanti_item = new QuantiItemPeptideNaturalIsotope(
trace_peptide, p_peptide, isotope_average_sp);
_quanti_item_list.push_back(quanti_item);
......@@ -284,8 +284,7 @@ Quantificator::add_peptide_quanti_items(
}
qDebug() << __FILE__ << " " << __FUNCTION__ << " " << __LINE__
<< " Quantificator::add_peptide_quanti_items end";
qDebug() << " Quantificator::add_peptide_quanti_items end";
}
void
......@@ -350,7 +349,7 @@ Quantificator::quantify()
_quanti_method->getDetectionMethod();
mcqout() << "MS run group '" << group_id << "': quantification method '"
<< quanti_method_id << "': quantification begin" << Qt::endl;
<< quanti_method_id << "': quantification begin" << endl;
_quanti_method->printInfos(mcqout());
qDebug();
......@@ -369,7 +368,7 @@ Quantificator::quantify()
count_msruns = 1;
mcqout() << "_quanti_item_list.size() '" << _quanti_item_list.size()
<< Qt::endl;
<< endl;
for(itmsrun = _group_to_quantify->begin();
itmsrun != _group_to_quantify->end();
++itmsrun, ++count_msruns)
......@@ -383,7 +382,7 @@ Quantificator::quantify()
.arg(current_msrun->getMsRunIdCstSPtr()->getXmlId())
.arg(_quanti_item_list.size())
.arg(Utilities::toString(_matching_mode))
<< Qt::endl;
<< endl;
current_msrun->buildMsRunXicExtractor(xic_extract_method);
mcqout() << QObject::tr(
......@@ -393,7 +392,7 @@ Quantificator::quantify()
.arg(_group_to_quantify->size())
.arg(group_id)
.arg(Utilities::toString(_matching_mode))
<< Qt::endl;
<< endl;
MapQuantiRealXic mapQuanti(*_p_monitor_speed,
current_msrun,
......@@ -406,7 +405,7 @@ Quantificator::quantify()
current_msrun->deleteMsRunXicExtractor();
mcqout() << "\t_peptide_list.size() '" << _peptide_list.size()
<< Qt::endl;
<< endl;
}
// compute retention time references
......@@ -429,7 +428,7 @@ Quantificator::quantify()
.arg(_xml_id)
.arg(current_msrun->getMsRunIdCstSPtr()->getXmlId())
.arg(_quanti_item_list.size())
<< Qt::endl;
<< endl;
current_msrun->buildMsRunXicExtractor(xic_extract_method);
......@@ -439,7 +438,7 @@ Quantificator::quantify()
.arg(count_msruns)
.arg(_group_to_quantify->size())
.arg(group_id)
<< Qt::endl;
<< endl;
MapQuanti mapQuanti(*_p_monitor_speed,
current_msrun,
......@@ -459,7 +458,7 @@ Quantificator::quantify()
// compute new rt references
mcqout() << QObject::tr(
"post matching : computing retention time references ")
<< Qt::endl;
<< endl;
QFuture<void> res =
QtConcurrent::map(_peptide_rt_list.begin(),
_peptide_rt_list.end(),
......@@ -470,9 +469,8 @@ Quantificator::quantify()
// rematch peaks stored in quanti items
mcqout() << QObject::tr(
"post matching : trying to match peaks using new "
"retention time references ")
<< Qt::endl;
"post matching : trying to match peaks using new "
"retention time references \n");
MonitorSpeedInterface *p_monitor_speed = _p_monitor_speed;
res = QtConcurrent::map(_quanti_item_list.begin(),
_quanti_item_list.end(),
......
......@@ -88,7 +88,7 @@ xicBase::toStream(QTextStream &to_stream) const
{
to_stream << it->x << " ";
}
to_stream << Qt::endl;
to_stream << endl;
it = begin();
itend = end();
......@@ -96,5 +96,5 @@ xicBase::toStream(QTextStream &to_stream) const
{
to_stream << it->y << " ";
}
to_stream << Qt::endl;
to_stream << endl;
}
......@@ -119,7 +119,7 @@ PepParser::processLine(QString &line)
if(line.isEmpty())
return;
QStringList token_list = line.split(_sep, Qt::SkipEmptyParts);
QStringList token_list = line.split(_sep, QString::SkipEmptyParts);
int count = token_list.count();
if(count < 5 || count > 6)
{
......@@ -198,7 +198,7 @@ PepParser::getSeparator(const QString &header)
<< ",");
foreach(const QString &sep, separators)
{
QStringList header_list = header.split(sep, Qt::SkipEmptyParts);
QStringList header_list = header.split(sep, QString::SkipEmptyParts);
int count = header_list.count();
if(count != 1 && count >= 5)
return sep;
......
[Desktop Entry]
Name=MassChroQ GUI 2.2.28
Name=MassChroQ GUI 2.2.29
Categories=Education;Science;Math;
Comment=MassChroQ GUI launcher
Exec=masschroq_gui %U
......
[Desktop Entry]
Name=MassChroQ Studio 2.2.28
Name=MassChroQ Studio 2.2.29
Categories=Education;Science;Math;
Comment=MassChroQ parameters editor
Exec=masschroq_studio %U
......
#!/bin/bash
wine "/home/langella/.wine/drive_c/Program Files/Inno Setup 6/ISCC.exe" masschroq-mxe.iss /O /F
wine "/home/langella/.wine/drive_c/Program Files (x86)/Inno Setup 6/ISCC.exe" masschroq-mxe.iss /O /F
......@@ -44,12 +44,14 @@ WizardImageStretch=yes
Name: "{app}"
[Files]
Source: "z:/home/langella/developpement/git/mxe_dll/*"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
Source: "z:/home/langella/developpement/git/mxe_dll_extra/Qt5XmlPatterns.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
Source: "{#cmake_build_dir}/src/libmasschroq.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
Source: "z:/home/langella/developpement/git/libodsstream/wbuild/src/libodsstream-qt5.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
Source: "z:/home/langella/developpement/git/pappsomspp/wbuild/src/libpappsomspp-qt5.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
Source: "z:/home/langella/developpement/git/pappsomspp/wbuild/src/pappsomspp/widget/libpappsomspp-widget-qt5.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
Source: "z:/win64/mxe_dll/*"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
Source: "z:/mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/*"; DestDir: {app}/plugins; Flags: ignoreversion recursesubdirs;
Source: "z:/win64/librdata/.libs/librdata-0.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
Source: "z:/home/langella/developpement/git/alglib/wbuild/libalglib.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
Source: "z:/home/langella/developpement/git/libpwizlite/wbuild/src/libpwizlite.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
Source: "z:/home/langella/developpement/git/libodsstream/wbuild/src/libodsstream.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
Source: "z:/home/langella/developpement/git/pappsomspp/wbuild/src/libpappsomspp.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
Source: "z:/home/langella/developpement/git/pappsomspp/wbuild/src/pappsomspp/widget/libpappsomspp-widget.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
Source: "{#sourceDir}\README"; DestDir: {app}; Flags: isreadme; Components: mcqComp
Source: "{#sourceDir}\COPYING"; DestDir: {app}; Flags: isreadme; Components: mcqComp
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment