Changeset 5141

Timestamp:

Oct 19, 2009, 9:03:37 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

References #1386: Plot function in the bioassay table in experiment explorer

The 'No labels' option now uses a space as labels instead of hiding them completely which makes it possible to keep the colored annotation boxes.

File:

• trunk/src/clients/web/net/sf/basedb/clients/web/servlet/ExperimentExplorerPlotServlet.java (modified) (4 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/servlet/ExperimentExplorerPlotServlet.java

@@ -171 +171 @@
     if (yLog && yLabel != null) yLabel = "log2("+yLabel+")";
     final boolean showXLabels = Values.getBoolean(request.getParameter("showXLabels"));
+    final boolean showAnnotations = true;
 
     // Box plot specific parameters
@@ -259 +260 @@
           Set<Integer> annotationTypes = explorer.getAnnotationTypeIds();
           List<AnnotationSummary> summaries = new ArrayList<AnnotationSummary>(3);
-          if (showXLabels && annotationTypes != null && annotationTypes.size() > 0)
+          if (showAnnotations && annotationTypes != null && annotationTypes.size() > 0)
           {
             categoryAnnotations = new String[Math.min(3, annotationTypes.size())];
@@ -278 +279 @@
           {
             short column = ba.getDataCubeColumnNo();
-            ColumnKey key = new ColumnKey(ba.getId(), ba.getName());
+            ColumnKey key = new ColumnKey(ba.getId(), showXLabels ? ba.getName(): " ");
             for (AnnotationSummary summary : summaries)
             {
@@ -306 +307 @@
           // Create the plot and chart objects
             categoryAxis.setCategoryLabelPositions(CategoryLabelPositions.UP_90);
-            categoryAxis.setVisible(showXLabels);
           Plot plot = new CategoryPlot(dataset, categoryAxis, valueAxis, new LineAndShapeRenderer());
           chart = new JFreeChart(plot);