Revision 26037

View differences:

trunk/extensions/extSymbology/src/org/gvsig/symbology/fmap/labeling/placements/MarkerPlacementAroundPoint.java
76 76
				ArrayList<LabelLocationMetrics> normalPreference = new ArrayList<LabelLocationMetrics>();
77 77
				ArrayList<LabelLocationMetrics> lowPreference = new ArrayList<LabelLocationMetrics>();
78 78
				Rectangle bounds = lc.getBounds();
79
				double width = bounds.getWidth()*.5 + 2;
79
				double width = bounds.getWidth();// *.5 + 2;
80 80
				double heigth = bounds.getHeight();
81 81

  
82 82
				double offsetX = 0, offsetY = 0;
83 83
				for (int i = 0; i < preferredPositions.length; i++) {
84
					// xOffset
85
					switch (i % 3) {
84
					switch (i) {
86 85
					case 0:
86
					case 3:
87
					case 5:
87 88
						// left
88 89
						offsetX = -width;
89 90
						break;
90 91
					case 2:
92
					case 4:
93
					case 7:
91 94
						// rigth
92 95
						offsetX = width;
93 96
						break;
94 97
					case 1:
98
					case 6:
95 99
					default:
96 100
						// horizontally centered
97 101
						offsetX = 0;
98 102
						break;
99

  
100 103
					}
101

  
102
					switch (i / 3) {
104
					switch (i) {
103 105
					case 0:
106
					case 1:
107
					case 2:
104 108
						// top
105 109
						offsetY = -heigth;
106 110
						break;
107
					case 2:
111
					case 5:
112
					case 6:
113
					case 7:
108 114
						// below
109 115
						offsetY = heigth;
110 116
						break;
111
					case 1:
117
					case 3:
118
					case 4:
112 119
					default:
113 120
						// vertically centered
114 121
						offsetY = 0;
115 122
						break;
116 123

  
117 124
					}
125
//					// xOffset
126
//					switch (i % 3) {
127
//					case 0:
128
//						// left
129
//						offsetX = -width;
130
//						break;
131
//					case 2:
132
//						// rigth
133
//						offsetX = width;
134
//						break;
135
//					case 1:
136
//					default:
137
//						// horizontally centered
138
//						offsetX = 0;
139
//						break;
140
//
141
//					}
142
//
143
//					switch (i / 3) {
144
//					case 0:
145
//						// top
146
//						offsetY = -heigth;
147
//						break;
148
//					case 2:
149
//						// below
150
//						offsetY = heigth;
151
//						break;
152
//					case 1:
153
//					default:
154
//						// vertically centered
155
//						offsetY = 0;
156
//						break;
157
//
158
//					}
118 159
					FPoint2D aux = new FPoint2D(p.getX() + offsetX, p.getY()+offsetY);
119 160

  
120 161
					IGeometry g=ShapeFactory.createPoint2D(aux);

Also available in: Unified diff