Changeset 1637 for trunk/gsdl

Timestamp:

2000-10-31T15:22:17+13:00 (24 years ago)

Author:

paynter

Message:

Rearranged paint function so that frequencys do not get written over by
long titles and phrases.

File:

• trunk/gsdl/src/phind/client/ResultCanvas.java (modified) (6 diffs)

trunk/gsdl/src/phind/client/ResultCanvas.java

@@ -227 +227 @@
     int visible = canvasSize.height / lineSpacing;
 
-    //System.out.println("h " + canvasSize.height + ", l " 
-    //         + lineSpacing + ", v " + visible);
-
     // get the initial scrollbar setting
     // and calculate the first result to output
@@ -239 +236 @@
     } 
     firstPhraseDisplayed = scrollValue;
+
+    // Draw the phrase area
 
     // draw the background
@@ -257 +256 @@
     }
     
-    // First column
-    g.setColor(new Color(235, 245, 235));
-    g.fillRect(firstColumn, 0, margin, canvasSize.height);
-
-    // Second column
-    g.setColor(new Color(200, 220, 200));
-    g.fillRect(secondColumn, 0, margin, canvasSize.height);
-    g.setColor(Color.black);
-
-    // if there are no phrases, output a brief explanation.
+    // If there are no phrases, output a brief explanation.
     if (numberOfPhrases == 0) {
         g.drawString("No phrases match this query.", leftMargin + 10, lineSpacing);
@@ -272 +262 @@
 
     // Output each of the visible ResultItems
+    ResultItem result;
     int tab, i, y = 0;
-    int center = leftMargin + ((rightMargin - leftMargin - g.getFontMetrics().stringWidth(parent.searchPhrase)) / 2);
-    ResultItem result;
-
-    for (i = scrollValue; (i < numberOfPhrases) && (y + lineSpacing < canvasSize.height); i++) {
+    int center = leftMargin 
+        + ((rightMargin - leftMargin 
+        - g.getFontMetrics().stringWidth(parent.searchPhrase)) / 2);
+    
+    for (i = scrollValue; 
+         (i < numberOfPhrases) && (y + lineSpacing < canvasSize.height); i++) {
 
         // Get the resultItem to output
         result = (ResultItem) phrases.elementAt(i);
-
+        
         // Graphics settings for drawing this line
         y += lineSpacing;
@@ -292 +285 @@
         }
 
-        // Draw the item - it could be phrase or a URL
-
-        // Write the document frequency
-        if ((result.documents > 1) || result.isPhrase()) {
-        g.drawString(" " + Integer.toString(result.documents), firstColumn, y);
-        }
-
-        // Write the term frequency
-        if (result.freq > 0) {
-        g.drawString(" " + Integer.toString(result.freq), secondColumn, y);
-        }
+        // Draw the item
 
         if (result.isPhrase()) {
@@ -346 +329 @@
     }
 
-    // adjust the scrollbar
+    // Draw the frequecy columns
+
+    // column backgrounds
+    g.setColor(new Color(235, 245, 235));
+    g.fillRect(firstColumn, 0, margin, canvasSize.height);
+    g.setColor(new Color(200, 220, 200));
+    g.fillRect(secondColumn, 0, margin, canvasSize.height);
+
+    // fill in the numbers
+    g.setColor(Color.black);
+    g.setFont(areaPlain);
+    y = 0;
+
+    for (i = scrollValue; 
+         (i < numberOfPhrases) && (y + lineSpacing < canvasSize.height); i++) {
+        
+        // Get the resultItem to output
+        result = (ResultItem) phrases.elementAt(i);
+        
+        // Graphics settings for drawing this line
+        y += lineSpacing;
+
+        // Write the document frequency
+        if ((result.documents > 1) || result.isPhrase()) {
+        g.drawString(" " + Integer.toString(result.documents), firstColumn, y);
+        }
+
+        // Write the term frequency
+        if (result.freq > 0) {
+        g.drawString(" " + Integer.toString(result.freq), secondColumn, y);
+        }
+    }
+
+    // Adjust the scrollbar
     if (visible >= numberOfPhrases) {
         parent.disableScrollbar();