[Nextobjects-devel] nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/graphics ConceptualView.java,1.20,1.21 PhysicalView.java,1.19,1.20

[<efl...@us...>]

Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/graphics
In directory sc8-pr-cvs1:/tmp/cvs-serv30142/src/org/devaki/nextobjects/workspace/models/graphics

Modified Files:
	ConceptualView.java PhysicalView.java 
Log Message:
Made 'model' --> 'png image' work with new graphics.


Index: ConceptualView.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/graphics/ConceptualView.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ConceptualView.java	2 Jun 2003 20:03:46 -0000	1.20
--- ConceptualView.java	3 Jun 2003 18:00:55 -0000	1.21
***************
*** 143,147 ****
  			public Image makeImage(int x,int y)
  			{
- 				// collect our objects.
  				Graphics2D big;
  				BufferedImage bi2;
--- 143,146 ----

Index: PhysicalView.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/graphics/PhysicalView.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** PhysicalView.java	2 Jun 2003 20:03:46 -0000	1.19
--- PhysicalView.java	3 Jun 2003 18:00:55 -0000	1.20
***************
*** 144,148 ****
  				}
  
! 				public BufferedImage getImage()
  				{
  					// collect our objects.
--- 144,148 ----
  				}
  
! 				public BufferedImage makeImage(int x,int y)
  				{
  					// collect our objects.
***************
*** 151,164 ****
  					Graphics2D bi2g;
  
! 					BaseObject[] tmp = myModel.getModel0bjects();
  
  					Rectangle rect;
  					myModel.calculateRectangle();
  					rect = myModel.getRectangle();
! 				
! 					bi =
! 						(BufferedImage) drawingArea.createImage(
! 							rect.width,
! 							rect.height);
  					big = bi.createGraphics();
  
--- 151,163 ----
  					Graphics2D bi2g;
  
! 					 BaseObject[] tmp = myModel.getModel0bjects();
  
  					Rectangle rect;
  					myModel.calculateRectangle();
  					rect = myModel.getRectangle();
! 							
! 						
! 					bi=(BufferedImage) drawingArea.createImage(rect.width,rect.height);
! 
  					big = bi.createGraphics();
  
***************
*** 179,186 ****
  							if (d.height > 0 && d.width > 0)
  							{
! 								bi2 =
! 									(BufferedImage) drawingArea.createImage(
! 										d.width,
! 										d.height);
  								bi2g = bi2.createGraphics();
  								tmp[k].getObjectView().paint(bi2g);
--- 178,182 ----
  							if (d.height > 0 && d.width > 0)
  							{
! 								bi2 =(BufferedImage)drawingArea.createImage(d.width,d.height);
  								bi2g = bi2.createGraphics();
  								tmp[k].getObjectView().paint(bi2g);
***************
*** 201,205 ****
  					 // blank fill, clean ...      
  					super.paintComponent(g2);
! 					Rectangle area;
  					BufferedImage bi2;
  					Graphics2D bi2g;
--- 197,201 ----
  					 // blank fill, clean ...      
  					super.paintComponent(g2);
! 					//Rectangle area;
  					BufferedImage bi2;
  					Graphics2D bi2g;
***************
*** 207,220 ****
  					if (fullRefresh)
  					{
! 						bi = getImage();
  						fullRefresh = false;
  					}
! 					int a=myModel.getRectangle().x;  
! 					int b=myModel.getRectangle().y; 
! 					Point p=new Point(a,b);
! 					g2.drawImage(bi,p.x,	p.y,this);
! 				
! 
! 
  					// loop/paint selected objects objects toviewPort panel.
  					for (int j = 0; j < ModelMan.getCurrentObjects().size(); j++)
--- 203,212 ----
  					if (fullRefresh)
  					{
! 						bi = (BufferedImage) makeImage(myModel.getRectangle().height,myModel.getRectangle().width);
  						fullRefresh = false;
  					}
! System.out.println(myModel.getRectangle());
! 					g2.drawImage(bi,myModel.getRectangle().x,	myModel.getRectangle().y,this);
! 					
  					// loop/paint selected objects objects toviewPort panel.
  					for (int j = 0; j < ModelMan.getCurrentObjects().size(); j++)
***************
*** 250,258 ****
  						} else
  						{
! 							Graphics tmpClip =g2.create(p.x,
! 							p.y,
  							getViewSize().width,
  							getViewSize().height);
- 							((BaseObject) ModelMan.getCurrentObjects().elementAt(j)).getObjectView().paint(tmpClip);
  						}
  						((BaseObject) ModelMan.getCurrentObjects().elementAt(j)).getObjectView().renderSelected(g);
--- 242,249 ----
  						} else
  						{
! 							Graphics tmpClip =g2.create(myModel.getRectangle().x,
! 							myModel.getRectangle().y,
  							getViewSize().width,
  							getViewSize().height);
  						}
  						((BaseObject) ModelMan.getCurrentObjects().elementAt(j)).getObjectView().renderSelected(g);