Revision 24059

View differences:

trunk/extensions/ext3Dgui/config/config.xml
168 168 
			<tool-bar name="Editing_tools" position="7">
169 169 
				<selectable-tool icon="rotation_manipulator" action-command="ROTATION_MANIPULATOR"  tooltip="rotation_manipulator" position="1"/>
170 170 
				<selectable-tool icon="tabbox_manipulator" action-command="TABBOX_MANIPULATOR"  tooltip="tabbox_manipulator" position="2"/>
171 
				<selectable-tool icon="scale_manipulator" action-command="SCALE_MANIPULATOR"  tooltip="scale_manipulator" position="3"/>
171 
<!--				<selectable-tool icon="scale_manipulator" action-command="SCALE_MANIPULATOR"  tooltip="scale_manipulator" position="3"/>-->
172 172 
			</tool-bar>
173 173 
		</extension>
174 174
trunk/extensions/ext3Dgui/src/org/gvsig/gvsig3dgui/manipulator/Manipulator3DExtension.java
54 54 
				em.changeDragger(DraggerType.TABBOX_DRAGGER);
55 55 
			} else if (actionCommand.equals("TABBOX_MANIPULATOR")) {
56 56 
				em.changeDragger(DraggerType.TRACKBALL_DRAGGER);
57 
			} else if (actionCommand.equals("SCALE_MANIPULATOR")) {
58 
				osgCacheService.endEditing();
59 
			}
57 
			}
60 58 
		}
61 59 

  		




  62
  60
  
    
	}


  		




  63
  61
  
    

  		




  64
  62
  
    
	public void initialize() {


  		




  65
  63
  
    
		// TODO Auto-generated method stub


  		




  
  64
  
    
		


  		




  
  65
  
    
		//Registering icons.


  		




  
  66
  
    
		PluginServices.getIconTheme().registerDefault(


  		




  
  67
  
    
				"tabbox_manipulator",


  		




  
  68
  
    
				this.getClass().getClassLoader().getResource(


  		




  
  69
  
    
				"images/tabbox_manipulator.gif"));


  		




  66
  70
  
    

  		




  67
  71
  
    
	}


  		




  68
  72
  
    

  		




  69
  73
  
    
	public boolean isEnabled() {


  		




  70
  
  
    
		// TODO Auto-generated method stub


  		




  71
  
  
    
		return true;


  		




  
  74
  
    
		boolean result = false;


  		




  
  75
  
    
		// Getting view3


  		




  
  76
  
    
		com.iver.andami.ui.mdiManager.IWindow view = PluginServices


  		




  
  77
  
    
		.getMDIManager().getActiveWindow();


  		




  
  78
  
    
		if ((view instanceof View3D)){


  		




  
  79
  
    
			// Casting to View3D


  		




  
  80
  
    
			View3D vista3D = (View3D) view;


  		




  
  81
  
    
			


  		




  
  82
  
    
			IProjectView model = vista3D.getModel();


  		




  
  83
  
    
			MapContext mapa = model.getMapContext();


  		




  
  84
  
    
			FLayer[] activeLayers = mapa.getLayers().getActives();


  		




  
  85
  
    
			if (activeLayers.length > 0) {


  		




  
  86
  
    
				FLayer layer = activeLayers[0];


  		




  
  87
  
    
				Layer3DProps props3D = Layer3DProps.getLayer3DProps(layer);


  		




  
  88
  
    
				if (props3D.getType() == Layer3DProps.layer3DOSG){


  		




  
  89
  
    
					result = true;


  		




  
  90
  
    
				}


  		




  
  91
  
    
			}


  		




  
  92
  
    
		}


  		




  
  93
  
    
		return result;


  		




  72
  94
  
    
	}


  		




  73
  95
  
    

  		




  74
  96
  
    
	public boolean isVisible() {


  		




  75
  
  
    
		// TODO Auto-generated method stub


  		




  76
  
  
    
		return true;


  		




  
  97
  
    
		// Getting view3


  		




  
  98
  
    
		com.iver.andami.ui.mdiManager.IWindow view = PluginServices


  		




  
  99
  
    
		.getMDIManager().getActiveWindow();


  		




  
  100
  
    
		return (view instanceof View3D);


  		




  77
  101
  
    
	}


  		




  78
  102
  
    

  		




  79
  103
  
    
}


  		












  

    
      trunk/extensions/ext3Dgui/src/org/gvsig/gvsig3dgui/import3D/ControlImport3D.java
    
  





  350
  350
  
    
				PluginServices.getText(this, "Ficheros *.ive"), "ive"));


  		




  351
  351
  
    
		iveExtensionsSupported.put("obj", new MyFileFilter("obj",


  		




  352
  352
  
    
				PluginServices.getText(this, "Ficheros *.obj"), "obj"));


  		




  
  353
  
    
		iveExtensionsSupported.put("dae", new MyFileFilter("dae",


  		




  
  354
  
    
				PluginServices.getText(this, "Ficheros *.dae"), "dae"));


  		




  353
  355
  
    
		


  		




  354
  356
  
    
		Iterator iter = osgExtensionsSupported.values().iterator();


  		




  355
  357
  
    
		


  		












  

    
      trunk/extensions/ext3Dgui/pom.xml
    
  





  26
  26
  
    
			<artifactId>libCorePlugin</artifactId>


  		




  27
  27
  
    
			<version>2.1-SNAPSHOT</version>


  		




  28
  28
  
    
		</dependency>


  		




  
  29
  
    
<!--		<dependency>-->


  		




  
  30
  
    
<!--			<groupId>org.gvsig</groupId>-->


  		




  
  31
  
    
<!--			<artifactId>libExpressions</artifactId>-->


  		




  
  32
  
    
<!--			<version>1.0-SNAPSHOT</version>-->


  		




  
  33
  
    
<!--		</dependency>-->


  		




  29
  34
  
    
		<dependency>


  		




  30
  
  
    
			<groupId>org.gvsig</groupId>


  		




  31
  
  
    
			<artifactId>libExpresions</artifactId>


  		




  32
  
  
    
			<version>1.0-SNAPSHOT</version>


  		




  33
  
  
    
		</dependency>


  		




  34
  
  
    
		<dependency>


  		




  35
  35
  
    
			<groupId>org.gvsig.legacy</groupId>


  		




  36
  36
  
    
			<artifactId>JimiProClasses</artifactId>


  		




  37
  37
  
    
			<version>gvsig</version>


  		












Also available in:  Unified diff