[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/eyes/tools/java/de/tub/eyes/diagram JDiagramViewer.java, 1.6, 1.7

[Till Wimmer]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/eyes/tools/java/de/tub/eyes/diagram
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10542

Modified Files:
	JDiagramViewer.java 
Log Message:
removed setViewport - this is no done by revalidate of root; resizeing disabled because of scrolling

Index: JDiagramViewer.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/eyes/tools/java/de/tub/eyes/diagram/JDiagramViewer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JDiagramViewer.java	24 Apr 2006 14:20:07 -0000	1.6
--- JDiagramViewer.java	18 May 2006 16:35:12 -0000	1.7
***************
*** 534,540 ****
          float oldY = (float)getHeight();
          
!         diagram.resize(baseSizeX/oldX, baseSizeY/oldY);
!         if (pane != null)
!             pane.setViewportView(this); // ugly, but it works!
      }
      
--- 534,538 ----
          float oldY = (float)getHeight();
          
!         setSize(sizeX, sizeY);
      }
      
***************
*** 544,554 ****
          int newSizeX = (int)(baseSizeX*zoomFactor[zoom]);
          int newSizeY = (int)(baseSizeY*zoomFactor[zoom]);
!         diagram.resize(newSizeX/(float)sizeX,newSizeY/(float)sizeY);
          sizeX = newSizeX;
          sizeY = newSizeY;
          
!         if (pane != null)
!             pane.setViewportView(this); // ugly, but it works!                   
!         
      }
      
--- 542,551 ----
          int newSizeX = (int)(baseSizeX*zoomFactor[zoom]);
          int newSizeY = (int)(baseSizeY*zoomFactor[zoom]);
!         if (mapNo == -1)
!             diagram.resize(newSizeX/(float)sizeX,newSizeY/(float)sizeY);
          sizeX = newSizeX;
          sizeY = newSizeY;
          
!         setSize(sizeX, sizeY);                
      }