Revision 45527 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
59 59
   JButton btnColorLineExpression = new JButton();
60 60
   JButton btnColorLineExpressionHistory = new JButton();
61 61
   JButton btnColorLineExpressionBookmarks = new JButton();
62
   JLabel lblLabelXExpression1 = new JLabel();
63
   JTextField txtSizeExp = new JTextField();
64
   JButton btnSizeExpression = new JButton();
65
   JButton btnSizeExpressionHistory = new JButton();
66
   JButton btnSizeExpressionBookmarks = new JButton();
62 67

  
63 68
   /**
64 69
    * Default constructor
......
150 155
   public JPanel createPanel()
151 156
   {
152 157
      JPanel jpanel1 = new JPanel();
153
      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");
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");
154 159
      CellConstraints cc = new CellConstraints();
155 160
      jpanel1.setLayout(formlayout1);
156 161

  
......
185 190

  
186 191
      lblLabelXExpression.setName("lblLabelXExpression");
187 192
      lblLabelXExpression.setText("x_offset_expression");
188
      jpanel1.add(lblLabelXExpression,cc.xy(2,18));
193
      jpanel1.add(lblLabelXExpression,cc.xy(2,20));
189 194

  
190 195
      lblLabelYExpression.setName("lblLabelYExpression");
191 196
      lblLabelYExpression.setText("y_offset_expression");
192
      jpanel1.add(lblLabelYExpression,cc.xy(2,20));
197
      jpanel1.add(lblLabelYExpression,cc.xy(2,22));
193 198

  
194 199
      lblLabelRotationExpression.setName("lblLabelRotationExpression");
195 200
      lblLabelRotationExpression.setText("rotation_expression");
196
      jpanel1.add(lblLabelRotationExpression,cc.xy(2,22));
201
      jpanel1.add(lblLabelRotationExpression,cc.xy(2,24));
197 202

  
198 203
      lblColorLineExpression.setName("lblColorLineExpression");
199 204
      lblColorLineExpression.setText("color_line");
200
      jpanel1.add(lblColorLineExpression,cc.xy(2,24));
205
      jpanel1.add(lblColorLineExpression,cc.xy(2,26));
201 206

  
202 207
      btnRotationExpression.setActionCommand("...");
203 208
      btnRotationExpression.setName("btnRotationExpression");
......
205 210
      btnRotationExpression.setText("...");
206 211
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
207 212
      btnRotationExpression.setBorder(emptyborder1);
208
      jpanel1.add(btnRotationExpression,cc.xy(6,22));
213
      jpanel1.add(btnRotationExpression,cc.xy(6,24));
209 214

  
210 215
      txtXOffset.setName("txtXOffset");
211
      jpanel1.add(txtXOffset,cc.xy(4,18));
216
      jpanel1.add(txtXOffset,cc.xy(4,20));
212 217

  
213 218
      txtYOffset.setName("txtYOffset");
214
      jpanel1.add(txtYOffset,cc.xy(4,20));
219
      jpanel1.add(txtYOffset,cc.xy(4,22));
215 220

  
216 221
      txtRotation.setName("txtRotation");
217
      jpanel1.add(txtRotation,cc.xy(4,22));
222
      jpanel1.add(txtRotation,cc.xy(4,24));
218 223

  
219 224
      btnYOffsetExpression.setActionCommand("...");
220 225
      btnYOffsetExpression.setName("btnYOffsetExpression");
......
222 227
      btnYOffsetExpression.setText("...");
223 228
      EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2);
224 229
      btnYOffsetExpression.setBorder(emptyborder2);
225
      jpanel1.add(btnYOffsetExpression,cc.xy(6,20));
230
      jpanel1.add(btnYOffsetExpression,cc.xy(6,22));
226 231

  
227 232
      btnXOffsetExpression.setActionCommand("...");
228 233
      btnXOffsetExpression.setName("btnXOffsetExpression");
......
230 235
      btnXOffsetExpression.setText("...");
231 236
      EmptyBorder emptyborder3 = new EmptyBorder(2,2,2,2);
232 237
      btnXOffsetExpression.setBorder(emptyborder3);
233
      jpanel1.add(btnXOffsetExpression,cc.xy(6,18));
238
      jpanel1.add(btnXOffsetExpression,cc.xy(6,20));
234 239

  
235 240
      btnXOffsetExpressionHistory.setActionCommand("...");
236 241
      btnXOffsetExpressionHistory.setName("btnXOffsetExpressionHistory");
......
238 243
      btnXOffsetExpressionHistory.setText("...");
239 244
      EmptyBorder emptyborder4 = new EmptyBorder(2,2,2,2);
240 245
      btnXOffsetExpressionHistory.setBorder(emptyborder4);
241
      jpanel1.add(btnXOffsetExpressionHistory,cc.xy(8,18));
246
      jpanel1.add(btnXOffsetExpressionHistory,cc.xy(8,20));
242 247

  
243 248
      btnXOffsetExpressionBookmarks.setActionCommand("...");
244 249
      btnXOffsetExpressionBookmarks.setName("btnXOffsetExpressionBookmarks");
......
246 251
      btnXOffsetExpressionBookmarks.setText("...");
247 252
      EmptyBorder emptyborder5 = new EmptyBorder(2,2,2,2);
248 253
      btnXOffsetExpressionBookmarks.setBorder(emptyborder5);
249
      jpanel1.add(btnXOffsetExpressionBookmarks,cc.xy(10,18));
254
      jpanel1.add(btnXOffsetExpressionBookmarks,cc.xy(10,20));
250 255

  
251 256
      btnYOffsetExpressionHistory.setActionCommand("...");
252 257
      btnYOffsetExpressionHistory.setName("btnYOffsetExpressionHistory");
......
254 259
      btnYOffsetExpressionHistory.setText("...");
255 260
      EmptyBorder emptyborder6 = new EmptyBorder(2,2,2,2);
256 261
      btnYOffsetExpressionHistory.setBorder(emptyborder6);
257
      jpanel1.add(btnYOffsetExpressionHistory,cc.xy(8,20));
262
      jpanel1.add(btnYOffsetExpressionHistory,cc.xy(8,22));
258 263

  
259 264
      btnYOffsetExpressionBookmarks.setActionCommand("...");
260 265
      btnYOffsetExpressionBookmarks.setName("btnYOffsetExpressionBookmarks");
......
262 267
      btnYOffsetExpressionBookmarks.setText("...");
263 268
      EmptyBorder emptyborder7 = new EmptyBorder(2,2,2,2);
264 269
      btnYOffsetExpressionBookmarks.setBorder(emptyborder7);
265
      jpanel1.add(btnYOffsetExpressionBookmarks,cc.xy(10,20));
270
      jpanel1.add(btnYOffsetExpressionBookmarks,cc.xy(10,22));
266 271

  
267 272
      btnRotationExpressionHistory.setActionCommand("...");
268 273
      btnRotationExpressionHistory.setName("btnRotationExpressionHistory");
......
270 275
      btnRotationExpressionHistory.setText("...");
271 276
      EmptyBorder emptyborder8 = new EmptyBorder(2,2,2,2);
272 277
      btnRotationExpressionHistory.setBorder(emptyborder8);
273
      jpanel1.add(btnRotationExpressionHistory,cc.xy(8,22));
278
      jpanel1.add(btnRotationExpressionHistory,cc.xy(8,24));
274 279

  
275 280
      btnRotationExpressionBookmarks.setActionCommand("...");
276 281
      btnRotationExpressionBookmarks.setName("btnRotationExpressionBookmarks");
......
278 283
      btnRotationExpressionBookmarks.setText("...");
279 284
      EmptyBorder emptyborder9 = new EmptyBorder(2,2,2,2);
280 285
      btnRotationExpressionBookmarks.setBorder(emptyborder9);
281
      jpanel1.add(btnRotationExpressionBookmarks,cc.xy(10,22));
286
      jpanel1.add(btnRotationExpressionBookmarks,cc.xy(10,24));
282 287

  
283 288
      txtPictureFile.setName("txtPictureFile");
284 289
      jpanel1.add(txtPictureFile,cc.xywh(4,2,5,1));
......
328 333
      jpanel1.add(lblDynamicValues,cc.xywh(2,16,9,1));
329 334

  
330 335
      txtColorLineExp.setName("txtColorLineExp");
331
      jpanel1.add(txtColorLineExp,cc.xy(4,24));
336
      jpanel1.add(txtColorLineExp,cc.xy(4,26));
332 337

  
333 338
      btnColorLineExpression.setActionCommand("...");
334 339
      btnColorLineExpression.setName("btnColorLineExpression");
......
336 341
      btnColorLineExpression.setText("...");
337 342
      EmptyBorder emptyborder13 = new EmptyBorder(2,2,2,2);
338 343
      btnColorLineExpression.setBorder(emptyborder13);
339
      jpanel1.add(btnColorLineExpression,cc.xy(6,24));
344
      jpanel1.add(btnColorLineExpression,cc.xy(6,26));
340 345

  
341 346
      btnColorLineExpressionHistory.setActionCommand("...");
342 347
      btnColorLineExpressionHistory.setName("btnColorLineExpressionHistory");
......
344 349
      btnColorLineExpressionHistory.setText("...");
345 350
      EmptyBorder emptyborder14 = new EmptyBorder(2,2,2,2);
346 351
      btnColorLineExpressionHistory.setBorder(emptyborder14);
347
      jpanel1.add(btnColorLineExpressionHistory,cc.xy(8,24));
352
      jpanel1.add(btnColorLineExpressionHistory,cc.xy(8,26));
348 353

  
349 354
      btnColorLineExpressionBookmarks.setActionCommand("...");
350 355
      btnColorLineExpressionBookmarks.setName("btnColorLineExpressionBookmarks");
......
352 357
      btnColorLineExpressionBookmarks.setText("...");
353 358
      EmptyBorder emptyborder15 = new EmptyBorder(2,2,2,2);
354 359
      btnColorLineExpressionBookmarks.setBorder(emptyborder15);
355
      jpanel1.add(btnColorLineExpressionBookmarks,cc.xy(10,24));
360
      jpanel1.add(btnColorLineExpressionBookmarks,cc.xy(10,26));
356 361

  
357
      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 });
362
      lblLabelXExpression1.setName("lblLabelXExpression");
363
      lblLabelXExpression1.setText("size_expression");
364
      jpanel1.add(lblLabelXExpression1,cc.xy(2,18));
365

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

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

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

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

  
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 });
358 394
      return jpanel1;
359 395
   }
360 396

  

Also available in: Unified diff