Revision 4611

View differences:

trunk/extensions/extWFS/src/com/iver/cit/gvsig/fmap/operations/strategies/WFSStrategy.java
47 47

  
48 48
import org.cresques.cts.ICoordTrans;
49 49

  
50
import com.iver.andami.PluginServices;
50 51
import com.iver.cit.gvsig.fmap.DriverException;
51 52
import com.iver.cit.gvsig.fmap.ViewPort;
52 53
import com.iver.cit.gvsig.fmap.core.IFeature;
......
56 57
import com.iver.cit.gvsig.fmap.drivers.wfs.IWFSdriver;
57 58
import com.iver.cit.gvsig.fmap.layers.FBitSet;
58 59
import com.iver.cit.gvsig.fmap.layers.FLayer;
60
import com.iver.cit.gvsig.fmap.layers.FLyrVect;
61
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource;
59 62
import com.iver.cit.gvsig.fmap.layers.VectorialAdapter;
60 63
import com.iver.cit.gvsig.fmap.layers.layerOperations.ClassifiableVectorial;
61 64
import com.iver.cit.gvsig.fmap.layers.layerOperations.Selectable;
......
80 83
    public void draw(BufferedImage image, Graphics2D g, ViewPort viewPort, Cancellable cancel) throws DriverException {
81 84
        // Nos aprovechamos del SQL para lanzar la consulta
82 85
        // teniendo en cuenta el boundingbox que toca.
83
        FLayer capa = getCapa();
86
    	com.iver.cit.gvsig.gui.View activeView = 
87
			(com.iver.cit.gvsig.gui.View) PluginServices.getMDIManager().getActiveView();
88
    	
89
    	FLayer capa = getCapa();
84 90
        ICoordTrans ct = getCapa().getCoordTrans();
85 91
        VectorialAdapter wfsAdapter =  (VectorialAdapter) ((SingleLayer) capa).getSource();
86 92
        if (wfsAdapter==null){
......
89 95
        	throw new DriverException("Error en la conexi?n");
90 96
        }
91 97
        IWFSdriver wfsDriver = (IWFSdriver) wfsAdapter.getDriver();
98
        
99
        
92 100
        wfsDriver.open();
93
		Selectable selection = (Selectable) getCapa();
94
		///ICoordTrans ct = getCapa().getCoordTrans();
95
		FBitSet bitSet = selection.getSelection();
96 101
        
102
//		Selectable selection = (Selectable) getCapa();
103
//        FBitSet bitSet = selection.getSelection();
104
        FLyrVect flryVect = (FLyrVect)getCapa();
105
//        FBitSet bitSet = flryVect.queryByRect(getSelectionBounds());
106
        FBitSet bitSet = flryVect.queryByRect(activeView.getMapControl().getViewPort().getExtent());
107
       
108
        
97 109
        String strEPSG = viewPort.getProjection().getAbrev().substring(5);
98 110
        IFeatureIterator geomIt=null;
99 111
        try{
trunk/extensions/extWFS/src/com/iver/cit/gvsig/wfs/ExtWFS.java
47 47
import com.iver.cit.gvsig.AddLayer;
48 48
import com.iver.cit.gvsig.gui.wfs.WizardWFS;
49 49

  
50
import es.gva.cit.catalogClient.schemas.discoverer.Resource;
51
import es.gva.cit.gvsig.catalogClient.loaders.LayerLoader;
52
import es.gva.cit.gvsig.wfs.loader.WFSLayerLoader;
53 50

  
54

  
55 51
public class ExtWFS implements Extension {
56 52

  
57 53
    public void inicializar() {
58
      System.out.println("A?ado Wizard WFS.");
54
    	System.out.println("A?ado Wizard WFS.");
59 55
        AddLayer.addWizard(WizardWFS.class);
60
        LayerLoader.addLoader(Resource.WFS, WFSLayerLoader.class);
61
       // StrategyMaster.register(NewStrategy.class);
56
        // StrategyMaster.register(NewStrategy.class);
62 57
    }
63 58

  
64 59
    public void execute(String actionCommand) {
trunk/extensions/extWFS/build.xml
9 9
  <property name="mainplugin" value="com.iver.cit.gvsig"/>
10 10
  <property name="plugin" value="com.iver.cit.gvsig.wfs"/>
11 11
  <property name="gvsiglibjar" value="gvsig-wfsclient"/>
12
  <property name="catalogPlugin" value="es.gva.cit.gvsig.catalogClient"/>
12 13
  <property name="fmapjar" value="fmap-wfsclient"/>
13 14
  <property name="driverjar" value="wfs"/>
14 15
  <property name="extensionDir" location="../_fwAndami/gvSIG/extensiones"/>
16
	
15 17
  <property name="drivers-dir" location="${extensionDir}/${mainplugin}/drivers" />
16 18

  
17 19
  <target name="init">
......
34 36
		
35 37
    <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
36 38
    <jar jarfile="${dist}/lib/${plugin}.jar" basedir="${build}" includes="com/iver/cit/gvsig/wfs/**"/>
37
    <jar jarfile="${dist}/${gvsiglibjar}.jar" basedir="${build}" includes="com/iver/cit/gvsig/gui/**"/>
39
    <jar jarfile="${dist}/lib/wfsLoader.jar" basedir="${build}" includes="es/gva/cit/gvsig/wfs/loader/**"/>
40
  	<jar jarfile="${dist}/${gvsiglibjar}.jar" basedir="${build}" includes="com/iver/cit/gvsig/gui/**"/>
38 41
  	<jar jarfile="${dist}/${fmapjar}.jar" basedir="${build}"
39 42
  		includes="com/iver/cit/gvsig/fmap/**,es/uji/lsi/wfs/**,org/cresques/io/rasterOld/**" />
40 43
  		<!-- excludes="com/iver/cit/gvsig/fmap/drivers/wfs/**" /-->
41 44
  	<copy file="config/config.xml" todir="${dist}"/>
42 45
    <copy file="config/plugin.dtd" todir="${dist}"/>
46
  	<!--
43 47
  	<copy todir="${dist}/lib">
44 48
  	  	<fileset dir="./lib" includes="gt2-wfs.jar"/>
45 49
  	</copy>
50
  	-->
46 51
  	<copy todir="${dist}">
47 52
    	<fileset dir="." includes="text*.properties"/>
48
    </copy>
49
    <!-- <copy todir="${dist}">
50
    	<fileset dir="./lib" includes="*.jar,*.zip"/>
51
    	<fileset dir="." includes=".keystore"/>
52
    </copy> -->
53
    </copy>  	
54
  	
53 55
  	<move todir="${extensionDir}/${mainplugin}/lib">
54 56
  		<fileset dir="${dist}" includes="${gvsiglibjar}.jar"/>
55 57
 		<fileset dir="${dist}" includes="${fmapjar}.jar"/>
56
 	</move>
58
  	</move>  	
57 59
    <move todir="${extensionDir}/${plugin}/">
58 60
    	<fileset dir="${dist}" includes="**/**"/>
59 61
    </move>
60
  	<!--copy todir="${extensionDir}/${mainplugin}/lib/">
61
    	<fileset dir="../Fmap 03/lib" includes="cms-grid.jar,fmap-ra.jar"/>
62
    </copy-->
62
  	<copy todir="${extensionDir}/${mainplugin}/lib">
63
  		<fileset dir="./lib" includes="gt2-wfs.jar"/>
64
  	</copy>	
65
  	<!--
66
    <move todir="${extensionDir}/${catalogPlugin}/lib/">
67
      	<fileset dir="${extensionDir}/${plugin}/lib" includes="**/**"/>
68
    </move>-->
69
 	
63 70
  </target>
64 71

  
65 72
	<target name="wfs-driver" depends="" description="Genera el jar de wfs">

Also available in: Unified diff