Revision 31877

View differences:

branches/gvSIG_19_ext3D_osgVP_2_2_0/extensions/ext3Dgui/src/org/gvsig/gvsig3dgui/display/FullScreenPanel.java
565 565
						_fullScreenViewer.frame();
566 566
					}
567 567
				};
568
				_view3D.getCanvas3d().addSlaveComponent(slavePainter);
568
				_view3D.getCanvas3d().addRenderSlaveComponent(slavePainter);
569 569
				new Thread(new Runnable() {
570 570
					
571 571
					public void run() {
......
575 575
							} catch (InterruptedException e) {
576 576
							}
577 577
						}
578
						_view3D.getCanvas3d().removeSlaveComponent(slavePainter);
578
						_view3D.getCanvas3d().removeRenderSlaveComponent(slavePainter);
579 579
						_fullScreenViewer.dispose();
580 580
					}
581 581
				}).start();
branches/gvSIG_19_ext3D_osgVP_2_2_0/extensions/ext3Dgui/src/org/gvsig/gvsig3dgui/layout/fframe/FFrameView3D.java
139 139
	public String getClassName() {
140 140
		return className;
141 141
	}
142
	
142

  
143 143
	/**
144 144
	 * Devuelve una descripci�n del FFrameView.
145 145
	 * 
......
236 236
	public void setView(ProjectViewBase v) {
237 237
		view = v;
238 238
		m_fmap = (MapContext3D) v.getMapContext();
239
		if(m_fmap.getCanvas3d() != null)
240
			m_fmap.getCanvas3d().addSlaveComponent(this);
241
	
239
		if (m_fmap.getCanvas3d() != null)
240
			m_fmap.getCanvas3d().addEventSlaveComponent(this);
241

  
242 242
	}
243
	
244
	
245
	
246 243

  
247 244
	/**
248 245
	 * Devuelve el modelo de la vista.
......
349 346
										.getRectOrigin().clone();
350 347
							} else {
351 348

  
352
								// System.err.println("r : " + r);
353 349
								if (r.getWidth() > getLayout().getWidth()
354 350
										|| r.getHeight() > getLayout()
355 351
												.getHeight()) {
......
359 355
									getMapContext().getViewPort().setImageSize(
360 356
											new Dimension((int) r.getWidth(),
361 357
													(int) r.getHeight()));
362
//									MapContext3D fmap = (MapContext3D) getMapContext()
363
//											.cloneToDraw();
364
									ViewPort3D viewp =(ViewPort3D)this.getMapContext().getViewPort();//.cloneViewPort();
358
									// MapContext3D fmap = (MapContext3D)
359
									// getMapContext()
360
									// .cloneToDraw();
361
									ViewPort3D viewp = (ViewPort3D) this
362
											.getMapContext().getViewPort();// .cloneViewPort();
365 363
									viewp.setImageSize(new Dimension(
366 364
											getLayout().getWidth(), getLayout()
367 365
													.getHeight()));
......
386 384
									try {
387 385
										getMapContext().draw(imgBase, g, scale);
388 386
									} catch (ReadDriverException e) {
389
										NotificationManager.showMessageError("Problems with driver rendering", e);
387
										NotificationManager
388
												.showMessageError(
389
														"Problems with driver rendering",
390
														e);
390 391
									}
391 392
									g.translate(r.getX(), r.getY());
392 393

  
393 394
								} else {
395

  
394 396
									getMapContext().getViewPort().setOffset(
395 397
											new Point2D.Double(r.x, r.y));
396 398
									getMapContext().getViewPort().setImageSize(
......
407 409
										getMapContext().draw(m_image, gimg,
408 410
												getScale());
409 411
									} catch (ReadDriverException e) {
410
										NotificationManager.showMessageError("Problems with driver rendering", e);
412
										NotificationManager
413
												.showMessageError(
414
														"Problems with driver rendering",
415
														e);
411 416
									}
412 417
									gimg.translate(((int) r.getX()), ((int) r
413 418
											.getY()));
......
419 424
									}
420 425
									g.drawImage(m_image, (int) r.getX(),
421 426
											(int) r.getY(), getLayout());
427

  
422 428
								}
423 429
								scaleAnt = getLayout().getLayoutControl()
424 430
										.getAT().getScaleX();
......
607 613

  
608 614
		try {
609 615
			// xml.putProperty("type", Layout.RECTANGLEVIEW);
610
		//	xml.putProperty("className", this.getClassName());
611
		
616
			// xml.putProperty("className", this.getClassName());
617

  
612 618
			xml.putProperty("m_Mode", m_Mode);
613 619
			xml.putProperty("m_typeScale", m_typeScale);
614 620
			xml.putProperty("m_extension", m_extension);
......
635 641
						break;
636 642
					}
637 643
				}
638
				
644

  
639 645
			}
640
			
641
//			titleWindow = ((ProjectView3D) view).getView().getWindowInfo().getTitle();
642
//			xml.putProperty("titleWindow", titleWindow);
643 646

  
647
			// titleWindow = ((ProjectView3D)
648
			// view).getView().getWindowInfo().getTitle();
649
			// xml.putProperty("titleWindow", titleWindow);
650

  
644 651
			if (!hasIndex) {
645 652
				xml.putProperty("indice", -1);
646 653
			}
......
840 847
	 *            DOCUMENT ME!
841 848
	 */
842 849
	public void setXMLEntity(XMLEntity xml) {
843
		
844
//		
850

  
851
		//		
845 852
		if (xml.getIntProperty("m_Selected") != 0) {
846 853
			this.setSelected(true);
847 854
		} else {
......
872 879
			view = (ProjectViewBase) project.getProjectDocumentByName(xml
873 880
					.getStringProperty("viewName"),
874 881
					ProjectView3DFactory._registerName);
875
			
876
	//		if (xml.contains("className"))
877
//				this.className=	xml.getStringProperty("className");
878
			
882

  
883
			// if (xml.contains("className"))
884
			// this.className= xml.getStringProperty("className");
885

  
879 886
		} else {
880 887
			if (indice != -1) {
881 888
				try {
......
891 898
			}
892 899
		}
893 900

  
894
//		if (xml.contains("titleWindow"))
895
//			this.titleWindow = xml.getStringProperty("titleWindow");
896
		
901
		// if (xml.contains("titleWindow"))
902
		// this.titleWindow = xml.getStringProperty("titleWindow");
903

  
897 904
		if (view != null) {
898 905
			this.setView(view);
899 906

  
......
1057 1064
		frame.setSelected(this.getSelected() != IFFrame.NOSELECT);
1058 1065
		frame.setLayout(layout);
1059 1066
		if ((frame.view != null) && (frame.m_fmap != null))
1060
			frame.m_fmap.getCanvas3d().addSlaveComponent(frame);
1067
			frame.m_fmap.getCanvas3d().addEventSlaveComponent(frame);
1061 1068

  
1062 1069
		if (frame instanceof IFFrameViewDependence) {
1063 1070
			((IFFrameViewDependence) frame).initDependence(layout
......
1075 1082
	public void repaint() {
1076 1083
		refresh = true;
1077 1084
		this.getLayout().getLayoutControl().refresh();
1085
		//this.refresh();
1078 1086
	}
1079 1087

  
1080 1088
	public void refreshOriginalExtent() {
1081 1089
		// TODO Auto-generated method stub
1082
		
1090

  
1083 1091
	}
1084 1092
}

Also available in: Unified diff