Revision 800

View differences:

org.gvsig.lrs/trunk/org.gvsig.lrs/org.gvsig.lrs.swing/org.gvsig.lrs.swing.impl/src/main/java/org/gvsig/lrs/swing/impl/JLrsShowMeasuresParamsView.xml
24 24
    </at>
25 25
    <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
26 26
   </super>
27
   <at name="id">/home/paco/projects/externals/gvsig-desktop/gvSIG_v2.1/org.gvsig.lrs/org.gvsig.lrs.swing/org.gvsig.lrs.swing.impl/src/main/java/org/gvsig/lrs/swing/impl/JLrsShowMeasuresParamsView.xml</at>
28
   <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:GROW(1.0),CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE</at>
29
   <at name="colspecs">FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:124PX:GROW(1.0),FILL:DEFAULT:NONE</at>
27
   <at name="id">/home/fdiaz/projects/gvSIG/org.gvsig.lrs/org.gvsig.lrs.swing/org.gvsig.lrs.swing.impl/src/main/java/org/gvsig/lrs/swing/impl/JLrsShowMeasuresParamsView.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:DEFAULT:GROW(1.0),CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
29
   <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
30 30
   <at name="components">
31 31
    <object classname="java.util.LinkedList">
32 32
     <item >
33 33
      <at name="value">
34
       <object classname="com.jeta.forms.store.memento.BeanMemento">
34
       <object classname="com.jeta.forms.store.memento.FormMemento">
35 35
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
36 36
         <at name="cellconstraints">
37 37
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
38 38
           <at name="column">2</at>
39
           <at name="row">2</at>
39
           <at name="row">10</at>
40 40
           <at name="colspan">1</at>
41 41
           <at name="rowspan">1</at>
42
           <at name="halign">default</at>
43
           <at name="valign">default</at>
44
           <at name="insets" object="insets">0,0,0,0</at>
45
          </object>
46
         </at>
47
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
48
        </super>
49
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
50
        <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
51
        <at name="beanproperties">
52
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
53
          <at name="classname">com.jeta.forms.components.label.JETALabel</at>
54
          <at name="properties">
55
           <object classname="com.jeta.forms.store.support.PropertyMap">
56
            <at name="text">distance</at>
57
            <at name="height">14</at>
58
            <at name="width">48</at>
59
            <at name="name">lblDistance</at>
60
            <at name="fill">
61
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
62
              <at name="name">fill</at>
63
             </object>
64
            </at>
65
            <at name="border">
66
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
67
              <super classname="com.jeta.forms.store.properties.BorderProperty">
68
               <at name="name">border</at>
69
              </super>
70
              <at name="borders">
71
               <object classname="java.util.LinkedList">
72
                <item >
73
                 <at name="value">
74
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
75
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
76
                    <at name="name">border</at>
77
                   </super>
78
                  </object>
79
                 </at>
80
                </item>
81
               </object>
82
              </at>
83
             </object>
84
            </at>
85
           </object>
86
          </at>
87
         </object>
88
        </at>
89
       </object>
90
      </at>
91
     </item>
92
     <item >
93
      <at name="value">
94
       <object classname="com.jeta.forms.store.memento.FormMemento">
95
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
96
         <at name="cellconstraints">
97
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
98
           <at name="column">2</at>
99
           <at name="row">4</at>
100
           <at name="colspan">3</at>
101
           <at name="rowspan">1</at>
102 42
           <at name="halign">right</at>
103 43
           <at name="valign">default</at>
104 44
           <at name="insets" object="insets">0,0,0,0</at>
......
106 46
         </at>
107 47
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
108 48
        </super>
109
        <at name="id">embedded.269660331</at>
49
        <at name="id">embedded.735374231</at>
110 50
        <at name="rowspecs">CENTER:DEFAULT:NONE</at>
111 51
        <at name="colspecs">FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
112 52
        <at name="components">
......
135 75
               <at name="classname">javax.swing.JButton</at>
136 76
               <at name="properties">
137 77
                <object classname="com.jeta.forms.store.support.PropertyMap">
138
                 <at name="text">_Accept</at>
139
                 <at name="height">22</at>
140
                 <at name="width">75</at>
141
                 <at name="name">btnAccept</at>
142
                 <at name="actionCommand">_Accept</at>
143 78
                 <at name="border">
144 79
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
145 80
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
......
160 95
                   </at>
161 96
                  </object>
162 97
                 </at>
98
                 <at name="actionCommand">_Accept</at>
99
                 <at name="name">btnAccept</at>
100
                 <at name="width">62</at>
101
                 <at name="text">_Accept</at>
102
                 <at name="height">22</at>
163 103
                </object>
164 104
               </at>
165 105
              </object>
......
191 131
               <at name="classname">javax.swing.JButton</at>
192 132
               <at name="properties">
193 133
                <object classname="com.jeta.forms.store.support.PropertyMap">
194
                 <at name="text">_Cancel</at>
195
                 <at name="height">22</at>
196
                 <at name="width">76</at>
197
                 <at name="name">btnCancel</at>
198
                 <at name="actionCommand">_Cancel</at>
199 134
                 <at name="border">
200 135
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
201 136
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
......
216 151
                   </at>
217 152
                  </object>
218 153
                 </at>
154
                 <at name="actionCommand">_Cancel</at>
155
                 <at name="name">btnCancel</at>
156
                 <at name="width">61</at>
157
                 <at name="text">_Cancel</at>
158
                 <at name="height">22</at>
219 159
                </object>
