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/PictureMarker.java

View differences:

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);

Also available in: Unified diff