[Geotools-commits] CVS: geotools/src/uk/ac/leeds/ccg/widgets MinMaxSlider.java,1.1,1.2

[James M. <jma...@us...>]

Update of /cvsroot/geotools/geotools/src/uk/ac/leeds/ccg/widgets
In directory usw-pr-cvs1:/tmp/cvs-serv9194

Modified Files:
	MinMaxSlider.java 
Log Message:
added labels


Index: MinMaxSlider.java
===================================================================
RCS file: /cvsroot/geotools/geotools/src/uk/ac/leeds/ccg/widgets/MinMaxSlider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -w -C2 -d -r1.1 -r1.2
*** MinMaxSlider.java	2001/12/05 16:25:39	1.1
--- MinMaxSlider.java	2001/12/06 18:16:27	1.2
***************
*** 88,91 ****
--- 88,92 ----
      public void setMinValue(int minValue) {
          this.minValue = minValue;
+         repaint();
      }
      
***************
*** 120,124 ****
          if(screenBuffer == null)bg=g;
          else bg = screenBuffer.getGraphics();
!         
          bg.setColor(getBackground());
          bg.fillRect(0,0,width,height);
--- 121,125 ----
          if(screenBuffer == null)bg=g;
          else bg = screenBuffer.getGraphics();
!         bg.setFont(getFont());
          bg.setColor(getBackground());
          bg.fillRect(0,0,width,height);
***************
*** 141,146 ****
          
          bg.setColor(getForeground());
!         bg.drawString(""+getMinSelected(),width-barWidth-20,p[0]);
!         bg.drawString(""+getMaxSelected(),width-barWidth-20,p[1]);
          if(screenBuffer!=null){
              g.drawImage(screenBuffer, 0,0,this);
--- 142,154 ----
          
          bg.setColor(getForeground());
!         
!         
!         String min = asLabel(getMinSelected());
!         String max = asLabel(getMaxSelected());
!         FontMetrics fm = this.getFontMetrics(getFont());
!         int len = fm.stringWidth(asLabel(getMinSelected()));
!         bg.drawString(min,width-barWidth-len,p[0]);
!         len = fm.stringWidth(asLabel(getMaxSelected()));
!         bg.drawString(max,width-barWidth-len,p[1]);
          if(screenBuffer!=null){
              g.drawImage(screenBuffer, 0,0,this);
***************
*** 148,151 ****
--- 156,171 ----
      }
      
+     public String asLabel(int value){
+         String result = ""+value;
+         if(value<0){
+             result = result.substring(1);
+             result = result+" "+negativeSuffix;
+         }
+         else{
+             result = result+" "+positiveSuffex;
+         }
+         return result;
+     }
+     
      protected int[] getLimits(){
          double valRange = maxValue-minValue;
***************
*** 161,165 ****
          double pixRange = getSize().height;
          double scale = pixRange/valRange;
!         return (int)(pix*scale)+minValue;
      }
      
--- 181,185 ----
          double pixRange = getSize().height;
          double scale = pixRange/valRange;
!         return (int)((pix+minValue)/scale);
      }
      
***************
*** 168,172 ****
          double pixRange = getSize().height;
          double scale = pixRange/valRange;
!         return (int)((val/scale)-minValue);
      }
      
--- 188,192 ----
          double pixRange = getSize().height;
          double scale = pixRange/valRange;
!         return (int)((val*scale)-minValue);
      }
      
***************
*** 183,186 ****
--- 203,207 ----
      public void setMaxValue(int maxValue) {
          this.maxValue = maxValue;
+          repaint();
      }
      
***************
*** 213,218 ****
          int old = this.minSelected;
          this.minSelected = minSelected;
-         repaint();
          this.propertySupport.firePropertyChange(this.PROP_MINSELECTED_PROPERTY,new Integer(old),new Integer(minSelected));
      }
      
--- 234,239 ----
          int old = this.minSelected;
          this.minSelected = minSelected;
          this.propertySupport.firePropertyChange(this.PROP_MINSELECTED_PROPERTY,new Integer(old),new Integer(minSelected));
+         repaint();
      }
      
***************
*** 236,241 ****
      
      public void mouseDragged(java.awt.event.MouseEvent mouseEvent) {
!         //System.out.println("start "+startValue+" now "+value+" "+(value-startValue));
          int value = pixToVal(mouseEvent.getY());
          switch(whatToMove){
              case TOP:
--- 257,263 ----
      
      public void mouseDragged(java.awt.event.MouseEvent mouseEvent) {
!         
          int value = pixToVal(mouseEvent.getY());
+         //System.out.println("start "+startValue+" now "+value+" diff "+(value-startValue));
          switch(whatToMove){
              case TOP:
***************
*** 265,269 ****
--- 287,295 ----
      int startValue;
      
+     /** Holds value of property negativeSuffix. */
+     private String negativeSuffix = "BCE";    
      
+     /** Holds value of property positiveSuffex. */
+     private String positiveSuffex = "CE";    
      
      public void mousePressed(java.awt.event.MouseEvent mouseEvent) {
***************
*** 297,300 ****
--- 323,354 ----
      public void setBarBackgroundColor(java.awt.Color barBackgroundColor) {
          this.barBackgroundColor = barBackgroundColor;
+     }
+     
+     /** Getter for property negativeSuffix.
+      * @return Value of property negativeSuffix.
+      */
+     public String getNegativeSuffix() {
+         return negativeSuffix;
+     }
+     
+     /** Setter for property negativeSuffix.
+      * @param negativeSuffix New value of property negativeSuffix.
+      */
+     public void setNegativeSuffix(String negativeSuffix) {
+         this.negativeSuffix = negativeSuffix;
+     }
+     
+     /** Getter for property positiveSuffex.
+      * @return Value of property positiveSuffex.
+      */
+     public String getPositiveSuffex() {
+         return positiveSuffex;
+     }
+     
+     /** Setter for property positiveSuffex.
+      * @param positiveSuffex New value of property positiveSuffex.
+      */
+     public void setPositiveSuffex(String positiveSuffex) {
+         this.positiveSuffex = positiveSuffex;
      }