Revision 3325 org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.app.wmsclient/src/main/java/org/gvsig/raster/wms/app/wmsclient/gui/panel/WMSParamsPanel.java

View differences:

WMSParamsPanel.java
58 58
import org.gvsig.fmap.dal.DALLocator;
59 59
import org.gvsig.fmap.dal.DataManager;
60 60
import org.gvsig.fmap.dal.DataParameters;
61
import org.gvsig.fmap.dal.DataServerExplorerParameters;
61 62
import org.gvsig.fmap.dal.DataStoreParameters;
62 63
import org.gvsig.fmap.dal.coverage.exception.RasterDriverException;
63 64
import org.gvsig.fmap.dal.coverage.store.parameter.TileDataParameters;
......
75 76
import org.gvsig.raster.wms.io.WMSDataParameters;
76 77
import org.gvsig.raster.wms.io.WMSLayerNode;
77 78
import org.gvsig.raster.wms.io.WMSServerExplorer;
79
import org.gvsig.raster.wms.io.WMSServerExplorerParameters;
78 80
import org.gvsig.raster.wms.io.time.RemoteTimeDimension;
79 81

  
80 82

  
......
127 129
	private WizardListenerSupport   listenerSupport;
128 130
	private JTabbedPane             jTabbedPane            = null;
129 131
	private JPanel                  tabLayers              = null;
130
	private JPanel                  jPanelFormats                = null;
131
	private JPanel                  jPanelSrsSelection                = null;
132
	private JPanel                  jPanelInfoByPointFormat                = null;
132
	private JPanel                  jPanelFormats          = null;
133
	private JPanel                  jPanelAxisOrder        = null;
134
	private JPanel                  jPanelSrsSelection     = null;
135
	private JPanel                  jPanelInfoByPointFormat = null;
133 136
	private StylesPanel             tabStyle               = null;
134 137
	private JCheckBox               chkTransparency        = null;
138
	private JCheckBox               chkAxisOrder           = null;
135 139
	private InfoPanel               tabInfo                = null;
136 140
	private DimensionPanel          tabDimensions          = null;
137 141
	private int                     dimensionTabIndex;
......
383 387
					javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
384 388
					javax.swing.border.TitledBorder.DEFAULT_POSITION, null,
385 389
					null));
386
			jPanelFormats.setBounds(5, 10, 485, 140);
387
			jPanelFormats.add(getJScrollPane6(), null);
390
			jPanelFormats.setBounds(5, 10, 485, 145);
391
			jPanelFormats.add(getJScrollPaneFormats(), null);
388 392
			jPanelFormats.add(getChkTransparency(), null);
389 393
		}
390 394
		return jPanelFormats;
......
404 408
					javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
405 409
					javax.swing.border.TitledBorder.DEFAULT_POSITION, null,
406 410
					null));
407
			jPanelSrsSelection.setBounds(5, 150, 485, 140);
411
			jPanelSrsSelection.setBounds(5, 162, 485, 126);
408 412
			jPanelSrsSelection.add(getJScrollPane2(), null);
409 413
		}
410 414
		return jPanelSrsSelection;
......
424 428
					javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
425 429
					javax.swing.border.TitledBorder.DEFAULT_POSITION, null,
426 430
					null));
427
			jPanelInfoByPointFormat.setBounds(5, 295, 485, 78);
431
			jPanelInfoByPointFormat.setBounds(5, 273, 485, 78);
428 432
			jPanelInfoByPointFormat.add(getJScrollPane3(), null);
429 433
		}
430 434
		return jPanelInfoByPointFormat;
......
435 439
	 *
436 440
	 * @return ScrollPane
437 441
	 */