220 160
               </at>
221 161
              </object>
......
230 170
          <at name="classname">com.jeta.forms.gui.form.GridView</at>
231 171
          <at name="properties">
232 172
           <object classname="com.jeta.forms.store.support.PropertyMap">
233
            <at name="name"/>
173
            <at name="border">
174
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
175
              <super classname="com.jeta.forms.store.properties.BorderProperty">
176
               <at name="name">border</at>
177
              </super>
178
              <at name="borders">
179
               <object classname="java.util.LinkedList"/>
180
              </at>
181
             </object>
182
            </at>
183
            <at name="name"></at>
234 184
            <at name="fill">
235 185
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
236 186
              <at name="name">fill</at>
......
263 213
              </at>
264 214
             </object>
265 215
            </at>
266
            <at name="border">
267
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
268
              <super classname="com.jeta.forms.store.properties.BorderProperty">
269
               <at name="name">border</at>
270
              </super>
271
              <at name="borders">
272
               <object classname="java.util.LinkedList"/>
273
              </at>
274
             </object>
275
            </at>
276 216
           </object>
277 217
          </at>
278 218
         </object>
......
311 251
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
312 252
         <at name="cellconstraints">
313 253
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
314
           <at name="column">4</at>
254
           <at name="column">2</at>
315 255
           <at name="row">2</at>
316 256
           <at name="colspan">1</at>
317 257
           <at name="rowspan">1</at>
......
323 263
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
324 264
        </super>
325 265
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
266
        <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
267
        <at name="beanproperties">
268
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
269
          <at name="classname">com.jeta.forms.components.label.JETALabel</at>
270
          <at name="properties">
271
           <object classname="com.jeta.forms.store.support.PropertyMap">
272
            <at name="border">
273
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
274
              <super classname="com.jeta.forms.store.properties.BorderProperty">
275
               <at name="name">border</at>
276
              </super>
277
              <at name="borders">
278
               <object classname="java.util.LinkedList">
279
                <item >
280
                 <at name="value">
281
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
282
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
283
                    <at name="name">border</at>
284
                   </super>
285
                  </object>
286
                 </at>
287
                </item>
288
               </object>
289
              </at>
290
             </object>
291
            </at>
292
            <at name="name">lblUnits</at>
293
            <at name="width">1247</at>
294
            <at name="text">_Data_units</at>
295
            <at name="fill">
296
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
297
              <at name="name">fill</at>
298
             </object>
299
            </at>
300
            <at name="toolTipText">_Units_of_measure_of_the_M_coordinate_of_the_layer</at>
301
            <at name="height">17</at>
302
           </object>
303
          </at>
304
         </object>
305
        </at>
306
       </object>
307
      </at>
308
     </item>
309
     <item >
310
      <at name="value">
311
       <object classname="com.jeta.forms.store.memento.BeanMemento">
312
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
313
         <at name="cellconstraints">
314
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
315
           <at name="column">2</at>
316
           <at name="row">4</at>
317
           <at name="colspan">1</at>
318
           <at name="rowspan">1</at>
319
           <at name="halign">default</at>
320
           <at name="valign">default</at>
321
           <at name="insets" object="insets">0,0,0,0</at>
322
          </object>
323
         </at>
324
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
325
        </super>
326
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
327
        <at name="beanclass">javax.swing.JComboBox</at>
328
        <at name="beanproperties">
329
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
330
          <at name="classname">javax.swing.JComboBox</at>
331
          <at name="properties">
332
           <object classname="com.jeta.forms.store.support.PropertyMap">
333
            <at name="border">
334
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
335
              <super classname="com.jeta.forms.store.properties.BorderProperty">
336
               <at name="name">border</at>
337
              </super>
338
              <at name="borders">
339
               <object classname="java.util.LinkedList">
340
                <item >
341
                 <at name="value">
342
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
343
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
344
                    <at name="name">border</at>
345
                   </super>
346
                  </object>
347
                 </at>
348
                </item>
349
               </object>
350
              </at>
351
             </object>
352
            </at>
353
            <at name="name">cboUnits</at>
354
            <at name="width">1247</at>
355
            <at name="items">
356
             <object classname="com.jeta.forms.store.properties.ItemsProperty">
357
              <at name="name">items</at>
358
             </object>
359
            </at>
360
            <at name="toolTipText">_Units_of_measure_of_the_M_coordinate_of_the_layer</at>
361
            <at name="height">23</at>
362
           </object>
363
          </at>
364
         </object>
365
        </at>
366
       </object>
367
      </at>
368
     </item>
369
     <item >
370
      <at name="value">
371
       <object classname="com.jeta.forms.store.memento.BeanMemento">
372
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
373
         <at name="cellconstraints">
374
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
375
           <at name="column">2</at>
376
           <at name="row">6</at>
377
           <at name="colspan">1</at>
378
           <at name="rowspan">1</at>
379
           <at name="halign">default</at>
380
           <at name="valign">default</at>
381
           <at name="insets" object="insets">0,0,0,0</at>
382
          </object>
383
         </at>
384
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
385
        </super>
386
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
387
        <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
388
        <at name="beanproperties">
389
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
390
          <at name="classname">com.jeta.forms.components.label.JETALabel</at>
391
          <at name="properties">
392
           <object classname="com.jeta.forms.store.support.PropertyMap">
393
            <at name="border">
394
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
395
              <super classname="com.jeta.forms.store.properties.BorderProperty">
396
               <at name="name">border</at>
397
              </super>
