Revision 1763 branches/gvSIG_CAD_Layout_version/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/EventsHandler.java

View differences:

EventsHandler.java
44 44
 */
45 45
package com.iver.cit.gvsig.gui.layout;
46 46

  
47
import com.iver.andami.PluginServices;
47 48
import com.iver.cit.gvsig.fmap.edition.EditionException;
48 49
import com.iver.cit.gvsig.fmap.tools.BehaviorException;
50
import com.iver.cit.gvsig.gui.cad.tools.SelectionCadTool;
49 51
import com.iver.cit.gvsig.gui.layout.fframes.FFrame;
50 52
import com.iver.cit.gvsig.gui.layout.fframes.FFrameGraphics;
51 53
import com.iver.cit.gvsig.gui.layout.fframes.IFFrame;
......
158 160
	public void mouseMoved(MouseEvent E) {
159 161
		if (layout.getTool()==Layout.GRAPHICS){
160 162
			layout.setLastPoint(E.getPoint());
163
			layout.setStatus(Layout.ACTUALIZADO);
161 164
			layout.repaint();
162 165
			try {
163 166
				layout.getCadToolAdapter().mouseMoved(E);
......
204 207
									m_pointSelected) != FFrame.NOSELECT) {
205 208
							listSelect.add((IFFrame) layout.getFFrames().get(j));
206 209
						}
210
					
207 211
					}
208

  
209 212
					if (listSelect.size() > 0) {
210 213
						for (int k = 0; k < listSelect.size(); k++) {
211 214
							if (((IFFrame) listSelect.get(k)).getSelected() != FFrame.NOSELECT) {
......
374 377
				}
375 378
			}
376 379
		} else if (E.getButton() == MouseEvent.BUTTON3) {
377
			Popupmenu popupmenu = new Popupmenu(layout, E.getPoint());
380
			if (!(layout.getCadToolAdapter().getCadTool() instanceof SelectionCadTool)){
381
				 //if (E.isPopupTrigger()) {
382
		            layout.getPopup().show(E.getComponent(),
383
		                       E.getX(), E.getY());
384
		            //layout.repaint();
385
		        //}
386
			}else{
387
				Popupmenu popupmenu = new Popupmenu(layout, E.getPoint());
388
			}
378 389
		}
379 390
	}
380 391

  
......
403 414
					(layout.getTool() == Layout.RECTANGLELEGEND) ||
404 415
					(layout.getTool() == Layout.RECTANGLETEXT)) {
405 416
				events.setFFrame();
417
				
406 418
			} else if (layout.getTool() == Layout.VIEW_ZOOMIN) {
407 419
				zooms.setViewZoomIn(p1, p2);
408 420
			} else if (layout.getTool() == Layout.VIEW_ZOOMOUT) {
......
414 426
			layout.setCancelDrawing(false);
415 427
		} else if (E.getButton() == MouseEvent.BUTTON3) {
416 428
		}
417

  
429
		/*if (layout.getTool()==Layout.GRAPHICS){
430
			layout.setStatus(Layout.GRAPHICS);
431
		}*/
418 432
		layout.repaint();
433
		PluginServices.getMainFrame().enableControls();
419 434
	}
420 435
}

Also available in: Unified diff