Changeset 3543

Timestamp:

Oct 14, 2015, 2:11:57 PM (7 years ago)

Author:

Nicklas Nordborg

Message:

References #812: Pilot report wizard

Minor adjusments to text positions.

A new version of the R script has "class" name in the pam50.txt file that doesn't match any of the headers, so we need to check which score that is the highest to be able to print it in bold.

File:

• extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/pdf/PilotReportWorker.java (modified) (3 diffs)

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/pdf/PilotReportWorker.java

@@ -90 +90 @@
   private static final float PLOT_START_Y = 474.5f;
   // Distance between plots
-  private static final float PLOT_DELTA_Y = 89.5f;
+  private static final float PLOT_DELTA_Y = 89.3f;
   // Size of plots
   private static final float PLOT_WIDTH = 160;
@@ -96 +96 @@
   // Text releated to plot
   private static final float PLOT_TEXT_X = 214;
-  private static final float PLOT_TEXT_START_Y = 510;
+  private static final float PLOT_TEXT_START_Y = 509.5f;
   
   private PilotReport script;
@@ -200 +200 @@
       String subtypeClass = parsePam50(new File(workDir, "PAM50.txt"), subtypeNames, subtypeScores);
       pdfUtil.addText(subtypeClass, 14, Element.ALIGN_LEFT, SUBTYPE_X1, SUBTYPE_Y1);
+      // Find max score
+      float maxScore = subtypeScores[0];
+      for (int scoreNo = 1; scoreNo < subtypeScores.length; scoreNo++)
+      {
+        if (subtypeScores[scoreNo] > maxScore) maxScore = subtypeScores[scoreNo];
+      }
+      // Print scores
       for (int scoreNo = 0; scoreNo < subtypeScores.length; scoreNo++)
       {
-        if (subtypeClass.equals(subtypeNames[scoreNo]))
+        if (Float.compare(subtypeScores[scoreNo], maxScore) == 0)
         {
           pdfUtil.addBoldText(twoDecimals.format(subtypeScores[scoreNo]), 12, Element.ALIGN_LEFT, SUBTYPE_X2+scoreNo*SUBTYPE_XX, SUBTYPE_Y2);