398
              <at name="borders">
399
               <object classname="java.util.LinkedList">
400
                <item >
401
                 <at name="value">
402
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
403
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
404
                    <at name="name">border</at>
405
                   </super>
406
                  </object>
407
                 </at>
408
                </item>
409
               </object>
410
              </at>
411
             </object>
412
            </at>
413
            <at name="name">lblDistance</at>
414
            <at name="width">1247</at>
415
            <at name="text">distance</at>
416
            <at name="fill">
417
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
418
              <at name="name">fill</at>
419
             </object>
420
            </at>
421
            <at name="height">17</at>
422
           </object>
423
          </at>
424
         </object>
425
        </at>
426
       </object>
427
      </at>
428
     </item>
429
     <item >
430
      <at name="value">
431
       <object classname="com.jeta.forms.store.memento.BeanMemento">
432
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
433
         <at name="cellconstraints">
434
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
435
           <at name="column">2</at>
436
           <at name="row">8</at>
437
           <at name="colspan">1</at>
438
           <at name="rowspan">1</at>
439
           <at name="halign">default</at>
440
           <at name="valign">default</at>
441
           <at name="insets" object="insets">0,0,0,0</at>
442
          </object>
443
         </at>
444
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
445
        </super>
446
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
326 447
        <at name="beanclass">javax.swing.JTextField</at>
327 448
        <at name="beanproperties">
328 449
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
329 450
          <at name="classname">javax.swing.JTextField</at>
330 451
          <at name="properties">
331 452
           <object classname="com.jeta.forms.store.support.PropertyMap">
332
            <at name="height">20</at>
333
            <at name="width">846</at>
334
            <at name="name">txtDistance</at>
335 453
            <at name="border">
336 454
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
337 455
              <super classname="com.jeta.forms.store.properties.BorderProperty">
......
352 470
              </at>
353 471
             </object>
354 472
            </at>
473
            <at name="name">txtDistance</at>
474
            <at name="width">1247</at>
475
            <at name="height">21</at>
355 476
           </object>
356 477
          </at>
357 478
         </object>
......
366 487
     <at name="classname">com.jeta.forms.gui.form.GridView</at>
367 488
     <at name="properties">
368 489
      <object classname="com.jeta.forms.store.support.PropertyMap">
369
       <at name="name"/>
490
       <at name="border">
491
        <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
492
         <super classname="com.jeta.forms.store.properties.BorderProperty">
493
          <at name="name">border</at>
494
         </super>
495
         <at name="borders">
496
          <object classname="java.util.LinkedList"/>
497
         </at>
498
        </object>
499
       </at>
500
       <at name="name"></at>
370 501
       <at name="fill">
371 502
        <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
372 503
         <at name="name">fill</at>
......
399 530
         </at>
400 531
        </object>
401 532
       </at>
402
       <at name="border">
403
        <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
404
         <super classname="com.jeta.forms.store.properties.BorderProperty">
405
          <at name="name">border</at>
406
         </super>
407
         <at name="borders">
408
          <object classname="java.util.LinkedList"/>
409
         </at>
410
        </object>
411
       </at>
412 533
      </object>
413 534
     </at>
414 535
    </object>
......
416 537
   <at name="cellpainters">
417 538
    <object classname="com.jeta.forms.store.support.Matrix">
418 539
     <at name="rows">
419
      <object classname="[Ljava.lang.Object;" size="5">
540
      <object classname="[Ljava.lang.Object;" size="11">
420 541
       <at name="item" index="0">
421
        <object classname="[Ljava.lang.Object;" size="5"/>
542
        <object classname="[Ljava.lang.Object;" size="3"/>
422 543
       </at>
423 544
       <at name="item" index="1">
424
        <object classname="[Ljava.lang.Object;" size="5"/>
545
        <object classname="[Ljava.lang.Object;" size="3"/>
425 546
       </at>
426 547
       <at name="item" index="2">
427
        <object classname="[Ljava.lang.Object;" size="5"/>
548
        <object classname="[Ljava.lang.Object;" size="3"/>
428 549
       </at>
429 550
       <at name="item" index="3">
430
        <object classname="[Ljava.lang.Object;" size="5"/>
551
        <object classname="[Ljava.lang.Object;" size="3"/>
431 552
       </at>
432 553
       <at name="item" index="4">
433
        <object classname="[Ljava.lang.Object;" size="5"/>
554
        <object classname="[Ljava.lang.Object;" size="3"/>
434 555
       </at>
556
       <at name="item" index="5">
557
        <object classname="[Ljava.lang.Object;" size="3"/>
558
       </at>
559
       <at name="item" index="6">
560
        <object classname="[Ljava.lang.Object;" size="3"/>
561
       </at>
562
       <at name="item" index="7">
563
        <object classname="[Ljava.lang.Object;" size="3"/>
564
       </at>
565
       <at name="item" index="8">
566
        <object classname="[Ljava.lang.Object;" size="3"/>
567
       </at>
568
       <at name="item" index="9">
569
        <object classname="[Ljava.lang.Object;" size="3"/>
570
       </at>
571
       <at name="item" index="10">
572
        <object classname="[Ljava.lang.Object;" size="3"/>
573
       </at>
435 574
      </object>
436 575
     </at>
437 576
    </object>
