Revision 202
org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.spi/src/main/java/org/gvsig/vectorediting/lib/spi/EditingProviderServices.java | ||
---|---|---|
213 | 213 |
int subtype) throws CreateGeometryException, DataException; |
214 | 214 |
|
215 | 215 |
/** |
216 |
* Create line as of two point objects. |
|
217 |
* |
|
218 |
* @param p1 |
|
219 |
* First point |
|
220 |
* @param p2 |
|
221 |
* Second point |
|
222 |
* @param subtype |
|
223 |
* of line. See {@link Geometry.SUBTYPES} |
|
224 |
* @return The Line created. |
|
225 |
*/ |
|
226 |
public Curve createLine(Point p1, Point p2, int subtype) |
|
227 |
throws CreateGeometryException, DataException; |
|
228 |
|
|
229 |
/** |
|
216 | 230 |
* Gets {@link SUBTYPES} of the feature store received as parameter. |
217 | 231 |
* |
218 | 232 |
* @return the subtype of the default geometry. |
org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.impl/src/main/java/org/gvsig/vectorediting/lib/impl/DefaultEditingProviderServices.java | ||
---|---|---|
523 | 523 |
return ((Math.PI * 2) - angle1) + angle2; |
524 | 524 |
} |
525 | 525 |
} |
526 |
|
|
527 |
/* |
|
528 |
* (non-Javadoc) |
|
529 |
* |
|
530 |
* @see |
|
531 |
* org.gvsig.vectorediting.lib.spi.EditingProviderServices#createLine(org |
|
532 |
* .gvsig.fmap.geom.primitive.Point, org.gvsig.fmap.geom.primitive.Point, |
|
533 |
* int) |
|
534 |
*/ |
|
535 |
public Curve createLine(Point p1, Point p2, int subtype) |
|
536 |
throws CreateGeometryException, DataException { |
|
537 |
return this.createLine(p1.getX(), p1.getY(), p2.getX(), p2.getY(), |
|
538 |
subtype); |
|
539 |
} |
|
526 | 540 |
} |
org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.arc/src/main/java/org/gvsig/vectorediting/lib/prov/arc/ArcEditingProvider.java | ||
---|---|---|
137 | 137 |
int subtype = |
138 | 138 |
editingProviderServices.getSubType(featureStore); |
139 | 139 |
Curve line = |
140 |
editingProviderServices |
|
141 |
.createLine(startPointValue.getX(), |
|
142 |
startPointValue.getY(), mousePosition.getX(), |
|
143 |
mousePosition.getY(), subtype); |
|
140 |
editingProviderServices.createLine(startPointValue, |
|
141 |
mousePosition, subtype); |
|
144 | 142 |
geometries.addGeometry(line); |
145 | 143 |
|
146 | 144 |
} catch (Exception e) { |
org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.circlecr/src/main/java/org/gvsig/vectorediting/lib/prov/circlecr/CircleCREditingProvider.java | ||
---|---|---|
93 | 93 |
try { |
94 | 94 |
int subtype = editingProviderServices.getSubType(featureStore); |
95 | 95 |
Curve line = |
96 |
editingProviderServices.createLine(centerPoint.getX(), |
|
97 |
centerPoint.getY(), mousePosition.getX(), |
|
98 |
mousePosition.getY(), subtype); |
|
96 |
editingProviderServices.createLine(centerPoint, mousePosition, |
|
97 |
subtype); |
|
99 | 98 |
Arc circle = |
100 | 99 |
editingProviderServices.createArc(centerPoint, |
101 | 100 |
mousePosition.distance(centerPoint), 0, 2 * Math.PI, |
org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.line/src/main/java/org/gvsig/vectorediting/lib/prov/line/LineEditingProvider.java | ||
---|---|---|
147 | 147 |
(EditingProviderServices) getProviderServices(); |
148 | 148 |
int subtype = editingProviderServices.getSubType(featureStore); |
149 | 149 |
Curve line = |
150 |
editingProviderServices.createLine(point.getX(), |
|
151 |
point.getY(), mousePosition.getX(), |
|
152 |
mousePosition.getY(), subtype); |
|
150 |
editingProviderServices.createLine(point, mousePosition, |
|
151 |
subtype); |
|
153 | 152 |
geometries.addGeometry(line); |
154 | 153 |
|
155 | 154 |
} catch (Exception e) { |
... | ... | |
230 | 229 |
Geometry geometry = null; |
231 | 230 |
int subtype = editingProviderServices.getSubType(featureStore); |
232 | 231 |
geometry = |
233 |
editingProviderServices.createLine(firstPointValue.getX(), |
|
234 |
firstPointValue.getY(), secondPointValue.getX(), |
|
235 |
secondPointValue.getY(), subtype); |
|
232 |
editingProviderServices.createLine(firstPointValue, |
|
233 |
secondPointValue, subtype); |
|
236 | 234 |
|
237 | 235 |
if (storeGeomType.isTypeOf(MULTICURVE)) { |
238 | 236 |
|
org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.regularpolygon/src/main/java/org/gvsig/vectorediting/lib/prov/regularpolygon/RegularPolygonEditingProvider.java | ||
---|---|---|
86 | 86 |
this.featureStore = |
87 | 87 |
(FeatureStore) parameters |
88 | 88 |
.getDynValue(EditingProviderFactory.FEATURE_STORE_FIELD); |
89 |
|
|
89 |
|
|
90 | 90 |
polygonSides = |
91 | 91 |
new DefaultEditingServiceParameter("sides", |
92 | 92 |
"sides_of_regular_polygon", EditingServiceParameter.TYPE.VALUE); |
... | ... | |
145 | 145 |
calculateRegularPolygon(modeValue, centerValue, |
146 | 146 |
mousePosition, sidesValue.intValue()); |
147 | 147 |
Curve line = |
148 |
editingProviderServices.createLine(centerValue.getX(), |
|
149 |
centerValue.getY(), mousePosition.getX(), |
|
150 |
mousePosition.getY(), subtype); |
|
148 |
editingProviderServices.createLine(centerValue, |
|
149 |
mousePosition, subtype); |
|
151 | 150 |
|
152 | 151 |
double radius = mousePosition.distance(centerValue); |
153 | 152 |
Curve circumference = |
... | ... | |
183 | 182 |
protected Curve calculateRegularPolygon(String modeValue, |
184 | 183 |
Point centerValue, Point pointOfCircle, int sidesValue) |
185 | 184 |
throws BaseException { |
186 |
|
|
185 |
|
|
187 | 186 |
GeometryManager geometryManager = GeometryLocator.getGeometryManager(); |
188 | 187 |
|
189 | 188 |
EditingProviderServices editingProviderServices = |
org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.polyline/src/main/java/org/gvsig/vectorediting/lib/prov/polyline/PolylineEditingProvider.java | ||
---|---|---|
93 | 93 |
.getDynValue(EditingProviderFactory.FEATURE_STORE_FIELD); |
94 | 94 |
|
95 | 95 |
I18nManager i18nManager = ToolsLocator.getI18nManager(); |
96 |
|
|
96 |
|
|
97 | 97 |
options = new LinkedHashMap<String, String>(); |
98 | 98 |
options.put(i18nManager.getTranslation("key_arc_mode"), "arc_mode"); |
99 | 99 |
options.put(i18nManager.getTranslation("key_line_mode"), "line_mode"); |
... | ... | |
165 | 165 |
editingProviderServices.getSubType(featureStore); |
166 | 166 |
|
167 | 167 |
lineAntPointToPoint = |
168 |
editingProviderServices.createLine(point.getX(), |
|
169 |
point.getY(), nextPoint.getX(), |
|
170 |
nextPoint.getY(), subtype); |
|
168 |
editingProviderServices.createLine(point, |
|
169 |
nextPoint, subtype); |
|
171 | 170 |
|
172 | 171 |
Double[] lineParams = |
173 | 172 |
editingProviderServices.getLineParams(point, |
... | ... | |
328 | 327 |
int subtype = |
329 | 328 |
editingProviderServices.getSubType(featureStore); |
330 | 329 |
Curve geometry = |
331 |
editingProviderServices.createLine(point.getX(), |
|
332 |
point.getY(), nextPoint.getX(), |
|
333 |
nextPoint.getY(), subtype); |
|
330 |
editingProviderServices.createLine(point, |
|
331 |
nextPoint, subtype); |
|
334 | 332 |
geometries.addGeometry(geometry); |
335 | 333 |
} catch (Exception e) { |
336 | 334 |
throw new DrawServiceException(e); |
... | ... | |
511 | 509 |
if (value instanceof String) { |
512 | 510 |
String option = (String) value; |
513 | 511 |
I18nManager i18nManager = ToolsLocator.getI18nManager(); |
514 |
|
|
512 |
|
|
515 | 513 |
if (option.equalsIgnoreCase(i18nManager |
516 | 514 |
.getTranslation("key_finish"))) { |
517 | 515 |
finishPolyline = true; |
org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.ellipse/src/main/java/org/gvsig/vectorediting/lib/prov/ellipse/EllipseEditingProvider.java | ||
---|---|---|
69 | 69 |
this.featureStore = |
70 | 70 |
(FeatureStore) parameters |
71 | 71 |
.getDynValue(EditingProviderFactory.FEATURE_STORE_FIELD); |
72 |
|
|
72 |
|
|
73 | 73 |
this.firstPointAxisA = |
74 | 74 |
new DefaultEditingServiceParameter("First point of A axis ", |
75 |
"first_point_A_axis", |
|
76 |
EditingServiceParameter.TYPE.POSITION); |
|
75 |
"first_point_A_axis", EditingServiceParameter.TYPE.POSITION); |
|
77 | 76 |
|
78 | 77 |
this.secondPointAxisA = |
79 | 78 |
new DefaultEditingServiceParameter("Second point of A axis", |
80 |
"second_point_A_axis", |
|
81 |
EditingServiceParameter.TYPE.POSITION); |
|
79 |
"second_point_A_axis", EditingServiceParameter.TYPE.POSITION); |
|
82 | 80 |
|
83 | 81 |
this.lengthAxisB = |
84 | 82 |
new DefaultEditingServiceParameter("Length of B axis", |
85 |
"length_of_B_axis", |
|
86 |
EditingServiceParameter.TYPE.POSITION, |
|
83 |
"length_of_B_axis", EditingServiceParameter.TYPE.POSITION, |
|
87 | 84 |
EditingServiceParameter.TYPE.VALUE); |
88 | 85 |
} |
89 | 86 |
|
... | ... | |
118 | 115 |
editingServiceProvider.getSubType(featureStore); |
119 | 116 |
Curve line = |
120 | 117 |
editingServiceProvider.createLine( |
121 |
firstPointAxis1Value.getX(), |
|
122 |
firstPointAxis1Value.getY(), |
|
123 |
mousePosition.getX(), mousePosition.getY(), |
|
124 |
subtype); |
|
118 |
firstPointAxis1Value, mousePosition, subtype); |
|
125 | 119 |
|
126 | 120 |
drawingStatus.addGeometry(line); |
127 | 121 |
return drawingStatus; |
... | ... | |
142 | 136 |
|
143 | 137 |
Curve aAxis = |
144 | 138 |
editingServiceProvider.createLine( |
145 |
firstPointAxis1Value.getX(), |
|
146 |
firstPointAxis1Value.getY(), |
|
147 |
secondPointAxis1Value.getX(), |
|
148 |
secondPointAxis1Value.getY(), subtype); |
|
139 |
firstPointAxis1Value, secondPointAxis1Value, |
|
140 |
subtype); |
|
149 | 141 |
drawingStatus.addGeometry(aAxis); |
150 | 142 |
|
151 | 143 |
Double[] lineParams = |
Also available in: Unified diff