Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8691] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2014-04-02 22:21:29
|
Revision: 8691
http://sourceforge.net/p/fudaa/svn/8691
Author: deniger
Date: 2014-04-02 22:21:23 +0000 (Wed, 02 Apr 2014)
Log Message:
-----------
CRUE-617
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutor.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorBuilder.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegate.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateLongitudinal.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportGlobalService.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportResultService.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/RapportCustomEditor.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/rptg/ReportRPTGGrapheBuilder.java
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateMultiVar.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateRPTG.java
Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2014-04-02 22:21:23 UTC (rev 8691)
@@ -1320,4 +1320,8 @@
Export.Calcul.ColumnName=Calcul
Export.Temps.ColumnName=Temps
Report.RunNonCurrentIgnored=Les donn\u00e9es des runs alternatifs ne sont pas export\u00e9s
-otfa.report.longitudinalFirstColName=Branche / Section
\ No newline at end of file
+otfa.report.longitudinalFirstColName=Branche / Section
+otfa.report.exportTo=Export rapport {0} vers {1}
+otfa.report.emhNotFound=L''EMH {0} n''a pas \u00e9t\u00e9 trouv\u00e9e
+otfa.report.emhNoRPTG=L''EMH {0} ne poss\u00e8de pas de r\u00e9sultat de pr\u00e9-traitement
+otfa.report.exportRPTG.on=Export RPTG sur EMH
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -372,15 +372,15 @@
if (StringUtils.isNotEmpty(item.getRapport())) {
final CtuluLogGroup reportGroup = logs.createGroup("otfa.reportCreation");
reportGroup.setDescriptionArgs(item.getRapport());
- CtuluLogGroup logReport = new CtuluLogGroup(BusinessMessages.RESOURCE_BUNDLE);
if (managerScenario.getRunCourant() == null) {
- logReport.createNewLog("otfa.report.loading").addSevereError("otfa.report.notGenerated.NoCurrentRun");
+ reportGroup.createNewLog("otfa.report.loading").addSevereError("otfa.report.notGenerated.NoCurrentRun");
} else {
OtfaReportExecutor report = new OtfaReportExecutor(projet, managerScenario, emhScenario, item, campagne);
- report.exportCSV(logReport);
+ report.exportCSV(reportGroup);
}
+
}
}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutor.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutor.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -116,7 +116,7 @@
File targetFile = null;
File modeleDir = projet.getDirForRunModele(managerScenario, managerScenario.getManagerFils(defaultModele.getId()), run);
if (CtuluLibString.isEmpty(targetCsvFile)) {
- targetCsvFile = report.getType().geti18n().toLowerCase() + "_" + CtuluLibFile.getSansExtension(xml.getName()) + ".csv";
+ targetCsvFile = report.getType().name().toLowerCase() + "_" + CtuluLibFile.getSansExtension(xml.getName()) + ".csv";
targetFile = new File(modeleDir, targetCsvFile).getAbsoluteFile();
} else {
targetFile = new File(targetCsvFile);
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorBuilder.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorBuilder.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -11,13 +11,13 @@
* @author Frederic Deniger
*/
public class OtfaReportExecutorBuilder {
-
+
private final OtfaReportExecutor parent;
-
+
public OtfaReportExecutorBuilder(OtfaReportExecutor parent) {
this.parent = parent;
}
-
+
protected OtfaReportExecutorDelegate createDelegate(ReportConfigContrat config, ReportViewLineInfoAndType reportInfo,
OtfaReportGlobalService reportGlobalService) {
switch (config.getType()) {
@@ -25,8 +25,12 @@
return new OtfaReportExecutorDelegateTemporal(parent, reportInfo, config, reportGlobalService);
case LONGITUDINAL:
return new OtfaReportExecutorDelegateLongitudinal(parent, reportInfo, config, reportGlobalService);
+ case MULTI_VAR:
+ return new OtfaReportExecutorDelegateMultiVar(parent, reportInfo, config, reportGlobalService);
+ case RPTG:
+ return new OtfaReportExecutorDelegateRPTG(parent, reportInfo, config, reportGlobalService);
}
return null;
}
-
+
}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegate.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegate.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegate.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -91,6 +91,7 @@
}
public void exportTo(File targetFile, CtuluLog log) {
+ log.addInfo("otfa.report.exportTo", reportInfo.getInfo().getNom(), targetFile.getAbsolutePath());
CSVPrinter writer = null;
try {
writer = new CSVPrinter(new FileOutputStream(targetFile));
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateLongitudinal.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateLongitudinal.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateLongitudinal.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -63,7 +63,7 @@
@Override
protected void exportTo(CSVPrinter printer, CtuluLog log) throws IOException {
- ReportLongitudinalConfig config = (ReportLongitudinalConfig) super.config;
+ ReportLongitudinalConfig content = (ReportLongitudinalConfig) super.config;
final CrueConfigMetier ccm = reportGlobalService.getResultService().getCcm();
ReportLongitudinalLimitHelper limitHelper = new ReportLongitudinalLimitHelper(ccm);
final Map<String, String> displayNameById = limitHelper.getDisplayNameById();
@@ -71,8 +71,8 @@
StringBuilder builder = new StringBuilder();
builder.append(quote).append(BusinessMessages.getString("otfa.report.longitudinalFirstColName")).append(quote).append(super.delimiter);
builder.append(quote).append(propertyXp.getDisplayNom()).append(quote);
- final List<ResultatTimeKey> profilTimes = config.getTimes();
- final List<ReportRunVariableKey> variables = config.getProfilVariables();
+ final List<ResultatTimeKey> profilTimes = content.getTimes();
+ final List<ReportRunVariableKey> variables = content.getProfilVariables();
for (ReportRunVariableKey variable : variables) {
if (ReportVariableTypeEnum.LIMIT_PROFIL.equals(variable.getVariable().getVariableType())) {
String displayName = displayNameById.get(variable.getVariableName());
@@ -99,7 +99,7 @@
log.addWarn(BusinessMessages.getString("Report.RunNonCurrentIgnored"));
}
printer.writelnComment(builder.toString());
- final List<ReportLongitudinalBrancheConfig> branchesConfig = config.getBranchesConfig();
+ final List<ReportLongitudinalBrancheConfig> branchesConfig = content.getBranchesConfig();
ReportLongitudinalPositionBuilder positionBuilder = new ReportLongitudinalPositionBuilder(reportGlobalService.getResultService(), ccm);
final ReportRunKey runCourant = new ReportRunKey();
Set<ReportRunKey> keys = Collections.singleton(runCourant);
Copied: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateMultiVar.java (from rev 8689, trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateTemporal.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateMultiVar.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateMultiVar.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -0,0 +1,80 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.projet.otfa;
+
+import com.Ostermiller.util.CSVPrinter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.dodico.crue.common.BusinessMessages;
+import org.fudaa.dodico.crue.metier.emh.ResultatTimeKey;
+import org.fudaa.dodico.crue.projet.report.ReportMultiVarConfig;
+import org.fudaa.dodico.crue.projet.report.ReportViewLineInfoAndType;
+import org.fudaa.dodico.crue.projet.report.data.ReportRunKey;
+import org.fudaa.dodico.crue.projet.report.data.ReportRunVariableEmhKey;
+import org.fudaa.dodico.crue.projet.report.data.ReportRunVariableHelper;
+import org.fudaa.dodico.crue.projet.report.data.ReportVariableKey;
+import org.fudaa.dodico.crue.projet.report.persist.ReportConfigContrat;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class OtfaReportExecutorDelegateMultiVar extends OtfaReportExecutorDelegate {
+
+ public OtfaReportExecutorDelegateMultiVar(OtfaReportExecutor parent, ReportViewLineInfoAndType reportInfo, ReportConfigContrat config,
+ OtfaReportGlobalService reportGlobalService) {
+ super(parent, reportInfo, config, reportGlobalService);
+ }
+
+ @Override
+ protected void exportTo(CSVPrinter printer, CtuluLog log) throws IOException {
+ ReportMultiVarConfig content = (ReportMultiVarConfig) super.config;
+ Map<String, List<ReportRunKey>> keyByVar = ReportRunVariableHelper.getByEmh(content.getReportRunEmhs());
+ List<ReportRunVariableEmhKey> keysToUse = new ArrayList<ReportRunVariableEmhKey>();
+ boolean containsNonCurrent = false;
+ ReportRunKey current = new ReportRunKey();
+ final ReportVariableKey horizontalVariableKey = super.reportGlobalService.getResultService().createVariableKey(content.getHorizontalVar());
+ for (String variableName : content.getVariables()) {
+ final ReportVariableKey verticalVariableKey = super.reportGlobalService.getResultService().createVariableKey(variableName);
+ for (String emhName : content.getEmhs()) {
+ List<ReportRunKey> keys = keyByVar.get(emhName);
+ if (containsAlternatif(keys)) {
+ containsNonCurrent = true;
+ }
+ if (containsCurrent(keys)) {
+ keysToUse.add(new ReportRunVariableEmhKey(current, horizontalVariableKey, emhName));
+ keysToUse.add(new ReportRunVariableEmhKey(current, verticalVariableKey, emhName));
+
+ }
+ }
+ }
+ if (containsNonCurrent) {
+ log.addWarn(BusinessMessages.getString("Report.RunNonCurrentIgnored"));
+ }
+ StringBuilder builder = new StringBuilder();
+ boolean addDelim = false;
+ for (ReportRunVariableEmhKey key : keysToUse) {
+ if (addDelim) {
+ builder.append(super.delimiter);
+ }
+ addDelim = true;
+ builder.append(quote).append(key.getRunVariableKey().getVariable().getVariableDisplayName()).append(" - ").append(key.getEmhName()).
+ append(quote);
+
+ }
+ printer.printlnComment(builder.toString());
+ final List<ResultatTimeKey> times = reportGlobalService.getRangeSelectedTimeKeys();
+ for (ResultatTimeKey time : times) {
+ for (ReportRunVariableEmhKey key : keysToUse) {
+ super.printVariable(printer, reportGlobalService.getResultService().getValue(time, key.getRunVariableKey(), key.getEmhName()), key.
+ getVariableName());
+ }
+ printer.println();
+ }
+ }
+
+}
Copied: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateRPTG.java (from rev 8689, trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateTemporal.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateRPTG.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateRPTG.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -0,0 +1,111 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.projet.otfa;
+
+import com.Ostermiller.util.CSVPrinter;
+import java.io.IOException;
+import java.util.List;
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.dodico.crue.common.BusinessMessages;
+import org.fudaa.dodico.crue.config.ccm.ConfigLoi;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
+import org.fudaa.dodico.crue.metier.emh.EMH;
+import org.fudaa.dodico.crue.metier.emh.LoiFF;
+import org.fudaa.dodico.crue.metier.emh.ResPrtGeo;
+import org.fudaa.dodico.crue.metier.helper.LoiHelper;
+import org.fudaa.dodico.crue.projet.report.ReportRPTGConfig;
+import org.fudaa.dodico.crue.projet.report.ReportViewLineInfoAndType;
+import org.fudaa.dodico.crue.projet.report.persist.ReportConfigContrat;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class OtfaReportExecutorDelegateRPTG extends OtfaReportExecutorDelegate {
+
+ public static LoiFF findLoi(List<LoiFF> lois, String varX, String varY, CrueConfigMetier ccm) {
+ for (LoiFF loiFF : lois) {
+ ConfigLoi config = ccm.getConfLoi().get(loiFF.getType());
+ if (config.getVarAbscisse().getNom().equals(varX) && config.getVarOrdonnee().getNom().equals(varY)) {
+ return loiFF;
+ } else if (config.getVarAbscisse().getNom().equals(varY) && config.getVarOrdonnee().getNom().equals(varX)) {
+ return LoiHelper.switchAbscOrdonnee(loiFF);
+ }
+ }
+ return null;
+ }
+
+ public OtfaReportExecutorDelegateRPTG(OtfaReportExecutor parent, ReportViewLineInfoAndType reportInfo, ReportConfigContrat config,
+ OtfaReportGlobalService reportGlobalService) {
+ super(parent, reportInfo, config, reportGlobalService);
+ }
+
+ @Override
+ protected void exportTo(CSVPrinter printer, CtuluLog log) throws IOException {
+ ReportRPTGConfig content = (ReportRPTGConfig) super.config;
+ EMH emh = reportGlobalService.getResultService().getRunCourant().getEMH(content.getEmh());
+ if (emh == null) {
+ log.addError("otfa.report.emhNotFound", content.getEmh());
+ return;
+ }
+ ResPrtGeo rptg = emh.getRPTG();
+ if (rptg == null) {
+ log.addError("otfa.report.emhNoRPTG", content.getEmh());
+ return;
+ }
+ printer.writelnComment(BusinessMessages.getString("otfa.report.exportRPTG.on") + ": " + emh.getNom());
+ List<LoiFF> lois = rptg.getLois();
+ final String var1 = content.getVar1();
+ final String var2 = content.getVar2();
+ final String varH = content.getVarHorizontal();
+ LoiFF lois1 = null;
+ LoiFF lois2 = null;
+ if (var1 != null) {
+ lois1 = findLoi(lois, varH, var1, reportGlobalService.getResultService().getCcm());
+ }
+ if (var2 != null) {
+ lois2 = findLoi(lois, varH, var2, reportGlobalService.getResultService().getCcm());
+ }
+ int max1 = 0;
+ int max2 = 0;
+ StringBuilder builder = new StringBuilder();
+ if (lois1 != null) {
+ max1 = lois1.getNombrePoint();
+ builder.append(super.quote).append(reportGlobalService.getResultService().getVariableName(varH)).append(super.quote);
+ builder.append(super.delimiter).append(super.quote).append(reportGlobalService.getResultService().getVariableName(var1)).append(super.quote);
+ }
+ if (lois2 != null) {
+ max2 = lois2.getNombrePoint();
+ if (builder.length() > 0) {
+ builder.append(super.delimiter);
+ }
+ builder.append(super.quote).append(reportGlobalService.getResultService().getVariableName(varH)).append(super.quote);
+ builder.append(super.delimiter).append(super.quote).append(reportGlobalService.getResultService().getVariableName(var2)).append(super.quote);
+ }
+ int maxSize = Math.max(max1, max2);
+ printer.printlnComment(builder.toString());
+ for (int i = 0; i < maxSize; i++) {
+ if (lois1 != null) {
+ if (i >= max1) {
+ printer.print(StringUtils.EMPTY);
+ printer.print(StringUtils.EMPTY);
+ }
+ printVariable(printer, lois1.getAbscisse(i), varH);
+ printVariable(printer, lois1.getOrdonnee(i), var1);
+ }
+ if (lois2 != null) {
+ if (i >= max2) {
+ printer.print(StringUtils.EMPTY);
+ printer.print(StringUtils.EMPTY);
+ }
+ printVariable(printer, lois2.getAbscisse(i), varH);
+ printVariable(printer, lois2.getOrdonnee(i), var2);
+ }
+ printer.println();
+ }
+
+ }
+
+}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportGlobalService.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportGlobalService.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportGlobalService.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -9,7 +9,6 @@
import java.util.Map;
import org.fudaa.dodico.crue.metier.emh.ResultatTimeKey;
import org.fudaa.dodico.crue.projet.report.ReportGlobalServiceContrat;
-import org.fudaa.dodico.crue.projet.report.ReportResultProviderServiceContrat;
import org.fudaa.dodico.crue.projet.report.formule.function.AggregationCacheKey;
import org.netbeans.api.progress.ProgressRunnable;
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportResultService.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportResultService.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportResultService.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -136,6 +136,14 @@
return getRunCourant().getEMH(nom);
}
+ public String getVariableName(String varName) {
+ if (formuleService.isFormule(varName)) {
+ return varName;
+ }
+ ItemVariable property = getCcm().getProperty(varName);
+ return property == null ? varName : property.getDisplayNom();
+ }
+
@Override
public PropertyNature getPropertyNature(String varName) {
if (formuleService.isFormule(varName)) {
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/RapportCustomEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/RapportCustomEditor.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/RapportCustomEditor.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -4,6 +4,7 @@
import java.awt.Color;
import org.fudaa.fudaa.crue.common.editor.CustomEditorAbstract;
import java.io.File;
+import java.util.Arrays;
import java.util.List;
import javax.swing.JComponent;
import javax.swing.JLabel;
@@ -60,7 +61,12 @@
ReportIndexReaderHelper helper = new ReportIndexReaderHelper(projet);
String value = (String) editor.getValue();
TreeNode selectedValue = null;
+ List<ReportContentType> toAvoid = Arrays.asList(ReportContentType.PLANIMETRY, ReportContentType.TRANSVERSAL);
for (ReportContentType reportContentType : values) {
+ //on ignore les rapports non gérés.
+ if (toAvoid.contains(reportContentType)) {
+ continue;
+ }
final CrueIOResu<List<ReportViewLineInfo>> linesIO = helper.readType(reportContentType);
if (linesIO != null && CtuluLibArray.isNotEmpty(linesIO.getMetier())) {
DefaultMutableTreeNode lineParent = new DefaultMutableTreeNode(reportContentType.getFolderName());
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -285,10 +285,13 @@
axeVConfig.apply(axe);
}
}
- if (horizontalPersist != null) {
+ boolean performZoom = false;
+ if (horizontalPersist != null && StringUtils.equals(horizontalPersist.getTitre(), uiController.getAxeX().getTitre())) {
horizontalPersist.apply(uiController.getAxeX());
+ } else {
+ performZoom = true;
}
- if (fromTemplate || content.isNoZoomSet()) {
+ if (performZoom || fromTemplate || content.isNoZoomSet()) {
uiController.getGraphe().restore();
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -40,12 +40,11 @@
* @author Frederic Deniger
*/
public class ReportMultiVarGrapheBuilder extends AbstractReportGrapheBuilder<CourbesUiController, ReportMultiVarConfig> {
-
+
public ReportMultiVarGrapheBuilder(CourbesUiController uiController, ViewCourbeManager loiLabelsManager) {
super(uiController, loiLabelsManager);
}
-
-
+
@Override
public List<EGCourbeSimple> getInternCourbes(ReportMultiVarConfig content, ProgressHandle progress) {
if (!reportService.isRunLoaded()) {
@@ -60,6 +59,10 @@
return Collections.emptyList();
}
PropertyNature propertyHorizontal = reportResultProviderService.getPropertyNature(content.getHorizontalVar());
+ //on change de variables horizontales: on oublie les pref.
+ if (propertyHorizontal != axeX.getUserObject()) {
+ content.saveAxeH(null);
+ }
axeX.setTitre(propertyHorizontal.getDisplayName());
axeX.setUniteVisible(true);
axeX.setUnite(propertyHorizontal.getUnite());
@@ -68,20 +71,12 @@
axeX.setSpecificFormat(new CtuluNumberFormatDefault(propertyHorizontal.getFormatter(DecimalFormatEpsilonEnum.PRESENTATION)));
axeX.setSpecificDetailFormat(new CtuluNumberFormatDefault(propertyHorizontal.getFormatter(DecimalFormatEpsilonEnum.COMPARISON)));
axeX.setUserObject(propertyHorizontal);
-// EGCourbe selectedComponent = uiController.getEGGrapheSimpleModel().getSelectedComponent();
-// Object selectedKey = null;
-// if (selectedComponent != null && selectedComponent.getModel() != null) {
-// selectedKey = ((CourbeModelWithKey) selectedComponent.getModel()).getKey();
-// if (ReportVerticalTimeKey.isTimeKey(selectedKey)) {
-// selectedKey = null;
-// }
-// }
Map<String, List<ReportRunKey>> keyByVar = ReportRunVariableHelper.getByEmh(content.getReportRunEmhs());
List<ResultatTimeKey> times = reportService.getRangeSelectedTimeKeys();
List<EGCourbeSimple> courbes = new ArrayList<EGCourbeSimple>();
Map<String, EGAxeVertical> saved = new HashMap<String, EGAxeVertical>();
for (String variableName : content.getVariables()) {
-
+
PropertyNature property = reportResultProviderService.getPropertyNature(variableName);
ReportVariableKey variableKey = reportResultProviderService.createVariableKey(variableName);
EGAxeVertical axeVertical = getOrCreateAxeVerticalConfigured(property, content, saved);
@@ -99,9 +94,6 @@
final EGCourbePersist persist = content.getCourbeconfigs().get(key);
applyPersistConfig(persist, courbe);
courbes.add(courbe);
-// if (selectedKey == null) {
-// selectedKey = key;
-// }
}
}
}
@@ -109,16 +101,16 @@
}
return courbes;
}
-
+
@Override
public void updateResultCurvesAfterTimeChanged(ReportMultiVarConfig content) {
}
-
+
@Override
public List<EGCourbeSimple> getInternCourbesAfterTimeChanged(ReportMultiVarConfig content, ProgressHandle progress) {
return Collections.emptyList();
}
-
+
private LoiConstanteCourbeModel createCourbeModel(ReportMultiVarConfig config, List<ResultatTimeKey> times, ReportRunVariableEmhKey key) {
ReportRunVariableKey hKey = new ReportRunVariableKey(key.getRunVariableKey().getRunKey(), reportResultProviderService.createVariableKey(
config.getHorizontalVar()));
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/rptg/ReportRPTGGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/rptg/ReportRPTGGrapheBuilder.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/rptg/ReportRPTGGrapheBuilder.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -18,6 +18,7 @@
import org.fudaa.dodico.crue.metier.emh.LoiFF;
import org.fudaa.dodico.crue.metier.emh.ResPrtGeo;
import org.fudaa.dodico.crue.metier.helper.LoiHelper;
+import org.fudaa.dodico.crue.projet.otfa.OtfaReportExecutorDelegateRPTG;
import org.fudaa.ebli.courbe.EGAxeVertical;
import org.fudaa.ebli.courbe.EGCourbePersist;
import org.fudaa.ebli.courbe.EGCourbeSimple;
@@ -92,19 +93,6 @@
return courbe;
}
- private LoiFF findLoi(List<LoiFF> lois, String varX, String varY, CrueConfigMetier ccm) {
- for (LoiFF loiFF : lois) {
- ConfigLoi config = ccm.getConfLoi().get(loiFF.getType());
- if (config.getVarAbscisse().getNom().equals(varX) && config.getVarOrdonnee().getNom().equals(varY)) {
- return loiFF;
- } else if (config.getVarAbscisse().getNom().equals(varY) && config.getVarOrdonnee().getNom().equals(varX)) {
- return LoiHelper.switchAbscOrdonnee(loiFF);
- }
- }
- return null;
-
- }
-
@Override
public List<EGCourbeSimple> getInternCourbes(ReportRPTGConfig content, ProgressHandle progress) {
final String varHorizontal = content.getVarHorizontal();
@@ -147,7 +135,7 @@
protected EGCourbeSimple createCourbe(List<LoiFF> lois, ReportRPTGConfig config, final String emhName, final String var1, CrueConfigMetier ccm,
boolean main, Map<String, EGAxeVertical> axesY) {
- LoiFF loi1 = findLoi(lois, config.getVarHorizontal(), var1, ccm);
+ LoiFF loi1 = OtfaReportExecutorDelegateRPTG.findLoi(lois, config.getVarHorizontal(), var1, ccm);
if (loi1 != null) {
PropertyNature property1 = reportResultProviderService.getPropertyNature(var1);
ItemVariable varX = reportResultProviderService.getCcmVariable(config.getVarHorizontal());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