org.gvsig.lrs/trunk/org.gvsig.lrs/org.gvsig.lrs.swing/org.gvsig.lrs.swing.impl/src/main/java/org/gvsig/lrs/swing/impl/JLrsShowMeasuresParamsView.java
1 1
package org.gvsig.lrs.swing.impl;
2 2

  
3
import com.jeta.open.i18n.I18NUtils;
3 4
import com.jgoodies.forms.layout.CellConstraints;
4 5
import com.jgoodies.forms.layout.FormLayout;
5 6
import java.awt.BorderLayout;
......
9 10
import javax.swing.Box;
10 11
import javax.swing.ImageIcon;
11 12
import javax.swing.JButton;
13
import javax.swing.JComboBox;
12 14
import javax.swing.JFrame;
13 15
import javax.swing.JLabel;
14 16
import javax.swing.JPanel;
......
17 19

  
18 20
public class JLrsShowMeasuresParamsView extends JPanel
19 21
{
20
   JLabel lblDistance = new JLabel();
21 22
   JButton btnAccept = new JButton();
22 23
   JButton btnCancel = new JButton();
24
   JLabel lblUnits = new JLabel();
25
   JComboBox cboUnits = new JComboBox();
26
   JLabel lblDistance = new JLabel();
23 27
   JTextField txtDistance = new JTextField();
24 28

  
25 29
   /**
......
98 102
   }
99 103

  
100 104
   /**
101
    * Method for recalculating the component orientation for
105
    * Method for recalculating the component orientation for 
102 106
    * right-to-left Locales.
103 107
    * @param orientation the component orientation to be applied
104 108
    */
......
112 116
   public JPanel createPanel()
113 117
   {
114 118
      JPanel jpanel1 = new JPanel();
115
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:124PX:GROW(1.0),FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:GROW(1.0),CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE");
119
      FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),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:DEFAULT:GROW(1.0),CENTER:DEFAULT:NONE,CENTER:2DLU:NONE");
116 120
      CellConstraints cc = new CellConstraints();
117 121
      jpanel1.setLayout(formlayout1);
118 122

  
123
      jpanel1.add(createPanel1(),new CellConstraints(2,10,1,1,CellConstraints.RIGHT,CellConstraints.DEFAULT));
124
      lblUnits.setName("lblUnits");
125
      lblUnits.setText("_Data_units");
126
      lblUnits.setToolTipText("_Units_of_measure_of_the_M_coordinate_of_the_layer");
127
      jpanel1.add(lblUnits,cc.xy(2,2));
128

  
129
      cboUnits.setName("cboUnits");
130
      cboUnits.setToolTipText("_Units_of_measure_of_the_M_coordinate_of_the_layer");
131
      jpanel1.add(cboUnits,cc.xy(2,4));
132

  
119 133
      lblDistance.setName("lblDistance");
120 134
      lblDistance.setText("distance");
121
      jpanel1.add(lblDistance,cc.xy(2,2));
135
      jpanel1.add(lblDistance,cc.xy(2,6));
122 136

  
123
      jpanel1.add(createPanel1(),new CellConstraints(2,4,3,1,CellConstraints.RIGHT,CellConstraints.DEFAULT));
124 137
      txtDistance.setName("txtDistance");
125
      jpanel1.add(txtDistance,cc.xy(4,2));
138
      jpanel1.add(txtDistance,cc.xy(2,8));
126 139

  
127
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5 },new int[]{ 1,2,3,4,5 });
140
      addFillComponents(jpanel1,new int[]{ 1,2,3 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11 });
128 141
      return jpanel1;
129 142
   }
