Revision 407
| 2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.main/pom.xml | ||
|---|---|---|
| 16 | 16 |
<scope>compile</scope> |
| 17 | 17 |
</dependency> |
| 18 | 18 |
<dependency> |
| 19 |
<groupId>org.gvsig</groupId>
|
|
| 20 |
<artifactId>org.gvsig.timesupport.lib.api</artifactId>
|
|
| 21 |
<scope>compile</scope>
|
|
| 22 |
</dependency>
|
|
| 19 |
<groupId>org.gvsig</groupId>
|
|
| 20 |
<artifactId>org.gvsig.timesupport.lib.api</artifactId>
|
|
| 21 |
<scope>compile</scope>
|
|
| 22 |
</dependency>
|
|
| 23 | 23 |
<dependency> |
| 24 | 24 |
<groupId>org.gvsig</groupId> |
| 25 | 25 |
<artifactId>org.gvsig.tools.swing.api</artifactId> |
| ... | ... | |
| 49 | 49 |
<dependency> |
| 50 | 50 |
<groupId>org.gvsig</groupId> |
| 51 | 51 |
<artifactId>org.gvsig.raster.lib.api</artifactId> |
| 52 |
<version>2.2.6</version> |
|
| 53 | 52 |
</dependency> |
| 54 | 53 |
<dependency> |
| 55 | 54 |
<groupId>org.gvsig</groupId> |
| 56 | 55 |
<artifactId>org.gvsig.raster.swing.api</artifactId> |
| 57 |
<version>2.2.6</version> |
|
| 58 | 56 |
</dependency> |
| 57 |
<dependency> |
|
| 58 |
<groupId>org.gvsig</groupId> |
|
| 59 |
<artifactId>org.gvsig.raster.lib.impl</artifactId> |
|
| 60 |
</dependency> |
|
| 59 | 61 |
|
| 60 | 62 |
<!-- runtime dependencies --> |
| 61 | 63 |
<dependency> |
| ... | ... | |
| 88 | 90 |
<artifactId>org.gvsig.fmap.dal.impl</artifactId> |
| 89 | 91 |
<scope>runtime</scope> |
| 90 | 92 |
</dependency> |
| 91 |
<!-- <dependency> --> |
|
| 92 |
<!-- <groupId>org.gvsig</groupId> --> |
|
| 93 |
<!-- <artifactId>org.gvsig.fmap.dal.spi</artifactId> --> |
|
| 94 |
<!-- <scope>runtime</scope> --> |
|
| 95 |
<!-- </dependency> --> |
|
| 96 | 93 |
<dependency> |
| 97 | 94 |
<groupId>org.gvsig</groupId> |
| 95 |
<artifactId>org.gvsig.raster.gdal.io</artifactId> |
|
| 96 |
<scope>runtime</scope> |
|
| 97 |
</dependency> |
|
| 98 |
<dependency> |
|
| 99 |
<groupId>org.gvsig</groupId> |
|
| 98 | 100 |
<artifactId>org.gvsig.fmap.dal.file.shp</artifactId> |
| 99 | 101 |
<scope>runtime</scope> |
| 100 | 102 |
</dependency> |
| ... | ... | |
| 103 | 105 |
<artifactId>org.gvsig.fmap.dal.file.dbf</artifactId> |
| 104 | 106 |
<scope>runtime</scope> |
| 105 | 107 |
</dependency> |
| 106 |
<!-- <dependency> --> |
|
| 107 |
<!-- <groupId>org.gvsig</groupId> --> |
|
| 108 |
<!-- <artifactId>org.gvsig.fmap.dal.file.lib</artifactId> --> |
|
| 109 |
<!-- <scope>runtime</scope> --> |
|
| 110 |
<!-- </dependency> --> |
|
| 111 | 108 |
<dependency> |
| 112 | 109 |
<groupId>org.gvsig</groupId> |
| 113 | 110 |
<artifactId>org.gvsig.timesupport.lib.impl</artifactId> |
| ... | ... | |
| 120 | 117 |
</dependency> |
| 121 | 118 |
<dependency> |
| 122 | 119 |
<groupId>org.gvsig</groupId> |
| 123 |
<artifactId>org.gvsig.proj.lib.proj4j</artifactId>
|
|
| 120 |
<artifactId>org.gvsig.raster.swing.impl</artifactId>
|
|
| 124 | 121 |
<scope>runtime</scope> |
| 125 | 122 |
</dependency> |
| 126 | 123 |
<dependency> |
| 127 | 124 |
<groupId>org.gvsig</groupId> |
| 128 |
<artifactId>org.gvsig.raster.lib.impl</artifactId> |
|
| 129 |
<version>2.2.6</version> |
|
| 125 |
<artifactId>org.gvsig.proj.lib.proj4j</artifactId> |
|
| 130 | 126 |
<scope>runtime</scope> |
| 131 | 127 |
</dependency> |
| 132 |
<dependency> |
|
| 133 |
<groupId>org.gvsig</groupId> |
|
| 134 |
<artifactId>org.gvsig.raster.swing.impl</artifactId> |
|
| 135 |
<version>2.2.6</version> |
|
| 136 |
<scope>runtime</scope> |
|
| 137 |
</dependency> |
|
| 138 | 128 |
|
| 139 | 129 |
<!-- View3D dependencies --> |
| 140 | 130 |
<dependency> |
| ... | ... | |
| 146 | 136 |
<artifactId>org.gvsig.view3d.swing.impl</artifactId> |
| 147 | 137 |
<scope>runtime</scope> |
| 148 | 138 |
</dependency> |
| 149 |
|
|
| 139 |
|
|
| 140 |
<dependency> |
|
| 141 |
<groupId>org.gvsig</groupId> |
|
| 142 |
<artifactId>org.gvsig.raster.fmap</artifactId> |
|
| 143 |
</dependency> |
|
| 150 | 144 |
</dependencies> |
| 145 |
|
|
| 146 |
<properties> |
|
| 147 |
<gdalpluginfolder>/home/lmarques/software/gvSIG-2.1.0-2269-64-final/gvSIG/extensiones/org.gvsig.raster.gdal.app</gdalpluginfolder> |
|
| 148 |
</properties> |
|
| 149 |
|
|
| 150 |
<build> |
|
| 151 |
<plugins> |
|
| 152 |
<plugin> |
|
| 153 |
<artifactId>maven-dependency-plugin</artifactId> |
|
| 154 |
<executions> |
|
| 155 |
<execution> |
|
| 156 |
<phase>package</phase> |
|
| 157 |
<goals> |
|
| 158 |
<goal>copy-dependencies</goal> |
|
| 159 |
</goals> |
|
| 160 |
<configuration> |
|
| 161 |
<includeTypes>jar</includeTypes> |
|
| 162 |
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact> |
|
| 163 |
<outputDirectory>${project.build.directory}/lib</outputDirectory>
|
|
| 164 |
<overWriteReleases>true</overWriteReleases> |
|
| 165 |
<overWriteSnapshots>true</overWriteSnapshots> |
|
| 166 |
<overWriteIfNewer>true</overWriteIfNewer> |
|
| 167 |
</configuration> |
|
| 168 |
</execution> |
|
| 169 |
</executions> |
|
| 170 |
</plugin> |
|
| 171 |
</plugins> |
|
| 172 |
</build> |
|
| 151 | 173 |
</project> |
| 2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.main/main.sh | ||
|---|---|---|
| 1 |
#!/bin/bash |
|
| 2 |
set -x |
|
| 3 |
JAR_FILE=`ls -1 target/org.gvsig.view3d.main* | grep -v ".*-sources.jar" | grep -v ".*-javadoc.jar" ` |
|
| 4 |
CLASSPATH=$JAR_FILE |
|
| 5 |
set +x |
|
| 6 |
for afile in target/lib/* |
|
| 7 |
do |
|
| 8 |
CLASSPATH="$CLASSPATH:$afile" |
|
| 9 |
done |
|
| 10 |
export GDAL_PLUGIN_FOLDER=`grep '<gdalpluginfolder' pom.xml | cut -f2 -d">" | cut -f1 -d"<"` |
|
| 11 |
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$GDAL_PLUGIN_FOLDER/jgdal/lib:$GDAL_PLUGIN_FOLDER/gdal/lib64:" |
|
| 12 |
echo 'Classpath:' |
|
| 13 |
echo $CLASSPATH |
|
| 14 |
echo 'Plugin folder:' |
|
| 15 |
echo $GDAL_PLUGIN_FOLDER |
|
| 16 |
echo 'Library path:' |
|
| 17 |
echo $LD_LIBRARY_PATH |
|
| 18 |
echo |
|
| 19 |
echo 'Command exec:' |
|
| 20 |
echo /usr/lib/jvm/java-7-openjdk-amd64/bin/java -cp $CLASSPATH org.gvsig.view3d.main.Main -Djava.library.path=${LD_LIBRARY_PATH}
|
|
| 21 |
/usr/lib/jvm/java-7-openjdk-amd64/bin/java -cp $CLASSPATH org.gvsig.view3d.main.Main -Djava.library.path=${LD_LIBRARY_PATH}
|
|
| 22 |
|
|
| 0 | 23 | |
| 2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.main/main-debug.sh | ||
|---|---|---|
| 1 |
#!/bin/bash |
|
| 2 |
set -x |
|
| 3 |
JAR_FILE=`ls -1 target/org.gvsig.view3d.main* | grep -v ".*-sources.jar" | grep -v ".*-javadoc.jar" ` |
|
| 4 |
CLASSPATH=$JAR_FILE |
|
| 5 |
set +x |
|
| 6 |
for afile in target/lib/* |
|
| 7 |
do |
|
| 8 |
CLASSPATH="$CLASSPATH:$afile" |
|
| 9 |
done |
|
| 10 |
export GDAL_PLUGIN_FOLDER=`grep '<gdalpluginfolder' pom.xml | cut -f2 -d">" | cut -f1 -d"<"` |
|
| 11 |
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$GDAL_PLUGIN_FOLDER/jgdal/lib:$GDAL_PLUGIN_FOLDER/gdal/lib64:" |
|
| 12 |
echo 'Classpath:' |
|
| 13 |
echo $CLASSPATH |
|
| 14 |
echo 'Plugin folder:' |
|
| 15 |
echo $GDAL_PLUGIN_FOLDER |
|
| 16 |
echo 'Library path:' |
|
| 17 |
echo $LD_LIBRARY_PATH |
|
| 18 |
echo |
|
| 19 |
echo 'Command exec:' |
|
| 20 |
echo /usr/lib/jvm/java-7-openjdk-amd64/bin/java -agentlib:jdwp=transport=dt_socket,address=8765,server=y,suspend=y -cp $CLASSPATH org.gvsig.view3d.main.Main -Djava.library.path=${LD_LIBRARY_PATH}
|
|
| 21 |
/usr/lib/jvm/java-7-openjdk-amd64/bin/java -agentlib:jdwp=transport=dt_socket,address=8765,server=y,suspend=y -cp $CLASSPATH org.gvsig.view3d.main.Main -Djava.library.path=${LD_LIBRARY_PATH}
|
|
| 0 | 22 | |
| 2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.main/src/main/java/org/gvsig/view3d/main/PaletteActions.java | ||
|---|---|---|
| 32 | 32 |
import javax.swing.AbstractAction; |
| 33 | 33 |
import javax.swing.Action; |
| 34 | 34 |
import javax.swing.JFileChooser; |
| 35 |
import javax.swing.SwingUtilities; |
|
| 35 | 36 |
|
| 36 |
import org.slf4j.Logger; |
|
| 37 |
import org.slf4j.LoggerFactory; |
|
| 38 |
|
|
| 39 | 37 |
import org.gvsig.fmap.dal.DALLocator; |
| 40 | 38 |
import org.gvsig.fmap.dal.DataManager; |
| 41 | 39 |
import org.gvsig.fmap.dal.DataStoreParameters; |
| ... | ... | |
| 47 | 45 |
import org.gvsig.fmap.mapcontext.MapContextManager; |
| 48 | 46 |
import org.gvsig.fmap.mapcontext.exceptions.LoadLayerException; |
| 49 | 47 |
import org.gvsig.fmap.mapcontext.layers.FLayer; |
| 48 |
import org.gvsig.raster.fmap.layers.FLyrRaster; |
|
| 49 |
import org.gvsig.raster.impl.store.DefaultRasterStore; |
|
| 50 | 50 |
import org.gvsig.tools.swing.api.ToolsSwingLocator; |
| 51 | 51 |
import org.gvsig.tools.swing.api.threadsafedialogs.ThreadSafeDialogsManager; |
| 52 | 52 |
import org.gvsig.utils.GenericFileFilter; |
| ... | ... | |
| 60 | 60 |
*/ |
| 61 | 61 |
public class PaletteActions {
|
| 62 | 62 |
|
| 63 |
private static final Logger logger = LoggerFactory |
|
| 64 |
.getLogger(PaletteActions.class); |
|
| 65 |
|
|
| 66 | 63 |
Map<String, Action> actions; |
| 67 | 64 |
Main main; |
| 68 | 65 |
|
| ... | ... | |
| 112 | 109 |
addVectorialLayer(file[i].getAbsolutePath()); |
| 113 | 110 |
} |
| 114 | 111 |
} catch (Exception ex) {
|
| 115 |
logger.warn("Problems adding layer", ex);
|
|
| 112 |
ex.printStackTrace();
|
|
| 116 | 113 |
} |
| 117 | 114 |
} |
| 118 | 115 |
} |
| ... | ... | |
| 129 | 126 |
MapContextLocator.getMapContextManager(); |
| 130 | 127 |
|
| 131 | 128 |
params = dataManager.createStoreParameters("Gdal Store");
|
| 132 |
params.setDynValue("FIELD_URI", layerPath);
|
|
| 129 |
params.setDynValue("uri", layerPath);
|
|
| 133 | 130 |
params.validate(); |
| 134 | 131 |
|
| 135 |
FeatureStore store =
|
|
| 136 |
(FeatureStore) dataManager.openStore(params.getDataStoreName(),
|
|
| 137 |
params); |
|
| 132 |
DefaultRasterStore store =
|
|
| 133 |
(DefaultRasterStore) dataManager.openStore(
|
|
| 134 |
params.getDataStoreName(), params);
|
|
| 138 | 135 |
|
| 139 |
FLayer layer = mapContextManager.createLayer(store.getName(), store); |
|
| 136 |
FLyrRaster layer = |
|
| 137 |
(FLyrRaster) mapContextManager.createLayer(store.getName(), store); |
|
| 138 |
|
|
| 139 |
this.main.getMapContext().beginAtomicEvent(); |
|
| 140 | 140 |
this.main.getMapContext().getLayers().addLayer(layer); |
| 141 |
layer.setActive(true); |
|
| 141 |
this.main.getMapContext().invalidate(); |
|
| 142 |
this.main.getMapContext().endAtomicEvent(); |
|
| 143 |
|
|
| 144 |
// XXX Forces component repaint. |
|
| 145 |
SwingUtilities.updateComponentTreeUI(this.main.mainFrame); |
|
| 142 | 146 |
} |
| 143 | 147 |
|
| 144 | 148 |
private AbstractAction getAddRasterLayerAction() {
|
| ... | ... | |
| 165 | 169 |
addRasterLayer(file[i].getAbsolutePath()); |
| 166 | 170 |
} |
| 167 | 171 |
} catch (Exception ex) {
|
| 168 |
logger.warn("Problems adding layer", ex);
|
|
| 172 |
ex.printStackTrace();
|
|
| 169 | 173 |
} |
| 170 | 174 |
} |
| 171 | 175 |
} |
| ... | ... | |
| 194 | 198 |
params); |
| 195 | 199 |
|
| 196 | 200 |
FLayer layer = mapContextManager.createLayer(store.getName(), store); |
| 201 |
this.main.getMapContext().beginAtomicEvent(); |
|
| 197 | 202 |
this.main.getMapContext().getLayers().addLayer(layer); |
| 198 |
layer.setActive(true); |
|
| 203 |
this.main.getMapContext().invalidate(); |
|
| 204 |
this.main.getMapContext().endAtomicEvent(); |
|
| 205 |
|
|
| 206 |
// XXX Forces component repaint. |
|
| 207 |
SwingUtilities.updateComponentTreeUI(this.main.mainFrame); |
|
| 199 | 208 |
} |
| 200 | 209 |
|
| 201 | 210 |
private AbstractAction getExitAction() {
|
| ... | ... | |
| 223 | 232 |
public void actionPerformed(ActionEvent e) {
|
| 224 | 233 |
View3DManager manager = View3DLocator.getManager(); |
| 225 | 234 |
View3DPanel view3dPanel = |
| 226 |
manager.createView3DPanel(main.getMapContext(), |
|
| 227 |
0); // Change value for constant key
|
|
| 235 |
manager.createView3DPanel(main.getMapContext(), 0);
|
|
| 236 |
// Change value for constant key |
|
| 228 | 237 |
view3dPanel.show(); |
| 229 | 238 |
} |
| 230 | 239 |
}; |
| ... | ... | |
| 269 | 278 |
public void actionPerformed(ActionEvent e) {
|
| 270 | 279 |
View3DManager manager = View3DLocator.getManager(); |
| 271 | 280 |
View3DPanel view3dPanel = |
| 272 |
manager.createView3DPanel(main.getMapContext(), |
|
| 273 |
1); // Change value for constant key
|
|
| 281 |
manager.createView3DPanel(main.getMapContext(), 1);
|
|
| 282 |
// Change value for constant key |
|
| 274 | 283 |
view3dPanel.show(); |
| 275 | 284 |
} |
| 276 | 285 |
}; |
| 2.1/trunk/org.gvsig.view3d/pom.xml | ||
|---|---|---|
| 84 | 84 |
<version>2.0.85</version> |
| 85 | 85 |
<scope>runtime</scope> |
| 86 | 86 |
</dependency> |
| 87 |
<dependency> |
|
| 88 |
<groupId>org.gvsig</groupId> |
|
| 89 |
<artifactId>org.gvsig.raster.gdal.io</artifactId> |
|
| 90 |
<version>2.2.7</version> |
|
| 91 |
</dependency> |
|
| 92 |
<dependency> |
|
| 93 |
<groupId>org.gvsig</groupId> |
|
| 94 |
<artifactId>org.gvsig.raster.lib.api</artifactId> |
|
| 95 |
<version>2.2.10</version> |
|
| 96 |
</dependency> |
|
| 97 |
<dependency> |
|
| 98 |
<groupId>org.gvsig</groupId> |
|
| 99 |
<artifactId>org.gvsig.raster.lib.impl</artifactId> |
|
| 100 |
<version>2.2.10</version> |
|
| 101 |
</dependency> |
|
| 102 |
<dependency> |
|
| 103 |
<groupId>org.gvsig</groupId> |
|
| 104 |
<artifactId>org.gvsig.raster.swing.api</artifactId> |
|
| 105 |
<version>2.2.6</version> |
|
| 106 |
</dependency> |
|
| 107 |
<dependency> |
|
| 108 |
<groupId>org.gvsig</groupId> |
|
| 109 |
<artifactId>org.gvsig.raster.swing.impl</artifactId> |
|
| 110 |
<version>2.2.6</version> |
|
| 111 |
<scope>runtime</scope> |
|
| 112 |
</dependency> |
|
| 113 |
<dependency> |
|
| 114 |
<groupId>org.gvsig</groupId> |
|
| 115 |
<artifactId>org.gvsig.raster.fmap</artifactId> |
|
| 116 |
<version>2.2.6</version> |
|
| 117 |
</dependency> |
|
| 87 | 118 |
</dependencies> |
| 88 | 119 |
</dependencyManagement> |
| 89 | 120 |
</project> |
Also available in: Unified diff