Revision 25039

View differences:

trunk/extensions/extRemoteSensing/src/org/gvsig/remotesensing/decisiontrees/DecisionTreeProcess.java
167 167
							}
168 168
												
169 169
							else{					
170
								rasterResult.setElem(y, x, 0, (int)rasterResult.noDataValue);
170
								rasterResult.setElem(y, x, 0, (byte)rasterResult.noDataValue);
171 171
								break;	
172 172
							}					
173 173
						}
......
180 180
							}
181 181
												
182 182
							else{					
183
								rasterResult.setElem(y, x, 0, (int)rasterResult.noDataValue);
183
								rasterResult.setElem(y, x, 0, (byte)rasterResult.noDataValue);
184 184
								break;	
185 185
							}					
186 186
						}
......
193 193
							}
194 194
												
195 195
							else{					
196
								rasterResult.setElem(y, x, 0, (int)rasterResult.noDataValue);
196
								rasterResult.setElem(y, x, 0, (byte)rasterResult.noDataValue);
197 197
								break;	
198 198
							}					
199 199
						}
......
206 206
							}
207 207
												
208 208
							else{					
209
								rasterResult.setElem(y, x, 0, (int)rasterResult.noDataValue);
209
								rasterResult.setElem(y, x, 0, (byte)rasterResult.noDataValue);
210 210
								break;	
211 211
							}					
212 212
						}
trunk/extensions/extRemoteSensing/src/org/gvsig/remotesensing/decisiontrees/gui/listener/DecisionTreePanelListener.java
215 215
		else if (e.getSource()==decisionTreePanel.getExportMenuItem()){
216 216
			
217 217
		}
218
		
219
		else if(e.getSource()==decisionTreePanel.getJButtonLoadTree()){
220
			// Cargar arbol
221
			JFileChooser openFileChooser;
222
			openFileChooser = new JFileChooser();			
223
			openFileChooser.setEnabled(false);
224
			openFileChooser.addChoosableFileFilter(new TreeFileFilter());
225
			int returnVal = openFileChooser.showOpenDialog(decisionTreePanel);
226
	        if (returnVal == JFileChooser.APPROVE_OPTION) {
227
	            File inFile = openFileChooser.getSelectedFile();
228
	            try {
229
					FileReader fileReader = new FileReader(inFile);
230
					XmlTag xmlTag = (XmlTag) XmlTag.unmarshal(fileReader);
231
					XMLEntity xmlDecisionTree = new XMLEntity(xmlTag);
232
					decisionTreePanel.getDecisionTree().setXMLEntity(xmlDecisionTree);
233
					decisionTreePanel.reloadGraph();
234
				} catch (FileNotFoundException e2) {
235
					// TODO Auto-generated catch block
236
					e2.printStackTrace();
237
				} catch (MarshalException e1) {
238
					// TODO Auto-generated catch block
239
					e1.printStackTrace();
240
				} catch (ValidationException e3) {
241
					// TODO Auto-generated catch block
242
					e3.printStackTrace();
243
				}
244
	        }
245
			
246
			
247
		}
248
		
249
		else if(e.getSource()==decisionTreePanel.getJButtonSaveTree()){
250
			
251
			JFileChooser openFileChooser;
252
			openFileChooser = new JFileChooser();			
253
			openFileChooser.setEnabled(false);
254
			openFileChooser.addChoosableFileFilter(new TreeFileFilter());
255
			int returnVal = openFileChooser.showSaveDialog(decisionTreePanel);
256
	        if (returnVal == JFileChooser.APPROVE_OPTION) {
257
	        	String fileName = openFileChooser.getSelectedFile().toString();
258
	        	if (!fileName.endsWith(".tree")){
259
	        		fileName = fileName + ".tree";
260
	        	}
261
	        	File file = new File(fileName);
262
	        	if (file.exists()){
263
	        		int resp = JOptionPane.showConfirmDialog(
264
							(Component) PluginServices.getMainFrame(),PluginServices.getText(this,"fichero_ya_existe_seguro_desea_guardarlo"),
265
							PluginServices.getText(this,"guardar"), JOptionPane.YES_NO_OPTION);
266
					if (resp != JOptionPane.YES_OPTION) {
267
						return;
268
					}
269
	        	}
270
				FileWriter writer;
271
				try {
272
					writer = new FileWriter(fileName);
273
					Marshaller m = new Marshaller(writer);
274
	    			m.setEncoding("ISO-8859-1");
275
	    			m.marshal(decisionTreePanel.getDecisionTree().getXMLEntity().getXmlTag());
276
				} catch (IOException e1) {
277
					// TODO Auto-generated catch block
278
					e1.printStackTrace();
279
				} catch (MarshalException e1) {
280
					// TODO Auto-generated catch block
281
					e1.printStackTrace();
282
				} catch (ValidationException e2) {
283
					// TODO Auto-generated catch block
284
					e2.printStackTrace();
285
				}
286
	        }
287
			
288
		}
