Revision 47464
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/resources-plugin/i18n/text.properties | ||
---|---|---|
1762 | 1762 |
_Combine=Combinar |
1763 | 1763 |
_Extent=Cuadro envolvente m\u00ednimo |
1764 | 1764 |
_ConvexHull=Envolvente convexa m\u00ednima |
1765 |
_Intersection=Intersecci\u00f3n |
|
1765 |
_Intersection=Intersecci\u00f3n |
|
1766 |
|
|
1767 |
_Join_the_insertion_point_and_the_offset_with_a_line=Unir el punto de intersecci\u00f3n y el de desplazamiento con una l\u00ednea |
|
1768 |
_Line_color=Color de la l\u00ednea |
|
1769 |
_Size_expression=Expresi\u00f3n para el tama\u00f1o |
|
1770 |
_X_offset_expression=Expresi\u00f3n para el desplazamiento en X |
|
1771 |
_Y_offset_expression=Expresi\u00f3n para el desplazamiento en Y |
|
1772 |
_Rotation_expression=Expresi\u00f3n para la rotaci\u00f3n |
|
1773 |
_Line_color_expression=Expresi\u00f3n para el color de la l\u00ednea |
|
1774 |
_History=Hist\u00f3rico |
|
1775 |
_Select_file=Selecci\u00f3n de archivo |
|
1776 |
_File_picker=Selector de archivos |
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties | ||
---|---|---|
1675 | 1675 |
_Combine=Combine |
1676 | 1676 |
_Extent=Extent |
1677 | 1677 |
_ConvexHull=Convex hull |
1678 |
_Intersection=Intersection |
|
1678 |
_Intersection=Intersection |
|
1679 |
|
|
1680 |
_Join_the_insertion_point_and_the_offset_with_a_line=Join the insertion point and the offset with a line |
|
1681 |
_Line_color=Line color |
|
1682 |
_Size_expression=Size expression |
|
1683 |
_X_offset_expression=X offset expression |
|
1684 |
_Y_offset_expression=Y offset expression |
|
1685 |
_Rotation_expression=Rotation expression |
|
1686 |
_Line_color_expression=Line color expression |
|
1687 |
_History=History |
|
1688 |
_Select_file=Select file |
|
1689 |
_File_picker=sFile picker |
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/java/org/gvsig/expressionevaluator/swing/impl/DefaultExpressionPickerController.java | ||
---|---|---|
190 | 190 |
this.button.setIcon(this.getIcon("picker-expression")); |
191 | 191 |
this.button.addActionListener(this.buttonAction); |
192 | 192 |
|
193 |
swingManager.addClearButton(this.text); |
|
193 |
swingManager.addClearButton(this.text, (ActionEvent e) -> { |
|
194 |
set((Expression)null); |
|
195 |
fireChangeEvent(); |
|
196 |
}); |
|
194 | 197 |
swingManager.setDefaultPopupMenu(this.text); |
195 | 198 |
JPopupMenu popupMenu = this.text.getComponentPopupMenu(); |
196 | 199 |
this.menuItem.addActionListener(buttonAction); |
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.lib/org.gvsig.symbology.lib.impl/src/main/java/org/gvsig/symbology/fmap/mapcontext/rendering/symbol/marker/impl/AbstractMarkerSymbol.java | ||
---|---|---|
132 | 132 |
@Override |
133 | 133 |
public void setRotation(double r) { |
134 | 134 |
this.rotation = r; |
135 |
this.setRotationExpression(null); |
|
135 | 136 |
} |
136 | 137 |
|
137 | 138 |
@Override |
... | ... | |
258 | 259 |
|
259 | 260 |
@Override |
260 | 261 |
public double getEfectiveRotationInDegres(Feature f) { |
262 |
if( StringUtils.isBlank(this.rotationExpression) ) { |
|
263 |
return Math.toDegrees(this.getRotation()); |
|
264 |
} |
|
261 | 265 |
// Por defecto vedra en grados. |
262 | 266 |
if( f == null ) { |
263 | 267 |
f = this.getFeature(); |
264 | 268 |
} |
265 |
if( f==null || StringUtils.isBlank(this.rotationExpression) ) {
|
|
266 |
return this.getRotation();
|
|
269 |
if( f==null ) { |
|
270 |
return Math.toDegrees(this.getRotation());
|
|
267 | 271 |
} |
268 | 272 |
double r = ExpressionUtils.parseDouble( |
269 | 273 |
this.getSymbolTable(f), |
... | ... | |
276 | 280 |
@Override |
277 | 281 |
public double getEfectiveRotationInRadians(Feature f) { |
278 | 282 |
// Pillamos el valor por defecto que es en grados y lo transformamos a radianes. |
283 |
if( StringUtils.isBlank(this.rotationExpression) ) { |
|
284 |
return this.getRotation(); |
|
285 |
} |
|
279 | 286 |
double r = this.getEfectiveRotationInDegres(f); |
280 | 287 |
if( r == 0 ) { |
281 | 288 |
return 0; |
... | ... | |
302 | 309 |
|
303 | 310 |
@Override |
304 | 311 |
public double getEfectiveSize(Feature f) { |
312 |
if(StringUtils.isBlank(this.sizeExpression) ) { |
|
313 |
return this.getSize(); |
|
314 |
} |
|
305 | 315 |
if( f == null ) { |
306 | 316 |
f = this.getFeature(); |
307 | 317 |
} |
308 |
if( f==null || StringUtils.isBlank(this.sizeExpression) ) {
|
|
318 |
if( f==null ) { |
|
309 | 319 |
return this.getSize(); |
310 | 320 |
} |
311 | 321 |
double sz = ExpressionUtils.parseDouble( |
... | ... | |
337 | 347 |
@Override |
338 | 348 |
public void setSize(double size) { |
339 | 349 |
this.size = size; |
350 |
this.setSizeExpression(null); |
|
340 | 351 |
} |
341 | 352 |
|
342 | 353 |
@Override |
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/PictureMarkerView.xml | ||
---|---|---|
24 | 24 |
</at> |
25 | 25 |
<at name="componentclass">com.jeta.forms.gui.form.FormComponent</at> |
26 | 26 |
</super> |
27 |
<at name="id">/home/jjdelcerro/datos/devel/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/PictureMarkerView.xml</at> |
|
28 |
<at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at> |
|
27 |
<at name="id">/home/fdiaz/projects/gvSIG/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/PictureMarkerView.xml</at> |
|
28 |
<at name="path">projects/gvSIG/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/PictureMarkerView.xml</at> |
|
29 |
<at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at> |
|
29 | 30 |
<at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE</at> |
30 | 31 |
<at name="components"> |
31 | 32 |
<object classname="java.util.LinkedList"> |
... | ... | |
74 | 75 |
</object> |
75 | 76 |
</at> |
76 | 77 |
<at name="name">lblLabelFileName</at> |
77 |
<at name="width">149</at>
|
|
78 |
<at name="width">162</at>
|
|
78 | 79 |
<at name="text">picture_file</at> |
79 | 80 |
<at name="fill"> |
80 | 81 |
<object classname="com.jeta.forms.store.properties.effects.PaintProperty"> |
81 | 82 |
<at name="name">fill</at> |
82 | 83 |
</object> |
83 | 84 |
</at> |
84 |
<at name="height">15</at>
|
|
85 |
<at name="height">17</at>
|
|
85 | 86 |
</object> |
86 | 87 |
</at> |
87 | 88 |
</object> |
... | ... | |
134 | 135 |
</object> |
135 | 136 |
</at> |
136 | 137 |
<at name="name">lblLabelSelFileName</at> |
137 |
<at name="width">149</at>
|
|
138 |
<at name="width">162</at>
|
|
138 | 139 |
<at name="text">selection_picture_file</at> |
139 | 140 |
<at name="fill"> |
140 | 141 |
<object classname="com.jeta.forms.store.properties.effects.PaintProperty"> |
141 | 142 |
<at name="name">fill</at> |
142 | 143 |
</object> |
143 | 144 |
</at> |
144 |
<at name="height">15</at>
|
|
145 |
<at name="height">17</at>
|
|
145 | 146 |
</object> |
146 | 147 |
</at> |
147 | 148 |
</object> |
... | ... | |
194 | 195 |
</object> |
195 | 196 |
</at> |
196 | 197 |
<at name="name">lblLabelSize</at> |
197 |
<at name="width">149</at>
|
|
198 |
<at name="width">162</at>
|
|
198 | 199 |
<at name="text">width</at> |
199 | 200 |
<at name="fill"> |
200 | 201 |
<object classname="com.jeta.forms.store.properties.effects.PaintProperty"> |
201 | 202 |
<at name="name">fill</at> |
202 | 203 |
</object> |
203 | 204 |
</at> |
204 |
<at name="height">15</at>
|
|
205 |
<at name="height">17</at>
|
|
205 | 206 |
</object> |
206 | 207 |
</at> |
207 | 208 |
</object> |
... | ... | |
216 | 217 |
<at name="cellconstraints"> |
217 | 218 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
218 | 219 |
<at name="column">2</at> |
219 |
<at name="row">8</at>
|
|
220 |
<at name="row">10</at>
|
|
220 | 221 |
<at name="colspan">1</at> |
221 | 222 |
<at name="rowspan">1</at> |
222 | 223 |
<at name="halign">default</at> |
... | ... | |
254 | 255 |
</object> |
255 | 256 |
</at> |
256 | 257 |
<at name="name">lblLabelX</at> |
257 |
<at name="width">149</at>
|
|
258 |
<at name="width">162</at>
|
|
258 | 259 |
<at name="text">x_offset</at> |
259 | 260 |
<at name="fill"> |
260 | 261 |
<object classname="com.jeta.forms.store.properties.effects.PaintProperty"> |
261 | 262 |
<at name="name">fill</at> |
262 | 263 |
</object> |
263 | 264 |
</at> |
264 |
<at name="height">15</at>
|
|
265 |
<at name="height">17</at>
|
|
265 | 266 |
</object> |
266 | 267 |
</at> |
267 | 268 |
</object> |
... | ... | |
276 | 277 |
<at name="cellconstraints"> |
277 | 278 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
278 | 279 |
<at name="column">2</at> |
279 |
<at name="row">10</at>
|
|
280 |
<at name="row">12</at>
|
|
280 | 281 |
<at name="colspan">1</at> |
281 | 282 |
<at name="rowspan">1</at> |
282 | 283 |
<at name="halign">default</at> |
... | ... | |
314 | 315 |
</object> |
315 | 316 |
</at> |
316 | 317 |
<at name="name">lblLabelY</at> |
317 |
<at name="width">149</at>
|
|
318 |
<at name="width">162</at>
|
|
318 | 319 |
<at name="text">y_offset</at> |
319 | 320 |
<at name="fill"> |
320 | 321 |
<object classname="com.jeta.forms.store.properties.effects.PaintProperty"> |
321 | 322 |
<at name="name">fill</at> |
322 | 323 |
</object> |
323 | 324 |
</at> |
324 |
<at name="height">15</at>
|
|
325 |
<at name="height">17</at>
|
|
325 | 326 |
</object> |
326 | 327 |
</at> |
327 | 328 |
</object> |
... | ... | |
354 | 355 |
<at name="properties"> |
355 | 356 |
<object classname="com.jeta.forms.store.support.PropertyMap"> |
356 | 357 |
<at name="name">txtSize</at> |
357 |
<at name="width">709</at>
|
|
358 |
<at name="height">20</at>
|
|
358 |
<at name="width">1031</at>
|
|
359 |
<at name="height">24</at>
|
|
359 | 360 |
</object> |
360 | 361 |
</at> |
361 | 362 |
</object> |
... | ... | |
370 | 371 |
<at name="cellconstraints"> |
371 | 372 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
372 | 373 |
<at name="column">4</at> |
373 |
<at name="row">8</at>
|
|
374 |
<at name="row">10</at>
|
|
374 | 375 |
<at name="colspan">7</at> |
375 | 376 |
<at name="rowspan">1</at> |
376 | 377 |
<at name="halign">default</at> |
... | ... | |
388 | 389 |
<at name="properties"> |
389 | 390 |
<object classname="com.jeta.forms.store.support.PropertyMap"> |
390 | 391 |
<at name="name">txtX</at> |
391 |
<at name="width">709</at>
|
|
392 |
<at name="height">20</at>
|
|
392 |
<at name="width">1031</at>
|
|
393 |
<at name="height">24</at>
|
|
393 | 394 |
</object> |
394 | 395 |
</at> |
395 | 396 |
</object> |
... | ... | |
404 | 405 |
<at name="cellconstraints"> |
405 | 406 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
406 | 407 |
<at name="column">4</at> |
407 |
<at name="row">10</at>
|
|
408 |
<at name="row">12</at>
|
|
408 | 409 |
<at name="colspan">7</at> |
409 | 410 |
<at name="rowspan">1</at> |
410 | 411 |
<at name="halign">default</at> |
... | ... | |
422 | 423 |
<at name="properties"> |
423 | 424 |
<object classname="com.jeta.forms.store.support.PropertyMap"> |
424 | 425 |
<at name="name">txtY</at> |
425 |
<at name="width">709</at>
|
|
426 |
<at name="height">20</at>
|
|
426 |
<at name="width">1031</at>
|
|
427 |
<at name="height">24</at>
|
|
427 | 428 |
</object> |
428 | 429 |
</at> |
429 | 430 |
</object> |
... | ... | |
438 | 439 |
<at name="cellconstraints"> |
439 | 440 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
440 | 441 |
<at name="column">2</at> |
441 |
<at name="row">20</at>
|
|
442 |
<at name="row">22</at>
|
|
442 | 443 |
<at name="colspan">1</at> |
443 | 444 |
<at name="rowspan">1</at> |
444 | 445 |
<at name="halign">default</at> |
... | ... | |
476 | 477 |
</object> |
477 | 478 |
</at> |
478 | 479 |
<at name="name">lblLabelXExpression</at> |
479 |
<at name="width">149</at>
|
|
480 |
<at name="text">x_offset_expression</at>
|
|
480 |
<at name="width">162</at>
|
|
481 |
<at name="text">_X_offset_expression</at>
|
|
481 | 482 |
<at name="fill"> |
482 | 483 |
<object classname="com.jeta.forms.store.properties.effects.PaintProperty"> |
483 | 484 |
<at name="name">fill</at> |
484 | 485 |
</object> |
485 | 486 |
</at> |
486 |
<at name="height">15</at>
|
|
487 |
<at name="height">17</at>
|
|
487 | 488 |
</object> |
488 | 489 |
</at> |
489 | 490 |
</object> |
... | ... | |
498 | 499 |
<at name="cellconstraints"> |
499 | 500 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
500 | 501 |
<at name="column">2</at> |
501 |
<at name="row">22</at>
|
|
502 |
<at name="row">24</at>
|
|
502 | 503 |
<at name="colspan">1</at> |
503 | 504 |
<at name="rowspan">1</at> |
504 | 505 |
<at name="halign">default</at> |
... | ... | |
536 | 537 |
</object> |
537 | 538 |
</at> |
538 | 539 |
<at name="name">lblLabelYExpression</at> |
539 |
<at name="width">149</at>
|
|
540 |
<at name="text">y_offset_expression</at>
|
|
540 |
<at name="width">162</at>
|
|
541 |
<at name="text">_Y_offset_expression</at>
|
|
541 | 542 |
<at name="fill"> |
542 | 543 |
<object classname="com.jeta.forms.store.properties.effects.PaintProperty"> |
543 | 544 |
<at name="name">fill</at> |
544 | 545 |
</object> |
545 | 546 |
</at> |
546 |
<at name="height">15</at>
|
|
547 |
<at name="height">17</at>
|
|
547 | 548 |
</object> |
548 | 549 |
</at> |
549 | 550 |
</object> |
... | ... | |
558 | 559 |
<at name="cellconstraints"> |
559 | 560 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
560 | 561 |
<at name="column">2</at> |
561 |
<at name="row">24</at>
|
|
562 |
<at name="row">26</at>
|
|
562 | 563 |
<at name="colspan">1</at> |
563 | 564 |
<at name="rowspan">1</at> |
564 | 565 |
<at name="halign">default</at> |
... | ... | |
596 | 597 |
</object> |
597 | 598 |
</at> |
598 | 599 |
<at name="name">lblLabelRotationExpression</at> |
599 |
<at name="width">149</at>
|
|
600 |
<at name="text">rotation_expression</at>
|
|
600 |
<at name="width">162</at>
|
|
601 |
<at name="text">_Rotation_expression</at>
|
|
601 | 602 |
<at name="fill"> |
602 | 603 |
<object classname="com.jeta.forms.store.properties.effects.PaintProperty"> |
603 | 604 |
<at name="name">fill</at> |
604 | 605 |
</object> |
605 | 606 |
</at> |
606 |
<at name="height">15</at>
|
|
607 |
<at name="height">17</at>
|
|
607 | 608 |
</object> |
608 | 609 |
</at> |
609 | 610 |
</object> |
... | ... | |
618 | 619 |
<at name="cellconstraints"> |
619 | 620 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
620 | 621 |
<at name="column">2</at> |
621 |
<at name="row">26</at>
|
|
622 |
<at name="row">28</at>
|
|
622 | 623 |
<at name="colspan">1</at> |
623 | 624 |
<at name="rowspan">1</at> |
624 | 625 |
<at name="halign">default</at> |
... | ... | |
656 | 657 |
</object> |
657 | 658 |
</at> |
658 | 659 |
<at name="name">lblColorLineExpression</at> |
659 |
<at name="width">149</at>
|
|
660 |
<at name="text">color_line</at>
|
|
660 |
<at name="width">162</at>
|
|
661 |
<at name="text">_Line_color_expression</at>
|
|
661 | 662 |
<at name="fill"> |
662 | 663 |
<object classname="com.jeta.forms.store.properties.effects.PaintProperty"> |
663 | 664 |
<at name="name">fill</at> |
664 | 665 |
</object> |
665 | 666 |
</at> |
666 |
<at name="height">15</at>
|
|
667 |
<at name="height">17</at>
|
|
667 | 668 |
</object> |
668 | 669 |
</at> |
669 | 670 |
</object> |
... | ... | |
678 | 679 |
<at name="cellconstraints"> |
679 | 680 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
680 | 681 |
<at name="column">6</at> |
681 |
<at name="row">24</at>
|
|
682 |
<at name="row">26</at>
|
|
682 | 683 |
<at name="colspan">1</at> |
683 | 684 |
<at name="rowspan">1</at> |
684 | 685 |
<at name="halign">default</at> |
... | ... | |
720 | 721 |
</object> |
721 | 722 |
</at> |
722 | 723 |
<at name="actionCommand">...</at> |
723 |
<at name="opaque">false</at> |
|
724 | 724 |
<at name="name">btnRotationExpression</at> |
725 |
<at name="width">19</at>
|
|
725 |
<at name="width">16</at>
|
|
726 | 726 |
<at name="text">...</at> |
727 |
<at name="height">19</at>
|
|
727 |
<at name="height">21</at>
|
|
728 | 728 |
</object> |
729 | 729 |
</at> |
730 | 730 |
</object> |
... | ... | |
739 | 739 |
<at name="cellconstraints"> |
740 | 740 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
741 | 741 |
<at name="column">4</at> |
742 |
<at name="row">20</at>
|
|
742 |
<at name="row">22</at>
|
|
743 | 743 |
<at name="colspan">1</at> |
744 | 744 |
<at name="rowspan">1</at> |
745 | 745 |
<at name="halign">default</at> |
... | ... | |
777 | 777 |
</object> |
778 | 778 |
</at> |
779 | 779 |
<at name="name">txtXOffset</at> |
780 |
<at name="width">613</at>
|
|
781 |
<at name="height">19</at>
|
|
780 |
<at name="width">947</at>
|
|
781 |
<at name="height">21</at>
|
|
782 | 782 |
</object> |
783 | 783 |
</at> |
784 | 784 |
</object> |
... | ... | |
793 | 793 |
<at name="cellconstraints"> |
794 | 794 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
795 | 795 |
<at name="column">4</at> |
796 |
<at name="row">22</at>
|
|
796 |
<at name="row">24</at>
|
|
797 | 797 |
<at name="colspan">1</at> |
798 | 798 |
<at name="rowspan">1</at> |
799 | 799 |
<at name="halign">default</at> |
... | ... | |
831 | 831 |
</object> |
832 | 832 |
</at> |
833 | 833 |
<at name="name">txtYOffset</at> |
834 |
<at name="width">613</at>
|
|
835 |
<at name="height">19</at>
|
|
834 |
<at name="width">947</at>
|
|
835 |
<at name="height">21</at>
|
|
836 | 836 |
</object> |
837 | 837 |
</at> |
838 | 838 |
</object> |
... | ... | |
847 | 847 |
<at name="cellconstraints"> |
848 | 848 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
849 | 849 |
<at name="column">4</at> |
850 |
<at name="row">24</at>
|
|
850 |
<at name="row">26</at>
|
|
851 | 851 |
<at name="colspan">1</at> |
852 | 852 |
<at name="rowspan">1</at> |
853 | 853 |
<at name="halign">default</at> |
... | ... | |
884 | 884 |
</at> |
885 | 885 |
</object> |
886 | 886 |
</at> |
887 |
<at name="name">txtRotation</at> |
|
888 |
<at name="width">613</at>
|
|
889 |
<at name="height">19</at>
|
|
887 |
<at name="name">txtRotationExp</at>
|
|
888 |
<at name="width">947</at>
|
|
889 |
<at name="height">21</at>
|
|
890 | 890 |
</object> |
891 | 891 |
</at> |
892 | 892 |
</object> |
... | ... | |
901 | 901 |
<at name="cellconstraints"> |
902 | 902 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
903 | 903 |
<at name="column">6</at> |
904 |
<at name="row">22</at>
|
|
904 |
<at name="row">24</at>
|
|
905 | 905 |
<at name="colspan">1</at> |
906 | 906 |
<at name="rowspan">1</at> |
907 | 907 |
<at name="halign">default</at> |
... | ... | |
943 | 943 |
</object> |
944 | 944 |
</at> |
945 | 945 |
<at name="actionCommand">...</at> |
946 |
<at name="opaque">false</at> |
|
947 | 946 |
<at name="name">btnYOffsetExpression</at> |
948 |
<at name="width">19</at>
|
|
947 |
<at name="width">16</at>
|
|
949 | 948 |
<at name="text">...</at> |
950 |
<at name="height">19</at>
|
|
949 |
<at name="height">21</at>
|
|
951 | 950 |
</object> |
952 | 951 |
</at> |
953 | 952 |
</object> |
... | ... | |
962 | 961 |
<at name="cellconstraints"> |
963 | 962 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
964 | 963 |
<at name="column">6</at> |
965 |
<at name="row">20</at>
|
|
964 |
<at name="row">22</at>
|
|
966 | 965 |
<at name="colspan">1</at> |
967 | 966 |
<at name="rowspan">1</at> |
968 | 967 |
<at name="halign">default</at> |
... | ... | |
1004 | 1003 |
</object> |
1005 | 1004 |
</at> |
1006 | 1005 |
<at name="actionCommand">...</at> |
1007 |
<at name="opaque">false</at> |
|
1008 | 1006 |
<at name="name">btnXOffsetExpression</at> |
1009 |
<at name="width">19</at>
|
|
1007 |
<at name="width">16</at>
|
|
1010 | 1008 |
<at name="text">...</at> |
1011 |
<at name="height">19</at>
|
|
1009 |
<at name="height">21</at>
|
|
1012 | 1010 |
</object> |
1013 | 1011 |
</at> |
1014 | 1012 |
</object> |
... | ... | |
1023 | 1021 |
<at name="cellconstraints"> |
1024 | 1022 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
1025 | 1023 |
<at name="column">8</at> |
1026 |
<at name="row">20</at>
|
|
1024 |
<at name="row">22</at>
|
|
1027 | 1025 |
<at name="colspan">1</at> |
1028 | 1026 |
<at name="rowspan">1</at> |
1029 | 1027 |
<at name="halign">default</at> |
... | ... | |
1065 | 1063 |
</object> |
1066 | 1064 |
</at> |
1067 | 1065 |
<at name="actionCommand">...</at> |
1068 |
<at name="opaque">false</at> |
|
1069 | 1066 |
<at name="name">btnXOffsetExpressionHistory</at> |
1070 |
<at name="width">19</at>
|
|
1067 |
<at name="width">16</at>
|
|
1071 | 1068 |
<at name="text">...</at> |
1072 |
<at name="height">19</at>
|
|
1069 |
<at name="height">21</at>
|
|
1073 | 1070 |
</object> |
1074 | 1071 |
</at> |
1075 | 1072 |
</object> |
... | ... | |
1084 | 1081 |
<at name="cellconstraints"> |
1085 | 1082 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
1086 | 1083 |
<at name="column">10</at> |
1087 |
<at name="row">20</at>
|
|
1084 |
<at name="row">22</at>
|
|
1088 | 1085 |
<at name="colspan">1</at> |
1089 | 1086 |
<at name="rowspan">1</at> |
1090 | 1087 |
<at name="halign">default</at> |
... | ... | |
1126 | 1123 |
</object> |
1127 | 1124 |
</at> |
1128 | 1125 |
<at name="actionCommand">...</at> |
1129 |
<at name="opaque">false</at> |
|
1130 | 1126 |
<at name="name">btnXOffsetExpressionBookmarks</at> |
1131 |
<at name="width">19</at>
|
|
1127 |
<at name="width">16</at>
|
|
1132 | 1128 |
<at name="text">...</at> |
1133 |
<at name="height">19</at>
|
|
1129 |
<at name="height">21</at>
|
|
1134 | 1130 |
</object> |
1135 | 1131 |
</at> |
1136 | 1132 |
</object> |
... | ... | |
1145 | 1141 |
<at name="cellconstraints"> |
1146 | 1142 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
1147 | 1143 |
<at name="column">8</at> |
1148 |
<at name="row">22</at>
|
|
1144 |
<at name="row">24</at>
|
|
1149 | 1145 |
<at name="colspan">1</at> |
1150 | 1146 |
<at name="rowspan">1</at> |
1151 | 1147 |
<at name="halign">default</at> |
... | ... | |
1187 | 1183 |
</object> |
1188 | 1184 |
</at> |
1189 | 1185 |
<at name="actionCommand">...</at> |
1190 |
<at name="opaque">false</at> |
|
1191 | 1186 |
<at name="name">btnYOffsetExpressionHistory</at> |
1192 |
<at name="width">19</at>
|
|
1187 |
<at name="width">16</at>
|
|
1193 | 1188 |
<at name="text">...</at> |
1194 |
<at name="height">19</at>
|
|
1189 |
<at name="height">21</at>
|
|
1195 | 1190 |
</object> |
1196 | 1191 |
</at> |
1197 | 1192 |
</object> |
... | ... | |
1206 | 1201 |
<at name="cellconstraints"> |
1207 | 1202 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
1208 | 1203 |
<at name="column">10</at> |
1209 |
<at name="row">22</at>
|
|
1204 |
<at name="row">24</at>
|
|
1210 | 1205 |
<at name="colspan">1</at> |
1211 | 1206 |
<at name="rowspan">1</at> |
1212 | 1207 |
<at name="halign">default</at> |
... | ... | |
1248 | 1243 |
</object> |
1249 | 1244 |
</at> |
1250 | 1245 |
<at name="actionCommand">...</at> |
1251 |
<at name="opaque">false</at> |
|
1252 | 1246 |
<at name="name">btnYOffsetExpressionBookmarks</at> |
1253 |
<at name="width">19</at>
|
|
1247 |
<at name="width">16</at>
|
|
1254 | 1248 |
<at name="text">...</at> |
1255 |
<at name="height">19</at>
|
|
1249 |
<at name="height">21</at>
|
|
1256 | 1250 |
</object> |
1257 | 1251 |
</at> |
1258 | 1252 |
</object> |
... | ... | |
1267 | 1261 |
<at name="cellconstraints"> |
1268 | 1262 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
1269 | 1263 |
<at name="column">8</at> |
1270 |
<at name="row">24</at>
|
|
1264 |
<at name="row">26</at>
|
|
1271 | 1265 |
<at name="colspan">1</at> |
1272 | 1266 |
<at name="rowspan">1</at> |
1273 | 1267 |
<at name="halign">default</at> |
... | ... | |
1309 | 1303 |
</object> |
1310 | 1304 |
</at> |
1311 | 1305 |
<at name="actionCommand">...</at> |
1312 |
<at name="opaque">false</at> |
|
1313 | 1306 |
<at name="name">btnRotationExpressionHistory</at> |
1314 |
<at name="width">19</at>
|
|
1307 |
<at name="width">16</at>
|
|
1315 | 1308 |
<at name="text">...</at> |
1316 |
<at name="height">19</at>
|
|
1309 |
<at name="height">21</at>
|
|
1317 | 1310 |
</object> |
1318 | 1311 |
</at> |
1319 | 1312 |
</object> |
... | ... | |
1328 | 1321 |
<at name="cellconstraints"> |
1329 | 1322 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
1330 | 1323 |
<at name="column">10</at> |
1331 |
<at name="row">24</at>
|
|
1324 |
<at name="row">26</at>
|
|
1332 | 1325 |
<at name="colspan">1</at> |
1333 | 1326 |
<at name="rowspan">1</at> |
1334 | 1327 |
<at name="halign">default</at> |
... | ... | |
1370 | 1363 |
</object> |
1371 | 1364 |
</at> |
1372 | 1365 |
<at name="actionCommand">...</at> |
1373 |
<at name="opaque">false</at> |
|
1374 | 1366 |
<at name="name">btnRotationExpressionBookmarks</at> |
1375 |
<at name="width">19</at>
|
|
1367 |
<at name="width">16</at>
|
|
1376 | 1368 |
<at name="text">...</at> |
1377 |
<at name="height">19</at>
|
|
1369 |
<at name="height">21</at>
|
|
1378 | 1370 |
</object> |
1379 | 1371 |
</at> |
1380 | 1372 |
</object> |
... | ... | |
1427 | 1419 |
</object> |
1428 | 1420 |
</at> |
1429 | 1421 |
<at name="name">txtPictureFile</at> |
1430 |
<at name="width">677</at>
|
|
1431 |
<at name="height">19</at>
|
|
1422 |
<at name="width">1003</at>
|
|
1423 |
<at name="height">21</at>
|
|
1432 | 1424 |
</object> |
1433 | 1425 |
</at> |
1434 | 1426 |
</object> |
... | ... | |
1481 | 1473 |
</object> |
1482 | 1474 |
</at> |
1483 | 1475 |
<at name="name">txtSelPictureFile</at> |
1484 |
<at name="width">677</at>
|
|
1485 |
<at name="height">19</at>
|
|
1476 |
<at name="width">1003</at>
|
|
1477 |
<at name="height">21</at>
|
|
1486 | 1478 |
</object> |
1487 | 1479 |
</at> |
1488 | 1480 |
</object> |
... | ... | |
1539 | 1531 |
</object> |
1540 | 1532 |
</at> |
1541 | 1533 |
<at name="actionCommand">...</at> |
1542 |
<at name="opaque">false</at> |
|
1543 | 1534 |
<at name="name">btnPictureFile</at> |
1544 |
<at name="width">19</at>
|
|
1535 |
<at name="width">16</at>
|
|
1545 | 1536 |
<at name="text">...</at> |
1546 |
<at name="height">19</at>
|
|
1537 |
<at name="height">21</at>
|
|
1547 | 1538 |
</object> |
1548 | 1539 |
</at> |
1549 | 1540 |
</object> |
... | ... | |
1600 | 1591 |
</object> |
1601 | 1592 |
</at> |
1602 | 1593 |
<at name="actionCommand">...</at> |
1603 |
<at name="opaque">false</at> |
|
1604 | 1594 |
<at name="name">btnSelPictureFile</at> |
1605 |
<at name="width">19</at>
|
|
1595 |
<at name="width">16</at>
|
|
1606 | 1596 |
<at name="text">...</at> |
1607 |
<at name="height">19</at>
|
|
1597 |
<at name="height">21</at>
|
|
1608 | 1598 |
</object> |
1609 | 1599 |
</at> |
1610 | 1600 |
</object> |
... | ... | |
1619 | 1609 |
<at name="cellconstraints"> |
1620 | 1610 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
1621 | 1611 |
<at name="column">2</at> |
1622 |
<at name="row">14</at>
|
|
1612 |
<at name="row">16</at>
|
|
1623 | 1613 |
<at name="colspan">1</at> |
1624 | 1614 |
<at name="rowspan">1</at> |
1625 | 1615 |
<at name="halign">default</at> |
... | ... | |
1657 | 1647 |
</object> |
1658 | 1648 |
</at> |
1659 | 1649 |
<at name="name">lblColorLine</at> |
1660 |
<at name="width">149</at>
|
|
1661 |
<at name="text">color_line</at>
|
|
1650 |
<at name="width">162</at>
|
|
1651 |
<at name="text">_Line_color</at>
|
|
1662 | 1652 |
<at name="fill"> |
1663 | 1653 |
<object classname="com.jeta.forms.store.properties.effects.PaintProperty"> |
1664 | 1654 |
<at name="name">fill</at> |
1665 | 1655 |
</object> |
1666 | 1656 |
</at> |
1667 |
<at name="height">15</at>
|
|
1657 |
<at name="height">17</at>
|
|
1668 | 1658 |
</object> |
1669 | 1659 |
</at> |
1670 | 1660 |
</object> |
... | ... | |
1679 | 1669 |
<at name="cellconstraints"> |
1680 | 1670 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
1681 | 1671 |
<at name="column">4</at> |
1682 |
<at name="row">14</at>
|
|
1672 |
<at name="row">16</at>
|
|
1683 | 1673 |
<at name="colspan">5</at> |
1684 | 1674 |
<at name="rowspan">1</at> |
1685 | 1675 |
<at name="halign">default</at> |
... | ... | |
1717 | 1707 |
</object> |
1718 | 1708 |
</at> |
1719 | 1709 |
<at name="name">txtColorLine</at> |
1720 |
<at name="width">677</at>
|
|
1721 |
<at name="height">19</at>
|
|
1710 |
<at name="width">1003</at>
|
|
1711 |
<at name="height">21</at>
|
|
1722 | 1712 |
</object> |
1723 | 1713 |
</at> |
1724 | 1714 |
</object> |
... | ... | |
1733 | 1723 |
<at name="cellconstraints"> |
1734 | 1724 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
1735 | 1725 |
<at name="column">10</at> |
1736 |
<at name="row">14</at>
|
|
1726 |
<at name="row">16</at>
|
|
1737 | 1727 |
<at name="colspan">1</at> |
1738 | 1728 |
<at name="rowspan">1</at> |
1739 | 1729 |
<at name="halign">default</at> |
... | ... | |
1775 | 1765 |
</object> |
1776 | 1766 |
</at> |
1777 | 1767 |
<at name="actionCommand">...</at> |
1778 |
<at name="opaque">false</at> |
|
1779 | 1768 |
<at name="name">btnColorLine</at> |
1780 |
<at name="width">19</at>
|
|
1769 |
<at name="width">16</at>
|
|
1781 | 1770 |
<at name="text">...</at> |
1782 |
<at name="height">19</at>
|
|
1771 |
<at name="height">21</at>
|
|
1783 | 1772 |
</object> |
1784 | 1773 |
</at> |
1785 | 1774 |
</object> |
... | ... | |
1794 | 1783 |
<at name="cellconstraints"> |
1795 | 1784 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
1796 | 1785 |
<at name="column">2</at> |
1797 |
<at name="row">12</at>
|
|
1786 |
<at name="row">14</at>
|
|
1798 | 1787 |
<at name="colspan">9</at> |
1799 | 1788 |
<at name="rowspan">1</at> |
1800 | 1789 |
<at name="halign">default</at> |
... | ... | |
1833 | 1822 |
</at> |
1834 | 1823 |
<at name="actionCommand">Join_the_insertion_point_and_the_offset_with_a_line</at> |
1835 | 1824 |
<at name="name">chkDrawLineToOffset</at> |
1836 |
<at name="width">871</at>
|
|
1825 |
<at name="width">1205</at>
|
|
1837 | 1826 |
<at name="horizontalTextPosition">2</at> |
1838 |
<at name="text">Join_the_insertion_point_and_the_offset_with_a_line</at> |
|
1839 |
<at name="height">17</at>
|
|
1827 |
<at name="text">_Join_the_insertion_point_and_the_offset_with_a_line</at>
|
|
1828 |
<at name="height">22</at>
|
|
1840 | 1829 |
</object> |
1841 | 1830 |
</at> |
1842 | 1831 |
</object> |
... | ... | |
1851 | 1840 |
<at name="cellconstraints"> |
1852 | 1841 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
1853 | 1842 |
<at name="column">2</at> |
1854 |
<at name="row">16</at>
|
|
1843 |
<at name="row">18</at>
|
|
1855 | 1844 |
<at name="colspan">9</at> |
1856 | 1845 |
<at name="rowspan">1</at> |
1857 | 1846 |
<at name="halign">default</at> |
... | ... | |
1889 | 1878 |
</object> |
1890 | 1879 |
</at> |
1891 | 1880 |
<at name="name">lblDynamicValues</at> |
1892 |
<at name="width">871</at>
|
|
1881 |
<at name="width">1205</at>
|
|
1893 | 1882 |
<at name="text">Valores dinamicos</at> |
1894 |
<at name="height">15</at>
|
|
1883 |
<at name="height">17</at>
|
|
1895 | 1884 |
</object> |
1896 | 1885 |
</at> |
1897 | 1886 |
</object> |
... | ... | |
1906 | 1895 |
<at name="cellconstraints"> |
1907 | 1896 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
1908 | 1897 |
<at name="column">4</at> |
1909 |
<at name="row">26</at>
|
|
1898 |
<at name="row">28</at>
|
|
1910 | 1899 |
<at name="colspan">1</at> |
1911 | 1900 |
<at name="rowspan">1</at> |
1912 | 1901 |
<at name="halign">default</at> |
... | ... | |
1944 | 1933 |
</object> |
1945 | 1934 |
</at> |
1946 | 1935 |
<at name="name">txtColorLineExp</at> |
1947 |
<at name="width">613</at>
|
|
1948 |
<at name="height">19</at>
|
|
1936 |
<at name="width">947</at>
|
|
1937 |
<at name="height">21</at>
|
|
1949 | 1938 |
</object> |
1950 | 1939 |
</at> |
1951 | 1940 |
</object> |
... | ... | |
1960 | 1949 |
<at name="cellconstraints"> |
1961 | 1950 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
1962 | 1951 |
<at name="column">6</at> |
1963 |
<at name="row">26</at>
|
|
1952 |
<at name="row">28</at>
|
|
1964 | 1953 |
<at name="colspan">1</at> |
1965 | 1954 |
<at name="rowspan">1</at> |
1966 | 1955 |
<at name="halign">default</at> |
... | ... | |
2002 | 1991 |
</object> |
2003 | 1992 |
</at> |
2004 | 1993 |
<at name="actionCommand">...</at> |
2005 |
<at name="opaque">false</at> |
|
2006 | 1994 |
<at name="name">btnColorLineExpression</at> |
2007 |
<at name="width">19</at>
|
|
1995 |
<at name="width">16</at>
|
|
2008 | 1996 |
<at name="text">...</at> |
2009 |
<at name="height">19</at>
|
|
1997 |
<at name="height">21</at>
|
|
2010 | 1998 |
</object> |
2011 | 1999 |
</at> |
2012 | 2000 |
</object> |
... | ... | |
2021 | 2009 |
<at name="cellconstraints"> |
2022 | 2010 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
2023 | 2011 |
<at name="column">8</at> |
2024 |
<at name="row">26</at>
|
|
2012 |
<at name="row">28</at>
|
|
2025 | 2013 |
<at name="colspan">1</at> |
2026 | 2014 |
<at name="rowspan">1</at> |
2027 | 2015 |
<at name="halign">default</at> |
... | ... | |
2063 | 2051 |
</object> |
2064 | 2052 |
</at> |
2065 | 2053 |
<at name="actionCommand">...</at> |
2066 |
<at name="opaque">false</at> |
|
2067 | 2054 |
<at name="name">btnColorLineExpressionHistory</at> |
2068 |
<at name="width">19</at>
|
|
2055 |
<at name="width">16</at>
|
|
2069 | 2056 |
<at name="text">...</at> |
2070 |
<at name="height">19</at>
|
|
2057 |
<at name="height">21</at>
|
|
2071 | 2058 |
</object> |
2072 | 2059 |
</at> |
2073 | 2060 |
</object> |
... | ... | |
2082 | 2069 |
<at name="cellconstraints"> |
2083 | 2070 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
2084 | 2071 |
<at name="column">10</at> |
2085 |
<at name="row">26</at>
|
|
2072 |
<at name="row">28</at>
|
|
2086 | 2073 |
<at name="colspan">1</at> |
2087 | 2074 |
<at name="rowspan">1</at> |
2088 | 2075 |
<at name="halign">default</at> |
... | ... | |
2124 | 2111 |
</object> |
2125 | 2112 |
</at> |
2126 | 2113 |
<at name="actionCommand">...</at> |
2127 |
<at name="opaque">false</at> |
|
2128 | 2114 |
<at name="name">btnColorLineExpressionBookmarks</at> |
2129 |
<at name="width">19</at>
|
|
2115 |
<at name="width">16</at>
|
|
2130 | 2116 |
<at name="text">...</at> |
2131 |
<at name="height">19</at>
|
|
2117 |
<at name="height">21</at>
|
|
2132 | 2118 |
</object> |
2133 | 2119 |
</at> |
2134 | 2120 |
</object> |
... | ... | |
2143 | 2129 |
<at name="cellconstraints"> |
2144 | 2130 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
2145 | 2131 |
<at name="column">2</at> |
2146 |
<at name="row">18</at>
|
|
2132 |
<at name="row">20</at>
|
|
2147 | 2133 |
<at name="colspan">1</at> |
2148 | 2134 |
<at name="rowspan">1</at> |
2149 | 2135 |
<at name="halign">default</at> |
... | ... | |
2180 | 2166 |
</at> |
2181 | 2167 |
</object> |
2182 | 2168 |
</at> |
2183 |
<at name="name">lblLabelXExpression</at>
|
|
2184 |
<at name="width">149</at>
|
|
2185 |
<at name="text">size_expression</at>
|
|
2169 |
<at name="name">lblLabelSizeExpression</at>
|
|
2170 |
<at name="width">162</at>
|
|
2171 |
<at name="text">_Size_expression</at>
|
|
2186 | 2172 |
<at name="fill"> |
2187 | 2173 |
<object classname="com.jeta.forms.store.properties.effects.PaintProperty"> |
2188 | 2174 |
<at name="name">fill</at> |
2189 | 2175 |
</object> |
2190 | 2176 |
</at> |
2191 |
<at name="height">15</at>
|
|
2177 |
<at name="height">17</at>
|
|
2192 | 2178 |
</object> |
2193 | 2179 |
</at> |
2194 | 2180 |
</object> |
... | ... | |
2203 | 2189 |
<at name="cellconstraints"> |
2204 | 2190 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
2205 | 2191 |
<at name="column">4</at> |
2206 |
<at name="row">18</at>
|
|
2192 |
<at name="row">20</at>
|
|
2207 | 2193 |
<at name="colspan">1</at> |
2208 | 2194 |
<at name="rowspan">1</at> |
2209 | 2195 |
<at name="halign">default</at> |
... | ... | |
2241 | 2227 |
</object> |
2242 | 2228 |
</at> |
2243 | 2229 |
<at name="name">txtSizeExp</at> |
2244 |
<at name="width">613</at>
|
|
2245 |
<at name="height">19</at>
|
|
2230 |
<at name="width">947</at>
|
|
2231 |
<at name="height">21</at>
|
|
2246 | 2232 |
</object> |
2247 | 2233 |
</at> |
2248 | 2234 |
</object> |
... | ... | |
2257 | 2243 |
<at name="cellconstraints"> |
2258 | 2244 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
2259 | 2245 |
<at name="column">6</at> |
2260 |
<at name="row">18</at>
|
|
2246 |
<at name="row">20</at>
|
|
2261 | 2247 |
<at name="colspan">1</at> |
2262 | 2248 |
<at name="rowspan">1</at> |
2263 | 2249 |
<at name="halign">default</at> |
... | ... | |
2299 | 2285 |
</object> |
2300 | 2286 |
</at> |
2301 | 2287 |
<at name="actionCommand">...</at> |
2302 |
<at name="opaque">false</at> |
|
2303 | 2288 |
<at name="name">btnSizeExpression</at> |
2304 |
<at name="width">19</at>
|
|
2289 |
<at name="width">16</at>
|
|
2305 | 2290 |
<at name="text">...</at> |
2306 |
<at name="height">19</at>
|
|
2291 |
<at name="height">21</at>
|
|
2307 | 2292 |
</object> |
2308 | 2293 |
</at> |
2309 | 2294 |
</object> |
... | ... | |
2318 | 2303 |
<at name="cellconstraints"> |
2319 | 2304 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
2320 | 2305 |
<at name="column">8</at> |
2321 |
<at name="row">18</at>
|
|
2306 |
<at name="row">20</at>
|
|
2322 | 2307 |
<at name="colspan">1</at> |
2323 | 2308 |
<at name="rowspan">1</at> |
2324 | 2309 |
<at name="halign">default</at> |
... | ... | |
2360 | 2345 |
</object> |
2361 | 2346 |
</at> |
2362 | 2347 |
<at name="actionCommand">...</at> |
2363 |
<at name="opaque">false</at> |
|
2364 | 2348 |
<at name="name">btnSizeExpressionHistory</at> |
2365 |
<at name="width">19</at>
|
|
2349 |
<at name="width">16</at>
|
|
2366 | 2350 |
<at name="text">...</at> |
2367 |
<at name="height">19</at>
|
|
2351 |
<at name="height">21</at>
|
|
2368 | 2352 |
</object> |
2369 | 2353 |
</at> |
2370 | 2354 |
</object> |
... | ... | |
2379 | 2363 |
<at name="cellconstraints"> |
2380 | 2364 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
2381 | 2365 |
<at name="column">10</at> |
2382 |
<at name="row">18</at>
|
|
2366 |
<at name="row">20</at>
|
|
2383 | 2367 |
<at name="colspan">1</at> |
2384 | 2368 |
<at name="rowspan">1</at> |
2385 | 2369 |
<at name="halign">default</at> |
... | ... | |
2421 | 2405 |
</object> |
2422 | 2406 |
</at> |
2423 | 2407 |
<at name="actionCommand">...</at> |
2424 |
<at name="opaque">false</at> |
|
2425 | 2408 |
<at name="name">btnSizeExpressionBookmarks</at> |
2426 |
<at name="width">19</at>
|
|
2409 |
<at name="width">16</at>
|
|
2427 | 2410 |
<at name="text">...</at> |
2428 |
<at name="height">19</at>
|
|
2411 |
<at name="height">21</at>
|
|
2429 | 2412 |
</object> |
2430 | 2413 |
</at> |
2431 | 2414 |
</object> |
... | ... | |
2433 | 2416 |
</object> |
2434 | 2417 |
</at> |
2435 | 2418 |
</item> |
2419 |
<item > |
|
2420 |
<at name="value"> |
|
2421 |
<object classname="com.jeta.forms.store.memento.BeanMemento"> |
|
2422 |
<super classname="com.jeta.forms.store.memento.ComponentMemento"> |
|
2423 |
<at name="cellconstraints"> |
|
2424 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
|
2425 |
<at name="column">2</at> |
|
2426 |
<at name="row">8</at> |
|
2427 |
<at name="colspan">1</at> |
|
2428 |
<at name="rowspan">1</at> |
|
2429 |
<at name="halign">default</at> |
|
2430 |
<at name="valign">default</at> |
|
2431 |
<at name="insets" object="insets">0,0,0,0</at> |
|
2432 |
</object> |
|
2433 |
</at> |
|
2434 |
<at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at> |
|
2435 |
</super> |
|
2436 |
<at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at> |
|
2437 |
<at name="beanclass">com.jeta.forms.components.label.JETALabel</at> |
|
2438 |
<at name="beanproperties"> |
|
2439 |
<object classname="com.jeta.forms.store.memento.PropertiesMemento"> |
|
2440 |
<at name="classname">com.jeta.forms.components.label.JETALabel</at> |
|
2441 |
<at name="properties"> |
|
2442 |
<object classname="com.jeta.forms.store.support.PropertyMap"> |
|
2443 |
<at name="border"> |
|
2444 |
<object classname="com.jeta.forms.store.properties.CompoundBorderProperty"> |
|
2445 |
<super classname="com.jeta.forms.store.properties.BorderProperty"> |
|
2446 |
<at name="name">border</at> |
|
2447 |
</super> |
|
2448 |
<at name="borders"> |
|
2449 |
<object classname="java.util.LinkedList"> |
|
2450 |
<item > |
|
2451 |
<at name="value"> |
|
2452 |
<object classname="com.jeta.forms.store.properties.DefaultBorderProperty"> |
|
2453 |
<super classname="com.jeta.forms.store.properties.BorderProperty"> |
|
2454 |
<at name="name">border</at> |
|
2455 |
</super> |
|
2456 |
</object> |
|
2457 |
</at> |
|
2458 |
</item> |
|
2459 |
</object> |
|
2460 |
</at> |
|
2461 |
</object> |
|
2462 |
</at> |
|
2463 |
<at name="name">lblLabelRotation</at> |
|
2464 |
<at name="width">162</at> |
|
2465 |
<at name="text">angle</at> |
|
2466 |
<at name="fill"> |
|
2467 |
<object classname="com.jeta.forms.store.properties.effects.PaintProperty"> |
|
2468 |
<at name="name">fill</at> |
|
2469 |
</object> |
|
2470 |
</at> |
|
2471 |
<at name="height">17</at> |
|
2472 |
</object> |
|
2473 |
</at> |
|
2474 |
</object> |
|
2475 |
</at> |
|
2476 |
</object> |
|
2477 |
</at> |
|
2478 |
</item> |
|
2479 |
<item > |
|
2480 |
<at name="value"> |
|
2481 |
<object classname="com.jeta.forms.store.memento.BeanMemento"> |
|
2482 |
<super classname="com.jeta.forms.store.memento.ComponentMemento"> |
|
2483 |
<at name="cellconstraints"> |
|
2484 |
<object classname="com.jeta.forms.store.memento.CellConstraintsMemento"> |
|
2485 |
<at name="column">4</at> |
|
2486 |
<at name="row">8</at> |
|
2487 |
<at name="colspan">7</at> |
|
2488 |
<at name="rowspan">1</at> |
|
2489 |
<at name="halign">default</at> |
|
2490 |
<at name="valign">default</at> |
|
2491 |
<at name="insets" object="insets">0,0,0,0</at> |
|
2492 |
</object> |
|
2493 |
</at> |
|
2494 |
<at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at> |
|
2495 |
</super> |
|
2496 |
<at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at> |
|
2497 |
<at name="beanclass">javax.swing.JSpinner</at> |
|
2498 |
<at name="beanproperties"> |
|
2499 |
<object classname="com.jeta.forms.store.memento.PropertiesMemento"> |
|
2500 |
<at name="classname">javax.swing.JSpinner</at> |
|
2501 |
<at name="properties"> |
|
2502 |
<object classname="com.jeta.forms.store.support.PropertyMap"> |
|
2503 |
<at name="name">txtRotation</at> |
|
2504 |
<at name="width">1031</at> |
|
2505 |
<at name="height">24</at> |
|
2506 |
</object> |
|
2507 |
</at> |
|
2508 |
</object> |
|
2509 |
</at> |
|
2510 |
</object> |
|
2511 |
</at> |
|
2512 |
</item> |
|
2436 | 2513 |
</object> |
2437 | 2514 |
</at> |
2438 | 2515 |
<at name="properties"> |
... | ... | |
2490 | 2567 |
<at name="cellpainters"> |
2491 | 2568 |
<object classname="com.jeta.forms.store.support.Matrix"> |
2492 | 2569 |
<at name="rows"> |
2493 |
<object classname="[Ljava.lang.Object;" size="27">
|
|
2570 |
<object classname="[Ljava.lang.Object;" size="29">
|
|
2494 | 2571 |
<at name="item" index="0"> |
2495 | 2572 |
<object classname="[Ljava.lang.Object;" size="11"/> |
2496 | 2573 |
</at> |
... | ... | |
2572 | 2649 |
<at name="item" index="26"> |
2573 | 2650 |
<object classname="[Ljava.lang.Object;" size="11"/> |
2574 | 2651 |
</at> |
2652 |
<at name="item" index="27"> |
|
2653 |
<object classname="[Ljava.lang.Object;" size="11"/> |
|
2654 |
</at> |
|
2655 |
<at name="item" index="28"> |
|
2656 |
<object classname="[Ljava.lang.Object;" size="11"/> |
|
2657 |
</at> |
|
2575 | 2658 |
</object> |
2576 | 2659 |
</at> |
2577 | 2660 |
</object> |
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/SymbolEditor.java | ||
---|---|---|
318 | 318 |
if (wi == null) { |
319 | 319 |
wi = new WindowInfo(WindowInfo.MODALDIALOG | WindowInfo.RESIZABLE); |
320 | 320 |
wi.setWidth(750); |
321 |
wi.setHeight(400);
|
|
321 |
wi.setHeight(500);
|
|
322 | 322 |
wi.setTitle(Messages.getText("symbol_property_editor")); |
323 | 323 |
} |
324 | 324 |
return wi; |
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/PictureMarker.java | ||
---|---|---|
115 | 115 |
toolsSwingManager.translate(view.lblLabelRotationExpression); |
116 | 116 |
toolsSwingManager.translate(view.lblLabelSelFileName); |
117 | 117 |
toolsSwingManager.translate(view.lblLabelSize); |
118 |
toolsSwingManager.translate(view.lblLabelRotation); |
|
118 | 119 |
toolsSwingManager.translate(view.lblLabelX); |
119 | 120 |
toolsSwingManager.translate(view.lblLabelXExpression); |
120 | 121 |
toolsSwingManager.translate(view.lblLabelY); |
121 | 122 |
toolsSwingManager.translate(view.lblLabelYExpression); |
123 |
toolsSwingManager.translate(view.chkDrawLineToOffset); |
|
124 |
toolsSwingManager.translate(view.lblColorLine); |
|
125 |
toolsSwingManager.translate(view.lblLabelSizeExpression); |
|
126 |
toolsSwingManager.translate(view.lblLabelXExpression); |
|
127 |
toolsSwingManager.translate(view.lblLabelYExpression); |
|
128 |
toolsSwingManager.translate(view.lblLabelRotationExpression); |
|
129 |
toolsSwingManager.translate(view.lblColorLineExpression); |
|
122 | 130 |
} |
123 | 131 |
|
124 | 132 |
/** |
... | ... | |
133 | 141 |
|
134 | 142 |
this.translate(); |
135 | 143 |
|
136 |
this.picturePicker = toolsSwingManager.createFilePickerController(view.txtPictureFile, view.btnPictureFile); |
|
144 |
this.picturePicker = toolsSwingManager.createFilePickerController( |
|
145 |
view.txtPictureFile, |
|
146 |
view.btnPictureFile, |
|
147 |
null, |
|
148 |
"PictureMarkerFiles", |
|
149 |
null, |
|
150 |
true |
|
151 |
); |
|
137 | 152 |
JPopupMenu menu = view.txtPictureFile.getComponentPopupMenu(); |
138 | 153 |
menu.add(expressionSwingManager.createJExpressionBuilderAction(view.txtPictureFile)); |
139 | 154 |
menu.add(expressionSwingManager.createUniqueTemporalFileAction(view.txtPictureFile,"picture",".png")); |
140 | 155 |
|
141 |
this.selectedPicturePicker = toolsSwingManager.createFilePickerController(view.txtSelPictureFile, view.btnSelPictureFile); |
|
156 |
this.selectedPicturePicker = toolsSwingManager.createFilePickerController( |
|
157 |
view.txtSelPictureFile, |
|
158 |
view.btnSelPictureFile, |
|
159 |
null, |
|
160 |
"PictureMarkerFiles", |
|
161 |
null, |
|
162 |
true |
|
163 |
); |
|
142 | 164 |
menu = view.txtSelPictureFile.getComponentPopupMenu(); |
143 | 165 |
menu.add(expressionSwingManager.createJExpressionBuilderAction(view.txtSelPictureFile)); |
144 | 166 |
menu.add(expressionSwingManager.createUniqueTemporalFileAction(view.txtSelPictureFile,"picture",".png")); |
... | ... | |
148 | 170 |
} |
149 | 171 |
}); |
150 | 172 |
view.txtSize.setModel(new SpinnerNumberModel(5, 0d, Double.POSITIVE_INFINITY, 0.5)); |
173 |
view.txtRotation.setModel(new SpinnerNumberModel(0, 0d, 360d, 0.5)); |
|
151 | 174 |
view.txtX.setModel(new SpinnerNumberModel(0, Integer.MIN_VALUE, Integer.MAX_VALUE, 1)); |
152 | 175 |
view.txtY.setModel(new SpinnerNumberModel(0, Integer.MIN_VALUE, Integer.MAX_VALUE, 1)); |
153 | 176 |
|
... | ... | |
174 | 197 |
view.btnYOffsetExpressionHistory |
175 | 198 |
); |
176 | 199 |
this.rotationExpPicker = expressionSwingManager.createExpressionPickerController( |
177 |
view.txtRotation, |
|
200 |
view.txtRotationExp,
|
|
178 | 201 |
view.btnRotationExpression, |
179 | 202 |
view.btnRotationExpressionBookmarks, |
180 | 203 |
view.btnRotationExpressionHistory |
... | ... | |
189 | 212 |
this.selectedPicturePicker.addChangeListener((ChangeEvent e) -> {fireSymbolChangedEvent();}); |
190 | 213 |
|
191 | 214 |
view.txtSize.addChangeListener((ChangeEvent e) -> {fireSymbolChangedEvent();}); |
215 |
view.txtRotation.addChangeListener((ChangeEvent e) -> {fireSymbolChangedEvent();}); |
|
192 | 216 |
view.txtX.addChangeListener((ChangeEvent e) -> {fireSymbolChangedEvent();}); |
193 | 217 |
view.txtY.addChangeListener((ChangeEvent e) -> {fireSymbolChangedEvent();}); |
194 | 218 |
this.colorLinePicker.addChangeListener((ChangeEvent e) -> {fireSymbolChangedEvent();}); |
... | ... | |
221 | 245 |
layer.setOffset(new Point2D.Double(getX(),getY())); |
222 | 246 |
layer.setLineToOffsetColor(this.colorLinePicker.get()); |
223 | 247 |
layer.setDrawLineToOffset(view.chkDrawLineToOffset.isSelected()); |
248 |
layer.setRotation(Math.toRadians(getRotation())); |
|
224 | 249 |
|
225 | 250 |
layer.setLineToOffsetColorExpression(getPhrase(this.colorExpPicker.get())); |
226 | 251 |
layer.setOffsetXExpression(getPhrase(this.xoffsetExpPicker.get())); |
... | ... | |
269 | 294 |
IPictureMarkerSymbol sym = (IPictureMarkerSymbol) layer; |
270 | 295 |
setValues( |
271 | 296 |
sym.getSize(), |
297 |
sym.getRotation(), |
|
272 | 298 |
sym.getOffset().getX(), |
273 | 299 |
sym.getOffset().getY(), |
274 | 300 |
sym.getSource(), |
... | ... | |
281 | 307 |
sym.getRotationExpression(), |
282 | 308 |
sym.isDrawLineToOffset() |
283 | 309 |
); |
310 |
fireSymbolChangedEvent(); |
|
284 | 311 |
} |
285 | 312 |
} catch (Exception ex) { |
286 | 313 |
LOGGER.warn("Can't refresh picture marker symbol panel.", ex); |
... | ... | |
300 | 327 |
String lineToOffsetColorExpression, |
301 | 328 |
String rotationExpression, |
302 | 329 |
boolean isDrawLineToOffset) { |
330 |
|
|
331 |
setValues(size, 0d, xOffset, yOffset, picture, selectedPicture, sizeExpression, offsetXExpression, offsetYExpression, lineToOffsetColor, lineToOffsetColorExpression, rotationExpression, isDrawLineToOffset); |
|
332 |
} |
|
333 |
protected void setValues( |
|
334 |
double size, |
|
335 |
double rotation, |
|
336 |
double xOffset, |
|
337 |
double yOffset, |
|
338 |
URL picture, |
|
339 |
URL selectedPicture, |
|
340 |
String sizeExpression, |
|
341 |
String offsetXExpression, |
|
342 |
String offsetYExpression, |
|
343 |
Color lineToOffsetColor, |
|
344 |
String lineToOffsetColorExpression, |
|
345 |
String rotationExpression, |
|
346 |
boolean isDrawLineToOffset) { |
|
303 | 347 |
|
304 | 348 |
setSize(size); |
349 |
setRotation(Math.toDegrees(rotation)); |
|
305 | 350 |
setX(xOffset); |
306 | 351 |
setY(yOffset); |
307 | 352 |
|
... | ... | |
372 | 417 |
return model.getNumber().doubleValue(); |
373 | 418 |
} |
374 | 419 |
|
420 |
protected double getRotation() { |
|
421 |
SpinnerNumberModel model = (SpinnerNumberModel) view.txtRotation.getModel(); |
|
422 |
return model.getNumber().doubleValue(); |
|
423 |
} |
|
424 |
|
|
375 | 425 |
protected double getX() { |
376 | 426 |
SpinnerNumberModel model = (SpinnerNumberModel) view.txtX.getModel(); |
377 | 427 |
return model.getNumber().doubleValue(); |
... | ... | |
395 | 445 |
model.setValue(d); |
396 | 446 |
} |
397 | 447 |
|
448 |
protected void setRotation(double degrees) { |
|
449 |
SpinnerNumberModel model = (SpinnerNumberModel) view.txtRotation.getModel(); |
|
450 |
model.setValue(degrees); |
|
451 |
} |
|
452 |
|
|
398 | 453 |
protected void setX(double d) { |
399 | 454 |
SpinnerNumberModel model = (SpinnerNumberModel) view.txtX.getModel(); |
400 | 455 |
model.setValue(d); |
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/PictureMarkerView.java | ||
---|---|---|
37 | 37 |
JButton btnRotationExpression = new JButton(); |
38 | 38 |
JTextField txtXOffset = new JTextField(); |
39 | 39 |
JTextField txtYOffset = new JTextField(); |
40 |
JTextField txtRotation = new JTextField(); |
|
40 |
JTextField txtRotationExp = new JTextField();
|
|
41 | 41 |
JButton btnYOffsetExpression = new JButton(); |
42 | 42 |
JButton btnXOffsetExpression = new JButton(); |
43 | 43 |
JButton btnXOffsetExpressionHistory = new JButton(); |
... | ... | |
59 | 59 |
JButton btnColorLineExpression = new JButton(); |
60 | 60 |
JButton btnColorLineExpressionHistory = new JButton(); |
61 | 61 |
JButton btnColorLineExpressionBookmarks = new JButton(); |
62 |
JLabel lblLabelXExpression1 = new JLabel();
|
|
62 |
JLabel lblLabelSizeExpression = new JLabel();
|
|
63 | 63 |
JTextField txtSizeExp = new JTextField(); |
64 | 64 |
JButton btnSizeExpression = new JButton(); |
65 | 65 |
JButton btnSizeExpressionHistory = new JButton(); |
66 | 66 |
JButton btnSizeExpressionBookmarks = new JButton(); |
67 |
JLabel lblLabelRotation = new JLabel(); |
|
68 |
JSpinner txtRotation = new JSpinner(); |
|
67 | 69 |
|
68 | 70 |
/** |
69 | 71 |
* Default constructor |
... | ... | |
155 | 157 |
public JPanel createPanel() |
156 | 158 |
{ |
157 | 159 |
JPanel jpanel1 = new JPanel(); |
158 |
FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE","CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE"); |
|
160 |
FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE","CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE");
|
|
159 | 161 |
CellConstraints cc = new CellConstraints(); |
160 | 162 |
jpanel1.setLayout(formlayout1); |
161 | 163 |
|
... | ... | |
173 | 175 |
|
174 | 176 |
lblLabelX.setName("lblLabelX"); |
175 | 177 |
lblLabelX.setText("x_offset"); |
176 |
jpanel1.add(lblLabelX,cc.xy(2,8));
|
|
178 |
jpanel1.add(lblLabelX,cc.xy(2,10));
|
|
177 | 179 |
|
178 | 180 |
lblLabelY.setName("lblLabelY"); |
179 | 181 |
lblLabelY.setText("y_offset"); |
180 |
jpanel1.add(lblLabelY,cc.xy(2,10));
|
|
182 |
jpanel1.add(lblLabelY,cc.xy(2,12));
|
|
181 | 183 |
|
182 | 184 |
txtSize.setName("txtSize"); |
183 | 185 |
jpanel1.add(txtSize,cc.xywh(4,6,7,1)); |
184 | 186 |
|
185 | 187 |
txtX.setName("txtX"); |
186 |
jpanel1.add(txtX,cc.xywh(4,8,7,1));
|
|
188 |
jpanel1.add(txtX,cc.xywh(4,10,7,1));
|
|
187 | 189 |
|
188 | 190 |
txtY.setName("txtY"); |
189 |
jpanel1.add(txtY,cc.xywh(4,10,7,1));
|
|
191 |
jpanel1.add(txtY,cc.xywh(4,12,7,1));
|
|
190 | 192 |
|
191 | 193 |
lblLabelXExpression.setName("lblLabelXExpression"); |
192 |
lblLabelXExpression.setText("x_offset_expression");
|
|
193 |
jpanel1.add(lblLabelXExpression,cc.xy(2,20));
|
|
194 |
lblLabelXExpression.setText("_X_offset_expression");
|
|
195 |
jpanel1.add(lblLabelXExpression,cc.xy(2,22));
|
|
194 | 196 |
|
195 | 197 |
lblLabelYExpression.setName("lblLabelYExpression"); |
196 |
lblLabelYExpression.setText("y_offset_expression");
|
|
197 |
jpanel1.add(lblLabelYExpression,cc.xy(2,22));
|
|
198 |
lblLabelYExpression.setText("_Y_offset_expression");
|
|
199 |
jpanel1.add(lblLabelYExpression,cc.xy(2,24));
|
|
198 | 200 |
|
199 | 201 |
lblLabelRotationExpression.setName("lblLabelRotationExpression"); |
200 |
lblLabelRotationExpression.setText("rotation_expression");
|
|
201 |
jpanel1.add(lblLabelRotationExpression,cc.xy(2,24));
|
|
202 |
lblLabelRotationExpression.setText("_Rotation_expression");
|
|
203 |
jpanel1.add(lblLabelRotationExpression,cc.xy(2,26));
|
|
202 | 204 |
|
203 | 205 |
lblColorLineExpression.setName("lblColorLineExpression"); |
204 |
lblColorLineExpression.setText("color_line");
|
|
205 |
jpanel1.add(lblColorLineExpression,cc.xy(2,26));
|
|
206 |
lblColorLineExpression.setText("_Line_color_expression");
|
|
207 |
jpanel1.add(lblColorLineExpression,cc.xy(2,28));
|
|
206 | 208 |
|
207 | 209 |
btnRotationExpression.setActionCommand("..."); |
208 | 210 |
btnRotationExpression.setName("btnRotationExpression"); |
209 |
btnRotationExpression.setOpaque(false); |
|
210 | 211 |
btnRotationExpression.setText("..."); |
211 | 212 |
EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2); |
212 | 213 |
btnRotationExpression.setBorder(emptyborder1); |
213 |
jpanel1.add(btnRotationExpression,cc.xy(6,24));
|
|
214 |
jpanel1.add(btnRotationExpression,cc.xy(6,26));
|
|
214 | 215 |
|
215 | 216 |
txtXOffset.setName("txtXOffset"); |
216 |
jpanel1.add(txtXOffset,cc.xy(4,20));
|
|
217 |
jpanel1.add(txtXOffset,cc.xy(4,22));
|
|
217 | 218 |
|
218 | 219 |
txtYOffset.setName("txtYOffset"); |
219 |
jpanel1.add(txtYOffset,cc.xy(4,22));
|
|
220 |
jpanel1.add(txtYOffset,cc.xy(4,24));
|
|
220 | 221 |
|
221 |
txtRotation.setName("txtRotation");
|
|
222 |
jpanel1.add(txtRotation,cc.xy(4,24));
|
|
222 |
txtRotationExp.setName("txtRotationExp");
|
|
223 |
jpanel1.add(txtRotationExp,cc.xy(4,26));
|
|
223 | 224 |
|
224 | 225 |
btnYOffsetExpression.setActionCommand("..."); |
225 | 226 |
btnYOffsetExpression.setName("btnYOffsetExpression"); |
226 |
btnYOffsetExpression.setOpaque(false); |
|
227 | 227 |
btnYOffsetExpression.setText("..."); |
228 | 228 |
EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2); |
229 | 229 |
btnYOffsetExpression.setBorder(emptyborder2); |
230 |
jpanel1.add(btnYOffsetExpression,cc.xy(6,22));
|
|
230 |
jpanel1.add(btnYOffsetExpression,cc.xy(6,24));
|
|
231 | 231 |
|
232 | 232 |
btnXOffsetExpression.setActionCommand("..."); |
233 | 233 |
btnXOffsetExpression.setName("btnXOffsetExpression"); |
234 |
btnXOffsetExpression.setOpaque(false); |
|
235 | 234 |
btnXOffsetExpression.setText("..."); |
236 | 235 |
EmptyBorder emptyborder3 = new EmptyBorder(2,2,2,2); |
237 | 236 |
btnXOffsetExpression.setBorder(emptyborder3); |
238 |
jpanel1.add(btnXOffsetExpression,cc.xy(6,20));
|
|
237 |
jpanel1.add(btnXOffsetExpression,cc.xy(6,22));
|
|
239 | 238 |
|
240 | 239 |
btnXOffsetExpressionHistory.setActionCommand("..."); |
241 | 240 |
btnXOffsetExpressionHistory.setName("btnXOffsetExpressionHistory"); |
242 |
btnXOffsetExpressionHistory.setOpaque(false); |
|
243 | 241 |
btnXOffsetExpressionHistory.setText("..."); |
244 | 242 |
EmptyBorder emptyborder4 = new EmptyBorder(2,2,2,2); |
245 | 243 |
btnXOffsetExpressionHistory.setBorder(emptyborder4); |
246 |
jpanel1.add(btnXOffsetExpressionHistory,cc.xy(8,20));
|
|
244 |
jpanel1.add(btnXOffsetExpressionHistory,cc.xy(8,22));
|
|
247 | 245 |
|
248 | 246 |
btnXOffsetExpressionBookmarks.setActionCommand("..."); |
249 | 247 |
btnXOffsetExpressionBookmarks.setName("btnXOffsetExpressionBookmarks"); |
250 |
btnXOffsetExpressionBookmarks.setOpaque(false); |
|
251 | 248 |
btnXOffsetExpressionBookmarks.setText("..."); |
252 | 249 |
EmptyBorder emptyborder5 = new EmptyBorder(2,2,2,2); |
253 | 250 |
btnXOffsetExpressionBookmarks.setBorder(emptyborder5); |
254 |
jpanel1.add(btnXOffsetExpressionBookmarks,cc.xy(10,20));
|
|
251 |
jpanel1.add(btnXOffsetExpressionBookmarks,cc.xy(10,22));
|
|
255 | 252 |
|
256 | 253 |
btnYOffsetExpressionHistory.setActionCommand("..."); |
257 | 254 |
btnYOffsetExpressionHistory.setName("btnYOffsetExpressionHistory"); |
258 |
btnYOffsetExpressionHistory.setOpaque(false); |
|
259 | 255 |
btnYOffsetExpressionHistory.setText("..."); |
260 | 256 |
EmptyBorder emptyborder6 = new EmptyBorder(2,2,2,2); |
261 | 257 |
btnYOffsetExpressionHistory.setBorder(emptyborder6); |
262 |
jpanel1.add(btnYOffsetExpressionHistory,cc.xy(8,22));
|
|
258 |
jpanel1.add(btnYOffsetExpressionHistory,cc.xy(8,24));
|
|
263 | 259 |
|
264 | 260 |
btnYOffsetExpressionBookmarks.setActionCommand("..."); |
265 | 261 |
btnYOffsetExpressionBookmarks.setName("btnYOffsetExpressionBookmarks"); |
266 |
btnYOffsetExpressionBookmarks.setOpaque(false); |
|
267 | 262 |
btnYOffsetExpressionBookmarks.setText("..."); |
268 | 263 |
EmptyBorder emptyborder7 = new EmptyBorder(2,2,2,2); |
269 | 264 |
btnYOffsetExpressionBookmarks.setBorder(emptyborder7); |
270 |
jpanel1.add(btnYOffsetExpressionBookmarks,cc.xy(10,22));
|
|
265 |
jpanel1.add(btnYOffsetExpressionBookmarks,cc.xy(10,24));
|
|
271 | 266 |
|
272 | 267 |
btnRotationExpressionHistory.setActionCommand("..."); |
273 | 268 |
btnRotationExpressionHistory.setName("btnRotationExpressionHistory"); |
274 |
btnRotationExpressionHistory.setOpaque(false); |
|
275 | 269 |
btnRotationExpressionHistory.setText("..."); |
276 | 270 |
EmptyBorder emptyborder8 = new EmptyBorder(2,2,2,2); |
277 | 271 |
btnRotationExpressionHistory.setBorder(emptyborder8); |
278 |
jpanel1.add(btnRotationExpressionHistory,cc.xy(8,24));
|
|
272 |
jpanel1.add(btnRotationExpressionHistory,cc.xy(8,26));
|
|
279 | 273 |
|
280 | 274 |
btnRotationExpressionBookmarks.setActionCommand("..."); |
281 | 275 |
btnRotationExpressionBookmarks.setName("btnRotationExpressionBookmarks"); |
Also available in: Unified diff