Changeset 1918 for trunk/www/analyze/index.jsp

Timestamp:

Feb 6, 2006, 2:59:19 PM (17 years ago)

Author:

Gregory Vincic

Message:

Initial revision of the JFreePlotServlet

File:

• trunk/www/analyze/index.jsp (modified) (8 diffs)

trunk/www/analyze/index.jsp

@@ -169 +169 @@
 final ItemContext cc = Base.getAndSetCurrentContext(sc, basType, pageContext, defaultContext);
 final ModeInfo mode = ModeInfo.get(request.getParameter("mode"));
+ItemResultList<BioAssay> baList = null;
 
 /* Command validation */
@@ -244 +245 @@
     var submitPage = 'index.jsp';
     var formId = 'bioassaysets';
-    
+    function configureColumns()
+    {
+      Table.configureColumns('<%=ID%>', formId, '<%=itemType.name()%>', '<%=(String)cc.getObject("defaultColumns")%>');
+    }
     function viewExperiment()
     {
@@ -284 +288 @@
     function switchTab(tabControlId, tabId)
     {
-      TabControl.setActiveTab(tabControlId, tabId);       
+      if(tabId == 'overviewplots')
+      {
+        location.replace('index.jsp?ID=<%=ID%>&experiment_id=<%=experimentId%>&item_id=<%=itemId%>&tabId=overviewplots');
+      }
+      else
+      {
+        TabControl.setActiveTab(tabControlId, tabId);
+      }
+      
     }
   </script>
@@ -371 +383 @@
         baQuery.include(Include.REMOVED);
         baQuery.include(Include.OTHERS);
-        ItemResultList<BioAssay> baList = baQuery.list(dc);
+        baList = baQuery.list(dc);
         for(BioAssay ba : baList) {%>
           <option value="<%=ba.getId()%>" <%=(bioassayId == ba.getId()) ? "selected=selected": ""%>><%=HTML.encodeTags(ba.getName())%>[<%=ba.getNumSpots()%>]</option>
@@ -419 +431 @@
         # --> extra value, not implemented
         % --> channel, eg. %1, %2
-      */
-      List<String> selectionList = new LinkedList<String>();
+      */      
       List<TableColumn> cols = new LinkedList<TableColumn>();
+      
+      /* Column definitions */
       cols.add( new TableColumn("position", "POSITION", "int", "Position") );
       cols.add( new TableColumn("ch1", "%1", "float", "Ch 1") );
       cols.add( new TableColumn("ch2", "%2", "float", "Ch 2") );
       cols.add( new TableColumn("externalId", "@externalId", "string", "External Id") );
+      cols.add( new TableColumn("name", "@name", "string", "Name") );
+      cols.add( new TableColumn("symbol", "@symbol", "string", "Symbol") );
+      cols.add( new TableColumn("ch1FgMedian", "$ch1FgMedian", "float", "ch1FgMedian") );
+      
+      /* End column definitions */
+      List<String> selectionList = new LinkedList<String>(); // Used when configuring query
       
       for(TableColumn c : cols)
@@ -446 +465 @@
       DynamicResultIterator spots = dynQuery.iterate(dc);
       %>
+      
+      <tbl:toolbar>
+        <tbl:button 
+          image="columns.gif" 
+          onclick="configureColumns()" 
+          title="Columns&hellip;" 
+          tooltip="Show, hide and re-order columns" 
+        />
+      </tbl:toolbar>
       <tbl:navigator
         page="<%=cc.getPage()%>" 
@@ -466 +494 @@
         </tr>
         <tbl:rows>
-          <%
-          
-          int reporter_i = spots.getIndex("externalId");
-          int ch1 = spots.getIndex("ch1");
-          int ch2 = spots.getIndex("ch2");
-          int position_i = spots.getIndex("position");
+          <%          
+          int[] indexValues = new int[cols.size()];
+          int i = 0;
+          for(TableColumn c : cols)
+          {
+            indexValues[i] = spots.getIndex(c.getId());
+            i++;
+          }
           while(spots.hasNext())
-          {
-            
+          {           
             SqlResult r = spots.next();
             %>
             <tbl:row>
                 <th colspan="3" class="index">&nbsp;</th>
-              <tbl:cell column="externalId"><%=r.getString(reporter_i) == null ? "" : r.getString(reporter_i)%></tbl:cell>
-              <tbl:cell column="ch1"><%=r.getFloat(ch1)%></tbl:cell>
-              <tbl:cell column="ch2"><%=r.getFloat(ch2)%></tbl:cell>
-              <tbl:cell column="position"><%=r.getInt(position_i)%></tbl:cell>
+                <%
+                i = 0;
+                for(TableColumn c : cols)
+                {%>
+                <tbl:cell column="<%=c.getId()%>">
+                  <%=r.getString(indexValues[i]) == null ? "" : r.getString(indexValues[i])%>
+                </tbl:cell>
+              <%
+              i++;
+              }%>
             </tbl:row>
           <%
@@ -499 +534 @@
       />
     </tbl:table>
+    <%}%>
+    </t:tab>
+    <t:tab id="overviewplots" title="Overview plots"> 
+    <%if(tabId.equals("overviewplots")){%>
+    <%for(BioAssay ba : baList) {%>
+          <img src="<%=root%>/analyze/jfreeplot/<%=ID%>/<%=itemId%>/<%=ba.getId()%>"/>
+        <%}%>
     <%}%>
     </t:tab>