Revision 8818

View differences:

trunk/libraries/libJCRS/src/org/gvsig/crs/gui/listeners/CRSSelectionDialogListener.java
56 56
import javax.swing.event.ListSelectionEvent;
57 57
import javax.swing.event.ListSelectionListener;
58 58

  
59
import org.gvsig.crs.CrsWkt;
59 60
import org.gvsig.crs.ICrs;
60 61
import org.gvsig.crs.gui.CRSSelectionDialog;
61 62
import org.gvsig.crs.persistence.CrsData;
......
169 170
		
170 171
		if (e.getSource() == dialog.getCrsMainPanel().getIauPanel().getJTable().getSelectionModel()){
171 172
			ListSelectionModel lsm = (ListSelectionModel)e.getSource();
172
			
173
			String[] not_soported = {"Oblique_Cylindrical_Equal_Area"};
174
			boolean soported = true;
173 175
			 if (lsm.isSelectionEmpty()) {
174 176
		        	dialog.getCrsMainPanel().getIauPanel().selectedRowTable = -1;
175 177
		        	dialog.getCrsMainPanel().getIauPanel().setCodeCRS(-1);
176 178
		        	dialog.getCrsMainPanel().getJButtonAccept().setEnabled(false);		        	
177 179
		        	dialog.setCode(0);        	
178 180
		        	
179
		    } 
180
	        else {   
181
	        	dialog.getCrsMainPanel().getIauPanel().selectedRowTable = lsm.getMinSelectionIndex();
182
	        	
183
        		dialog.getCrsMainPanel().getIauPanel().setCodeCRS(Integer.parseInt((String)dialog.getCrsMainPanel().getIauPanel().sorter.getValueAt(dialog.getCrsMainPanel().getIauPanel().selectedRowTable,0)));
184
        		dialog.getCrsMainPanel().getIauPanel().setWKT();
185
            	dialog.setCode(dialog.getCrsMainPanel().getIauPanel().getCodeCRS());
186
            	dialog.getCrsMainPanel().getJButtonAccept().setEnabled(true);	
187
	        }
188
	        	
181
			 } 
182
			 else {  
183
				 
184
				 dialog.getCrsMainPanel().getIauPanel().selectedRowTable = lsm.getMinSelectionIndex();
185
				 dialog.getCrsMainPanel().getIauPanel().setCodeCRS(Integer.parseInt((String)dialog.getCrsMainPanel().getIauPanel().sorter.getValueAt(dialog.getCrsMainPanel().getIauPanel().selectedRowTable,0)));
186
				 dialog.getCrsMainPanel().getIauPanel().setWKT();
187
				 CrsWkt crs = new CrsWkt(dialog.getCrsMainPanel().getIauPanel().getWKT());
188
				 String crs_kind = crs.getProjection();
189
				 for (int i = 0; i < not_soported.length; i++) {
190
					 if (crs_kind.equals(not_soported[i])) {
191
		        		soported = false;
192
					 }
193
		        }
194
		        if (soported){
195
		        	//dialog.getCrsMainPanel().getIauPanel().setWKT();
196
		        	dialog.setCode(dialog.getCrsMainPanel().getIauPanel().getCodeCRS());
197
		        	dialog.getCrsMainPanel().getJButtonAccept().setEnabled(true);	
198
		        }
199
		        else {
200
		        	JOptionPane.showMessageDialog(dialog, PluginServices.getText(this,"crs_not_soported"), "Warning...",
201
							JOptionPane.WARNING_MESSAGE);
202
		        	dialog.getCrsMainPanel().getIauPanel().setCodeCRS(-1);
203
		        	dialog.getCrsMainPanel().getIauPanel().setCodeCRS(0);
204
		        	dialog.getCrsMainPanel().getJButtonAccept().setEnabled(false);	        		
205
		        }	        		            	
206
		     }
189 207
		}
190 208
		
