Revision 142 branches/usability_v2/org.gvsig.app.document.layout.app/org.gvsig.app.document.layout.app.mainplugin/src/main/java/org/gvsig/app/project/documents/layout/fframes/gui/dialogs/FFrameViewDialog.java

View differences:

FFrameViewDialog.java
39 39
import org.gvsig.app.project.documents.layout.fframes.FFrameGrid;
40 40
import org.gvsig.app.project.documents.layout.fframes.FFrameView;
41 41
import org.gvsig.app.project.documents.layout.fframes.IFFrame;
42
import org.gvsig.app.project.documents.layout.fframes.IFFrameUseFMap;
42 43
import org.gvsig.app.project.documents.layout.fframes.ListViewModel;
43 44
import org.gvsig.app.project.documents.layout.fframes.gui.JPRotation;
44 45
import org.gvsig.app.project.documents.layout.gui.LayoutPanel;
......
475 476

  
476 477
                            newFFrameView.setTypeScale(getCbEscala()
477 478
                                .getSelectedIndex());
478
                            newFFrameView.setScale(Double
479
                                .parseDouble(getTEscalaNumerica().getText()));
479
                            if (newFFrameView.getTypeScale()!=IFFrameUseFMap.AUTOMATICO){
480
                            	newFFrameView.setScale(Double
481
                            			.parseDouble(getTEscalaNumerica().getText()));
482
                            }
480 483
                            newFFrameView.setView(m_projectView);
481

  
482
                            // fframeview.setFMap(m_projectView.getMapContext());
483
                            newFFrameView.setExtension(getCbExtension()
484
                                .getSelectedIndex());
485 484
                            newFFrameView.setQuality(getCbCalidad()
486 485
                                .getSelectedIndex());
487 486
                            if (fframeview.getGrid() != null) {                             
488 487
                                ((FFrameGrid) fframeview.getGrid())
489 488
                                    .setFFrameDependence(newFFrameView);
490
                                // ((FFrameGrid)grid).setBoundBox();
491 489
                                newFFrameView.setGrid(fframeview.getGrid());
492 490
                            }
493 491
                            newFFrameView.showGrid(getChbShowGrid()
......
496 494
                                .toSheetRect(rect, layoutPanel
497 495
                                    .getLayoutControl().getAT()));
498 496

  
499
                            /*
500
                             * for (int i=0;i<m_layout.getFFrames().size();i++){
501
                             * IFFrame
502
                             * fframe=(IFFrame)m_layout.getFFrames().get(i);
503
                             * if (fframe instanceof FFrameScaleBar){
504
                             * if
505
                             * (((FFrameScaleBar)fframe).getFFrameView()==fframeview
506
                             * ){
507
                             * if (getJComboBox().getSelectedIndex()!=0){
508
                             * ((FFrameScaleBar)fframe).setIsFixed(true);
509
                             * ((FFrameScaleBar)fframe).setScaleView(Long.parseLong
510
                             * (getJTextField().getText()));
511
                             * }else{
512
                             * ((FFrameScaleBar)fframe).setIsFixed(false);
513
                             * }
514
                             * 
515
                             * }
516
                             * }
517
                             * 
518
                             * 
519
                             * }
520
                             */
521 497
                        }
522 498
                    } catch (CloneNotSupportedException e1) {
523 499
                        LOG.error("It is not possible clonate the object", e);
524 500
                    }
525 501
                    isAcepted = true;
526

  
527
                    // }else{
528
                    // isAcepted=false;
529
                    // }
530 502
                    PluginServices.getMDIManager().closeWindow(
531 503
                        FFrameViewDialog.this);
532 504
                }

Also available in: Unified diff