Mercurial > dive4elements > river

comparison flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java @ 1386:9aa1a453eed5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Issue 294. Redesigned UESK tab layout, removed superfluous map wrapper canvas. flys-client/trunk@3185 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Raimund Renkert <raimund.renkert@intevation.de>
date Tue, 08 Nov 2011 13:07:56 +0000
parents 9981ba2ee13a
children d29a9fa10313
comparison
equal deleted inserted replaced
1385:31e69ee9dd36 1386:9aa1a453eed5
50 protected MeasureControl measureControl; 50 protected MeasureControl measureControl;
51 51
52 protected Canvas position; 52 protected Canvas position;
53 53
54 54
55 public MapToolbar(MapOutputTab mapTab, FloodMap floodMap, Canvas wrapper) { 55 public MapToolbar(MapOutputTab mapTab, FloodMap floodMap) {
56 this(mapTab, floodMap, wrapper, true); 56 this(mapTab, floodMap, true);
57 } 57 }
58 58
59 59
60 public MapToolbar(FloodMap floodMap, Canvas wrapper, boolean digitize) { 60 public MapToolbar(FloodMap floodMap, boolean digitize) {
61 this(null, floodMap, wrapper, digitize); 61 this(null, floodMap, digitize);
62 } 62 }
63 63
64 64
65 public MapToolbar( 65 public MapToolbar(
66 MapOutputTab mapTab, 66 MapOutputTab mapTab,
67 FloodMap floodMap, 67 FloodMap floodMap,
68 Canvas wrapper,
69 boolean digitize) 68 boolean digitize)
70 { 69 {
71 super(mapTab); 70 super(mapTab);
72 71
73 setWidth100(); 72 setWidth100();
75 setMembersMargin(10); 74 setMembersMargin(10);
76 setPadding(5); 75 setPadding(5);
77 setBorder("1px solid black"); 76 setBorder("1px solid black");
78 77
79 this.floodMap = floodMap; 78 this.floodMap = floodMap;
80
81 Canvas spacer = new Canvas();
82 spacer.setWidth("*");
83 79
84 zoomToMaxButton = createMaxExtentControl(); 80 zoomToMaxButton = createMaxExtentControl();
85 zoomBoxButton = createZoomBoxControl(); 81 zoomBoxButton = createZoomBoxControl();
86 zoomOutButton = createZoomOutControl(); 82 zoomOutButton = createZoomOutControl();
87 panButton = createPanControl(); 83 panButton = createPanControl();
88 drawControl = createDrawControl(); 84 drawControl = createDrawControl();
89 selectButton = createSelectFeatureControl(); 85 selectButton = createSelectFeatureControl();
90 measureControl = createMeasureControl(); 86 measureControl = createMeasureControl();
91 position = createMousePosition(wrapper); 87 position = createMousePosition();
92 removeButton = createRemoveFeatureControl(); 88 removeButton = createRemoveFeatureControl();
93 elevationButton = createElevationControl(); 89 elevationButton = createElevationControl();
94 90
95 if (mapTab != null) { 91 if (mapTab != null) {
96 datacageButton = createDatacageControl(); 92 datacageButton = createDatacageControl();
108 addMember(removeButton); 104 addMember(removeButton);
109 addMember(elevationButton); 105 addMember(elevationButton);
110 } 106 }
111 107
112 addMember(measureControl); 108 addMember(measureControl);
113 addMember(spacer);
114 addMember(position); 109 addMember(position);
115 } 110 }
116 111
117 112
118 protected Map getMap() { 113 protected Map getMap() {
438 433
439 return btn; 434 return btn;
440 } 435 }
441 436
442 437
443 protected Canvas createMousePosition(Canvas mapWrapper) { 438 protected Canvas createMousePosition() {
444 return new MapPositionPanel(floodMap.getMapWidget(), mapWrapper); 439 return new MapPositionPanel(floodMap.getMapWidget());
445 } 440 }
446 441
447 442
448 protected MeasureControl createMeasureControl() { 443 protected MeasureControl createMeasureControl() {
449 EnableDisableCmd cmd = new EnableDisableCmd() { 444 EnableDisableCmd cmd = new EnableDisableCmd() {
http://dive4elements.wald.intevation.org