Revision 4774 trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/EventsHandler.java

View differences:

EventsHandler.java
62 62
import com.iver.andami.PluginServices;
63 63
import com.iver.cit.gvsig.gui.layout.fframes.IFFrame;
64 64
import com.iver.cit.gvsig.gui.layout.fframes.IFFrameEditable;
65
import com.iver.cit.gvsig.gui.layout.fframes.IFFrameGroupSelectable;
65 66

  
66 67

  
67 68
/**
......
130 131
        if (e.getButton() != MouseEvent.BUTTON3) {
131 132
            layout.setLastPoint(e.getPoint());
132 133
            layout.repaint();
133
        } 
134
        }
134 135
        if (layout.getTool() == Layout.EDIT){
135
        	for (int i=0;i<layout.getFFrames().length;i++){
136
        		IFFrame frame=(IFFrame)layout.getFFrame(i);
136
        	IFFrame[] fframes=layout.getFFrames();
137
        	for (int i=0;i<fframes.length;i++){
138
        		IFFrame frame=fframes[i];
137 139
        		if (frame instanceof IFFrameEditable){
138 140
        			((IFFrameEditable)frame).pointDragged(FLayoutUtilities.toSheetPoint(e.getPoint(),layout.getAT()));
139 141
        			layout.setStatus(Layout.GRAPHICS);
140
        			
142

  
141 143
        		}
142 144
        	}
143
        	
145

  
144 146
        }
145 147
    }
146 148

  
......
190 192
            if (E.getButton() == MouseEvent.BUTTON1) {
191 193
                if (layout.getTool() == Layout.SELECT) {
192 194
                    m_pointSelected = new Point2D.Double(E.getX(), E.getY());
193

  
194
                    if (layout.getFFrames().length > 0) {
195
                    IFFrame[] fframes=layout.getFFrames();
196
                    if (fframes.length > 0) {
195 197
                        ArrayList listSelect = new ArrayList();
196

  
197
                        for (int j = 0; j < layout.getFFrames().length; j++) {
198
                            if (((IFFrame) layout.getFFrame(j)).getContains(
198
                        for (int j = 0; j < fframes.length; j++) {
199
                            if (fframes[j].getContains(
199 200
                                        m_pointSelected) != IFFrame.NOSELECT) {
200
                                listSelect.add((IFFrame) layout.getFFrame(j));
201
                                listSelect.add(fframes[j]);
201 202
                            }
202 203
                        }
203 204

  
......
215 216
                                    (index > (listSelect.size() - 1))) {
216 217
                                index = 0;
217 218
                            }
218

  
219
                            for (int j = 0; j < layout.getFFrames().length;
219
                            for (int j = 0; j < fframes.length;
220 220
                                    j++) {
221
                                IFFrame fframe = (IFFrame) layout.getFFrame(j);
221
                                IFFrame fframe = fframes[j];
222 222

  
223 223
                                if (!E.isShiftDown()) {
224 224
                                    fframe.setSelected(false);
......
263 263
    public void mouseEntered(MouseEvent arg0) {
264 264
        /* TODO        PluginServices.getMainFrame().getStatusBar().setMessage("0",
265 265
           layout.getAtributes().getNameUnit());
266
         
266

  
267 267
        if (layout.getTool() == Layout.PAN) {
268 268
            layout.setMapCursor(Layout.iLayoutpan);
269 269
        } else if (layout.getTool() == Layout.ZOOM_MAS) {
......
343 343
                layout.setCancelDrawing(true);
344 344
            } else if (layout.getTool() == Layout.SELECT) {
345 345
                m_pointSelected = new Point2D.Double(E.getX(), E.getY());
346
                IFFrame[] fframes=layout.getFFrames();
347
                for (int i = 0; i < fframes.length; i++) {
348
                    IFFrame fframe = fframes[i];
346 349

  
347
                for (int i = 0; i < layout.getFFrames().length; i++) {
348
                    IFFrame fframe = ((IFFrame) layout.getFFrame(i));
349

  
350 350
                    if (m_pointSelected != null) {
351 351
                        if (!E.isShiftDown()) {
352 352
                            if ((fframe.getSelected() != IFFrame.NOSELECT)) {
353
                                fframe.setSelected(m_pointSelected);
353
                                fframe.setSelected(m_pointSelected,E);
354 354
                            }
355
                        }else if (fframe instanceof IFFrameGroupSelectable){
356
                        	    fframe.setSelected(m_pointSelected,E);
355 357
                        }
356 358
                    }
357 359

  
......
371 373
                }
372 374
            } else if (layout.getTool() == Layout.SET_TAG) {
373 375
                m_pointSelected = new Point2D.Double(E.getX(), E.getY());
376
                IFFrame[] fframes=layout.getFFrames();
377
                for (int i = 0; i < fframes.length; i++) {
378
                    IFFrame fframe = fframes[i];
374 379

  
375
                for (int i = 0; i < layout.getFFrames().length; i++) {
376
                    IFFrame fframe = ((IFFrame) layout.getFFrame(i));
377

  
378 380
                    if (m_pointSelected != null) {
379 381
                        if (fframe.contains(m_pointSelected)) {
380 382
                            fframe.openTag();
......
382 384
                    }
383 385
                }
384 386
            } else if (layout.getTool() == Layout.EDIT){
385
            	for (int i=0;i<layout.getFFrames().length;i++){
386
            		IFFrame frame=(IFFrame)layout.getFFrame(i);
387
            	IFFrame[] fframes=layout.getFFrames();
388
            	for (int i=0;i<fframes.length;i++){
389
            		IFFrame frame=fframes[i];
387 390
            		if (frame instanceof IFFrameEditable){
388 391
            			((IFFrameEditable)frame).pointPressed(FLayoutUtilities.toSheetPoint(E.getPoint(),layout.getAT()));
389 392
            		}
......
423 426
                    (layout.getTool() == Layout.RECTANGLETEXT) ||
424 427
                    (layout.getTool() == Layout.RECTANGLENORTH)||
425 428
                    (layout.getTool() == Layout.RECTANGLEBOX)) {
426
                events.setFFrame();
429
                events.addFFrame();
427 430
                PluginServices.getMainFrame().enableControls();
428 431
                layout.refresh();
429 432
            } else if (layout.getTool() == Layout.VIEW_ZOOMIN) {
......
440 443
                layout.setStatus(Layout.GRAPHICS);
441 444
                layout.repaint();
442 445
            } else if (layout.getTool() == Layout.EDIT){
443
            	for (int i=0;i<layout.getFFrames().length;i++){
444
            		IFFrame frame=(IFFrame)layout.getFFrame(i);
446
            	IFFrame[] fframes=layout.getFFrames();
447
            	for (int i=0;i<fframes.length;i++){
448
            		IFFrame frame=fframes[i];
445 449
            		if (frame instanceof IFFrameEditable){
446 450
            			if (frame.getSelected()!=IFFrame.NOSELECT && ((IFFrameEditable)frame).isEditing()){
447 451
            				/*IFFrame fframeAux=frame.cloneFFrame(layout);
......
467 471
        } else if (E.getButton() == MouseEvent.BUTTON3) {
468 472
        }
469 473

  
470
      
474

  
471 475
    }
472 476
    private void delLastPoint(){
473 477
    	layout.getGeometryAdapter().delLastPoint();
......
484 488
                (layout.getTool() == Layout.POINT)) {
485 489
            layout.getGeometryAdapter().end();
486 490
            PluginServices.getMainFrame().enableControls();
487
            events.setFFrame();
491
            events.addFFrame();
488 492
            layout.initGeometryAdapter();
489 493
            layout.refresh();
490 494
        }
......
509 513
			layout.delFFrameSelected();
510 514
			layout.refresh();
511 515
			break;
512
		
516

  
513 517
		}
514 518
		}else{
515 519
		switch (arg0.getKeyCode()) {
......
573 577
			case KeyEvent.VK_RIGHT:
574 578
			case KeyEvent.VK_UP:
575 579
			case KeyEvent.VK_DOWN:
576
				
580

  
577 581
				layout.getEFS().startComplexCommand();
578 582
				for (int i=0;i<fframes.length;i++){
579 583
					IFFrame fframeAux=fframes[i].cloneFFrame(layout);
......
589 593
		}
590 594
			difX=0;
591 595
			difY=0;
592
		
596

  
593 597
	}
594 598

  
595 599
	public void keyTyped(KeyEvent arg0) {
596 600
		// TODO Auto-generated method stub
597
		
601

  
598 602
	}
599 603
	private Rectangle2D getRectMove(Rectangle2D r,int difX,int difY) {
600 604
		Rectangle2D rectMove=new Rectangle2D.Double();

Also available in: Unified diff