Changeset 4097


Ignore:
Timestamp:
Jan 21, 2011, 2:28:38 PM (12 years ago)
Author:
olle
Message:

Refs #730. Refs #535. Refs #287. Hits Comparison Report updated in GUI, to hopefully be simpler and increase consistency:

  1. Class/file action/hit/HitsComparisonReportStep1.java in client/servlet/ updated in page title.
  1. Class/file action/hit/HitsComparisonReport.java in client/servlet/ updated in page title.
  1. Class/file gui/form/ProjectComparisonForm.java in client/servlet/ updated to use one fieldset for each hit selection, when selecting projects, as separate fieldsets are used when selecting filter settings.
  1. English dictionary file locale/en/dictionary in client/servlet/ updated with new string keys.


Location:
trunk/client/servlet/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/client/servlet/src/locale/en/dictionary

    r4091 r4097  
    245245HitsComparisonOnlyUseLeadingProteins=Only use leading proteins
    246246HitsComparisonReportBtn=Hits Comparison Report
    247 HitsComparisonReportComparisonType=Hits Comparison Report - Comparison type
     247HitsComparisonReportComparisonType=Comparison type
    248248HitsComparisonReportComparisonTypeSelect=Comparison type
    249 HitsComparisonReportFilterSettings1=Hits Comparison Report - Filter Settings Hit Selection 1
    250 HitsComparisonReportFilterSettings2=Hits Comparison Report - Filter Settings Hit Selection 2
     249HitsComparisonReportFilterSettings1=Hit Selection 1 - Filter Settings
     250HitsComparisonReportFilterSettings2=Hit Selection 2 - Filter Settings
    251251HitsComparisonReportFilterSettings=Hits Comparison Report - Filter Settings
    252252HitsComparisonReport=Hits Comparison Report
    253 HitsComparisonReportOutput=Hits Comparison Report - Output
     253HitsComparisonReportOutput=Output
    254254HitsComparisonReportProject1CombinedFDRUpperCutoff=Combined Search FDR
    255 HitsComparisonReportProject1=Hit Selection 1 Project
     255HitsComparisonReportProject1=Project
    256256HitsComparisonReportProject1Id=Project ID
    257257HitsComparisonReportProject1Name=Project Name
    258258HitsComparisonReportProject2CombinedFDRUpperCutoff=Combined Search FDR
    259 HitsComparisonReportProject2=Hit Selection 2 Project
     259HitsComparisonReportProject2=Project
    260260HitsComparisonReportProject2Id=Project ID
    261261HitsComparisonReportProject2Name=Project Name
    262262HitsComparisonReportProjectSelection=Hits Comparison Report - Project Selection
    263 HitsComparisonReportProteinSettings=Hits Comparison Report - Protein Comparison Settings Only
     263HitsComparisonReportProjectSelection1=Hit Selection 1 - Project Selection
     264HitsComparisonReportProjectSelection2=Hit Selection 2 - Project Selection
     265HitsComparisonReportProteinSettings=Protein Comparison Settings Only
    264266HitsComparisonReportScoreTypeSelect=Score Type
     267HitsComparisonReportStep1=Hits Comparison Report - Step 1 of 2
     268HitsComparisonReportStep2=Hits Comparison Report - Step 2 of 2
    265269HitSelectionNumber=Hit Selection #
    266270Hits=Hits
  • trunk/client/servlet/src/org/proteios/action/hit/HitsComparisonReport.java

    r3853 r4097  
    9595      throws ActionException, InvalidParameterValue
    9696  {
    97   ColumnContainer cc;
     97    ColumnContainer cc;
    9898
    99   cc = new ColumnContainer();
     99    cc = new ColumnContainer();
    100100    DbControl dc = newDbControl();
    101101    Project project = isProjectActive(dc);
     
    128128    // Get form
    129129    Form form = new HitComparisonForm(project, project1, project2, filenamePrefixDefault);
    130     String pageTitle = new String("HitsComparisonReport");
     130    String pageTitle = new String("HitsComparisonReportStep2");
    131131    Title title = new Title(pageTitle);
    132132    // Instruction area
     
    155155    RowLayout layout = getLayoutFactory().getRowLayout();
    156156    layout.add(title);
    157   cc.add(form);
    158   cc.add(instructionArea);
     157    cc.add(form);
     158    cc.add(instructionArea);
    159159    layout.add(cc);
    160160    setLayout(layout);
  • trunk/client/servlet/src/org/proteios/action/hit/HitsComparisonReportStep1.java

    r4016 r4097  
    7171      throws ActionException, InvalidParameterValue
    7272  {
    73   ColumnContainer cc;
     73    ColumnContainer cc;
    7474
    75   cc = new ColumnContainer();
     75    cc = new ColumnContainer();
    7676
    7777    // Default filename prefix
     
    124124    // Get form
    125125    Form form = new ProjectComparisonForm(project, hitProjList);
    126     String pageTitle = new String("HitsComparisonReportProjectSelection");
     126    String pageTitle = new String("HitsComparisonReportStep1");
    127127    Title title = new Title(pageTitle);
    128128    // Instruction area
     
    145145     */
    146146    RowLayout layout = getLayoutFactory().getRowLayout();
    147   cc.add(form);
    148   cc.add(instructionArea);
     147    cc.add(form);
     148    cc.add(instructionArea);
    149149
    150150    layout.add(title);
  • trunk/client/servlet/src/org/proteios/gui/form/ProjectComparisonForm.java

    r3849 r4097  
    3737public class ProjectComparisonForm extends Form
    3838{
    39   public final Fieldset fs;
     39  public final Fieldset fs1, fs2;
    4040  public final Select<VInteger> project1SelectBox;
    4141  public final Select<VInteger> project2SelectBox;
     
    4444  {
    4545    super("comparisonOfHitsReportProjectSelectionForm");
    46     fs = new Fieldset("HitsComparisonReportProjectSelection");
    47     addFieldset(fs);
    4846   
    4947    // Project 1 selection
     48    fs1 = new Fieldset("HitsComparisonReportProjectSelection1");
     49    addFieldset(fs1);
    5050    project1SelectBox = new Project1Select(project, projectList);
    5151    project1SelectBox.setLabel("HitsComparisonReportProject1");
    52     fs.add(project1SelectBox);
     52    fs1.add(project1SelectBox);
    5353    // Project 2 selection
     54    fs2 = new Fieldset("HitsComparisonReportProjectSelection2");
     55    addFieldset(fs2);
    5456    project2SelectBox = new Project2Select(project, projectList);
    5557    project2SelectBox.setLabel("HitsComparisonReportProject2");
    56     fs.add(project2SelectBox);
     58    fs2.add(project2SelectBox);
    5759  }
    5860}
Note: See TracChangeset for help on using the changeset viewer.