Revision 9392 trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/gui/dialogs/FConfigLayoutDialog.java

View differences:

FConfigLayoutDialog.java
52 52
import com.iver.andami.PluginServices;
53 53
import com.iver.andami.ui.mdiManager.IWindow;
54 54
import com.iver.andami.ui.mdiManager.WindowInfo;
55
import com.iver.cit.gvsig.gui.layout.Attributes;
56
import com.iver.cit.gvsig.gui.layout.Layout;
55
import com.iver.cit.gvsig.project.documents.layout.Attributes;
57 56
import com.iver.cit.gvsig.project.documents.layout.Size;
57
import com.iver.cit.gvsig.project.documents.layout.gui.Layout;
58 58

  
59 59

  
60 60
/**
......
117 117
	private void initialize() {
118 118
		nf.setMaximumFractionDigits(2);
119 119
		this.setLayout(null);
120
		type = m_layout.getAtributes().getType();
121
		unit = m_layout.getAtributes().getSelTypeUnit();
122
		isLand = m_layout.getAtributes().isLandSpace();
123
		sup = m_layout.getAtributes().m_area[0];
124
		inf = m_layout.getAtributes().m_area[1];
125
		izq = m_layout.getAtributes().m_area[2];
126
		der = m_layout.getAtributes().m_area[3];
120
		type = m_layout.getLayoutContext().getAtributes().getType();
121
		unit = m_layout.getLayoutContext().getAtributes().getSelTypeUnit();
122
		isLand = m_layout.getLayoutContext().getAtributes().isLandSpace();
123
		sup = m_layout.getLayoutContext().getAtributes().m_area[0];
124
		inf = m_layout.getLayoutContext().getAtributes().m_area[1];
125
		izq = m_layout.getLayoutContext().getAtributes().m_area[2];
126
		der = m_layout.getLayoutContext().getAtributes().m_area[3];
127 127
		this.add(getLTamPag(), null);
128 128
		this.add(getCbTipoFolio(), null);
129 129
		this.add(getLDistancia(), null);
......
189 189
			cbTipoFolio.addItem(PluginServices.getText(this, "A0"));
190 190
			cbTipoFolio.addItem(PluginServices.getText(this, "Personalizado"));
191 191

  
192
			cbTipoFolio.setSelectedIndex(m_layout.getAtributes().getType());
192
			cbTipoFolio.setSelectedIndex(m_layout.getLayoutContext().getAtributes().getType());
193 193
			cbTipoFolio.addActionListener(new java.awt.event.ActionListener() {
194 194
					public void actionPerformed(java.awt.event.ActionEvent e) {
195 195
						type = cbTipoFolio.getSelectedIndex();
196 196

  
197
						Size size = m_layout.getAtributes().getSizeinUnits(isLand,
197
						Size size = m_layout.getLayoutContext().getAtributes().getSizeinUnits(isLand,
198 198
								type);
199 199
						getTAlto().setText(String.valueOf(nf.format(
200 200
									size.getAlto())));
......
234 234
			cbUnidades = new javax.swing.JComboBox(Attributes.NAMES);
235 235
			cbUnidades.setSize(175, 20);
236 236
			cbUnidades.setLocation(175, 40);
237
			cbUnidades.setSelectedIndex(m_layout.getAtributes().getSelTypeUnit());
237
			cbUnidades.setSelectedIndex(m_layout.getLayoutContext().getAtributes().getSelTypeUnit());
238 238
			cbUnidades.addActionListener(new java.awt.event.ActionListener() {
239 239
					public void actionPerformed(java.awt.event.ActionEvent e) {
240 240
						unit = cbUnidades.getSelectedIndex();
241
						m_layout.getAtributes().setUnit(unit);
241
						m_layout.getLayoutContext().getAtributes().setUnit(unit);
242 242

  
243
						Size size = m_layout.getAtributes().getSizeinUnits(isLand,
243
						Size size = m_layout.getLayoutContext().getAtributes().getSizeinUnits(isLand,
244 244
								type);
245 245
						getTAlto().setText(String.valueOf(nf.format(
246 246
									size.getAncho())));
......
297 297
			tAncho.setSize(60, 20);
298 298
			tAncho.setLocation(110, 65);
299 299

  
300
			Size size = m_layout.getAtributes().getSizeinUnits(isLand, type);
300
			Size size = m_layout.getLayoutContext().getAtributes().getSizeinUnits(isLand, type);
301 301
			String s = String.valueOf(nf.format(size.getAncho()));
302 302
			tAncho.setText(s);
303 303
		}
......
316 316
			tAlto.setSize(60, 20);
317 317
			tAlto.setLocation(280, 65);
318 318

  
319
			Size size = m_layout.getAtributes().getSizeinUnits(isLand, type);
319
			Size size = m_layout.getLayoutContext().getAtributes().getSizeinUnits(isLand, type);
320 320
			String s = String.valueOf(nf.format(size.getAlto()));
321 321
			tAlto.setText(s);
322 322
		}
......
366 366

  
367 367
		if (b) {
368 368
			getTSuperior().setText(String.valueOf(nf.format(
369
						m_layout.getAtributes().toUnits(sup))));
369
						m_layout.getLayoutContext().getAtributes().toUnits(sup))));
370 370
			getTIzquierdo().setText(String.valueOf(nf.format(
371
						m_layout.getAtributes().toUnits(izq))));
371
						m_layout.getLayoutContext().getAtributes().toUnits(izq))));
372 372
			getTInferior().setText(String.valueOf(nf.format(
373
						m_layout.getAtributes().toUnits(inf))));
373
						m_layout.getLayoutContext().getAtributes().toUnits(inf))));
374 374
			getTDerecho().setText(String.valueOf(nf.format(
375
						m_layout.getAtributes().toUnits(der))));
375
						m_layout.getLayoutContext().getAtributes().toUnits(der))));
376 376
			getTSuperior().setEnabled(true);
377 377
			getTIzquierdo().setEnabled(true);
378 378
			getTInferior().setEnabled(true);
......
400 400
			chbMargenes.setSize(230, 21);
401 401
			chbMargenes.setText(PluginServices.getText(this,"personalizar_margenes"));
402 402
			chbMargenes.setLocation(125, 145);
403
			chbMargenes.setSelected(m_layout.getAtributes().isMargin());
404
			setMargin(m_layout.getAtributes().isMargin());
403
			chbMargenes.setSelected(m_layout.getLayoutContext().getAtributes().isMargin());
404
			setMargin(m_layout.getLayoutContext().getAtributes().isMargin());
405 405
			chbMargenes.addActionListener(new java.awt.event.ActionListener() {
406 406
					public void actionPerformed(java.awt.event.ActionEvent e) {
407 407
						if (chbMargenes.isSelected()) {
......
445 445
			tSuperior.setSize(60, 20);
446 446
			tSuperior.setLocation(110, 167);
447 447

  
448
			if (m_layout.getAtributes().isMargin()) {
448
			if (m_layout.getLayoutContext().getAtributes().isMargin()) {
449 449
				tSuperior.setText(String.valueOf(nf.format(
450
							m_layout.getAtributes().toUnits(sup))));
450
							m_layout.getLayoutContext().getAtributes().toUnits(sup))));
451 451
			}
452 452
		}
453 453

  
......
481 481
			tIzquierdo.setSize(60, 20);
482 482
			tIzquierdo.setLocation(280, 167);
483 483

  
484
			if (m_layout.getAtributes().isMargin()) {
484
			if (m_layout.getLayoutContext().getAtributes().isMargin()) {
485 485
				tIzquierdo.setText(String.valueOf(nf.format(
486
							m_layout.getAtributes().toUnits(izq))));
486
							m_layout.getLayoutContext().getAtributes().toUnits(izq))));
487 487
			}
488 488
		}
489 489

  
......
517 517
			tInferior.setSize(60, 20);
518 518
			tInferior.setLocation(110, 190);
519 519

  
520
			if (m_layout.getAtributes().isMargin()) {
520
			if (m_layout.getLayoutContext().getAtributes().isMargin()) {
521 521
				tInferior.setText(String.valueOf(nf.format(
522
							m_layout.getAtributes().toUnits(inf))));
522
							m_layout.getLayoutContext().getAtributes().toUnits(inf))));
523 523
			}
524 524
		}
525 525

  
......
553 553
			tDerecho.setSize(60, 20);
554 554
			tDerecho.setLocation(280, 190);
555 555

  
556
			if (m_layout.getAtributes().isMargin()) {
556
			if (m_layout.getLayoutContext().getAtributes().isMargin()) {
557 557
				tDerecho.setText(String.valueOf(nf.format(
558
							m_layout.getAtributes().toUnits(der))));
558
							m_layout.getLayoutContext().getAtributes().toUnits(der))));
559 559
			}
560 560
		}
561 561

  
......
592 592
			cbResolucion.addItem(PluginServices.getText(this, "alta"));
593 593
			cbResolucion.addItem(PluginServices.getText(this, "normal"));
594 594
			cbResolucion.addItem(PluginServices.getText(this, "baja"));
595
			cbResolucion.setSelectedIndex(m_layout.getAtributes().getResolution());
595
			cbResolucion.setSelectedIndex(m_layout.getLayoutContext().getAtributes().getResolution());
596 596
			cbResolucion.addActionListener(new java.awt.event.ActionListener() {
597 597
					public void actionPerformed(java.awt.event.ActionEvent e) {
598 598
						resolution = cbResolucion.getSelectedIndex();
......
616 616
			bAceptar.setLocation(130, 245);
617 617
			bAceptar.addActionListener(new java.awt.event.ActionListener() {
618 618
					public void actionPerformed(java.awt.event.ActionEvent e) {
619
						m_layout.getAtributes().setUnit(unit);
619
						m_layout.getLayoutContext().getAtributes().setUnit(unit);
620 620

  
621 621
						if (isLand) {
622
							m_layout.getAtributes().setIsLandScape(true);
622
							m_layout.getLayoutContext().getAtributes().setIsLandScape(true);
623 623
						} else {
624
							m_layout.getAtributes().setIsLandScape(false);
624
							m_layout.getLayoutContext().getAtributes().setIsLandScape(false);
625 625
						}
626 626

  
627
						m_layout.getAtributes().setType(type);
628
						m_layout.getAtributes().setSizeinUnits(isLand);
627
						m_layout.getLayoutContext().getAtributes().setType(type);
628
						m_layout.getLayoutContext().getAtributes().setSizeinUnits(isLand);
629 629
						obtainArea();
630 630

  
631 631
						double[] area = { sup, inf, izq, der };
......
637 637
										  .doubleValue());
638 638
						}
639 639

  
640
						m_layout.getAtributes().setSelectedOptions(type, unit,
640
						m_layout.getLayoutContext().getAtributes().setSelectedOptions(type, unit,
641 641
							isLand, margin, resolution, area);
642 642
						PluginServices.getMDIManager().closeWindow(FConfigLayoutDialog.this);
643
						m_layout.fullRect();
643
						m_layout.getLayoutControl().fullRect();
644 644
						//m_layout.refresh();
645 645
					}
646 646
				});
......
705 705
											  .doubleValue());
706 706
							}
707 707

  
708
							Size size = m_layout.getAtributes().getSizeinUnits(isLand,
708
							Size size = m_layout.getLayoutContext().getAtributes().getSizeinUnits(isLand,
709 709
									type);
710 710
							getTAncho().setText(String.valueOf(nf.format(
711 711
										size.getAncho())));
......
755 755
											  .doubleValue());
756 756
							}
757 757

  
758
							Size size = m_layout.getAtributes().getSizeinUnits(isLand,
758
							Size size = m_layout.getLayoutContext().getAtributes().getSizeinUnits(isLand,
759 759
									type);
760 760
							getTAncho().setText(String.valueOf(nf.format(
761 761
										size.getAncho())));
......
800 800
			s = "0";
801 801
		}
802 802

  
803
		sup = m_layout.getAtributes().fromUnits(Double.valueOf(s).doubleValue());
803
		sup = m_layout.getLayoutContext().getAtributes().fromUnits(Double.valueOf(s).doubleValue());
804 804
		s = (getTIzquierdo().getText());
805 805
		s = s.replace(',', '.');
806 806

  
......
808 808
			s = "0";
809 809
		}
810 810

  
811
		izq = m_layout.getAtributes().fromUnits(Double.valueOf(s).doubleValue());
811
		izq = m_layout.getLayoutContext().getAtributes().fromUnits(Double.valueOf(s).doubleValue());
812 812
		s = (getTInferior().getText());
813 813
		s = s.replace(',', '.');
814 814

  
......
816 816
			s = "0";
817 817
		}
818 818

  
819
		inf = m_layout.getAtributes().fromUnits(Double.valueOf(s).doubleValue());
819
		inf = m_layout.getLayoutContext().getAtributes().fromUnits(Double.valueOf(s).doubleValue());
820 820
		s = (getTDerecho().getText());
821 821
		s = s.replace(',', '.');
822 822

  
......
824 824
			s = "0";
825 825
		}
826 826

  
827
		der = m_layout.getAtributes().fromUnits(Double.valueOf(s).doubleValue());
827
		der = m_layout.getLayoutContext().getAtributes().fromUnits(Double.valueOf(s).doubleValue());
828 828
	}
829 829
}

Also available in: Unified diff