Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7840] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-10-31 17:55:15
|
Revision: 7840
http://fudaa.svn.sourceforge.net/fudaa/?rev=7840&view=rev
Author: deniger
Date: 2012-10-31 17:55:03 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
CRUE-332
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/planimetry/ReportPlanimetryConfigUI.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportVisuPanelService.java
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java 2012-10-31 17:25:53 UTC (rev 7839)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java 2012-10-31 17:55:03 UTC (rev 7840)
@@ -69,6 +69,9 @@
createFindActions();
getVueCalque().setCheckTtranslation(false);
}
+
+
+
public PlanimetryVisuPanelConfigurer getConfigurer() {
return configurer;
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java 2012-10-31 17:25:53 UTC (rev 7839)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java 2012-10-31 17:55:03 UTC (rev 7840)
@@ -14,12 +14,14 @@
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.BCalqueInteraction;
+import org.fudaa.ebli.calque.BCalqueLegendeCustomizer;
import org.fudaa.ebli.calque.ZCalqueSelectionInteractionSimple;
import org.fudaa.ebli.calque.ZEbliCalquesPanel;
import org.fudaa.ebli.commun.EbliActionInterface;
import org.fudaa.ebli.commun.EbliActionPaletteAbstract;
import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.geometrie.GrBoite;
+import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.fudaa.crue.common.action.ExportImageAction;
import org.fudaa.fudaa.crue.common.action.ExportImageToClipboardAction;
import org.fudaa.fudaa.crue.planimetry.ConfigureUIAction;
@@ -94,13 +96,6 @@
return deleteCascadeAction;
}
-// @Override
-// protected EbliActionInterface createRepereAction() {
-// final EbliActionPaletteAbstract plAction = new FSigGrillePalette(getGrille(), getVisuPanel());
-// plAction.putValue(Action.SHORT_DESCRIPTION, EbliResource.EBLI.getString("Transformations du repère"));
-// return plAction;
-// }
-
@Override
public void restaurer() {
final BCalqueInteraction cq = unsetCurrentInteractifCalque();
@@ -149,6 +144,23 @@
@Override
protected void buildButtonGroupStandard() {
+ PlanimetryVisuPanel panel = (PlanimetryVisuPanel) getPn();
+ if (standardActionGroup_ != null || panel.getCqLegend() == null) {
+ return;
+ }
+ final ArrayList l = new ArrayList(6);
+ EbliActionPaletteAbstract ebliActionPaletteAbstract = new EbliActionPaletteAbstract(EbliLib.getS("Légende"),
+ EbliResource.EBLI.getToolIcon("legend"),
+ "EDIT_LEGEND", true) {
+ @Override
+ public JComponent buildContentPane() {
+ return new BCalqueLegendeCustomizer(getView().getCqLegend());
+ }
+ };
+ ebliActionPaletteAbstract.setParent(pn_);
+ l.add(ebliActionPaletteAbstract);
+ standardActionGroup_ = new EbliActionInterface[l.size()];
+ l.toArray(standardActionGroup_);
}
@Override
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java 2012-10-31 17:25:53 UTC (rev 7839)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java 2012-10-31 17:55:03 UTC (rev 7840)
@@ -38,6 +38,7 @@
import org.fudaa.fudaa.crue.report.node.ReportNodeEMH;
import org.fudaa.fudaa.crue.report.node.ReportNodeEMHFactory;
import org.fudaa.fudaa.crue.report.persist.ReportPlanimetryConfig;
+import org.fudaa.fudaa.crue.report.planimetry.ReportPlanimetryConfigUI;
import org.fudaa.fudaa.crue.report.planimetry.ReportPlanimetryConfigurer;
import org.fudaa.fudaa.crue.report.service.ReportViewServiceContrat;
import org.fudaa.fudaa.crue.report.service.ReportVisuPanelService;
@@ -155,7 +156,9 @@
planimetryController.getCqNoeud().modeleDonnees().setNodeConfigurationExtra(reportPlanimetryConfigurer.getNodeConfigurationExtra());
planimetryController.getCqSection().modeleDonnees().setSectionConfigurationExtra(reportPlanimetryConfigurer.getSectionConfigurationExtra());
planimetryController.getCqTrace().modeleDonnees().setTraceConfigurationExtra(reportPlanimetryConfigurer.getTraceConfigurationExtra());
+ //mettre a jour les legenede
}
+ new ReportPlanimetryConfigUI(planimetryController).updatePalettes();
panel.getVueCalque().repaint(0);
}
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/planimetry/ReportPlanimetryConfigUI.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/planimetry/ReportPlanimetryConfigUI.java 2012-10-31 17:25:53 UTC (rev 7839)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/planimetry/ReportPlanimetryConfigUI.java 2012-10-31 17:55:03 UTC (rev 7840)
@@ -12,14 +12,12 @@
import com.jidesoft.swing.JideTabbedPane;
import java.util.ArrayList;
import java.util.List;
-import org.fudaa.ctulu.CtuluRange;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.emh.EnumCatEMH;
import org.fudaa.dodico.crue.metier.result.OrdResExtractor;
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryController;
-import org.fudaa.fudaa.crue.report.data.ReportRunVariableKey;
import org.fudaa.fudaa.crue.report.data.ReportVariableKey;
import org.fudaa.fudaa.crue.report.data.ReportVariableTypeEnum;
import org.fudaa.fudaa.crue.report.planimetry.ReportPlanimetryConfigDataUI.ExtraEditor;
@@ -88,12 +86,24 @@
data.setUsePalette(traceData.isUsePalette());
data.setPaletteVariable(traceData.getPaletteVariable());
traceConfigurationExtra.setData(traceData);
+ updatePalettes();
planimetryController.getState().setStudyConfigModified();
}
return ok;
}
+ public void updatePalettes() {
+ final ReportPlanimetryBrancheConfig brancheConfigurationExtra = (ReportPlanimetryBrancheConfig) planimetryController.getCqBranche().modeleDonnees().getBrancheConfigurationExtra();
+ final ReportPlanimetryCasierConfig casierConfigurationExtra = (ReportPlanimetryCasierConfig) planimetryController.getCqCasier().modeleDonnees().getCasierConfigurationExtra();
+ final ReportPlanimetryNodeConfig nodeConfigurationExtra = (ReportPlanimetryNodeConfig) planimetryController.getCqNoeud().modeleDonnees().getNodeConfigurationExtra();
+ final ReportPlanimetrySectionConfig sectionConfigurationExtra = (ReportPlanimetrySectionConfig) planimetryController.getCqSection().modeleDonnees().getSectionConfigurationExtra();
+ planimetryController.getCqBranche().setPaletteCouleurPlages(brancheConfigurationExtra.getData().getPalette());
+ planimetryController.getCqCasier().setPaletteCouleurPlages(casierConfigurationExtra.getData().getPalette());
+ planimetryController.getCqNoeud().setPaletteCouleurPlages(nodeConfigurationExtra.getData().getPalette());
+ planimetryController.getCqSection().setPaletteCouleurPlages(sectionConfigurationExtra.getData().getPalette());
+ }
+
private ReportPlanimetryConfigDataUI create(EnumCatEMH catEMH) {
EMHScenario scenario = reportService.getRunCourant().getScenario();
OrdResExtractor extractor = new OrdResExtractor(scenario.getOrdResScenario());
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportVisuPanelService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportVisuPanelService.java 2012-10-31 17:25:53 UTC (rev 7839)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportVisuPanelService.java 2012-10-31 17:55:03 UTC (rev 7840)
@@ -7,6 +7,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
+import org.fudaa.ebli.calque.BCalqueLegende;
import org.fudaa.ebli.commun.EbliActionInterface;
import org.fudaa.fudaa.crue.common.helper.CtuluUIForNetbeans;
import org.fudaa.fudaa.crue.options.services.ConfigurationManagerService;
@@ -125,6 +126,12 @@
panel.getPlanimetryController().getCqCasier().setActions(actions);
panel.getPlanimetryController().getCqSection().setActions(actions);
panel.getPlanimetryController().getCqTrace().setActions(actions);
+ panel.addCalqueLegend();
+ final BCalqueLegende cqLegend = panel.getCqLegend();
+ panel.getPlanimetryController().getCqBranche().setLegende(cqLegend);
+ panel.getPlanimetryController().getCqNoeud().setLegende(cqLegend);
+ panel.getPlanimetryController().getCqCasier().setLegende(cqLegend);
+ panel.getPlanimetryController().getCqSection().setLegende(cqLegend);
if (CollectionUtils.isNotEmpty(result.additionnalLayer)) {
panel.getPlanimetryController().addAdditionnalLayer(result.additionnalLayer);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
