Revision 47464 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

View differences:

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");
282
      btnRotationExpressionBookmarks.setOpaque(false);
283 276
      btnRotationExpressionBookmarks.setText("...");
284 277
      EmptyBorder emptyborder9 = new EmptyBorder(2,2,2,2);
285 278
      btnRotationExpressionBookmarks.setBorder(emptyborder9);
286
      jpanel1.add(btnRotationExpressionBookmarks,cc.xy(10,24));
279
      jpanel1.add(btnRotationExpressionBookmarks,cc.xy(10,26));
287 280

  
288 281
      txtPictureFile.setName("txtPictureFile");
289 282
      jpanel1.add(txtPictureFile,cc.xywh(4,2,5,1));
......
293 286

  
294 287
      btnPictureFile.setActionCommand("...");
295 288
      btnPictureFile.setName("btnPictureFile");
296
      btnPictureFile.setOpaque(false);
297 289
      btnPictureFile.setText("...");
298 290
      EmptyBorder emptyborder10 = new EmptyBorder(2,2,2,2);
299 291
      btnPictureFile.setBorder(emptyborder10);
......
301 293

  
302 294
      btnSelPictureFile.setActionCommand("...");
303 295
      btnSelPictureFile.setName("btnSelPictureFile");
304
      btnSelPictureFile.setOpaque(false);
305 296
      btnSelPictureFile.setText("...");
306 297
      EmptyBorder emptyborder11 = new EmptyBorder(2,2,2,2);
307 298
      btnSelPictureFile.setBorder(emptyborder11);
308 299
      jpanel1.add(btnSelPictureFile,cc.xy(10,4));
309 300

  
310 301
      lblColorLine.setName("lblColorLine");
311
      lblColorLine.setText("color_line");
312
      jpanel1.add(lblColorLine,cc.xy(2,14));
302
      lblColorLine.setText("_Line_color");
303
      jpanel1.add(lblColorLine,cc.xy(2,16));
313 304

  
314 305
      txtColorLine.setName("txtColorLine");
315
      jpanel1.add(txtColorLine,cc.xywh(4,14,5,1));
306
      jpanel1.add(txtColorLine,cc.xywh(4,16,5,1));
316 307

  
317 308
      btnColorLine.setActionCommand("...");
318 309
      btnColorLine.setName("btnColorLine");
319
      btnColorLine.setOpaque(false);
320 310
      btnColorLine.setText("...");
321 311
      EmptyBorder emptyborder12 = new EmptyBorder(2,2,2,2);
322 312
      btnColorLine.setBorder(emptyborder12);
323
      jpanel1.add(btnColorLine,cc.xy(10,14));
313
      jpanel1.add(btnColorLine,cc.xy(10,16));
324 314

  
325 315
      chkDrawLineToOffset.setActionCommand("Join_the_insertion_point_and_the_offset_with_a_line");
326 316
      chkDrawLineToOffset.setName("chkDrawLineToOffset");
327
      chkDrawLineToOffset.setText("Join_the_insertion_point_and_the_offset_with_a_line");
317
      chkDrawLineToOffset.setText("_Join_the_insertion_point_and_the_offset_with_a_line");
328 318
      chkDrawLineToOffset.setHorizontalTextPosition(JCheckBox.LEFT);
329
      jpanel1.add(chkDrawLineToOffset,cc.xywh(2,12,9,1));
319
      jpanel1.add(chkDrawLineToOffset,cc.xywh(2,14,9,1));
330 320

  
331 321
      lblDynamicValues.setName("lblDynamicValues");
332 322
      lblDynamicValues.setText("Valores dinamicos");
333
      jpanel1.add(lblDynamicValues,cc.xywh(2,16,9,1));
323
      jpanel1.add(lblDynamicValues,cc.xywh(2,18,9,1));
334 324

  
335 325
      txtColorLineExp.setName("txtColorLineExp");
336
      jpanel1.add(txtColorLineExp,cc.xy(4,26));
326
      jpanel1.add(txtColorLineExp,cc.xy(4,28));
337 327

  
338 328
      btnColorLineExpression.setActionCommand("...");
339 329
      btnColorLineExpression.setName("btnColorLineExpression");
340
      btnColorLineExpression.setOpaque(false);
341 330
      btnColorLineExpression.setText("...");
342 331
      EmptyBorder emptyborder13 = new EmptyBorder(2,2,2,2);
343 332
      btnColorLineExpression.setBorder(emptyborder13);
344
      jpanel1.add(btnColorLineExpression,cc.xy(6,26));
