Changeset 7603 for trunk/projects


Ignore:
Timestamp:
01/27/11 23:56:17 (9 years ago)
Author:
aivar
Message:

Thought there might be a bug here, so made the display table more flexible with indices defined as constants rather than hardcoded.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/projects/slim-plugin/src/main/java/loci/slim/analysis/plugins/Display.java

    r7597 r7603  
    6767@SLIMAnalyzer(name="Display Fit Results") 
    6868public class Display implements ISLIMAnalyzer { 
     69    private static final int C_INDEX = 1; 
     70    private static final int A1_INDEX = 2; 
     71    private static final int T1_INDEX = 3; 
     72    private static final int A2_INDEX = 4; 
     73    private static final int T2_INDEX = 5; 
     74    private static final int A3_INDEX = 6; 
     75    private static final int T3_INDEX = 7; 
    6976    private static final Character TAU = 'T'; //TODO IJ1 doesn't display Unicode, was: = '\u03c4'; 
    7077    private static final String T = "" + TAU; 
     
    103110    /** 
    104111     * Enum that contains the possible formulas for the values to be displayed. 
    105      * This table is very specifically tied to the order of parameter indices. 
    106112     */ 
    107113    //TODO need Ta, Ti, Tm 
    108114    private static enum Formula { 
    109         T_FORMULA(T, 3), 
    110         T1_FORMULA(T1, 3), 
    111         T2_FORMULA(T2, 5), 
    112         T3_FORMULA(T3, 7), 
    113         T1_T2_FORMULA(T1_T2, 3, 5), // specifies T1/T2, parameter index 3 divided by parameter index 5 
    114         T2_T1_FORMULA(T2_T1 ,5, 3), 
    115         T1_T3_FORMULA(T1_T3, 3, 7), 
    116         T3_T1_FORMULA(T3_T1, 7, 3), 
    117         T2_T3_FORMULA(T2_T3, 5, 7), 
    118         T3_T2_FORMULA(T3_T2, 7, 5), 
    119         A_FORMULA(A, 2), 
    120         A1_FORMULA(A1, 2), 
    121         A2_FORMULA(A2, 4), 
    122         A3_FORMULA(A3, 6), 
    123         A1_A2_FORMULA(A1_A2, 2, 4), 
    124         A2_A1_FORMULA(A2_A1, 4, 2), 
    125         A1_A3_FORMULA(A1_A3, 2, 6), 
    126         A3_A1_FORMULA(A3_A1, 6, 2), 
    127         A2_A3_FORMULA(A2_A3, 4, 6), 
    128         A3_A2_FORMULA(A3_A2, 6, 4), 
    129         C_FORMULA(C, 1); 
     115        T_FORMULA(T, T1_INDEX), 
     116        T1_FORMULA(T1, T1_INDEX), 
     117        T2_FORMULA(T2, T2_INDEX), 
     118        T3_FORMULA(T3, T3_INDEX), 
     119        T1_T2_FORMULA(T1_T2, T1_INDEX, T2_INDEX), // specifies T1/T2, parameter index of T1 divided by parameter index of T2 
     120        T2_T1_FORMULA(T2_T1, T2_INDEX, T1_INDEX), 
     121        T1_T3_FORMULA(T1_T3, T1_INDEX, T3_INDEX), 
     122        T3_T1_FORMULA(T3_T1, T3_INDEX, T1_INDEX), 
     123        T2_T3_FORMULA(T2_T3, T2_INDEX, T3_INDEX), 
     124        T3_T2_FORMULA(T3_T2, T3_INDEX, T2_INDEX), 
     125        A_FORMULA(A, A1_INDEX), 
     126        A1_FORMULA(A1, A1_INDEX), 
     127        A2_FORMULA(A2, A2_INDEX), 
     128        A3_FORMULA(A3, A3_INDEX), 
     129        A1_A2_FORMULA(A1_A2, A1_INDEX, A2_INDEX), 
     130        A2_A1_FORMULA(A2_A1, A2_INDEX, A1_INDEX), 
     131        A1_A3_FORMULA(A1_A3, A1_INDEX, A3_INDEX), 
     132        A3_A1_FORMULA(A3_A1, A3_INDEX, A1_INDEX), 
     133        A2_A3_FORMULA(A2_A3, A2_INDEX, A3_INDEX), 
     134        A3_A2_FORMULA(A3_A2, A3_INDEX, A2_INDEX), 
     135        C_FORMULA(C, C_INDEX); 
    130136 
    131137        // This contains the displayable name 
     
    197203        if (FitRegion.EACH != region) { 
    198204            // not appropriate 
    199             MessageDialog dialog = new MessageDialog(null, "Display Fit Results", "Requires each pixel be fitted."); 
     205           //TODO? just ignoring is okay? MessageDialog dialog = new MessageDialog(null, "Display Fit Results", "A."); 
    200206            return; 
    201207        } 
Note: See TracChangeset for help on using the changeset viewer.