Revision 1607
| trunk/org.gvsig.app.document.layout2.app/org.gvsig.app.document.layout2.app.mainplugin/src/main/java/org/gvsig/app/project/documents/layout/report/LayoutReportActionImpl.java | ||
|---|---|---|
| 139 | 139 |
private String viewTag; |
| 140 | 140 |
private boolean highlightRecord; |
| 141 | 141 |
private ISymbol highlightSymbol; |
| 142 |
private Color fillColor; |
|
| 143 |
private Color lineColor; |
|
| 142 |
// private Color fillColor;
|
|
| 143 |
// private Color lineColor;
|
|
| 144 | 144 |
|
| 145 | 145 |
@SuppressWarnings("OverridableMethodCallInConstructor")
|
| 146 | 146 |
private LayoutReportActionImpl(ReportActionFactory factory, FeatureStore store, JsonObject json) {
|
| ... | ... | |
| 155 | 155 |
this.setReportLabel(this.json.getString(LAYOUT_REPORT_LABEL, this.getReportName())); |
| 156 | 156 |
this.highlightRecord = this.json.getBoolean(LAYOUT_REPORT_HIGHLIGHT_RECORD, true); |
| 157 | 157 |
this.highlightSymbol = createSymbol(this.json.getString(LAYOUT_REPORT_HIGHLIGHT_SYMBOL, null)); |
| 158 |
this.fillColor = new Color(this.json.getInt(LAYOUT_REPORT_FILL_COLOR, Color.WHITE.getRGB()&(0x2F<<24))); |
|
| 159 |
this.lineColor = new Color(this.json.getInt(LAYOUT_REPORT_LINE_COLOR, Color.WHITE.getRGB())); |
|
| 158 |
// this.fillColor = new Color(this.json.getInt(LAYOUT_REPORT_FILL_COLOR, Color.WHITE.getRGB()&(0x2F<<24)));
|
|
| 159 |
// this.lineColor = new Color(this.json.getInt(LAYOUT_REPORT_LINE_COLOR, Color.WHITE.getRGB()));
|
|
| 160 | 160 |
this.setCenterToCurrentRow(this.json.getBoolean(LAYOUT_REPORT_CENTER_TO_CURRENT_ROW, true)); |
| 161 | 161 |
this.setZoomToCurrentRow(this.json.getBoolean(LAYOUT_REPORT_ZOOM_TO_CURRENT_ROW, true)); |
| 162 | 162 |
this.setBufferSize(0.0); |
| trunk/org.gvsig.app.document.layout2.app/org.gvsig.app.document.layout2.app.mainplugin/src/main/java/org/gvsig/app/project/documents/layout/report/LayoutReportAction.java | ||
|---|---|---|
| 21 | 21 |
String LAYOUT_REPORT_TEMPLATE_NAME = "templateName"; |
| 22 | 22 |
String LAYOUT_REPORT_HIGHLIGHT_RECORD = "highlightRecord"; |
| 23 | 23 |
String LAYOUT_REPORT_HIGHLIGHT_SYMBOL = "highlightSymbol"; |
| 24 |
String LAYOUT_REPORT_LINE_COLOR = "lineColor"; |
|
| 25 |
String LAYOUT_REPORT_FILL_COLOR = "fillColor"; |
|
| 24 |
// String LAYOUT_REPORT_LINE_COLOR = "lineColor";
|
|
| 25 |
// String LAYOUT_REPORT_FILL_COLOR = "fillColor";
|
|
| 26 | 26 |
String LAYOUT_REPORT_TYPE = "type"; |
| 27 | 27 |
String LAYOUT_REPORT_VIEW_TAG = "viewTag"; |
| 28 | 28 |
String LAYOUT_REPORT_USE_INTERNAL_PDF_VIEWER = "useInternalPdfViewer"; |
| trunk/org.gvsig.app.document.layout2.app/org.gvsig.app.document.layout2.app.mainplugin/src/main/java/org/gvsig/app/extension/reportfromlayout/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(); |
| trunk/org.gvsig.app.document.layout2.app/org.gvsig.app.document.layout2.app.mainplugin/src/main/java/org/gvsig/app/extension/reportfromlayout/ConfigureReportFromLayoutParameters.java | ||
|---|---|---|
| 57 | 57 |
|
| 58 | 58 |
public void setViewTag(String tag); |
| 59 | 59 |
|
| 60 |
public Color getFillColor(); |
|
| 61 |
|
|
| 62 |
public void setFillColor(Color color); |
|
| 60 |
// public Color getFillColor(); |
|
| 61 |
// |
|
| 62 |
// public void setFillColor(Color color); |
|
| 63 |
// |
|
| 64 |
// public Color getLineColor(); |
|
| 65 |
// |
|
| 66 |
// public void setLineColor(Color color); |
|
| 63 | 67 |
|
| 64 |
public Color getLineColor(); |
|
| 65 |
|
|
| 66 |
public void setLineColor(Color color); |
|
| 67 |
|
|
| 68 | 68 |
public ISymbol getHighlightSymbol(); |
| 69 | 69 |
|
| 70 | 70 |
public void setHighlightSymbol(ISymbol symbol); |
| trunk/org.gvsig.app.document.layout2.app/org.gvsig.app.document.layout2.app.mainplugin/src/main/java/org/gvsig/app/extension/reportfromlayout/ConfigureReportFromLayoutParametersImpl.java | ||
|---|---|---|
| 25 | 25 |
private boolean useIntervalPdfViewer; |
| 26 | 26 |
private boolean highlightRecord; |
| 27 | 27 |
private String viewTag; |
| 28 |
private Color fillColor; |
|
| 29 |
private Color lineColor; |
|
| 28 |
// private Color fillColor;
|
|
| 29 |
// private Color lineColor;
|
|
| 30 | 30 |
private ISymbol highLightSymbol; |
| 31 | 31 |
|
| 32 | 32 |
@Override |
| ... | ... | |
| 129 | 129 |
this.viewTag = viewTag; |
| 130 | 130 |
} |
| 131 | 131 |
|
| 132 |
@Override |
|
| 133 |
public Color getFillColor() {
|
|
| 134 |
return this.fillColor; |
|
| 135 |
} |
|
| 132 |
// @Override |
|
| 133 |
// public Color getFillColor() {
|
|
| 134 |
// return this.fillColor; |
|
| 135 |
// } |
|
| 136 |
// |
|
| 137 |
// @Override |
|
| 138 |
// public void setFillColor(Color color) {
|
|
| 139 |
// this.fillColor = color; |
|
| 140 |
// } |
|
| 141 |
// |
|
| 142 |
// @Override |
|
| 143 |
// public Color getLineColor() {
|
|
| 144 |
// return this.lineColor; |
|
| 145 |
// } |
|
| 146 |
// |
|
| 147 |
// @Override |
|
| 148 |
// public void setLineColor(Color color) {
|
|
| 149 |
// this.lineColor = color; |
|
| 150 |
// } |
|
| 136 | 151 |
|
| 137 | 152 |
@Override |
| 138 |
public void setFillColor(Color color) {
|
|
| 139 |
this.fillColor = color; |
|
| 140 |
} |
|
| 141 |
|
|
| 142 |
@Override |
|
| 143 |
public Color getLineColor() {
|
|
| 144 |
return this.lineColor; |
|
| 145 |
} |
|
| 146 |
|
|
| 147 |
@Override |
|
| 148 |
public void setLineColor(Color color) {
|
|
| 149 |
this.lineColor = color; |
|
| 150 |
} |
|
| 151 |
|
|
| 152 |
@Override |
|
| 153 | 153 |
public ISymbol getHighlightSymbol() {
|
| 154 | 154 |
return highLightSymbol; |
| 155 | 155 |
} |
| trunk/org.gvsig.app.document.layout2.app/org.gvsig.app.document.layout2.app.mainplugin/src/main/resources-plugin/i18n/text.properties | ||
|---|---|---|
| 84 | 84 |
_Creating_report=Creando informe |
| 85 | 85 |
_Highlight_record=Resaltar registro |
| 86 | 86 |
_Line_color=Color de la linea |
| 87 |
_Transparency=Transparencia |
|
| 87 |
_Transparency=Transparencia |
|
| 88 |
_Select_symbol=Seleccionar s\u00edmbolo |
|
| trunk/org.gvsig.app.document.layout2.app/org.gvsig.app.document.layout2.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties | ||
|---|---|---|
| 84 | 84 |
_Creating_report=Creating report |
| 85 | 85 |
_Highlight_record=Highlight record |
| 86 | 86 |
_Line_color=Line color |
| 87 |
_Transparency=Transparency |
|
| 87 |
_Transparency=Transparency |
|
| 88 |
_Select_symbol=Select symbol |
|
Also available in: Unified diff