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

Merge remote-tracking branch 'origin/renne'

parents ecb52362 8cfc2b87
This diff is collapsed.
......@@ -106,7 +106,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
<number>5</number>
</property>
<widget class="QWidget" name="spectrum_tab">
<property name="sizePolicy">
......@@ -137,9 +137,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>998</width>
<height>700</height>
<y>-199</y>
<width>992</width>
<height>655</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
......@@ -663,13 +663,6 @@
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="label_80">
<property name="text">
<string>Noise suppression routine</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLineEdit" name="snlm_edit"/>
</item>
......@@ -690,49 +683,8 @@
</property>
</widget>
</item>
<item row="11" column="2">
<widget class="QPushButton" name="suns_push_button">
<property name="text">
<string>?</string>
</property>
</widget>
</item>
<item row="11" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_37">
<item>
<widget class="QRadioButton" name="suns_yes_radio_button">
<property name="text">
<string>yes</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup_8</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="suns_no_radio_button">
<property name="text">
<string>no</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup_8</string>
</attribute>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_35">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
<layout class="QHBoxLayout" name="horizontalLayout_37"/>
</item>
</layout>
</item>
......@@ -770,8 +722,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>551</width>
<height>360</height>
<width>1006</width>
<height>456</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
......@@ -1119,17 +1071,17 @@
<rect>
<x>0</x>
<y>0</y>
<width>331</width>
<height>326</height>
<width>1006</width>
<height>456</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="8" column="0">
<widget class="QLabel" name="label_37">
<item row="5" column="2">
<widget class="QPushButton" name="rpmmotif_push_button">
<property name="text">
<string>Potential modifications motif 1</string>
<string>?</string>
</property>
</widget>
</item>
......@@ -1153,13 +1105,6 @@
<item row="3" column="1">
<widget class="QLineEdit" name="rmm2_edit"/>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_35">
<property name="text">
<string>Potential modifications 2</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="rmm1_push_button">
<property name="text">
......@@ -1192,13 +1137,6 @@
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_34">
<property name="text">
<string>Potential modifications 1</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_36">
<property name="text">
<string>Potential modifications motif</string>
......@@ -1212,19 +1150,9 @@
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="rpmm1_edit"/>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="rpmm_edit"/>
</item>
<item row="6" column="2">
<widget class="QPushButton" name="rpmm2_push_button">
<property name="text">
<string>?</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QPushButton" name="rpmm_push_button">
<property name="text">
......@@ -1232,53 +1160,9 @@
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLineEdit" name="rpmm2_edit"/>
</item>
<item row="5" column="2">
<widget class="QPushButton" name="rpmm1_push_button">
<property name="text">
<string>?</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_38">
<property name="text">
<string>Potential modifications motif 2</string>
</property>
</widget>
</item>
<item row="7" column="1">
<item row="5" column="1">
<widget class="QLineEdit" name="rpmmotif_edit"/>
</item>
<item row="8" column="1">
<widget class="QLineEdit" name="rpmmotif1_edit"/>
</item>
<item row="9" column="1">
<widget class="QLineEdit" name="rpmmotif2_edit"/>
</item>
<item row="7" column="2">
<widget class="QPushButton" name="rpmmotif_push_button">
<property name="text">
<string>?</string>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QPushButton" name="rpmmotif1_push_button">
<property name="text">
<string>?</string>
</property>
</widget>
</item>
<item row="9" column="2">
<widget class="QPushButton" name="rpmmotif2_push_button">
<property name="text">
<string>?</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
......@@ -1315,8 +1199,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>517</width>
<height>360</height>
<width>1006</width>
<height>456</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_11">
......@@ -1800,8 +1684,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>533</width>
<height>632</height>
<width>992</width>
<height>614</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_14">
......@@ -2353,8 +2237,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>589</width>
<height>496</height>
<width>992</width>
<height>457</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_15">
......@@ -2957,56 +2841,8 @@
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QLabel" name="label_77">
<property name="text">
<string>Write mzIdentML output file</string>
</property>
</widget>
</item>
<item row="13" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_36">
<item>
<widget class="QRadioButton" name="mzid_yes_radio_button">
<property name="text">
<string>yes</string>
</property>
<attribute name="buttonGroup">
<string notr="true">mzid_button_group</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="mzid_no_radio_button">
<property name="text">
<string>no</string>
</property>
<attribute name="buttonGroup">
<string notr="true">mzid_button_group</string>
</attribute>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_34">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="13" column="2">
<widget class="QPushButton" name="mzid_push_button">
<property name="text">
<string>?</string>
</property>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout_36"/>
</item>
<item row="12" column="2">
<widget class="QPushButton" name="oxp_push_button">
......@@ -3722,38 +3558,6 @@
</hint>
</hints>
</connection>
<connection>
<sender>rpmm1_push_button</sender>
<signal>clicked()</signal>
<receiver>EditTandemPresetView</receiver>
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
<x>1031</x>
<y>336</y>
</hint>
<hint type="destinationlabel">
<x>1690</x>
<y>366</y>
</hint>
</hints>
</connection>
<connection>
<sender>rpmm2_push_button</sender>
<signal>clicked()</signal>
<receiver>EditTandemPresetView</receiver>
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
<x>1031</x>
<y>370</y>
</hint>
<hint type="destinationlabel">
<x>1691</x>
<y>336</y>
</hint>
</hints>
</connection>
<connection>
<sender>rpmmotif_push_button</sender>
<signal>clicked()</signal>
......@@ -3770,38 +3574,6 @@
</hint>
</hints>
</connection>
<connection>
<sender>rpmmotif1_push_button</sender>
<signal>clicked()</signal>
<receiver>EditTandemPresetView</receiver>
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
<x>1031</x>
<y>438</y>
</hint>
<hint type="destinationlabel">
<x>1637</x>
<y>385</y>
</hint>
</hints>
</connection>
<connection>
<sender>rpmmotif2_push_button</sender>
<signal>clicked()</signal>
<receiver>EditTandemPresetView</receiver>
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
<x>1031</x>
<y>472</y>
</hint>
<hint type="destinationlabel">
<x>1637</x>
<y>435</y>
</hint>
</hints>
</connection>
<connection>
<sender>smic_push_button</sender>
<signal>clicked()</signal>
......@@ -4458,22 +4230,6 @@
</hint>
</hints>
</connection>
<connection>
<sender>mzid_push_button</sender>
<signal>clicked()</signal>
<receiver>EditTandemPresetView</receiver>
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
<x>1017</x>
<y>642</y>
</hint>
<hint type="destinationlabel">
<x>1399</x>
<y>782</y>
</hint>
</hints>
</connection>
<connection>
<sender>snlm_push_button</sender>
<signal>clicked()</signal>
......@@ -4506,22 +4262,6 @@
</hint>
</hints>
</connection>
<connection>
<sender>suns_push_button</sender>
<signal>clicked()</signal>
<receiver>EditTandemPresetView</receiver>
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
<x>993</x>
<y>554</y>
</hint>
<hint type="destinationlabel">
<x>1580</x>
<y>560</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>doCopy()</slot>
......@@ -4534,39 +4274,38 @@
<slot>doSelectDir()</slot>
</slots>
<buttongroups>
<buttongroup name="rss_button_group"/>
<buttongroup name="scp_button_group"/>
<buttongroup name="sxi_button_group"/>
<buttongroup name="sunlw_button_group"/>
<buttongroup name="buttonGroup_5"/>
<buttongroup name="spmmeu_button_group"/>
<buttongroup name="buttonGroup_2"/>
<buttongroup name="syi_button_group"/>
<buttongroup name="refine_button_group"/>
<buttongroup name="sbi_button_group"/>
<buttongroup name="sai_button_group"/>
<buttongroup name="rupmffr_button_group"/>
<buttongroup name="pcsemi_button_group"/>
<buttongroup name="spmmeu_button_group"/>
<buttongroup name="pstpb_button_group"/>
<buttongroup name="sfmmeu_button_group"/>
<buttongroup name="mzid_button_group"/>
<buttongroup name="pqp_button_group"/>
<buttongroup name="buttonGroup_4"/>
<buttongroup name="buttonGroup_3"/>
<buttongroup name="sir_button_group"/>
<buttongroup name="suca_button_group"/>
<buttongroup name="sai_button_group"/>
<buttongroup name="oresu_button_group"/>
<buttongroup name="ruc_button_group"/>
<buttongroup name="buttonGroup_6"/>
<buttongroup name="rupmffr_button_group"/>
<buttongroup name="refine_button_group"/>
<buttongroup name="buttonGroup_8"/>
<buttongroup name="sbi_button_group"/>
<buttongroup name="buttonGroup_7"/>
<buttongroup name="buttonGroup"/>
<buttongroup name="rcsemi_button_group"/>
<buttongroup name="sci_button_group"/>
<buttongroup name="rpm_button_group"/>
<buttongroup name="pcsemi_button_group"/>
<buttongroup name="pqa_button_group"/>
<buttongroup name="spmmie_button_group"/>
<buttongroup name="buttonGroup_7"/>
<buttongroup name="szi_button_group"/>
<buttongroup name="scp_button_group"/>
<buttongroup name="spmmie_button_group"/>
<buttongroup name="rss_button_group"/>
<buttongroup name="ruc_button_group"/>
<buttongroup name="rcsemi_button_group"/>
<buttongroup name="sci_button_group"/>
<buttongroup name="sxi_button_group"/>
<buttongroup name="oresu_button_group"/>
<buttongroup name="pqp_button_group"/>
<buttongroup name="sir_button_group"/>
<buttongroup name="buttonGroup_8"/>
<buttongroup name="ospec_button_group"/>
<buttongroup name="buttonGroup_4"/>
<buttongroup name="sunlw_button_group"/>
<buttongroup name="sfmmeu_button_group"/>
<buttongroup name="rpm_button_group"/>
<buttongroup name="suca_button_group"/>
<buttongroup name="buttonGroup_5"/>
<buttongroup name="syi_button_group"/>
</buttongroups>
</ui>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -35,51 +35,53 @@ using namespace std;
int
main(int argc, char *argv[])
{
QTextStream errorStream(stderr, QIODevice::WriteOnly);
QApplication app(argc, argv);
QTextStream errorStream(stderr, QIODevice::WriteOnly);
QApplication app(argc, argv);
qRegisterMetaType<TandemRunBatch>("TandemRunBatch");
qRegisterMetaType<std::vector<pappso::pappso_double>>(
"std::vector<pappso::pappso_double>");
qRegisterMetaType<pappso::PrecisionPtr>("pappso::PrecisionPtr");
qRegisterMetaType<std::vector<pappso::XicCstSPtr>>(
"std::vector<pappso::XicCstSPtr>");
qRegisterMetaType<pappso::PeptideSp>("pappso::PeptideSp");
qRegisterMetaType<pappso::XicExtractMethod>("pappso::XicExtractMethod");
qRegisterMetaType<pappso::MassSpectrumCstSPtr>("pappso::MassSpectrumCstSPtr");
qRegisterMetaType<MsRunSp>("MsRunSp");
qRegisterMetaType<std::vector<pappso::PeptideNaturalIsotopeAverageSp>>(
"std::vector<pappso::PeptideNaturalIsotopeAverageSp>");
qRegisterMetaType<ExportFastaType>("ExportFastaType");
qRegisterMetaType<MasschroqFileParameters>("MasschroqFileParameters");
qRegisterMetaType<TandemRunBatch>("TandemRunBatch");
qRegisterMetaType<std::vector<pappso::pappso_double>>(
"std::vector<pappso::pappso_double>");
qRegisterMetaType<pappso::PrecisionPtr>("pappso::PrecisionPtr");
qRegisterMetaType<std::vector<pappso::XicCstSPtr>>(
"std::vector<pappso::XicCstSPtr>");
qRegisterMetaType<pappso::PeptideSp>("pappso::PeptideSp");
qRegisterMetaType<pappso::XicExtractMethod>("pappso::XicExtractMethod");
qRegisterMetaType<pappso::MassSpectrumCstSPtr>("pappso::MassSpectrumCstSPtr");
qRegisterMetaType<MsRunSp>("MsRunSp");
qRegisterMetaType<std::vector<pappso::PeptideNaturalIsotopeAverageSp>>(
"std::vector<pappso::PeptideNaturalIsotopeAverageSp>");
qRegisterMetaType<ExportFastaType>("ExportFastaType");
qRegisterMetaType<MasschroqFileParameters>("MasschroqFileParameters");
// qRegisterMetaType<pappso::PeakIonIsotopeMatch>("pappso::PeakIonIsotopeMatch");
qRegisterMetaType<ContaminantRemovalMode>("ContaminantRemovalMode");
try
// qRegisterMetaType<pappso::PeakIonIsotopeMatch>("pappso::PeakIonIsotopeMatch");
try
{
QCoreApplication::setOrganizationName("PAPPSO");
QCoreApplication::setOrganizationDomain("pappso.inra.fr");
QCoreApplication::setApplicationName("xtpcpp");
MainWindow window;
window.show();
QCoreApplication::setOrganizationName("PAPPSO");
QCoreApplication::setOrganizationDomain("pappso.inra.fr");
QCoreApplication::setApplicationName("xtpcpp");
MainWindow window;
window.show();
// This code will start the messaging engine in QT and in
// 10ms it will start the execution in the MainClass.run routine;
QTimer::singleShot(10, &window, SLOT(run()));
// This code will start the messaging engine in QT and in
// 10ms it will start the execution in the MainClass.run routine;
QTimer::singleShot(10, &window, SLOT(run()));
return app.exec();
return app.exec();
}
catch(pappso::PappsoException &error)
catch(pappso::PappsoException &error)
{
errorStream << "Oops! an error occurred in XTPcpp. Dont Panic :" << endl;
errorStream << error.qwhat() << endl;
app.exit(1);
errorStream << "Oops! an error occurred in XTPcpp. Dont Panic :" << endl;
errorStream << error.qwhat() << endl;
app.exit(1);
}
catch(std::exception &error)
catch(std::exception &error)
{
errorStream << "Oops! an error occurred in XTPcpp. Dont Panic :" << endl;
errorStream << error.what() << endl;
app.exit(1);
errorStream << "Oops! an error occurred in XTPcpp. Dont Panic :" << endl;
errorStream << error.what() << endl;
app.exit(1);