130 143

  
org.gvsig.lrs/trunk/org.gvsig.lrs/org.gvsig.lrs.swing/org.gvsig.lrs.swing.impl/src/main/java/org/gvsig/lrs/swing/impl/JLrsShowMeasuresParamsController.java
8 8

  
9 9
import java.awt.event.ActionEvent;
10 10
import java.awt.event.ActionListener;
11
import java.awt.event.ItemEvent;
12
import java.awt.event.ItemListener;
13
import java.io.File;
14
import java.text.ParseException;
15
import java.util.Iterator;
16 11
import java.util.Locale;
17

  
18
import javax.swing.ComboBoxModel;
19
import javax.swing.DefaultComboBoxModel;
20 12
import javax.swing.JComponent;
21
import javax.swing.JFormattedTextField;
22
import javax.swing.JOptionPane;
23
import javax.swing.ListCellRenderer;
24
import javax.swing.text.MaskFormatter;
25

  
26
import org.apache.commons.io.FileUtils;
27
import org.apache.commons.lang3.StringUtils;
28
import org.cresques.cts.IProjection;
29
import org.gvsig.fmap.dal.DALLocator;
30
import org.gvsig.fmap.dal.DataManager;
31
import org.gvsig.fmap.dal.DataStoreParameters;
32
import org.gvsig.fmap.dal.exception.DataException;
33
import org.gvsig.fmap.dal.exception.ReadException;
34
import org.gvsig.fmap.dal.feature.EditableFeatureAttributeDescriptor;
35
import org.gvsig.fmap.dal.feature.EditableFeatureType;
36
import org.gvsig.fmap.dal.feature.Feature;
37
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
38
import org.gvsig.fmap.dal.feature.FeatureSelection;
39
import org.gvsig.fmap.dal.feature.FeatureStore;
40
import org.gvsig.fmap.dal.feature.FeatureType;
41
import org.gvsig.fmap.dal.feature.NewFeatureStoreParameters;
42
import org.gvsig.fmap.dal.store.shp.SHPNewStoreParameters;
43
import org.gvsig.fmap.geom.DataTypes;
44
import org.gvsig.fmap.geom.Geometry;
45
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
46
import org.gvsig.fmap.geom.Geometry.TYPES;
47
import org.gvsig.fmap.geom.GeometryException;
48
import org.gvsig.fmap.geom.GeometryLocator;
49 13
import org.gvsig.fmap.mapcontext.layers.FLayer;
50
import org.gvsig.fmap.mapcontext.layers.operations.LayerCollection;
51
import org.gvsig.fmap.mapcontext.layers.operations.LayersVisitor;
52
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
53
import org.gvsig.lrs.lib.api.DistanceUnits;
54 14
import org.gvsig.lrs.lib.api.LrsAlgorithmParams;
55 15
import org.gvsig.lrs.lib.api.LrsAlgorithmsLocator;
56 16
import org.gvsig.lrs.lib.api.LrsAlgorithmsManager;
57
import org.gvsig.lrs.lib.api.LrsCalibrateRouteAlgorithmParams;
58
import org.gvsig.lrs.lib.api.LrsMeasureCalculationMethods;
59 17
import org.gvsig.lrs.lib.api.LrsShowMeasuresAlgorithmParams;
18
import static org.gvsig.lrs.lib.api.LrsShowMeasuresAlgorithmParams.LRS_SHOWMEASURES_KILOMETER;
19
import static org.gvsig.lrs.lib.api.LrsShowMeasuresAlgorithmParams.LRS_SHOWMEASURES_KILOMETER_LABEL;
20
import static org.gvsig.lrs.lib.api.LrsShowMeasuresAlgorithmParams.LRS_SHOWMEASURES_METER;
21
import static org.gvsig.lrs.lib.api.LrsShowMeasuresAlgorithmParams.LRS_SHOWMEASURES_METER_LABEL;
22
import static org.gvsig.lrs.lib.api.LrsShowMeasuresAlgorithmParams.LRS_SHOWMEASURES_UNKNOWN_OTHER;
23
import static org.gvsig.lrs.lib.api.LrsShowMeasuresAlgorithmParams.LRS_SHOWMEASURES_UNKNOWN_OTHER_LABEL;
60 24
import org.gvsig.lrs.lib.api.exceptions.LrsGettingParametersException;
61 25
import org.gvsig.lrs.lib.api.exceptions.LrsNeededParameterException;
62 26
import org.gvsig.lrs.swing.api.JLrsAlgorithmParams;
63 27
import org.gvsig.tools.ToolsLocator;
64
import org.gvsig.tools.exception.BaseException;
65 28
import org.gvsig.tools.i18n.I18nManager;
66
import org.gvsig.tools.locator.LocatorException;
67 29
import org.gvsig.tools.swing.api.ActionListenerSupport;
68 30
import org.gvsig.tools.swing.api.ToolsSwingLocator;
69
import org.gvsig.tools.swing.api.threadsafedialogs.ThreadSafeDialogsManager;
70
import org.gvsig.tools.visitor.VisitCanceledException;
31
import org.gvsig.tools.swing.api.ToolsSwingManager;
32
import org.gvsig.tools.swing.api.ToolsSwingUtils;
33
import org.gvsig.tools.util.LabeledValue;
34
import org.gvsig.tools.util.LabeledValueImpl;
71 35
import org.slf4j.Logger;
72 36
import org.slf4j.LoggerFactory;
73 37

  
74
public class JLrsShowMeasuresParamsController extends JLrsShowMeasuresParamsView  implements JLrsAlgorithmParams{
38
public final class JLrsShowMeasuresParamsController extends JLrsShowMeasuresParamsView  implements JLrsAlgorithmParams{
75 39

  
76 40
    /**
77 41
     *
......
79 43
    private static final Logger logger = LoggerFactory.getLogger(JLrsShowMeasuresParamsController.class);
80 44

  
81 45
    private boolean canceled;
82
    private ActionListenerSupport listeners = ToolsSwingLocator.getToolsSwingManager().createActionListenerSupport();
46
    private final ActionListenerSupport listeners = ToolsSwingLocator.getToolsSwingManager().createActionListenerSupport();
83 47

  
84
    private FLayer layer;
48
    private final FLayer layer;
85 49

  
86 50
    /**
51
     * @param layer
52
     * @param params
87 53
     * @param layers
88 54
     * @throws LrsNeededParameterException
89 55
     *
......
96 62
        setParams(params);
97 63
    }
98 64

  
65
    @Override
99 66
    public void addActionListener(ActionListener listener) {
100 67
        listeners.addActionListener(listener);
101 68
    }
102 69

  
70
    @Override
103 71
    public void removeActionListener(ActionListener listener) {
104 72
        listeners.removeActionListener(listener);
105 73
    }
106 74

  
107 75
    private void translate() {
108
        I18nManager i18nManager = ToolsLocator.getI18nManager();
76
        ToolsSwingManager toolsSwingManager = ToolsSwingLocator.getToolsSwingManager();
77
        toolsSwingManager.translate(lblDistance);
78
        toolsSwingManager.translate(txtDistance);
79
        toolsSwingManager.translate(lblUnits);
80
        toolsSwingManager.translate(cboUnits);
109 81

  
110
        lblDistance.setText(i18nManager.getTranslation(lblDistance.getText()));
111

  
112
        btnAccept.setText(i18nManager.getTranslation(btnAccept.getText()));
113
        btnCancel.setText(i18nManager.getTranslation(btnCancel.getText()));
114

  
82
        toolsSwingManager.translate(btnAccept);
83
        toolsSwingManager.translate(btnCancel);
115 84
    }
116 85

  
117 86
    /**
118 87
     *
88
     * @param locale
119 89
     */
120 90
    public void setLocate(Locale locale) {
121 91
        Locale l = super.getLocale();
......
128 98
    /**
129 99
     *  Validates one curve M-layer with selected features
130 100
     *  if it is not correct throws an exception
101
     * @param layer
131 102
     * @throws LrsNeededParameterException
132 103
     */
133 104
    public static void validateLayer(FLayer layer)throws LrsNeededParameterException {
......
152 123

  
153 124
        validateLayer(layer);
154 125

  
155
        txtDistance.setText(new Double(0).toString());
126
        txtDistance.setText(Double.toString(0d));
156 127

  
157
        this.btnAccept.addActionListener(new ActionListener() {
158

  
159
            public void actionPerformed(ActionEvent e) {
160
                canceled = false;
161
                doClose();
162
                listeners.fireActionEvent(new ActionEvent(JLrsShowMeasuresParamsController.this, 0, "accept"));
163

  
164
            }
128
        this.btnAccept.addActionListener((ActionEvent e) -> {
129
            canceled = false;
130
            doClose();
131
            listeners.fireActionEvent(new ActionEvent(JLrsShowMeasuresParamsController.this, 0, "accept"));
165 132
        });
133
        
134
        I18nManager i18n = ToolsLocator.getI18nManager();
166 135

  
167
        this.btnCancel.addActionListener(new ActionListener() {
136
        this.cboUnits.addItem(new LabeledValueImpl<>(i18n.getTranslation(LRS_SHOWMEASURES_UNKNOWN_OTHER_LABEL), LRS_SHOWMEASURES_UNKNOWN_OTHER));
137
        this.cboUnits.addItem(new LabeledValueImpl<>(i18n.getTranslation(LRS_SHOWMEASURES_METER_LABEL), LRS_SHOWMEASURES_METER));
138
        this.cboUnits.addItem(new LabeledValueImpl<>(i18n.getTranslation(LRS_SHOWMEASURES_KILOMETER_LABEL), LRS_SHOWMEASURES_KILOMETER));
168 139

  
169
            public void actionPerformed(ActionEvent e) {
170
                canceled = true;
171
                doClose();
172
                listeners.fireActionEvent(new ActionEvent(JLrsShowMeasuresParamsController.this, 0, "cancel"));
173
            }
140
        this.btnCancel.addActionListener((ActionEvent e) -> {
141
            canceled = true;
142
            doClose();
143
            listeners.fireActionEvent(new ActionEvent(JLrsShowMeasuresParamsController.this, 0, "cancel"));
174 144
        });
175 145

  
176 146
        setVisibleAceptCancel(false);
177 147
        canceled = false;
148
        
149
        ToolsSwingUtils.ensureRowsCols(this, 8, 50);
150

  
178 151
    }
179 152

  
180 153

  
......
183 156
        this.setVisible(false);
184 157
    }
185 158

  
159
    @Override
186 160
    public boolean isCanceled() {
187 161
        return this.canceled;
188 162
    }
189 163

  
164
    @Override
190 165
    public void setVisibleAceptCancel(boolean visible) {
191 166
        this.btnAccept.setVisible(visible);
192 167
        this.btnCancel.setVisible(visible);
193 168
    }
194 169

  
170
    @Override
195 171
    public boolean getVisibleAceptCancel() {
196 172
        return this.btnAccept.isVisible();
197 173
    }
198 174

  
175
    @Override
199 176
    public JComponent asJComponent() {
200 177
        return this;
201 178
    }
202 179

  
180
    @Override
203 181
    public LrsAlgorithmParams getParams() throws LrsGettingParametersException, LrsNeededParameterException {
204 182
        LrsAlgorithmsManager manager = LrsAlgorithmsLocator.getLrsAlgorithmsManager();
205 183
        LrsShowMeasuresAlgorithmParams params = manager.createLrsShowMeasuresAlgorithmParams();
......
207 185

  
208 186
        try {
209 187
            Double distance = Double.valueOf(this.txtDistance.getText());
210
            params.setDistance((Double)distance);
188
            params.setDistance(distance);
189

  
190
            Object item = this.cboUnits.getSelectedItem();
191
            if(item instanceof LabeledValue){
192
                Integer units = (Integer) ((LabeledValue)item).getValue();
193
                params.setUnits(units);
194
            }
195
            
211 196
        } catch (Exception e) {
212 197
            params.setDistance(1);
213 198
        }
org.gvsig.lrs/trunk/org.gvsig.lrs/org.gvsig.lrs.app/org.gvsig.lrs.app.mainplugin/src/main/java/org/gvsig/lrs/app/showmeasures/ShowMeasuresExtension.java
69 69
import org.gvsig.lrs.lib.api.LrsAlgorithmsLocator;
70 70
import org.gvsig.lrs.lib.api.LrsAlgorithmsManager;
71 71
import org.gvsig.lrs.lib.api.LrsShowMeasuresAlgorithmParams;
72
import static org.gvsig.lrs.lib.api.LrsShowMeasuresAlgorithmParams.LRS_SHOWMEASURES_KILOMETER;
73
import static org.gvsig.lrs.lib.api.LrsShowMeasuresAlgorithmParams.LRS_SHOWMEASURES_METER;
72 74
import org.gvsig.lrs.lib.api.exceptions.LrsGettingParametersException;
73 75
import org.gvsig.lrs.lib.api.exceptions.LrsNeededParameterException;
74 76
import org.gvsig.lrs.swing.api.JLrsAlgorithmParams;
......
169 171
                        WindowManager.MODE.WINDOW);
170 172

  
171 173
                    final double distance = params.getDistance();
174
                    final int units = params.getUnits();
172 175

  
173 176
                    Thread task = new Thread(new Runnable() {
174 177

  
175 178
                        public void run() {
176 179
                            try {
177
                                showMeasures(graphics, activeLayer, distance, taskStatus);
180
                                showMeasures(graphics, activeLayer, distance, units, taskStatus);
178 181
                                mapContext.invalidate();
179 182
                                if(!taskStatus.isRunning() && progressDialog.asJComponent().isVisible()){
180 183
                                    progressDialog.asJComponent().setVisible(false);
......
241 244
     * Shows measurements along the selected features in a layer with a fixed spacing
242 245
     *
243 246
     */
244
    private void showMeasures(GraphicLayer graphics, FLyrVect layer, double distance, SimpleTaskStatus taskStatus)
247
    private void showMeasures(GraphicLayer graphics, FLyrVect layer, double distance, int units, SimpleTaskStatus taskStatus)
245 248
        throws DataException, CreateGeometryException, LocatorException {
246 249
        FeatureStore featureStore = layer.getFeatureStore();
247 250
        FeatureSelection selection = featureStore.getFeatureSelection();
......
256 259
                Feature feature = (Feature) it.next();
257 260
                Geometry geometry = feature.getDefaultGeometry();
258 261
                if (geometry instanceof Line) {
259
                    curValue = showLineMeasures(graphics, curValue, (Line) geometry, distance, ct);
262
                    curValue = showLineMeasures(graphics, curValue, (Line) geometry, distance, units, ct);
260 263
                    taskStatus.setCurValue(curValue);
261 264
                } else if (geometry instanceof MultiLine) {
262 265
                    MultiLine multiLine = (MultiLine) geometry;
263 266
                    int primitives = multiLine.getPrimitivesNumber();
264 267
                    for (int i = 0; i < primitives; i++) {
265
                        curValue = showLineMeasures(graphics, curValue, (Line) multiLine.getPrimitiveAt(i), distance, ct);
268
                        curValue = showLineMeasures(graphics, curValue, (Line) multiLine.getPrimitiveAt(i), distance, units, ct);
266 269
                        taskStatus.setCurValue(curValue);
267 270
                    }
268 271
                }
......
283 286
     * @throws LocatorException
284 287
     * @throws CreateGeometryException
285 288
     */
286
    private long showLineMeasures(GraphicLayer graphics, long curValue, Line line, Double distance, ICoordTrans ct) throws CreateGeometryException, LocatorException {
289
    private long showLineMeasures(GraphicLayer graphics, long curValue, Line line, Double distance, int units, ICoordTrans ct) throws CreateGeometryException, LocatorException {
287 290
        long value = curValue;
288 291
        for (int i = 0; i < line.getNumVertices() - 1; i++) {
289 292
            value++;
......
292 295

  
293 296
            double div = m0 / distance;
294 297
            if (isMultiple(m0, distance)) {
295
                showMeasure(graphics, vertex, m0, ct);
298
                showMeasure(graphics, vertex, m0, units, ct);
296 299
            }
297 300
            Point nextVertex = line.getVertex(i + 1);
298 301
            double m1 = nextVertex.getCoordinateAt(vertex.getDimension() - 1);
......
300 303
            for (Iterator iterator = multiples.iterator(); iterator.hasNext();) {
301 304
                Double m = (Double) iterator.next();
302 305
                Point point = getPointWithMBetweenTwoVertex(m, vertex, nextVertex);
303
                showMeasure(graphics, point, m, ct);
306
                showMeasure(graphics, point, m, units, ct);
304 307
            }
305 308
        }
306 309
        value++;
......
313 316
     * @param m
314 317
     * @param ct
315 318
     */
316
    private void showMeasure(GraphicLayer graphics, Point p, double m, ICoordTrans ct) {
319
    private void showMeasure(GraphicLayer graphics, Point p, double m, int units, ICoordTrans ct) {
317 320

  
318 321
        GeometryManager geomManager = GeometryLocator.getGeometryManager();
319 322
        SymbolManager symbolManager = MapContextLocator.getSymbolManager();
320 323

  
321 324
        ISymbol markerSymbol = symbolManager.createSymbol(Geometry.TYPES.POINT, Color.RED);
322 325
        ISimpleTextSymbol textSymbol = getTextSymbol();
326
        DecimalFormat formato = new DecimalFormat("0.000");
327
        double theMeasure = m;
328
        if(units == LRS_SHOWMEASURES_METER){
329
            theMeasure = m/1000;
330
        }
331
        
332
        String text = formato.format(theMeasure);
333
        if(units == LRS_SHOWMEASURES_METER || units == LRS_SHOWMEASURES_KILOMETER){
334
            text = text.replace(",", " + ");
335
        }
323 336

  
324
        DecimalFormat formato = new DecimalFormat("0.000");
325
        textSymbol.setText(formato.format(m).replace(",", " + "));
337
        textSymbol.setText(text);
326 338
        int idMarkerSymbol = graphics.addSymbol(markerSymbol);
327 339
        int idTextSymbol = graphics.addSymbol(textSymbol);
328 340
        Point clonedPoint = (Point) p.cloneGeometry();
org.gvsig.lrs/trunk/org.gvsig.lrs/org.gvsig.lrs.app/org.gvsig.lrs.app.mainplugin/src/main/resources-plugin/i18n/text.properties
44 44
grouping_features=Agrupando elementos
45 45
at_least_one_layer_needed=Es necesaria al menos una capa
46 46
impossible_to_find_needed_layer=No se ha podido encontrar la capa necesaria
47
error_creating_outputStore=Error creando el almac\u00E9n de salida
47
error_creating_outputStore=Error creando el almac\u00e9n de salida
48 48
load_layer_question=\u00bfLe gustar\u00eda cargar la capa generada?
49 49
load_layer_question_title=\u00bfCargar Capa?
50 50

  
......
52 52
calibrate_point_layer=Capa de puntos de calibraci\u00f3n
53 53
id_calibration_point_route_field=Identificador de ruta en la capa de puntos
54 54
measures_field=Campo de medidas
55
measure_calc_method=M\u00E9todo de c\u00e1lculo de mediciones
56
search_radius=Radio de b\u00FAsqueda
55
measure_calc_method=M\u00e9todo de c\u00e1lculo de mediciones
56
search_radius=Radio de b\u00fasqueda
57 57
interpolate_between_calibration_points=Interpolar entre puntos de calibraci\u00f3n
58 58
units=Unidades
59 59
extrapolate_before_calibration_points=Extrapolar antes de puntos de calibraci\u00f3n
60
extrapolate_after_calibration_points=Extrapolar despu\u00E9s de puntos de calibraci\u00f3n
60
extrapolate_after_calibration_points=Extrapolar despu\u00e9s de puntos de calibraci\u00f3n
61 61
include_all=Incluir todos los elementos en la capa de salida
62 62
distance=Distancia
63 63
measures=Medidas
......
98 98
route_not_contained=El identificador de ruta no esta contenido en la capa en edici\u00f3n
99 99

  
100 100
warnings_in_edit_route=Se han encontrado las siguientes advertencias en la tabla de edici\u00f3n:
101
accept_warnings_question=\u00BFEsta seguro de que desea continuar guardando estos datos?
101
accept_warnings_question=\u00bfEsta seguro de que desea continuar guardando estos datos?
102 102
warnings_dialog=Di\u00e1logo de Advertencias Encontradas
103 103
more_warnings_found=...y {0} advertencias mas encontradas
104 104
warn_Not_data_found_in_table=La tabla de edici\u00f3n no tiene datos
......
129 129
at_least_a_line_needed=Al menos una l\u00ednea es necesaria
130 130
show_measures=Mostrar medidas
131 131
wiper_measures=Limpiar medidas
132

  
133
_Data_units=Unidades de los datos
134
_m=m
135
_Km=Km
136
_Unknown_slash_other=Desconocida / otras
137
_Units_of_measure_of_the_M_coordinate_of_the_layer=Unidades de medida de la coordenada M de la capa
org.gvsig.lrs/trunk/org.gvsig.lrs/org.gvsig.lrs.app/org.gvsig.lrs.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties
130 130
show_measures=Show Measures
131 131
wiper_measures=Clean measures
132 132

  
133
_Data_units=Data units
134
_m=m
135
_Km=Km
136
_Unknown_slash_other=Unknown / other
137
_Units_of_measure_of_the_M_coordinate_of_the_layer=Units of measure of the M coordinate of the layer
org.gvsig.lrs/trunk/org.gvsig.lrs/org.gvsig.lrs.lib/org.gvsig.lrs.lib.impl/src/main/java/org/gvsig/lrs/lib/impl/DefaultLrsShowMeasuresAlgorithmParams.java
36 36
    private double distance = 0.0;
37 37
    private final String NAME = "LrsShowMeasuresAlgorithm";
38 38
    private final String DESCRIPTION = "Algorithm to show measures with linear reference system.";
39
    private int units = LRS_SHOWMEASURES_UNKNOWN_OTHER;
39 40

  
40 41

  
41 42
    /**
......
67 68
        this.distance = distance;
68 69
    }
69 70

  
71
    public int getUnits() {
72
        return units;
73
    }
74

  
75
    public void setUnits(int units) {
76
        this.units = units;
77
    }
78

  
70 79
}
org.gvsig.lrs/trunk/org.gvsig.lrs/org.gvsig.lrs.lib/org.gvsig.lrs.lib.api/src/main/java/org/gvsig/lrs/lib/api/LrsShowMeasuresAlgorithmParams.java
28 28
 *
29 29
 */
30 30
public interface LrsShowMeasuresAlgorithmParams extends LrsAlgorithmParams {
31
    public static final Integer LRS_SHOWMEASURES_UNKNOWN_OTHER = 0;
32
    public static final Integer LRS_SHOWMEASURES_METER = 1;
33
    public static final Integer LRS_SHOWMEASURES_KILOMETER = 2;
34
    
35
    public static final String LRS_SHOWMEASURES_UNKNOWN_OTHER_LABEL = "_Unknown_slash_other";
36
    public static final String LRS_SHOWMEASURES_METER_LABEL = "_m";
37
    public static final String LRS_SHOWMEASURES_KILOMETER_LABEL = "_Km";
38
    
31 39
    /**
32 40
     * @return the distance
33 41
     */
......
37 45
     * @param distance the distance to set
38 46
     */
39 47
    public void setDistance(double distance);
40
}
48
    
49
    public int getUnits();
50

  
51
    public void setUnits(int units);
52

  
53
}

Also available in: Unified diff