Revision 3592
trunk/libraries/libRemoteServices/src/org/gvsig/remoteClient/wms/WMSStatus.java | ||
---|---|---|
143 | 143 |
/** |
144 | 144 |
* @return |
145 | 145 |
*/ |
146 |
private boolean getTransparency() {
|
|
146 |
public boolean getTransparency() {
|
|
147 | 147 |
return transparency; |
148 | 148 |
} |
149 | 149 |
|
trunk/libraries/libRemoteServices/src/org/gvsig/remoteClient/wms/WMSProtocolHandler.java | ||
---|---|---|
365 | 365 |
"&HEIGHT=" + status.getHeight() + "&FORMAT=" + status.getFormat() + |
366 | 366 |
"&" + Utilities.Vector2URLParamString(status.getDimensions()); |
367 | 367 |
|
368 |
// if (status.getTransparency()) {
|
|
369 |
// req += "&TRANSPARENT=TRUE";
|
|
370 |
// }
|
|
368 |
if (status.getTransparency()) { |
|
369 |
req += "&TRANSPARENT=TRUE"; |
|
370 |
} |
|
371 | 371 |
// |
372 | 372 |
// if (status.getBGColor() != null) { |
373 | 373 |
// req += ("&COLOR=" + status.getBGColor()); |
374 | 374 |
// } |
375 | 375 |
// |
376 |
// if (time != null) { |
|
377 |
// req += ("&TIME=" + time); |
|
378 |
// } |
|
379 |
// |
|
380 |
// if (elevation != -1) { |
|
381 |
// req += ("&ELEVATION=" + elevation); |
|
382 |
// } |
|
383 | 376 |
|
377 |
|
|
384 | 378 |
return req.replaceAll(" ", "%20"); |
385 | 379 |
} |
386 | 380 |
|
trunk/libraries/libRemoteServices/src/org/gvsig/remoteClient/wms/wms_1_1_1/WMSProtocolHandler1_1_1.java | ||
---|---|---|
12 | 12 |
import java.util.TreeMap; |
13 | 13 |
import java.util.Vector; |
14 | 14 |
|
15 |
import org.gvsig.remoteClient.exceptions.WMSException; |
|
15 | 16 |
import org.gvsig.remoteClient.utils.CapabilitiesTags; |
16 | 17 |
import org.gvsig.remoteClient.utils.ExceptionTags; |
17 | 18 |
import org.kxml2.io.KXmlParser; |
... | ... | |
23 | 24 |
* </p> |
24 | 25 |
*/ |
25 | 26 |
public class WMSProtocolHandler1_1_1 extends org.gvsig.remoteClient.wms.WMSProtocolHandler { |
26 |
|
|
27 |
private WMSLayer1_1_1 fakeRootLayer; |
|
28 |
|
|
27 | 29 |
public WMSProtocolHandler1_1_1() |
28 | 30 |
{ |
29 | 31 |
this.version = "1.1.1"; |
... | ... | |
31 | 33 |
this.serviceInfo = new ServiceInformation(); |
32 | 34 |
this.layers = new TreeMap(); |
33 | 35 |
this.srs = new Vector(); |
36 |
|
|
34 | 37 |
} |
35 | 38 |
|
36 | 39 |
//------------------------------------------------------------------------------ |
... | ... | |
100 | 103 |
catch (IOException ioe) { |
101 | 104 |
ioe.printStackTrace(); |
102 | 105 |
// TODO: Implement logic to handle the exceptions |
103 |
} |
|
106 |
} finally { |
|
107 |
|
|
108 |
} |
|
104 | 109 |
// In the parsing process the layer has been filled |
105 | 110 |
} |
106 | 111 |
|
... | ... | |
177 | 182 |
else if (parser.getName().compareTo(CapabilitiesTags.LAYER)==0) |
178 | 183 |
{ |
179 | 184 |
WMSLayer1_1_1 lyr = new WMSLayer1_1_1(); |
180 |
rootLayer = lyr; |
|
185 |
if (rootLayer == null) |
|
186 |
rootLayer = lyr; |
|
187 |
else { |
|
188 |
// Handles when there is no general root layer, will use |
|
189 |
// a fake non-queryable one. |
|
190 |
if (!rootLayer.equals(getFakeRootLayer())){ |
|
191 |
WMSLayer1_1_1 aux = (WMSLayer1_1_1) rootLayer; |
|
192 |
rootLayer = getFakeRootLayer(); |
|
193 |
rootLayer.getChildren().add(aux); |
|
194 |
} |
|
195 |
rootLayer.getChildren().add(lyr); |
|
196 |
} |
|
181 | 197 |
lyr.parse(parser, layers); |
182 |
//if((lyr != null) && (lyr.getName() != null)) |
|
183 |
//{ |
|
198 |
|
|
184 | 199 |
if (lyr.getName()!=null) |
185 |
layers.put(lyr.getName(), lyr); |
|
186 |
//Add all the SRS that the layer supports to the WMSProtocolHandler if they dont exist already |
|
187 |
for (i=0;i<lyr.getAllSrs().size();i++) |
|
188 |
{ |
|
189 |
if (!this.srs.contains(lyr.getAllSrs().elementAt(i))) |
|
190 |
{ |
|
191 |
this.srs.add( lyr.getAllSrs().elementAt(i)); |
|
192 |
} |
|
193 |
} |
|
194 |
//} |
|
195 |
//else |
|
196 |
//TODO: a layer without title is a parent layer.... not queryable |
|
200 |
layers.put(lyr.getName(), lyr); |
|
201 |
//Add all the SRS that the layer supports to the WMSProtocolHandler if they dont exist already |
|
202 |
for (i=0;i<lyr.getAllSrs().size();i++) |
|
203 |
{ |
|
204 |
if (!this.srs.contains(lyr.getAllSrs().elementAt(i))) |
|
205 |
{ |
|
206 |
this.srs.add( lyr.getAllSrs().elementAt(i)); |
|
207 |
} |
|
208 |
} |
|
209 |
|
|
197 | 210 |
} |
198 | 211 |
else if ((parser.getName().compareTo(CapabilitiesTags.VENDORSPECIFICCAPABILITIES)==0) || |
199 | 212 |
(parser.getName().compareTo(CapabilitiesTags.USERDEFINEDSYMBOLIZATION )==0)) |
... | ... | |
262 | 275 |
//parser.require(KXmlParser.END_TAG, null, CapabilitiesTags.REQUEST); |
263 | 276 |
} |
264 | 277 |
|
278 |
private WMSLayer1_1_1 getFakeRootLayer(){ |
|
279 |
if (fakeRootLayer == null){ |
|
280 |
fakeRootLayer = new WMSLayer1_1_1(); |
|
281 |
fakeRootLayer.setTitle(serviceInfo.title); |
|
282 |
fakeRootLayer.setQueryable(false); |
|
283 |
fakeRootLayer.setName(null); |
|
284 |
} |
|
285 |
return fakeRootLayer; |
|
286 |
} |
|
265 | 287 |
/* (non-Javadoc) |
266 | 288 |
* @see org.gvsig.remoteClient.wms.WMSProtocolHandler#parseException(byte[]) |
267 | 289 |
*/ |
trunk/libraries/libRemoteServices/src/org/gvsig/remoteClient/wms/wms_1_1_1/WMSLayer1_1_1.java | ||
---|---|---|
88 | 88 |
else if (parser.getName().compareTo(CapabilitiesTags.SRS)==0) |
89 | 89 |
{ |
90 | 90 |
value = parser.nextText(); |
91 |
if (value != null) addSrs(value); |
|
91 |
if (value != null){ |
|
92 |
String[] srs = value.split(" "); |
|
93 |
for (int i = 0; i < srs.length; i++) { |
|
94 |
addSrs(srs[i]); |
|
95 |
} |
|
96 |
|
|
97 |
} |
|
92 | 98 |
} |
93 | 99 |
else if (parser.getName().compareTo(CapabilitiesTags.BOUNDINGBOX)==0) |
94 | 100 |
{ |
branches/gvSIG_WMSv2/extensions/extWMS/build.xml | ||
---|---|---|
40 | 40 |
<copy todir="${dist}"> |
41 | 41 |
<fileset dir="config" includes="text*.properties"/> |
42 | 42 |
</copy> |
43 |
<copy todir="${lib-dir}"> |
|
43 |
<copy todir="${dist}/images"> |
|
44 |
<fileset dir="images/" includes="*"/> |
|
45 |
</copy> |
|
46 |
<copy todir="${lib-dir}"> |
|
44 | 47 |
<fileset dir="./lib" includes="*.jar,*.zip"/> |
45 | 48 |
<fileset dir="." includes=".keystore"/> |
46 | 49 |
</copy> |
branches/gvSIG_WMSv2/extensions/extWMS/src/com/iver/cit/gvsig/fmap/layers/FLyrWMS.java | ||
---|---|---|
658 | 658 |
info.put("format", getFormat()); |
659 | 659 |
info.put("wmsTransparency", new Boolean(wmsTransparency)); |
660 | 660 |
info.put("styles", styles); |
661 |
info.put("dimensions", dimensions); |
|
661 | 662 |
return info; |
662 | 663 |
} |
663 | 664 |
} catch (Exception e) { |
branches/gvSIG_WMSv2/extensions/extWMS/src/com/iver/cit/gvsig/fmap/layers/TimeDimension.java | ||
---|---|---|
43 | 43 |
* |
44 | 44 |
* $Id$ |
45 | 45 |
* $Log$ |
46 |
* Revision 1.1.2.6 2006-01-10 11:33:31 jaume |
|
46 |
* Revision 1.1.2.7 2006-01-11 12:20:30 jaume |
|
47 |
* *** empty log message *** |
|
48 |
* |
|
49 |
* Revision 1.1.2.6 2006/01/10 11:33:31 jaume |
|
47 | 50 |
* Time dimension working against Jet Propulsion Laboratory's WMS server |
48 | 51 |
* |
49 | 52 |
* Revision 1.1.2.5 2006/01/09 18:10:38 jaume |
... | ... | |
335 | 338 |
isGeologic = false; |
336 | 339 |
} else if (dimensionExpression.matches(regexDateExtendedForBCE)) { |
337 | 340 |
|
338 |
} else throw new IllegalArgumentException(dimensionExpression); |
|
341 |
} else { |
|
342 |
System.err.println("Invalid dimension expression: "+expr+" (for "+this.getName()+")"); |
|
343 |
//throw new IllegalArgumentException(dimensionExpression); |
|
344 |
} |
|
339 | 345 |
String[] s = dimensionExpression.split("/"); |
340 | 346 |
minValue = valueOf(s[0]); |
341 | 347 |
maxValue = (s.length>1) ? valueOf(s[1]) : valueOf(s[0]); |
branches/gvSIG_WMSv2/extensions/extWMS/src/com/iver/cit/gvsig/gui/dialogs/WMSPropsDialog.java | ||
---|---|---|
177 | 177 |
toc.getLstFormats().setSelectedIndex(index); |
178 | 178 |
|
179 | 179 |
toc.getChkTransparency().setEnabled(((Boolean) info.get("wmsTransparency")).booleanValue()); |
180 |
toc.getStyleTree().setStylesSelection((Vector) info.get("styles"));
|
|
181 |
|
|
180 |
toc.getStyleTree().setSelections((Vector) info.get("styles"));
|
|
181 |
toc.getDimensionTree().setSelections((Vector) info.get("dimensions")); |
|
182 | 182 |
|
183 | 183 |
|
184 | 184 |
return toc; |
branches/gvSIG_WMSv2/extensions/extWMS/src/com/iver/cit/gvsig/gui/panels/StyleTree.java | ||
---|---|---|
43 | 43 |
* |
44 | 44 |
* $Id$ |
45 | 45 |
* $Log$ |
46 |
* Revision 1.1.2.5 2006-01-10 11:33:31 jaume |
|
46 |
* Revision 1.1.2.6 2006-01-11 12:20:30 jaume |
|
47 |
* *** empty log message *** |
|
48 |
* |
|
49 |
* Revision 1.1.2.5 2006/01/10 11:33:31 jaume |
|
47 | 50 |
* Time dimension working against Jet Propulsion Laboratory's WMS server |
48 | 51 |
* |
49 | 52 |
* Revision 1.1.2.4 2006/01/09 18:10:38 jaume |
... | ... | |
115 | 118 |
private void initialize(){ |
116 | 119 |
setToggleClickCount(1); |
117 | 120 |
setRowHeight(22); |
121 |
|
|
118 | 122 |
setCellRenderer(new TreeCellRenderer() { |
119 | 123 |
public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { |
120 | 124 |
if (leaf) { |
... | ... | |
162 | 166 |
* @param styleNames, Vector containing the style names. |
163 | 167 |
* The styles order <b>must match</b> with the layer order. |
164 | 168 |
*/ |
165 |
public void setStylesSelection(Vector styleNames){
|
|
169 |
public void setSelections(Vector styleNames){
|
|
166 | 170 |
|
167 | 171 |
StylesTreeModel model = (StylesTreeModel) getModel(); |
168 | 172 |
if (model.getChildCount(model.getRoot())!=styleNames.size()){ |
... | ... | |
309 | 313 |
/** |
310 | 314 |
* Adds a new branch to this tree. It must be a layer node. |
311 | 315 |
* @param node |
316 |
* @return <b>True</b>, if the added branch actually defines any style. |
|
317 |
* <b>False</b>, if the layer has no styles. |
|
312 | 318 |
*/ |
313 |
public void addLayerBranch(WMSLayerNode node){ |
|
319 |
public boolean addLayerBranch(WMSLayerNode node){ |
|
320 |
if (node.getStyles()==null || node.getStyles().size()==0){ |
|
321 |
return false; |
|
322 |
} |
|
314 | 323 |
WMSLayerNode myNode = (WMSLayerNode) node.clone(); |
315 | 324 |
myNode.setParent((WMSLayerNode) getRoot()); |
316 | 325 |
((WMSLayerNode)getRoot()).getChildren().add(myNode); |
326 |
return true; |
|
317 | 327 |
} |
318 | 328 |
|
319 | 329 |
|
branches/gvSIG_WMSv2/extensions/extWMS/src/com/iver/cit/gvsig/gui/panels/DimensionTree.java | ||
---|---|---|
43 | 43 |
* |
44 | 44 |
* $Id$ |
45 | 45 |
* $Log$ |
46 |
* Revision 1.1.2.6 2006-01-10 13:11:38 jaume
|
|
46 |
* Revision 1.1.2.7 2006-01-11 12:20:30 jaume
|
|
47 | 47 |
* *** empty log message *** |
48 | 48 |
* |
49 |
* Revision 1.1.2.6 2006/01/10 13:11:38 jaume |
|
50 |
* *** empty log message *** |
|
51 |
* |
|
49 | 52 |
* Revision 1.1.2.5 2006/01/10 11:33:31 jaume |
50 | 53 |
* Time dimension working against Jet Propulsion Laboratory's WMS server |
51 | 54 |
* |
... | ... | |
86 | 89 |
import com.iver.cit.gvsig.fmap.layers.IFMapWMSDimension; |
87 | 90 |
import com.iver.cit.gvsig.fmap.layers.TimeDimension; |
88 | 91 |
import com.iver.cit.gvsig.fmap.layers.WMSLayerNode; |
89 |
import com.iver.cit.gvsig.fmap.layers.WMSLayerNode.FMapWMSStyle; |
|
90 | 92 |
import com.iver.cit.gvsig.gui.beans.listeners.BeanListener; |
91 |
import com.iver.cit.gvsig.gui.panels.EditionPanel; |
|
92 | 93 |
/** |
93 | 94 |
* @author jaume |
94 | 95 |
* |
... | ... | |
180 | 181 |
public Vector getDimensions() { |
181 | 182 |
return ((DimensionTreeModel) getModel()).getDimension(); |
182 | 183 |
} |
184 |
|
|
185 |
/** |
|
186 |
* @param vector |
|
187 |
*/ |
|
188 |
public void setSelections(Vector dimensions) { |
|
189 |
DimensionTreeModel model = ((DimensionTreeModel) getModel()); |
|
190 |
for (int i = 0; i < dimensions.size(); i++) { |
|
191 |
String[] dim = ((String) dimensions.get(i)).split("="); |
|
192 |
for (int j = 0; j < dim.length; j++) { |
|
193 |
|
|
194 |
} |
|
195 |
} |
|
196 |
} |
|
183 | 197 |
|
184 | 198 |
} |
185 | 199 |
|
... | ... | |
215 | 229 |
expressions.put(currentDimensionNode, val); |
216 | 230 |
} |
217 | 231 |
|
232 |
/* |
|
233 |
* (non-Javadoc) |
|
234 |
* @see javax.swing.tree.TreeModel#getRoot() |
|
235 |
*/ |
|
218 | 236 |
public Object getRoot() { |
219 | 237 |
return root; |
220 | 238 |
} |
221 | 239 |
|
240 |
/* |
|
241 |
* (non-Javadoc) |
|
242 |
* @see javax.swing.tree.TreeModel#getChildCount(java.lang.Object) |
|
243 |
*/ |
|
222 | 244 |
public int getChildCount(Object parent) { |
223 | 245 |
int count=0; |
224 | 246 |
|
... | ... | |
227 | 249 |
else |
228 | 250 |
count = ((WMSLayerNode) parent).getDimensions().size(); |
229 | 251 |
return count; |
230 |
} |
|
231 |
|
|
252 |
} |
|
253 |
/* |
|
254 |
* (non-Javadoc) |
|
255 |
* @see javax.swing.tree.TreeModel#isLeaf(java.lang.Object) |
|
256 |
*/ |
|
232 | 257 |
public boolean isLeaf(Object node) { |
233 | 258 |
return (node instanceof IFMapWMSDimension); |
234 | 259 |
} |
235 |
|
|
260 |
|
|
261 |
/* |
|
262 |
* (non-Javadoc) |
|
263 |
* @see javax.swing.tree.TreeModel#addTreeModelListener(javax.swing.event.TreeModelListener) |
|
264 |
*/ |
|
236 | 265 |
public void addTreeModelListener(TreeModelListener l) { |
237 | 266 |
} |
238 |
|
|
267 |
|
|
268 |
/* |
|
269 |
* (non-Javadoc) |
|
270 |
* @see javax.swing.tree.TreeModel#removeTreeModelListener(javax.swing.event.TreeModelListener) |
|
271 |
*/ |
|
239 | 272 |
public void removeTreeModelListener(TreeModelListener l) { |
240 | 273 |
} |
241 | 274 |
|
275 |
/* |
|
276 |
* (non-Javadoc) |
|
277 |
* @see javax.swing.tree.TreeModel#getChild(java.lang.Object, int) |
|
278 |
*/ |
|
242 | 279 |
public Object getChild(Object parent, int index) { |
243 | 280 |
if (parent instanceof IFMapWMSDimension) |
244 | 281 |
return null; |
... | ... | |
248 | 285 |
return ((WMSLayerNode) parent).getDimensions().get(index); |
249 | 286 |
} |
250 | 287 |
|
288 |
/* |
|
289 |
* (non-Javadoc) |
|
290 |
* @see javax.swing.tree.TreeModel#getIndexOfChild(java.lang.Object, java.lang.Object) |
|
291 |
*/ |
|
251 | 292 |
public int getIndexOfChild(Object parent, Object child) { |
252 | 293 |
if (parent instanceof IFMapWMSDimension){ |
253 | 294 |
return -1; |
... | ... | |
270 | 311 |
return -1; |
271 | 312 |
} |
272 | 313 |
|
314 |
/* |
|
315 |
* (non-Javadoc) |
|
316 |
* @see javax.swing.tree.TreeModel#valueForPathChanged(javax.swing.tree.TreePath, java.lang.Object) |
|
317 |
*/ |
|
273 | 318 |
public void valueForPathChanged(TreePath path, Object newValue) { |
274 | 319 |
|
275 | 320 |
} |
... | ... | |
278 | 323 |
* Adds a new branch to this tree. It must be a layer node. |
279 | 324 |
* @param node |
280 | 325 |
*/ |
281 |
public void addLayerBranch(WMSLayerNode node){ |
|
326 |
public boolean addLayerBranch(WMSLayerNode node){ |
|
327 |
if (node.getDimensions() == null || node.getDimensions().size()==0) |
|
328 |
return false; |
|
329 |
|
|
282 | 330 |
WMSLayerNode myNode = (WMSLayerNode) node.clone(); |
283 | 331 |
myNode.setParent((WMSLayerNode) getRoot()); |
284 | 332 |
((WMSLayerNode)getRoot()).getChildren().add(myNode); |
333 |
return true; |
|
285 | 334 |
} |
286 | 335 |
|
287 | 336 |
/** |
... | ... | |
308 | 357 |
Iterator it = expressions.keySet().iterator(); |
309 | 358 |
while (it.hasNext()){ |
310 | 359 |
IFMapWMSDimension key = (IFMapWMSDimension) it.next(); |
311 |
v.add(key.getName()+"="+expressions.get(key)); |
|
360 |
String myDimensionString = key.getName()+"="+expressions.get(key); |
|
361 |
if (!v.contains(myDimensionString)) |
|
362 |
v.add(myDimensionString); |
|
312 | 363 |
} |
313 | 364 |
return v; |
314 | 365 |
} |
branches/gvSIG_WMSv2/extensions/extWMS/src/com/iver/cit/gvsig/gui/panels/WMSParamsPanel.java | ||
---|---|---|
133 | 133 |
private JTable tblStyles = null; |
134 | 134 |
private InfoPanel tabInfo = null; |
135 | 135 |
private DimensionPanel tabDimensions = null; |
136 |
private int dimensionTabIndex; |
|
137 |
private int stylesTabIndex; |
|
136 | 138 |
|
137 |
|
|
138 | 139 |
public WMSParamsPanel(){ |
139 | 140 |
super(); |
140 | 141 |
initialize(); |
... | ... | |
452 | 453 |
dimensionRoot.setTitle(PluginServices.getText(this, "selected_themes")); |
453 | 454 |
|
454 | 455 |
DimensionTreeModel model = new DimensionTreeModel(dimensionRoot); |
455 |
|
|
456 |
jTabbedPane.setEnabledAt(dimensionTabIndex, false); |
|
456 | 457 |
for (int i=0; i<size; i++) { |
457 | 458 |
WMSLayerNode node = (WMSLayerNode) getLstSelectedLayers().getModel().getElementAt(i); |
458 | 459 |
WMSLayerNode myNode = new WMSLayerNode(); |
... | ... | |
465 | 466 |
IFMapWMSDimension dim = (IFMapWMSDimension) node.getDimensions().get(j); |
466 | 467 |
myNode.addDimension(dim.getName(), dim.getUnit(), dim.getUnitSymbol(), dim.getExpression()); |
467 | 468 |
} |
468 |
model.addLayerBranch(myNode); |
|
469 |
// If any of the layers defines dimensions, the tab will be enabled. |
|
470 |
if (model.addLayerBranch(myNode)) |
|
471 |
jTabbedPane.setEnabledAt(dimensionTabIndex, true); |
|
469 | 472 |
} |
470 | 473 |
getDimensionTree().setModel(model); |
471 | 474 |
|
... | ... | |
481 | 484 |
styleRoot.setTitle(PluginServices.getText(this, "selected_themes")); |
482 | 485 |
|
483 | 486 |
StylesTreeModel model = new StylesTreeModel(styleRoot); |
484 |
|
|
487 |
jTabbedPane.setEnabledAt(stylesTabIndex, false); |
|
485 | 488 |
for (int i=0; i<size; i++){ |
486 | 489 |
WMSLayerNode node = (WMSLayerNode)getLstSelectedLayers().getModel().getElementAt(i); |
487 | 490 |
WMSLayerNode myNode = new WMSLayerNode(); |
... | ... | |
495 | 498 |
FMapWMSStyle sty = (FMapWMSStyle) node.getStyles().get(j); |
496 | 499 |
myNode.addStyle(sty.name, sty.title, sty.styleAbstract); |
497 | 500 |
} |
498 |
model.addLayerBranch(myNode); |
|
501 |
|
|
502 |
// If any of the layers defines styles, the tab will be enabled. |
|
503 |
if (model.addLayerBranch(myNode)) |
|
504 |
jTabbedPane.setEnabledAt(stylesTabIndex, true); |
|
505 |
|
|
499 | 506 |
} |
500 | 507 |
getStyleTree().setModel(model); |
501 | 508 |
|
... | ... | |
514 | 521 |
* Gets the currently shown style tree. |
515 | 522 |
* @return |
516 | 523 |
*/ |
517 |
private DimensionTree getDimensionTree() {
|
|
524 |
public DimensionTree getDimensionTree() {
|
|
518 | 525 |
return getTabDimensions().getDimensionTree(); |
519 | 526 |
} |
520 | 527 |
|
... | ... | |
528 | 535 |
|
529 | 536 |
for (int i = 0; i < selecciones.length; i++) { |
530 | 537 |
WMSLayerNode nodo = (WMSLayerNode) selecciones[i].getLastPathComponent(); |
531 |
if (nodo.getName()==null) |
|
538 |
if (nodo.getChildren().size()>0) |
|
539 |
// no es un nodo hijo |
|
532 | 540 |
continue; |
533 | 541 |
//Se a?ade a la lista de layers seleccionados |
534 | 542 |
JDnDListModel modelo = (JDnDListModel) lstSelectedLayers.getModel(); |
... | ... | |
675 | 683 |
listenerSupport = support; |
676 | 684 |
} |
677 | 685 |
|
678 |
public void setWizardData(WizardData data) { |
|
679 |
this.dataSource = (WMSWizardData) data; |
|
686 |
public void setWizardData(WMSWizardData data) { |
|
680 | 687 |
((JDnDListModel) getLstSelectedLayers().getModel()).clear(); |
681 | 688 |
getLstSelectedLayers().repaint(); |
682 | 689 |
|
... | ... | |
864 | 871 |
jTabbedPane.addTab(PluginServices.getText(this, "formatos"), null, getTabFormats(), null); |
865 | 872 |
//jTabbedPane.addTab(PluginServices.getText(this, "estilos (old)"), null, getTabStyleSelect(), null); |
866 | 873 |
jTabbedPane.addTab(PluginServices.getText(this, "estilos"), null, getTabStyle(), null); |
874 |
stylesTabIndex = jTabbedPane.getTabCount()-1; |
|
867 | 875 |
//jTabbedPane.addTab(PluginServices.getText(this, "estilos tabla"), null, getTabStyles(), null); |
868 | 876 |
jTabbedPane.addTab(PluginServices.getText(this, "dimensiones"), null, getTabDimensions(), null); |
869 |
|
|
877 |
dimensionTabIndex = jTabbedPane.getTabCount()-1; |
|
878 |
jTabbedPane.setEnabledAt(dimensionTabIndex, false); |
|
879 |
jTabbedPane.setEnabledAt(stylesTabIndex, false); |
|
870 | 880 |
} |
871 | 881 |
return jTabbedPane; |
872 | 882 |
} |
... | ... | |
933 | 943 |
public StylesPanel getTabStyle() { |
934 | 944 |
if (tabStyle == null) { |
935 | 945 |
tabStyle = new StylesPanel(); |
946 |
tabStyle.setEnabled(false); |
|
936 | 947 |
} |
937 | 948 |
return tabStyle; |
938 | 949 |
} |
... | ... | |
1160 | 1171 |
private DimensionPanel getTabDimensions() { |
1161 | 1172 |
if (tabDimensions == null) { |
1162 | 1173 |
tabDimensions = new DimensionPanel(); |
1174 |
tabDimensions.setEnabled(false); |
|
1163 | 1175 |
|
1164 | 1176 |
} |
1165 | 1177 |
return tabDimensions; |
branches/gvSIG_WMSv2/extensions/extWMS/src/com/iver/cit/gvsig/gui/panels/EditionPanel.java | ||
---|---|---|
43 | 43 |
* |
44 | 44 |
* $Id$ |
45 | 45 |
* $Log$ |
46 |
* Revision 1.1.2.1 2006-01-10 13:11:38 jaume
|
|
46 |
* Revision 1.1.2.2 2006-01-11 12:20:30 jaume
|
|
47 | 47 |
* *** empty log message *** |
48 | 48 |
* |
49 |
* Revision 1.1.2.1 2006/01/10 13:11:38 jaume |
|
50 |
* *** empty log message *** |
|
51 |
* |
|
49 | 52 |
* Revision 1.1.2.2 2006/01/10 11:33:31 jaume |
50 | 53 |
* Time dimension working against Jet Propulsion Laboratory's WMS server |
51 | 54 |
* |
... | ... | |
244 | 247 |
lblMin1.setBounds(52, 32, 138, 15); |
245 | 248 |
lblMin = new JLabel(); |
246 | 249 |
lblMin.setText(PluginServices.getText(this, "from")); |
250 |
lblMin.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT); |
|
251 |
lblMin.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); |
|
247 | 252 |
lblMin.setBounds(5, 32, 41, 15); |
248 | 253 |
minPanel = new JPanel(); |
249 | 254 |
minPanel.setLayout(null); |
... | ... | |
276 | 281 |
lblMax1.setFont(new java.awt.Font("MS Sans Serif", java.awt.Font.BOLD, 11)); |
277 | 282 |
lblMax = new JLabel(); |
278 | 283 |
lblMax.setText(PluginServices.getText(this, "to")); |
284 |
lblMax.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); |
|
285 |
lblMax.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT); |
|
279 | 286 |
lblMax.setBounds(5, 14, 41, 15); |
280 | 287 |
|
281 | 288 |
maxPanel = new JPanel(); |
branches/gvSIG_WMSv2/extensions/extWMS/src/com/iver/cit/gvsig/gui/wizards/WMSWizardData.java | ||
---|---|---|
56 | 56 |
* |
57 | 57 |
* @author Fernando Gonz?lez Cort?s |
58 | 58 |
*/ |
59 |
public class WMSWizardData implements WizardData {
|
|
59 |
public class WMSWizardData { // should implemement any kind of wizard data interface?
|
|
60 | 60 |
private String title; |
61 | 61 |
private String theAbstract; |
62 | 62 |
private WMSLayerNode layer; |
branches/gvSIG_WMSv2/extensions/extWMS/src/com/iver/cit/gvsig/gui/wizards/WMSWizard.java | ||
---|---|---|
248 | 248 |
if (!xml.contains("wms-servers")) { |
249 | 249 |
String[] servers = new String[11]; |
250 | 250 |
servers[0] = "http://www.idee.es/wms/IDEE-Base/IDEE-Base"; |
251 |
servers[1] = "http://wms.jpl.nasa.gov/wms.cgi?";
|
|
251 |
servers[1] = "http://wms.jpl.nasa.gov/wms.cgi"; |
|
252 | 252 |
servers[2] = "http://www2.dmsolutions.ca/cgi-bin/mswms_gmap?"; |
253 | 253 |
servers[3] = "http://demo.deegree.org:8080/deegree/wms"; |
254 | 254 |
servers[4] = "http://orto.cth.gva.es/wmsconnector/com.esri.wms.Esrimap/wms_patricova"; |
branches/gvSIG_WMSv2/extensions/extWMS/src/com/iver/cit/gvsig/gui/beans/Pager.java | ||
---|---|---|
43 | 43 |
* |
44 | 44 |
* $Id$ |
45 | 45 |
* $Log$ |
46 |
* Revision 1.1.2.1 2006-01-10 13:11:38 jaume
|
|
46 |
* Revision 1.1.2.2 2006-01-11 12:20:30 jaume
|
|
47 | 47 |
* *** empty log message *** |
48 | 48 |
* |
49 |
* Revision 1.1.2.1 2006/01/10 13:11:38 jaume |
|
50 |
* *** empty log message *** |
|
51 |
* |
|
49 | 52 |
* Revision 1.1.2.1 2006/01/10 11:33:31 jaume |
50 | 53 |
* Time dimension working against Jet Propulsion Laboratory's WMS server |
51 | 54 |
* |
... | ... | |
68 | 71 |
import java.awt.event.ActionEvent; |
69 | 72 |
import java.awt.event.ActionListener; |
70 | 73 |
|
74 |
import javax.swing.ImageIcon; |
|
71 | 75 |
import javax.swing.JButton; |
72 | 76 |
import javax.swing.JPanel; |
73 | 77 |
import javax.swing.JSlider; |
74 | 78 |
import javax.swing.JTextField; |
75 | 79 |
|
76 |
import com.iver.cit.gvsig.gui.beans.DefaultBean; |
|
77 |
|
|
78 | 80 |
/** |
79 | 81 |
* Bean useful to browse a very large list of data. It includes |
80 | 82 |
* a set of navigation buttons to step ahead or behind by one or |
... | ... | |
168 | 170 |
setValue(lowLimit, true); |
169 | 171 |
} |
170 | 172 |
}}); |
173 |
btnFastBackward.setIcon(new ImageIcon(getClass().getClassLoader().getResource("images/fastbackward.png"))); |
|
171 | 174 |
} |
172 | 175 |
return btnFastBackward; |
173 | 176 |
} |
174 | 177 |
|
175 | 178 |
/** |
176 |
* This method initializes btnBackWard
|
|
179 |
* This method initializes btnBackward
|
|
177 | 180 |
* |
178 | 181 |
* @return javax.swing.JButton |
179 | 182 |
*/ |
... | ... | |
188 | 191 |
setValue(currentValue-1, true); |
189 | 192 |
} |
190 | 193 |
}}); |
194 |
btnBackward.setIcon(new ImageIcon(getClass().getClassLoader().getResource("images/backward.png"))); |
|
191 | 195 |
} |
192 | 196 |
return btnBackward; |
193 | 197 |
} |
... | ... | |
285 | 289 |
setValue(currentValue+1, true); |
286 | 290 |
} |
287 | 291 |
}}); |
292 |
btnForward.setIcon(new ImageIcon(getClass().getClassLoader().getResource("images/forward.png"))); |
|
288 | 293 |
} |
289 | 294 |
return btnForward; |
290 | 295 |
} |
... | ... | |
305 | 310 |
setValue(itemCount, true); |
306 | 311 |
} |
307 | 312 |
}}); |
313 |
btnFastForward.setIcon(new ImageIcon(getClass().getClassLoader().getResource("images/fastforward.png"))); |
|
308 | 314 |
} |
309 | 315 |
return btnFastForward; |
310 | 316 |
} |
... | ... | |
353 | 359 |
slider.addChangeListener(new javax.swing.event.ChangeListener() { |
354 | 360 |
public void stateChanged(javax.swing.event.ChangeEvent e) { |
355 | 361 |
int value = (int) (getSlider().getValue() * itemCount * 0.01); |
356 |
System.out.println(value+" "+currentValue); |
|
357 | 362 |
|
358 | 363 |
refreshText(value); |
359 | 364 |
|
Also available in: Unified diff