333
      jpanel1.add(btnColorLineExpression,cc.xy(6,28));
345 334

  
346 335
      btnColorLineExpressionHistory.setActionCommand("...");
347 336
      btnColorLineExpressionHistory.setName("btnColorLineExpressionHistory");
348
      btnColorLineExpressionHistory.setOpaque(false);
349 337
      btnColorLineExpressionHistory.setText("...");
350 338
      EmptyBorder emptyborder14 = new EmptyBorder(2,2,2,2);
351 339
      btnColorLineExpressionHistory.setBorder(emptyborder14);
352
      jpanel1.add(btnColorLineExpressionHistory,cc.xy(8,26));
340
      jpanel1.add(btnColorLineExpressionHistory,cc.xy(8,28));
353 341

  
354 342
      btnColorLineExpressionBookmarks.setActionCommand("...");
355 343
      btnColorLineExpressionBookmarks.setName("btnColorLineExpressionBookmarks");
356
      btnColorLineExpressionBookmarks.setOpaque(false);
357 344
      btnColorLineExpressionBookmarks.setText("...");
358 345
      EmptyBorder emptyborder15 = new EmptyBorder(2,2,2,2);
359 346
      btnColorLineExpressionBookmarks.setBorder(emptyborder15);
360
      jpanel1.add(btnColorLineExpressionBookmarks,cc.xy(10,26));
347
      jpanel1.add(btnColorLineExpressionBookmarks,cc.xy(10,28));
361 348

  
362
      lblLabelXExpression1.setName("lblLabelXExpression");
363
      lblLabelXExpression1.setText("size_expression");
364
      jpanel1.add(lblLabelXExpression1,cc.xy(2,18));
349
      lblLabelSizeExpression.setName("lblLabelSizeExpression");
350
      lblLabelSizeExpression.setText("_Size_expression");
351
      jpanel1.add(lblLabelSizeExpression,cc.xy(2,20));
365 352

  
366 353
      txtSizeExp.setName("txtSizeExp");
367
      jpanel1.add(txtSizeExp,cc.xy(4,18));
354
      jpanel1.add(txtSizeExp,cc.xy(4,20));
368 355

  
369 356
      btnSizeExpression.setActionCommand("...");
370 357
      btnSizeExpression.setName("btnSizeExpression");
371
      btnSizeExpression.setOpaque(false);
372 358
      btnSizeExpression.setText("...");
373 359
      EmptyBorder emptyborder16 = new EmptyBorder(2,2,2,2);
374 360
      btnSizeExpression.setBorder(emptyborder16);
375
      jpanel1.add(btnSizeExpression,cc.xy(6,18));
361
      jpanel1.add(btnSizeExpression,cc.xy(6,20));
376 362

  
377 363
      btnSizeExpressionHistory.setActionCommand("...");
378 364
      btnSizeExpressionHistory.setName("btnSizeExpressionHistory");
379
      btnSizeExpressionHistory.setOpaque(false);
380 365
      btnSizeExpressionHistory.setText("...");
381 366
      EmptyBorder emptyborder17 = new EmptyBorder(2,2,2,2);
382 367
      btnSizeExpressionHistory.setBorder(emptyborder17);
383
      jpanel1.add(btnSizeExpressionHistory,cc.xy(8,18));
368
      jpanel1.add(btnSizeExpressionHistory,cc.xy(8,20));
384 369

  
385 370
      btnSizeExpressionBookmarks.setActionCommand("...");
386 371
      btnSizeExpressionBookmarks.setName("btnSizeExpressionBookmarks");
387
      btnSizeExpressionBookmarks.setOpaque(false);
388 372
      btnSizeExpressionBookmarks.setText("...");
389 373
      EmptyBorder emptyborder18 = new EmptyBorder(2,2,2,2);
390 374
      btnSizeExpressionBookmarks.setBorder(emptyborder18);
391
      jpanel1.add(btnSizeExpressionBookmarks,cc.xy(10,18));
375
      jpanel1.add(btnSizeExpressionBookmarks,cc.xy(10,20));
392 376

  
393
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7,8,9,10,11 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27 });
377
      lblLabelRotation.setName("lblLabelRotation");
378
      lblLabelRotation.setText("angle");
379
      jpanel1.add(lblLabelRotation,cc.xy(2,8));
380

  
381
      txtRotation.setName("txtRotation");
382
      jpanel1.add(txtRotation,cc.xywh(4,8,7,1));
383

  
384
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7,8,9,10,11 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29 });
394 385
      return jpanel1;
395 386
   }
396 387

  

Also available in: Unified diff