191 209
		if (e.getSource() == dialog.getCrsMainPanel().getEpsgPanel().getJTable().getSelectionModel()){
trunk/libraries/libJCRS/src/org/gvsig/crs/gui/listeners/CRSMainTrPanelListener.java
61 61
import javax.swing.event.ListSelectionEvent;
62 62
import javax.swing.event.ListSelectionListener;
63 63

  
64
import org.gvsig.crs.CrsWkt;
64 65
import org.gvsig.crs.ICrs;
65 66
import org.gvsig.crs.Query;
66 67
import org.gvsig.crs.gui.CRSMainTrPanel;
67 68
import org.gvsig.crs.ogr.GetTransepsg;
69
import org.gvsig.crs.ogr.Iau2wkt;
68 70
import org.gvsig.crs.persistence.CrsData;
69 71
import org.gvsig.crs.persistence.RecentCRSsPersistence;
70 72

  
......
189 191
					panel.getNadsTrPanel().setCode(panel.getCrsMainPanel().getRecentsPanel().getCodeCRS());
190 192
					panel.getNadsTrPanel().setTargetAuthority(panel.getCrsWkt_target().getAuthority());
191 193
				}
192
				if (panel.getNadsTrPanel().getJComboNadFile().getSelectedIndex() == 0) {
194
				if (panel.getNadsTrPanel().getJComboNadFile().getSelectedIndex() == 0)
193 195
					panel.getJButtonAccept().setEnabled(false);
194
				}
196
				else panel.getJButtonAccept().setEnabled(true);
195 197
				panel.setNads_tr(true);
196 198
			    cl.show(panel.getJPanelMain(), "nad");		    
197 199
			}
......
318 320
		
319 321
		if (e.getSource() == panel.getCrsMainPanel().getIauPanel().getJTable().getSelectionModel()){
320 322
			ListSelectionModel lsm = (ListSelectionModel)e.getSource();				
321
			
323
			String[] not_soported = {"Oblique_Cylindrical_Equal_Area"};
324
			boolean soported = true;
322 325
	        if (lsm.isSelectionEmpty()) {
323 326
	        	panel.getCrsMainPanel().getIauPanel().selectedRowTable = -1;
324 327
	        	panel.getCrsMainPanel().getIauPanel().setCodeCRS(-1);
......
330 333
	        else {        	
331 334
	        	panel.getCrsMainPanel().getIauPanel().selectedRowTable = lsm.getMinSelectionIndex();
332 335
	        	panel.getCrsMainPanel().getIauPanel().setCodeCRS(Integer.parseInt((String)panel.getCrsMainPanel().getIauPanel().sorter.getValueAt(panel.getCrsMainPanel().getIauPanel().selectedRowTable,0)));
333
	        	panel.getCrsMainPanel().getIauPanel().setWKT();  
334
        		panel.getJComboOptions().setEnabled(false);
335
        		panel.getJButtonAccept().setEnabled(true);	            	
336
	        	panel.getCrsMainPanel().getIauPanel().setWKT();
337
	        	CrsWkt crs = new CrsWkt(panel.getCrsMainPanel().getIauPanel().getWKT());
338
	        	String crs_kind = crs.getProjection();
339
	        	for (int i = 0; i < not_soported.length; i++) {
340
	        		if (crs_kind.equals(not_soported[i])) {
341
	        			soported = false;
342
	        		}
343
	        	}
344
	        	if (soported){
345
	        		//panel.getCrsMainPanel().getIauPanel().setWKT();  
346
	        		panel.getJComboOptions().setEnabled(false);
347
	        		panel.getJButtonAccept().setEnabled(true);	
348
	        	}
349
	        	else {
350
	        		JOptionPane.showMessageDialog(panel, PluginServices.getText(this,"crs_not_soported"), "Warning...",
351
							JOptionPane.WARNING_MESSAGE);
352
	        		panel.getCrsMainPanel().getIauPanel().setCodeCRS(-1);
353
	        		panel.getCrsMainPanel().getIauPanel().setCodeCRS(0);
354
	        		panel.getJButtonAccept().setEnabled(false);	        		
355
	        	}	        		            	
336 356
	        }
337 357
		}
338 358
		

Also available in: Unified diff