Changeset 4556


Ignore:
Timestamp:
May 21, 2014, 9:11:41 AM (9 years ago)
Author:
Fredrik Levander
Message:

Allowing OpenMS SuperHirn? feature detection

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/client/servlet/src/org/proteios/action/file/UseSpectrumFileForOpenMsSearchExtension.java

    r4311 r4556  
    200200    optionList.add(new Option("Centroided", "Centroided"));
    201201    optionList.add(new Option("IsotopeWavelet", "Isotope wavelet"));
     202    optionList.add(new Option("SuperHirn", "SuperHirn"));
    202203    selected = new String("Centroided");
    203204    Select<VString> featureFinderAlgorithmSelectBox = new Select<VString>(validStringParam, optionList);
  • trunk/plugin/src/org/proteios/plugins/OpenMSFeatureImporter.java

    r4207 r4556  
    432432      {
    433433        dc.saveItem(feature);
    434         feature.setEndRetentionTimeInMinutes(endRT);
    435         feature.setStartRetentionTimeInMinutes(startRT);
     434        if (endRT==0f)
     435        {
     436          feature.setEndRetentionTimeInMinutes(feature.getApexRetentionTimeInMinutes());
     437        }
     438        else
     439        {
     440          feature.setEndRetentionTimeInMinutes(endRT);
     441        }
     442        if (startRT==Float.MAX_VALUE)
     443        {
     444          feature.setStartRetentionTimeInMinutes(feature.getApexRetentionTimeInMinutes());
     445        }
     446        else
     447        {
     448          feature.setStartRetentionTimeInMinutes(startRT);
     449        }
    436450        featureCount++;
    437451      }
  • trunk/plugin/src/org/proteios/plugins/RunOpenMsPlugin.java

    r4344 r4556  
    13141314          progress.display(percentCompleted, progressMessage);
    13151315        }
     1316      }
     1317      else if (line.contains("-- done"))
     1318      {
     1319        progress.display(EstimatedTotalPercentage(100, getCurrentPhase()), getCurrentPhaseStr()+" done");
    13161320      }
    13171321    }
Note: See TracChangeset for help on using the changeset viewer.