Changeset 3893

Timestamp:

Oct 19, 2010, 2:40:01 PM (13 years ago)

Author:

olle

Message:

Refs #700. Class/file gui/form/XTandemParameterSetForm.java in client/servlet/
updated to comply with some requests for Ticket #700 (New X!Tandem form):

1. Entry for fragment monoisotopic mass error units should be placed directly

after entry for fragment monoisotopic mass error. In order to keep the
correspondence between source code and displayed form high, the order of
variables has been changed also in places not directly involved with
the visual elements of the form.

2. List path default paraameters are left out, and list path taxonomy information

should be submitted, but not shown in the form.

3. Since none of the list path entries should be shown, field set "List Path"

is removed. Hidden field for list path taxonomy information is instead added
to the "Spectrum" field set.

File:

• trunk/client/servlet/src/org/proteios/gui/form/XTandemParameterSetForm.java (modified) (12 diffs)

trunk/client/servlet/src/org/proteios/gui/form/XTandemParameterSetForm.java

@@ -48 +48 @@
   public static final VString VXTANDEM_SPECTRUM_FRAG_MI_MASS_ERROR = new VString("XTandemSpectrumFragmentMonoisotopicMassError", 0,
     32, false);
+  public static final VString VXTANDEM_SPECTRUM_FRAG_MI_MASS_ERROR_UNITS = new VString("XTandemSpectrumFragmentMonoisotopicMassErrorUnits", 0,
+    32, false);
   public static final VString VXTANDEM_SPECTRUM_PARENT_MI_MASS_ERROR_PLUS = new VString("XTandemSpectrumParentMonoisotopicMassErrorPlus", 0,
     32, false);
