Revision 3173

View differences:

org.gvsig.raster.roimask/trunk/org.gvsig.raster.roimask/pom.xml
10 10
	<parent>
11 11
      <groupId>org.gvsig</groupId>
12 12
      <artifactId>org.gvsig.desktop</artifactId>
13
      <version>2.0.85</version>
13
      <version>2.0.87</version>
14 14
  </parent>
15 15
    <scm>
16 16
        <connection>scm:svn:https://devel.gvsig.org/svn/gvsig-raster/org.gvsig.raster.roimask/trunk/org.gvsig.raster.roimask</connection>
17 17
        <developerConnection>scm:svn:https://devel.gvsig.org/svn/gvsig-raster/org.gvsig.raster.roimask/trunk/org.gvsig.raster.roimask</developerConnection>
18 18
        <url>https://devel.gvsig.org/redmine/projects/gvsig-raster/repository/show/org.gvsig.raster.roimask/trunk/org.gvsig.raster.roimask</url>
19 19
    </scm>
20
    
20

  
21 21
    <repositories>
22 22
      <repository>
23 23
        <id>gvsig-public-http-repository</id>
......
35 35
        </snapshots>
36 36
      </repository>
37 37
    </repositories>
38
    
38

  
39 39
    <build>
40 40
        <plugins>
41 41
            <plugin>
......
48 48
            </plugin>
49 49
        </plugins>
50 50
    </build>
51
    		
51

  
52 52
	<dependencyManagement>
53 53
		<dependencies>
54 54
                        <dependency>
......
61 61
                        <dependency>
62 62
                                <groupId>org.gvsig</groupId>
63 63
                                <artifactId>org.gvsig.geoprocess</artifactId>
64
                                <version>2.2.21</version>
64
                                <version>2.2.22</version>
65 65
                                <type>pom</type>
66 66
                                <scope>import</scope>
67 67
                        </dependency>
......
103 103
				<version>2.2.3-SNAPSHOT</version>
104 104
			</dependency>
105 105
			-->
106
			
106

  
107 107
		</dependencies>
108 108
	</dependencyManagement>
109 109
	<modules>
org.gvsig.raster.roimask/trunk/org.gvsig.raster.roimask/org.gvsig.raster.roimask.toolbox.algorithm/src/main/java/org/gvsig/raster/roimask/ROIMaskSextanteAlgorithm.java
30 30
    public static final String ALPHA             = ROIMaskProcess.ALPHA;
31 31
    public static final String INVERSE           = ROIMaskProcess.INVERSE;
32 32
    public static final String NODATA            = ROIMaskProcess.NODATA;
33
    
34 33

  
34

  
35 35
    public void defineCharacteristics() {
36 36
        setName(getTranslation("mask"));
37 37
        setGroup(getTranslation("basic_raster_algorithms"));
38 38
        // setGeneratesUserDefinedRasterOutput(false);
39
       
39

  
40 40
        try {
41 41
            m_Parameters.addInputRasterLayer(LAYER, getTranslation("Input_layer"), true);
42 42
            m_Parameters.addNumericalValue(ALPHA, getTranslation("alpha"), 0,
......
53 53
    	if(existsOutPutFile(ROIMaskSextanteAlgorithm.RESULT, 0)) {
54 54
    		throw new GeoAlgorithmExecutionException(getTranslation("file_exists"));
55 55
    	}
56
    	
56

  
57 57
    	IRasterLayer input = m_Parameters.getParameterValueAsRasterLayer(LAYER);
58 58
    	int alpha = m_Parameters.getParameterValueAsInt(ALPHA);
59 59
    	boolean inverse = m_Parameters.getParameterValueAsBoolean(INVERSE);
......
66 66
    			ext.getXMin(), ext.getYMax(), ext.getXMax(), ext.getYMin());
67 67
		try {
68 68
			output = getNewRORasterLayer(
69
					RESULT, 
70
					Sextante.getText("Mask_image"), 
71
					input.getDataType(), 
69
					RESULT,
70
					Sextante.getText("Mask_image"),
71
					input.getDataType(),
72 72
					input.getBandsCount());
73 73
			rois = lyrRaster.getRois().toArray(new ROI[lyrRaster.getRois().size()]);
74 74
			task = RasterBaseAlgorithmLibrary.getManager().createRasterTask("ROIMaskProcess");
......
77 77
		} catch (ROIException e1) {
78 78
			 Sextante.addErrorToLog(e1);
79 79
		}
80
    	
81
    	String fileName = ((FLyrRasterIRasterLayer)output).getFileName(); //getOutPutFile(RESULT);
80

  
81
    	String fileName = ((FLyrRasterIRasterLayer)output).getName();
82 82
    	task.addParam(ROIMaskProcess.PATH, fileName);
83 83
		task.addParam(ROIMaskProcess.RASTER_STORE1, lyrRaster.getDataStore());
84 84
		task.addParam(ROIMaskProcess.ROIS, rois);
......
88 88
		task.addParam(ROIMaskProcess.WINDOW, bbox);
89 89
		task.addParam(ROIMaskProcess.OUTPUT_WIDTH, ext.getNX());
90 90
		task.addParam(ROIMaskProcess.OUTPUT_HEIGHT, ext.getNY());
91
		
91

  
92 92
		try {
93 93
			task.execute();
94 94
			((FLyrRasterIRasterLayer)output).setBaseDataObject(fileName);
......
96 96
			Sextante.addErrorToLog(e);
97 97
		} catch (ProcessException e) {
98 98
			Sextante.addErrorToLog(e);
99
		} 
99
		}
100 100

  
101 101
		if(getTaskMonitor().isCanceled())
102 102
			return false;
103 103

  
104 104
        return true;
105 105
    }
106
    
106

  
107 107
    /*
108 108
     * TODO: Customized panels
109 109
    @Override

Also available in: Unified diff