Revision 1607 trunk/org.gvsig.app.document.layout2.app/org.gvsig.app.document.layout2.app.mainplugin/src/main/java/org/gvsig/app/extension/reportfromlayout/ConfigureReportFromLayout.java

View differences:

ConfigureReportFromLayout.java
5 5
 */
6 6
package org.gvsig.app.extension.reportfromlayout;
7 7

  
8
import java.awt.Color;
9 8
import java.awt.Dimension;
10 9
import java.awt.event.ActionEvent;
11 10
import java.awt.event.ActionListener;
......
25 24
import org.apache.commons.codec.binary.Hex;
26 25
import org.apache.commons.io.IOUtils;
27 26
import org.apache.commons.lang3.StringUtils;
28
import org.gvsig.andami.PluginServices;
29 27
import org.gvsig.app.ApplicationLocator;
30 28
import org.gvsig.app.gui.styling.SymbolSelector;
31 29
import org.gvsig.app.project.documents.Document;
......
43 41
import org.gvsig.fmap.dal.swing.report.ReportAction;
44 42
import org.gvsig.fmap.dal.swing.storesrepository.StoresRepositoryController;
45 43
import org.gvsig.fmap.mapcontext.MapContextLocator;
46
import org.gvsig.fmap.mapcontext.rendering.legend.IVectorLegend;
47 44
import org.gvsig.fmap.mapcontext.rendering.symbols.ISymbol;
48 45
import org.gvsig.json.Json;
49 46
import org.gvsig.json.JsonObjectBuilder;
......
58 55
import org.gvsig.tools.swing.api.ToolsSwingManager;
59 56
import org.gvsig.tools.swing.api.ToolsSwingUtils;
60 57
import org.gvsig.tools.swing.api.documentfilters.PositiveDoubleDocumentFilter;
61
import org.gvsig.tools.swing.api.pickercontroller.ColorPickerController;
62 58
import org.gvsig.tools.swing.api.threadsafedialogs.ThreadSafeDialogsManager;
63 59
import org.gvsig.tools.swing.api.windowmanager.Dialog;
64 60
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
......
304 300
        params.setZoomToCurrentRow(this.chkZoomToCurrentRow.isSelected());
305 301
        double bufferSize = PositiveDoubleDocumentFilter.getValue(this.txtBufferSize);
306 302
        params.setBufferSize(bufferSize);
307
//        params.setSelectCurrentRow(this.chkSelectCurrentRow.isSelected());
308 303
        params.setViewTag(this.getViewTag());
309 304
        params.setUseIntervalPdfViewer(this.chkUseInternalPdfViewer.isSelected());
310 305
        params.setHighlightRecord(this.chkHighlightRecord.isSelected());
......
323 318
        manager.translate(chkCenterToCurrentRow);
324 319
        manager.translate(chkZoomToCurrentRow);
325 320
        manager.translate(lblBufferSize);
326
//        manager.translate(chkSelectCurrentRow);
327 321
        manager.translate(chkUseInternalPdfViewer);
328 322
        manager.translate(txtBufferSize);
329 323
        manager.translate(chkHighlightRecord);
324
        manager.translate(btnSelectSymbol);
330 325
    }
331 326
    
332 327
    public boolean doConfigureReportFromLayout(ConfigureReportFromLayoutParameters params) {
......
365 360
            return false;
366 361
        }
367 362
        
368
        Color fillColor = params.getFillColor();
369
        Color lineColor = params.getLineColor();
370 363
        boolean centerToCurrentRow = params.isCenterToCurrentRow();
371 364
        boolean zoomToCurrentRow = params.isZoomToCurrentRow();
372 365
        double bufferSize = params.getBufferSize();
......
380 373
                layout, 
381 374
                identifier, 
382 375
                label, 
383
                lineColor,
384
                fillColor,
385 376
                centerToCurrentRow, 
386 377
                zoomToCurrentRow, 
387 378
                bufferSize, 
......
398 389
            LayoutDocument layout, 
399 390
            String name, 
400 391
            String label,
401
            Color lineColor,
402
            Color fillColor,
403 392
            boolean centerToCurrentRow,
404 393
            boolean zoomToCurrentRow,
405 394
            double bufferSize,
......
428 417
            jsonBuilder.add(LayoutReportActionImpl.LAYOUT_REPORT_TYPE, LayoutReportActionFactory.LAYOUT_REPORT_ACTION_NAME);
429 418
            jsonBuilder.add(LayoutReportActionImpl.LAYOUT_REPORT_LABEL, label);
430 419
            jsonBuilder.add(LayoutReportActionImpl.LAYOUT_REPORT_TEMPLATE_NAME, templateName);
431
            jsonBuilder.add(LayoutReportActionImpl.LAYOUT_REPORT_HIGHLIGHT_SYMBOL, this.toString(highlightSymbol));
432
            jsonBuilder.add(LayoutReportActionImpl.LAYOUT_REPORT_LINE_COLOR, lineColor.getRGB()&(lineColor.getAlpha()<<24));
433
            jsonBuilder.add(LayoutReportActionImpl.LAYOUT_REPORT_FILL_COLOR, fillColor.getRGB()&(fillColor.getAlpha()<<24));
420
            if(highlightSymbol != null){
421
                jsonBuilder.add(LayoutReportActionImpl.LAYOUT_REPORT_HIGHLIGHT_SYMBOL, this.toString(highlightSymbol));
422
            }
434 423
            jsonBuilder.add(LayoutReportActionImpl.LAYOUT_REPORT_CENTER_TO_CURRENT_ROW, centerToCurrentRow);
435 424
            jsonBuilder.add(LayoutReportActionImpl.LAYOUT_REPORT_ZOOM_TO_CURRENT_ROW, zoomToCurrentRow);
436 425
            jsonBuilder.add(LayoutReportActionImpl.LAYOUT_REPORT_BUFFER_SIZE, bufferSize);
......
467 456
    
468 457
    private String toString(ISymbol symbol){
469 458
        try {
459
            if(symbol == null){
460
                return null;
461
            }
470 462
            PersistenceManager persistenceManager = ToolsLocator.getPersistenceManager();
471 463
            PersistentState state = persistenceManager.getState(symbol);
472 464
            ByteArrayOutputStream out = new ByteArrayOutputStream();

Also available in: Unified diff