218 289
	}
219 290

  
220 291
	public void actionButtonPressed(ButtonsPanelEvent e) {
trunk/extensions/extRemoteSensing/src/org/gvsig/remotesensing/decisiontrees/gui/ExpressionEditorPanel.java
46 46
		listener = new ExpressionEditorPanelListener(this);
47 47
		DefaultGraphCell cell = getDecisionTreePanel().getSelectedCell();
48 48
		Object userObject = cell.getUserObject();
49
		cell.setUserObject("   ");
49 50
		if(userObject instanceof DecisionTreeNode){
50 51
			decisionTreenode = (DecisionTreeNode)userObject;
51 52
			getCalculatorPanel().getJTextExpression().setText(decisionTreenode.getExpression());
trunk/extensions/extRemoteSensing/src/org/gvsig/remotesensing/decisiontrees/gui/DecisionTreePanel.java
52 52
import javax.swing.JMenuItem;
53 53
import javax.swing.JPanel;
54 54
import javax.swing.JPopupMenu;
55
import javax.swing.JScrollBar;
55 56
import javax.swing.JScrollPane;
56 57
import javax.swing.JTabbedPane;
58
import javax.swing.ScrollPaneConstants;
57 59
import javax.swing.border.EmptyBorder;
58 60

  
59 61
import org.gvsig.gui.beans.buttonspanel.ButtonsPanel;
60 62
import org.gvsig.gui.beans.defaultbuttonspanel.DefaultButtonsPanel;
63
import org.gvsig.gui.beans.panelGroup.treePanel.TreePanel;
64
import org.gvsig.gui.beans.swing.JButton;
61 65
import org.gvsig.remotesensing.decisiontrees.DecisionTree;
62 66
import org.gvsig.remotesensing.decisiontrees.DecisionTreeNode;
63 67
import org.gvsig.remotesensing.decisiontrees.gui.listener.DecisionTreePanelListener;
......
111 115
	private View						view				= null;
112 116
	private JTabbedPane					tabbedPanel 		= null; 
113 117
	private OptionsPanel				outputOptionsPanel  = null;
114
	
118
	private JPanel 						treePanel 			= null;
119
	private JButton						jButtonSaveTree		= null;
120
	private JButton						jButtonLoadTree		= null;
115 121

  
116 122
	public DecisionTreePanel(DecisionTreeDialog decisionTreeDialog, View view) {
117 123
		super(ButtonsPanel.BUTTONS_APPLYCLOSE);
......
137 143
		getImportMenuItem().addActionListener(listener);
138 144
		getExportMenuItem().addActionListener(listener);
139 145
		getJGraph().addMouseListener(listener);
146
		getJButtonLoadTree().addActionListener(listener);
147
		getJButtonSaveTree().addActionListener(listener);
140 148
		this.addButtonPressedListener(listener);
141 149
	}
142 150

  
......
144 152
		if (tabbedPanel==null){
145 153
			tabbedPanel = new JTabbedPane();
146 154
			tabbedPanel.setBorder(new EmptyBorder(0,10,0,10));	
147
			tabbedPanel.addTab(PluginServices.getText(this, "arbol"), getScrollPane());
155
			tabbedPanel.addTab(PluginServices.getText(this, "arbol"), getTreePanel());
148 156
			tabbedPanel.addTab(PluginServices.getText(this,"output_options"), getOutputOptionsPanel());
149 157
		}
150 158
		return tabbedPanel;
......
192 200
	public void insertCells(DecisionTreeNode node, DefaultGraphCell parent, int position) {
193 201
		int x = 0;
194 202
		int y = 0;
195
		int w = 40;
203
		int w = 90;
196 204
		int h = 40;
197 205
		if(parent==null){
198 206
			y = 10;
......
273 281
	    	GraphConstants.setAutoSize(cell.getAttributes(),false);
274 282
	    	GraphConstants.setResize(cell.getAttributes(),false);
275 283
	    	GraphConstants.setInset(cell.getAttributes(), 10);
276
	    	GraphConstants.setMoveable(cell.getAttributes(), false);
277
	    	GraphConstants.setSizeable(cell.getAttributes(),false);
284
	    	GraphConstants.setMoveable(cell.getAttributes(), true);
285
	    	GraphConstants.setSizeable(cell.getAttributes(),true);
278 286

  
279 287
			return cell;
280 288
		}
......
283 291
		DefaultEdge edge = new DefaultEdge(label);
284 292
		edge.setSource(parentCell);
285 293
		edge.setTarget(cell);
286
		GraphConstants.setLineEnd(edge.getAttributes(), GraphConstants.ARROW_CLASSIC);
287
		GraphConstants.setEndFill(edge.getAttributes(), true);
294
		GraphConstants.setLineEnd(edge.getAttributes(), GraphConstants.ARROW_SIMPLE);
295
		GraphConstants.setEndFill(edge.getAttributes(), false);
288 296
		GraphConstants.setAutoSize(edge.getAttributes(), true);
289 297
		getJGraph().getGraphLayoutCache().insert(edge);
290 298
		return edge;
......
298 306
		return scrollPane;
299 307
	}
300 308

  
309
	
310
	public JPanel getTreePanel(){
311
		
312
		if(treePanel ==null){
313
			treePanel = new JPanel();
314
			BorderLayout bd= new BorderLayout();
315
			treePanel.setLayout(bd);
316
			treePanel.add(getScrollPane(), BorderLayout.CENTER);
317
			
318
			JPanel paux= new JPanel();
319
			paux.add(getJButtonLoadTree());
320
			paux.add(getJButtonSaveTree());
321
			
322
			JPanel p= new JPanel();
323
			p.setLayout(new BorderLayout());
324
			p.add(paux, BorderLayout.WEST);
325
			treePanel.add(p,BorderLayout.SOUTH);
326
		}
327
		
328
		return treePanel;
329
	}
330
	
301 331
	public JGraph getJGraph() {
302 332
		if (jGraph == null){
303 333
			GraphModel model = new DefaultGraphModel();
......
484 514
		if (menuBarPanel == null){
485 515
			menuBarPanel = new JPanel();
486 516
			menuBarPanel.setLayout(new BorderLayout());
487
			menuBarPanel.add(getMenuBar(),BorderLayout.WEST);
517
		//	menuBarPanel.add(getMenuBar(),BorderLayout.WEST);
488 518
		}
489 519
		return menuBarPanel;
490 520
	}
......
499 529
		return decisionTree;
500 530
	}
501 531

  
532
	public JButton getJButtonLoadTree() {
533
		
534
		if(jButtonLoadTree==null){
535
			jButtonLoadTree= new JButton(PluginServices.getText(this,"loadtree"));
536
		}
537
		return jButtonLoadTree;
538
	}
539

  
540
	public JButton getJButtonSaveTree() {
541
		if(jButtonSaveTree==null){
542
			jButtonSaveTree= new JButton(PluginServices.getText(this,"savetree"));
543
		}
544
		return jButtonSaveTree;
545
	}
546
	
547
	
548

  
502 549
}

Also available in: Unified diff