Commit 86da5409 authored by Renne Thomas's avatar Renne Thomas
Browse files

Remove output mzid line

parent c9ce7ea2
......@@ -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">
......@@ -138,8 +138,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>998</width>
<height>700</height>
<width>992</width>
<height>680</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
......@@ -770,8 +770,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 +1119,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="9" column="2">
<widget class="QPushButton" name="rpmmotif2_push_button">
<property name="text">
<string>Potential modifications motif 1</string>
<string>?</string>
</property>
</widget>
</item>
......@@ -1153,13 +1153,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">
......@@ -1191,13 +1184,6 @@
</property>
</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">
......@@ -1212,70 +1198,84 @@
</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">
<item row="4" column="2">
<widget class="QPushButton" name="rpmm_push_button">
<property name="text">
<string>?</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QPushButton" name="rpmm_push_button">
<item row="5" column="2">
<widget class="QPushButton" name="rpmm1_push_button">
<property name="text">
<string>?</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLineEdit" name="rpmm2_edit"/>
<item row="7" column="1">
<widget class="QLineEdit" name="rpmmotif_edit"/>
</item>
<item row="5" column="2">
<widget class="QPushButton" name="rpmm1_push_button">
<item row="7" column="2">
<widget class="QPushButton" name="rpmmotif_push_button">
<property name="text">
<string>?</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_38">
<item row="6" column="2">
<widget class="QPushButton" name="rpmm2_push_button">
<property name="text">
<string>Potential modifications motif 2</string>
<string>?</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLineEdit" name="rpmmotif_edit"/>
<item row="8" column="2">
<widget class="QPushButton" name="rpmmotif1_push_button">
<property name="text">
<string>?</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLineEdit" name="rpmmotif2_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 row="6" column="1">
<widget class="QLineEdit" name="rpmm2_edit"/>
</item>
<item row="7" column="2">
<widget class="QPushButton" name="rpmmotif_push_button">
<item row="5" column="1">
<widget class="QLineEdit" name="rpmm1_edit"/>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_38">
<property name="text">
<string>?</string>
<string>Potential modifications motif 2</string>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QPushButton" name="rpmmotif1_push_button">
<item row="8" column="0">
<widget class="QLabel" name="label_37">
<property name="text">
<string>?</string>
<string>Potential modifications motif 1</string>
</property>
</widget>
</item>
<item row="9" column="2">
<widget class="QPushButton" name="rpmmotif2_push_button">
<item row="6" column="0">
<widget class="QLabel" name="label_35">
<property name="text">
<string>?</string>
<string>Potential modifications 2</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_34">
<property name="text">
<string>Potential modifications 1</string>
</property>
</widget>
</item>
......@@ -1315,8 +1315,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 +1800,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">
......@@ -2352,9 +2352,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>589</width>
<height>496</height>
<y>-1</y>
<width>992</width>
<height>457</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_15">
......@@ -2957,56 +2957,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">
......@@ -3738,22 +3690,6 @@
</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 +3706,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 +4362,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>
......@@ -4522,6 +4410,54 @@
</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>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>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>
</connections>
<slots>
<slot>doCopy()</slot>
......@@ -4534,39 +4470,39 @@
<slot>doSelectDir()</slot>
</slots>
<buttongroups>
<buttongroup name="rss_button_group"/>
<buttongroup name="scp_button_group"/>
<buttongroup name="buttonGroup_6"/>
<buttongroup name="buttonGroup_4"/>
<buttongroup name="rupmffr_button_group"/>
<buttongroup name="sxi_button_group"/>
<buttongroup name="sir_button_group"/>
<buttongroup name="pcsemi_button_group"/>
<buttongroup name="buttonGroup_3"/>
<buttongroup name="pstpb_button_group"/>
<buttongroup name="buttonGroup_7"/>
<buttongroup name="scp_button_group"/>
<buttongroup name="sunlw_button_group"/>
<buttongroup name="buttonGroup_5"/>
<buttongroup name="refine_button_group"/>
<buttongroup name="pqa_button_group"/>
<buttongroup name="ospec_button_group"/>
<buttongroup name="spmmie_button_group"/>
<buttongroup name="szi_button_group"/>
<buttongroup name="syi_button_group"/>
<buttongroup name="buttonGroup"/>
<buttongroup name="oresu_button_group"/>
<buttongroup name="spmmeu_button_group"/>
<buttongroup name="buttonGroup_8"/>
<buttongroup name="suca_button_group"/>
<buttongroup name="sci_button_group"/>
<buttongroup name="rss_button_group"/>
<buttongroup name="buttonGroup_2"/>
<buttongroup name="syi_button_group"/>
<buttongroup name="pstpb_button_group"/>
<buttongroup name="buttonGroup_5"/>
<buttongroup name="rpm_button_group"/>
<buttongroup name="sfmmeu_button_group"/>
<buttongroup name="mzid_button_group"/>
<buttongroup name="pqp_button_group"/>
<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="szi_button_group"/>
<buttongroup name="ospec_button_group"/>
<buttongroup name="buttonGroup_4"/>
<buttongroup name="sbi_button_group"/>
<buttongroup name="sai_button_group"/>
</buttongroups>
</ui>
......@@ -557,10 +557,6 @@ EditTandemPresetDialog::doHelp()
{
html_doc.setFileName(":/tandem/resources/html_doc/oxp.html");
}
if(senderObjName == "mzid_push_button")
{
html_doc.setFileName(":/tandem/resources/html_doc/mzid.html");
}
if(html_doc.open(QFile::ReadOnly | QFile::Text))
{
......@@ -844,11 +840,8 @@ EditTandemPresetDialog::readUi()
_tandem_params.setParamLabelValue("output, xsl path",
ui->oxp_edit->text());
_tandem_params.setParamLabelValue("output, mzid", "no");
if(ui->mzid_yes_radio_button->isChecked())
{
_tandem_params.setParamLabelValue("output, mzid", "yes");
}
//_tandem_params.setParamLabelValue("output, mzid", "no");
}
catch(pappso::PappsoException &error)
{
......@@ -1457,13 +1450,7 @@ EditTandemPresetDialog::populate()
//<note type="input" label="output, xsl path">tandem-style.xsl</note>
ui->oxp_edit->setText(_tandem_params.getValue("output, xsl path"));
//<note type="input" label="output, mzid">no</note>
ui->mzid_yes_radio_button->setChecked(true);
ui->mzid_no_radio_button->setChecked(false);
if(_tandem_params.getValue("output, mzid") == "no")
{ // -1 for not found
ui->mzid_yes_radio_button->setChecked(false);
ui->mzid_no_radio_button->setChecked(true);
}
}
catch(pappso::ExceptionNotFound &error)
{
......
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<title>output, xsl path</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css">
a {
color: blue;
cursor: pointer;
font-weight: normal;
font-family: Verdana, Arial, Helvetica,sans-serif;
text-decoration: none;
font-size: 10pt;
}
a:visited {
color: blue;
cursor: pointer;
font-weight: normal;
font-style: italic;
text-decoration: underline;
font-family: Verdana, Arial, Helvetica,sans-serif;
font-size: 10pt;
}
h1 {
color: black;
font-weight: bold;
font-family: Verdana, Arial, Helvetica,sans-serif;
font-size: 10pt;
margin-bottom:10px;
}
h2 {
color: black;
font-weight: bold;
font-family: Verdana, Arial, Helvetica,sans-serif;
font-size: 10pt;
margin-bottom:10px;
}
p {
color: black;
font-weight: normal;
font-family: Verdana, Arial, Helvetica,sans-serif;
font-size: 10pt;
margin-bottom:10px;
}
.also {
color: black;
font-weight: normal;
font-family: Verdana, Arial, Helvetica,sans-serif;
font-size: 10pt;
margin-bottom:10px;
}
li {
color: black;
font-weight: normal;
font-family: Verdana, Arial, Helvetica,sans-serif;
font-size: 10pt;
margin-bottom:10px;
}
.e {
color: red;