438
	private JScrollPane getJScrollPane6() {
442
	private JScrollPane getJScrollPaneFormats() {
439 443
		if (jScrollPane6 == null) {
440 444
			jScrollPane6 = new JScrollPane();
441
			jScrollPane6.setBounds(5, 23, 470, 110);
445
			jScrollPane6.setBounds(5, 23, 470, 85);
442 446
			jScrollPane6.setViewportView(getLstFormats());
443
			jScrollPane6.setPreferredSize(new java.awt.Dimension(250, 180));
447
			jScrollPane6.setPreferredSize(new java.awt.Dimension(250, 85));
444 448
		}
445 449

  
446 450
		return jScrollPane6;
447 451
	}
448 452

  
453

  
449 454
	/**
455
	 * This method initializes chkTrasparency
456
	 *
457
	 * @return CheckBox
458
	 */
459
	private JCheckBox getChkTransparency() {
460
		if (chkTransparency == null) {
461
			chkTransparency = new JCheckBox();
462
			chkTransparency.setText(PluginServices.getText(this,
463
					"wms_transparency"));
464
			chkTransparency.setSelected(true);
465
			chkTransparency.addItemListener(new java.awt.event.ItemListener() {
466
				public void itemStateChanged(java.awt.event.ItemEvent e) {
467
					fireWizardComplete(isCorrectlyConfigured());
468
				}
469
			});
470
			chkTransparency.setBounds(15, 115, 421, 21);
471
			chkTransparency.setVisible(true);
472
		}
473
		return chkTransparency;
474
	}
475
	
476
	/**
450 477
	 * This method initializes jScrollPane2
451 478
	 *
452 479
	 * @return ScrollPane
......
454 481
	private JScrollPane getJScrollPane2() {
455 482
		if (jScrollPane2 == null) {
456 483
			jScrollPane2 = new JScrollPane();
457
			jScrollPane2.setBounds(5, 23, 470, 110);
484
			jScrollPane2.setBounds(5, 23, 470, 91);
458 485
			jScrollPane2.setViewportView(getLstSRSs());
459
			jScrollPane2.setPreferredSize(new java.awt.Dimension(250, 180));
486
			jScrollPane2.setPreferredSize(new java.awt.Dimension(250, 91));
460 487
		}
461 488

  
462 489
		return jScrollPane2;
......
1197 1224
	/**
1198 1225
	 * Returns the tab amount that the WMSParamsPanel currently have
1199 1226
	 *
1200
	 * Devuelve el nmero de solapas que tiene actualmente el WMSParamsPanel
1227
	 * Devuelve el numero de solapas que tiene actualmente el WMSParamsPanel
1201 1228
	 *
1202 1229
	 * @return int
1203 1230
	 */
......
1264 1291
	public void setTransparent(boolean b) {
1265 1292
		getChkTransparency().setSelected(b);
1266 1293
	}
1267

  
1294
	
1295
	
1268 1296
	/**
1269
	 * This method initializes chkTrasparency
1270
	 *
1271
	 * @return CheckBox
1297
	 * Returns true if the WMS protocol version in use is
1298
	 * >= 1.3.0, and false otherwise.
1299
	 * @return
1272 1300
	 */
1273
	private JCheckBox getChkTransparency() {
1274
		if (chkTransparency == null) {
1275
			chkTransparency = new JCheckBox();
1276
			chkTransparency.setText(PluginServices.getText(this,
1277
					"wms_transparency"));
1278
			chkTransparency.setSelected(true);
1279
			chkTransparency.addItemListener(new java.awt.event.ItemListener() {
1280
				public void itemStateChanged(java.awt.event.ItemEvent e) {
1281
					fireWizardComplete(isCorrectlyConfigured());
1301
	private boolean checkAxisVersion() {
1302
		try {
1303
			if (explorer!=null && explorer.getVersion()!=null) {
1304
				String version = explorer.getVersion();
1305
				String[] parts = version.split("\\.");
1306
				if (parts.length>=2) {
1307
					int major = Integer.parseInt(parts[0]);
1308
					int minor = Integer.parseInt(parts[1]);
1309
					if ((major==1 && minor <3) || major < 1) {
1310
						return false;
1311
					}
1282 1312
				}
1283
			});
1284
			chkTransparency.setBounds(5, 168, 441, 21);
1285

  
1313
				else if (parts.length>0) {
1314
					int major = Integer.parseInt(parts[0]);
1315
					if (major<2) {
1316
						return false;
1317
					}
1318
				}
1319
			}
1286 1320
		}
1287
		return chkTransparency;
1321
		catch (NumberFormatException ex) {}
1322
		return true;
1288 1323
	}
1289 1324

  
1290 1325
	/**
......
1444 1479
			par.setQueryable(explorer.isQueryable());
1445 1480
			par.setName(node.getTitle());
1446 1481
			par.setURI(explorer.getHost());
1447
			par.deleteCache(updating);
1482
			par.deleteCache(updating);			
1483
			par.setXyAxisOrder(getXYAxisorder());
1448 1484
			
1449 1485
			FLyrWMS layer = new FLyrWMS();
1450 1486
			try {
......
1562 1598
				par.setName(node.getTitle());
1563 1599
				par.setURI(explorer.getHost());
1564 1600
				par.deleteCache(updating);
1601
				par.setXyAxisOrder(getXYAxisorder());
1565 1602
				
1566 1603
				FLyrWMS layer = new FLyrWMS();
1567 1604
				layer.setParameters(parameters);
1568 1605
				layer.setName(node.getName());
1569 1606
				layer.setExplorer(explorer);
1570
				
1571
				/*try {
1572
					layer.setFullExtent(getLayersRectangle());
1573
				} catch (InitializeException e) {
1574
					if (e.getCause() instanceof InvocationTargetException) {
1575
						Throwable t = ((InvocationTargetException)e.getCause()).getTargetException().getCause();
1576
						if(t != null) {
1577
							String msg = t.getMessage();
1578
							JOptionPane.showMessageDialog(this, msg, Messages.getText("Error"), JOptionPane.ERROR_MESSAGE);
1579
						}
1580
						log.info(e.getMessage(), e);
1581
					} else {
1582
						throw e;
1583
					}
1584
					return null;
1585
				} catch (ProjectionLayerException e) {
1586
					throw new InitializeException(e);
1587
				}*/
1588 1607
				return layer;
1589 1608

  
1590 1609
			} else {
......
1593 1612
		}
1594 1613
	}
1595 1614

  
1615
	private boolean getXYAxisorder() {
1616
		DataServerExplorerParameters dsExplParams = explorer.getParameters();
1617
		if (dsExplParams instanceof WMSServerExplorerParameters) {
1618
			return ((WMSServerExplorerParameters)dsExplParams).isXyAxisOrder();
1619
		}
1620
		return false;
1621

  
1622
	}
1623

  
1596 1624
	/**
1597 1625
	 * If user selects the chekbox Disagregate layers, will get the selected
1598 1626
	 * layers rendered in one the tree structure in WMS will be lost.
......
1629 1657
		par.setName(getLayerName());
1630 1658
		par.setURI(explorer.getHost());
1631 1659
		par.deleteCache(updating);
1660
		par.setXyAxisOrder(getXYAxisorder());
1632 1661
		
1633 1662
		FLyrWMS layer = new FLyrWMS();
1634 1663
		layer.setParameters(parameters);
1635 1664
		layer.setExplorer(explorer);
1636 1665
		layer.setName(getLayerName());
1637
		
1638
		/*try {
1639
			layer.setFullExtent(getLayersRectangle());
1640
		} catch (InitializeException e) {
1641
			String msg = getDriverExceptionMessage(e);
1642
			if(msg != null) {
1643
				JOptionPane.showMessageDialog(this, msg, Messages.getText("Error"), JOptionPane.ERROR_MESSAGE);
1644
				return null;
1645
			} else
1646
				throw e;
1647
		} catch (ProjectionLayerException e) {
1648
			throw new InitializeException(e);
1649
		}*/
1650 1666
		return layer;
1651 1667
	}
1652 1668

  

Also available in: Unified diff