@@ -53 +55 @@
     32, false);
   public static final VString VXTANDEM_SPECTRUM_PARENT_MI_MASS_ISOTOPE_ERROR = new VString("XTandemSpectrumParentMonoisotopicMassIsotopeError", 0,
-    32, false);
-  public static final VString VXTANDEM_SPECTRUM_FRAG_MI_MASS_ERROR_UNITS = new VString("XTandemSpectrumFragmentMonoisotopicMassErrorUnits", 0,
     32, false);
   public static final VString VXTANDEM_SPECTRUM_PARENT_MI_MASS_ERROR_UNITS = new VString("XTandemSpectrumParentMonoisotopicMassErrorUnits", 0,
@@ -201 +201 @@
 
   // Form field sets, fields, menus, and select boxes
-  public Fieldset listPathFS;
+  public Fieldset hiddenFieldContainerFS;
+  //public Fieldset listPathFS;
   public Select<VString> listPathDefaultParametersSB;
   public TextField<String> taxonomyInformationListPathF;
@@ -207 +208 @@
   public TextField<String> spectrumPathF;
   public TextField<String> fragMiMassErrorF;
+  public Select<VString> fragMiMassErrorUnitsM;
   public TextField<String> parentMiMassErrorPlusF;
   public TextField<String> parentMiMassErrorMinusF;
   public Select<VString> parentMiMassIsotopeErrorM;
-  public Select<VString> fragMiMassErrorUnitsM;
   public Select<VString> parentMiMassErrorUnitsM;
   public Select<VString> fragMassTypeM;
@@ -321 +322 @@
     //List<String> selectedList = null;
     /*
+     * Spectrum field set is used for hidden fields from other field sets
+     */
+    spectrumFS = new Fieldset();
+    spectrumFS.setTitle("XTandemParameterSetSpectrum");
+    addFieldset(spectrumFS);
+    hiddenFieldContainerFS = spectrumFS;
+    /*
      * List path field set
      */
+    /*
     listPathFS = new Fieldset();
     listPathFS.setTitle("XTandemParameterSetListPath");
     addFieldset(listPathFS);
+    */
     // List path, default parameters
+    /*
     listPathDefaultParametersSB = createSingleSelectBox(
       VXTANDEM_LIST_PATH_DEFAULT_PARAMETERS,
@@ -334 +345 @@
       null);
     listPathFS.add(listPathDefaultParametersSB);
+    */
     // List path, taxonomy information
     taxonomyInformationListPathF = new TextField<String>(VXTANDEM_LIST_PATH_TAXONOMY_INFORMATION);
-    listPathFS.add(taxonomyInformationListPathF);
+    //listPathFS.add(taxonomyInformationListPathF);
+    taxonomyInformationListPathF.setHidden(true);
+    hiddenFieldContainerFS.add(taxonomyInformationListPathF);
     /*
      * Spectrum field set
      */
+    // Spectrum field set already created
+    /*
     spectrumFS = new Fieldset();
     spectrumFS.setTitle("XTandemParameterSetSpectrum");
     addFieldset(spectrumFS);
+    */
     // Spectrum, path
     spectrumPathF = new TextField<String>(VXTANDEM_SPECTRUM_PATH);
@@ -349 +366 @@
     fragMiMassErrorF = new TextField<String>(VXTANDEM_SPECTRUM_FRAG_MI_MASS_ERROR);
     spectrumFS.add(fragMiMassErrorF);
+    // Spectrum, fragment monoisotopic mass error units
+    validStringParam = VXTANDEM_SPECTRUM_FRAG_MI_MASS_ERROR_UNITS;
+    stringList = new ArrayList<String>();
+    stringList.add("Daltons");
+    stringList.add("ppm");
+    fragMiMassErrorUnitsM = new Select<VString>(validStringParam, stringList, null);
+    spectrumFS.add(fragMiMassErrorUnitsM);
     // Spectrum, parent monoisotopic mass error plus
     parentMiMassErrorPlusF = new TextField<String>(VXTANDEM_SPECTRUM_PARENT_MI_MASS_ERROR_PLUS);
@@ -362 +386 @@
     parentMiMassIsotopeErrorM = new Select<VString>(validStringParam, stringList, null);
     spectrumFS.add(parentMiMassIsotopeErrorM);
-    // Spectrum, fragment monoisotopic mass error units
-    validStringParam = VXTANDEM_SPECTRUM_FRAG_MI_MASS_ERROR_UNITS;
-    stringList = new ArrayList<String>();
-    stringList.add("Daltons");
-    stringList.add("ppm");
-    fragMiMassErrorUnitsM = new Select<VString>(validStringParam, stringList, null);
-    spectrumFS.add(fragMiMassErrorUnitsM);
     // Spectrum, parent monoisotopic mass error units
     validStringParam = VXTANDEM_SPECTRUM_PARENT_MI_MASS_ERROR_UNITS;
@@ -811 +828 @@
      */
     // List path, default parameters
-    listPathDefaultParametersSB.selectOption(obj.getListPathDefaultParameters());
+    //listPathDefaultParametersSB.selectOption(obj.getListPathDefaultParameters());
     // List path, taxonomy information
     taxonomyInformationListPathF.setValue(obj.getListPathTaxonomyInformation());
@@ -821 +838 @@
     // Spectrum, fragment monoisotopic mass error
     fragMiMassErrorF.setValue(obj.getSpectrumFragmentMonoisotopicMassError());
+    // Spectrum, fragment monoisotopic mass error units
+    fragMiMassErrorUnitsM.selectOption(obj.getSpectrumFragmentMonoisotopicMassErrorUnits());
     // Spectrum, parent monoisotopic mass error plus
     parentMiMassErrorPlusF.setValue(obj.getSpectrumParentMonoisotopicMassErrorPlus());
@@ -827 +846 @@
     // Spectrum, parent monoisotopic mass isotope error
     parentMiMassIsotopeErrorM.selectOption(obj.getSpectrumParentMonoisotopicMassIsotopeError());
-    // Spectrum, fragment monoisotopic mass error units
-    fragMiMassErrorUnitsM.selectOption(obj.getSpectrumFragmentMonoisotopicMassErrorUnits());
     // Spectrum, parent monoisotopic mass error units
     parentMiMassErrorUnitsM.selectOption(obj.getSpectrumParentMonoisotopicMassErrorUnits());
@@ -1477 +1494 @@
     Integer maxDisplaySize,
     String selected)
-  {
-    
+  {   
     Select<VString> selectBox = new Select<VString>(validStringParam, optionList);
     selectBox.setLabel(label);