Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[9552] trunk/soft/fudaa-crue/ui-report/src/main/java/org /fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java
|
From: <de...@us...> - 2017-05-04 20:47:58
|
Revision: 9552
http://sourceforge.net/p/fudaa/svn/9552
Author: deniger
Date: 2017-05-04 20:47:55 +0000 (Thu, 04 May 2017)
Log Message:
-----------
CRUE-677
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java 2017-05-04 14:36:08 UTC (rev 9551)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java 2017-05-04 20:47:55 UTC (rev 9552)
@@ -46,248 +46,257 @@
* @author Frederic Deniger
*/
public class ReportLongitudinalGrapheBuilder extends AbstractReportGrapheBuilder<CourbesUiController, ReportLongitudinalConfig> {
-
- public ReportLongitudinalGrapheBuilder(CourbesUiController uiController, ViewCourbeManager loiLabelsManager) {
- super(uiController, loiLabelsManager);
- }
-
- protected EGAxeVertical getOrCreateAxeVerticalZ(ReportLongitudinalConfig content, Map<String, EGAxeVertical> saved) {
- return getOrCreateAxeVerticalConfigured(getVariableZ().getNature(), content, saved);
- }
- ReportLongitudinalPositionBrancheContent result;
-
- @Override
- public void runUnloaded() {
- super.runUnloaded();
- result = null;
- }
-
- @Override
- public ReportResultProviderService getReportResultProviderService() {
- return reportResultProviderService;
- }
-
- @Override
- public List<EGCourbeSimple> getInternCourbes(ReportLongitudinalConfig content, ProgressHandle progress) {
- Map<String, EGAxeVertical> saved = new HashMap<>();
- ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content, saved);
- EGAxeVertical axeZ = courbeBuilder.getAxeZ();
- uiController.configureAxeH(reportService.getCcm().getProperty(CrueConfigMetierConstants.PROP_XP), true);
- double xpInit = 0;
- result = new ReportLongitudinalPositionBrancheContent();
- ReportLongitudinalPositionBuilder positionBuilder = new ReportLongitudinalPositionBuilder(reportResultProviderService, reportService.getCcm());
- Set<ReportRunKey> keys = getRunKeysToUse(content);
- for (ReportLongitudinalBrancheConfig brancheConfig : content.getBranchesConfig()) {
- if (progress != null) {
- progress.setDisplayName(brancheConfig.getName());
- }
- xpInit = xpInit + brancheConfig.getDecalXp();
- positionBuilder.buildPositions(xpInit, brancheConfig, result, keys);
- xpInit = xpInit + brancheConfig.getLength();
+
+ public ReportLongitudinalGrapheBuilder(CourbesUiController uiController, ViewCourbeManager loiLabelsManager) {
+ super(uiController, loiLabelsManager);
}
- uiController.getGraphe().setHorizontalBanner(new ReportLongitudinalBanner(content, result));
- final List<EGCourbeSimple> res = createNonTimeStepCourbes(content, axeZ, courbeBuilder, progress);
- res.addAll(createCourbesOnCurrentTimeStep(content, progress, saved));
- return res;
- }
-
- @Override
- public void applyLabelsConfigChanged(ReportLongitudinalConfig content) {
- List<LabelConfig> labels = content.getLoiLegendConfig().getLabels();
- ReportRunKey runKey = reportService.getRunCourant() == null ? null : reportService.getRunCourant().getRunKey();
- for (LabelConfig config : labels) {
- ReportLabelContent labelContent = (ReportLabelContent) config.getKey();
- String text = runKey == null ? StringUtils.EMPTY : reportResultProviderService.getLabelString(labelContent, runKey, content.getMainEMHName(),
- DecimalFormatEpsilonEnum.PRESENTATION, content.getSelectedTimeStepInReport());
- String tltip = runKey == null ? StringUtils.EMPTY : reportResultProviderService.getLabelString(labelContent, runKey, content.getMainEMHName(),
- DecimalFormatEpsilonEnum.COMPARISON, content.getSelectedTimeStepInReport());
- config.setText(text);
- config.setTooltipText(tltip);
+
+ protected EGAxeVertical getOrCreateAxeVerticalZ(ReportLongitudinalConfig content, Map<String, EGAxeVertical> saved) {
+ return getOrCreateAxeVerticalConfigured(getVariableZ().getNature(), content, saved);
}
- this.loiLabelsManager.getLoiLabelsManager().applyConfig();
- }
-
- protected List<EGCourbeSimple> retrieveCourbesNonTimeStep() {
- EGGrapheSimpleModel model = uiController.getEGGrapheSimpleModel();
- List<EGCourbeSimple> res = new ArrayList<>();
- EGCourbeSimple[] courbes = model.getCourbes();
- for (int i = 0; i < courbes.length; i++) {
- EGCourbeSimple courbe = courbes[i];
- Object key = ((CourbeModelWithKey) courbe.getModel()).getKey();
- if (key != null && ReportRunVariableTimeKey.class.equals(key.getClass())) {
- ReportRunVariableTimeKey reportKey = (ReportRunVariableTimeKey) key;
- if (!reportKey.isDefinedOnSelectedTimeStep() || reportKey.isLimitProfilVariable() || reportKey.isRPTIVariable() || isExpressionNotTimeDependant(
- reportKey.getRunVariableKey())) {
- res.add(courbe);
- }
- }
+ ReportLongitudinalPositionBrancheContent result;
+
+ @Override
+ public void runUnloaded() {
+ super.runUnloaded();
+ result = null;
}
- return res;
- }
-
- @Override
- public List<EGCourbeSimple> getInternCourbesAfterTimeChanged(ReportLongitudinalConfig content, ProgressHandle progress) {
- Map<String, EGAxeVertical> saved = new HashMap<>();
- List<EGCourbeSimple> res = retrieveCourbesNonTimeStep();
- res.addAll(createCourbesOnCurrentTimeStep(content, progress, saved));
- return res;
- }
-
- private List<EGCourbeSimple> createCourbesOnCurrentTimeStep(ReportLongitudinalConfig content, ProgressHandle progress,
- Map<String, EGAxeVertical> saved) {
- if (Boolean.FALSE.equals(content.getCurrentTimeDisplayed())) {
- return Collections.emptyList();
+
+ @Override
+ public ReportResultProviderService getReportResultProviderService() {
+ return reportResultProviderService;
}
- ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content, saved);
- if (result == null) {
- return Collections.emptyList();
+
+ @Override
+ public List<EGCourbeSimple> getInternCourbes(ReportLongitudinalConfig content, ProgressHandle progress) {
+ Map<String, EGAxeVertical> saved = new HashMap<>();
+ ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content, saved);
+ EGAxeVertical axeZ = courbeBuilder.getAxeZ();
+ uiController.configureAxeH(reportService.getCcm().getProperty(CrueConfigMetierConstants.PROP_XP), true);
+ double xpInit = 0;
+ result = new ReportLongitudinalPositionBrancheContent();
+ ReportLongitudinalPositionBuilder positionBuilder = new ReportLongitudinalPositionBuilder(reportResultProviderService, reportService.getCcm());
+ Set<ReportRunKey> keys = getRunKeysToUse(content);
+ for (ReportLongitudinalBrancheConfig brancheConfig : content.getBranchesConfig()) {
+ if (progress != null) {
+ progress.setDisplayName(brancheConfig.getName());
+ }
+ xpInit = xpInit + brancheConfig.getDecalXp();
+ positionBuilder.buildPositions(xpInit, brancheConfig, result, keys);
+ xpInit = xpInit + brancheConfig.getLength();
+ }
+ uiController.getGraphe().setHorizontalBanner(new ReportLongitudinalBanner(content, result));
+ final List<EGCourbeSimple> res = createNonTimeStepCourbes(content, axeZ, courbeBuilder, progress);
+ res.addAll(createCourbesOnCurrentTimeStep(content, progress, saved));
+ return res;
}
- List<ReportRunVariableKey> var = content.getProfilVariables();
- List<EGCourbeSimple> courbes = new ArrayList<>();
- ResultatTimeKey selectedTime = reportService.getSelectedTime();
- if (selectedTime != null) {
- for (ReportRunVariableKey reportRunVariableKey : var) {
- if (progress != null) {
- progress.setDisplayName(reportRunVariableKey.getVariableName() + ": " + reportRunVariableKey.getReportRunKey().getDisplayName());
+
+ @Override
+ public void applyLabelsConfigChanged(ReportLongitudinalConfig content) {
+ List<LabelConfig> labels = content.getLoiLegendConfig().getLabels();
+ ReportRunKey runKey = reportService.getRunCourant() == null ? null : reportService.getRunCourant().getRunKey();
+ for (LabelConfig config : labels) {
+ ReportLabelContent labelContent = (ReportLabelContent) config.getKey();
+ String text = runKey == null ? StringUtils.EMPTY : reportResultProviderService.getLabelString(labelContent, runKey, content.getMainEMHName(),
+ DecimalFormatEpsilonEnum.PRESENTATION, content.getSelectedTimeStepInReport());
+ String tltip = runKey == null ? StringUtils.EMPTY : reportResultProviderService.getLabelString(labelContent, runKey, content.getMainEMHName(),
+ DecimalFormatEpsilonEnum.COMPARISON, content.getSelectedTimeStepInReport());
+ config.setText(text);
+ config.setTooltipText(tltip);
}
- if (reportRunVariableKey.isReadOrVariable()) {
- EGCourbeSimple courbe = courbeBuilder.createCourbe(reportRunVariableKey, selectedTime, true);
- courbes.add(courbe);
+ this.loiLabelsManager.getLoiLabelsManager().applyConfig();
+ }
+
+ protected List<EGCourbeSimple> retrieveCourbesNonTimeStep() {
+ EGGrapheSimpleModel model = uiController.getEGGrapheSimpleModel();
+ List<EGCourbeSimple> res = new ArrayList<>();
+ EGCourbeSimple[] courbes = model.getCourbes();
+ for (int i = 0; i < courbes.length; i++) {
+ EGCourbeSimple courbe = courbes[i];
+ Object key = ((CourbeModelWithKey) courbe.getModel()).getKey();
+ if (key != null && ReportRunVariableTimeKey.class.equals(key.getClass())) {
+ ReportRunVariableTimeKey reportKey = (ReportRunVariableTimeKey) key;
+ if (!reportKey.isDefinedOnSelectedTimeStep() || reportKey.isLimitProfilVariable() || reportKey.isRPTIVariable() || isExpressionNotTimeDependant(
+ reportKey.getRunVariableKey())) {
+ res.add(courbe);
+ }
+ }
}
- }
+ return res;
}
- return courbes;
- }
-
- public EMHSectionProfil retrieveProfil(EMH emh) {
- return ReportProfilHelper.retrieveProfil(emh);
- }
-
- public ItemVariable getVariableZ() {
- return reportService.getCcm().getProperty(CrueConfigMetierConstants.PROP_Z);
- }
-
- protected void updateReadCourbeName(EGCourbe courbe) {
- ReportRunVariableTimeKey key = (ReportRunVariableTimeKey) ((CourbeModelWithKey) courbe.getModel()).getKey();
- if (!key.isLimitProfilVariable()) {
- courbe.getModel().setTitle(key.getDisplayName(getReportResultProviderService().getReportService().getReportTimeFormatter().
- getResulatKeyTempsSceToStringTransformer()));
+
+ @Override
+ public List<EGCourbeSimple> getInternCourbesAfterTimeChanged(ReportLongitudinalConfig content, ProgressHandle progress) {
+ Map<String, EGAxeVertical> saved = new HashMap<>();
+ List<EGCourbeSimple> res = retrieveCourbesNonTimeStep();
+ res.addAll(createCourbesOnCurrentTimeStep(content, progress, saved));
+ return res;
}
- }
-
- public Set<ReportRunKey> getRunKeysToUse(ReportLongitudinalConfig content) {
- final List<ReportRunVariableKey> variables = content.getProfilVariables();
- Set<ReportRunKey> keys = new HashSet<>();
- if (reportService.getRunCourant() != null) {
- keys.add(reportService.getRunCourant().getRunKey());
+
+ private List<EGCourbeSimple> createCourbesOnCurrentTimeStep(ReportLongitudinalConfig content, ProgressHandle progress,
+ Map<String, EGAxeVertical> saved) {
+ if (Boolean.FALSE.equals(content.getCurrentTimeDisplayed())) {
+ return Collections.emptyList();
+ }
+ ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content, saved);
+ if (result == null) {
+ return Collections.emptyList();
+ }
+ List<ReportRunVariableKey> var = content.getProfilVariables();
+ List<EGCourbeSimple> courbes = new ArrayList<>();
+ ResultatTimeKey selectedTime = reportService.getSelectedTime();
+ if (selectedTime != null) {
+ for (ReportRunVariableKey reportRunVariableKey : var) {
+ if (reportRunVariableKey.isReadOrVariable() && !isExpressionNotTimeDependant(reportRunVariableKey)) {
+ if (progress != null) {
+ progress.setDisplayName(reportRunVariableKey.getVariableName() + ": " + reportRunVariableKey.getReportRunKey().getDisplayName());
+ }
+ EGCourbeSimple courbe = courbeBuilder.createCourbe(reportRunVariableKey, selectedTime, true);
+ courbes.add(courbe);
+ }
+ }
+ }
+ return courbes;
}
- for (ReportRunVariableKey reportRunVariableKey : variables) {
- keys.add(reportRunVariableKey.getRunKey());
+
+ public EMHSectionProfil retrieveProfil(EMH emh) {
+ return ReportProfilHelper.retrieveProfil(emh);
}
- return keys;
- }
-
- EGAxeVertical getRightAxis(ReportLongitudinalConfig content, Map<String, EGAxeVertical> savedAxed) {
- String variableDrawnOnRightAxis = content.getVariableDrawnOnRightAxis(reportResultProviderService);
- EGAxeVertical rightAxis = null;
- if (StringUtils.isNotBlank(variableDrawnOnRightAxis)) {
- rightAxis = getOrCreateAxeVerticalConfigured(reportResultProviderService.getPropertyNature(variableDrawnOnRightAxis), content, savedAxed);
+
+ public ItemVariable getVariableZ() {
+ return reportService.getCcm().getProperty(CrueConfigMetierConstants.PROP_Z);
}
- if (rightAxis != null) {
- rightAxis.setDroite(true);
+
+ protected void updateReadCourbeName(EGCourbe courbe) {
+ ReportRunVariableTimeKey key = (ReportRunVariableTimeKey) ((CourbeModelWithKey) courbe.getModel()).getKey();
+ if (!key.isLimitProfilVariable()) {
+ courbe.getModel().setTitle(key.getDisplayName(getReportResultProviderService().getReportService().getReportTimeFormatter().
+ getResulatKeyTempsSceToStringTransformer()));
+ }
}
- return rightAxis;
- }
-
- void updateCourbeNames(ReportLongitudinalConfig content) {
- EGCourbeSimple[] courbes = uiController.getEGGrapheSimpleModel().getCourbes();
- for (EGCourbeSimple courbe : courbes) {
- updateReadCourbeName(courbe);
-
+
+ public Set<ReportRunKey> getRunKeysToUse(ReportLongitudinalConfig content) {
+ final List<ReportRunVariableKey> variables = content.getProfilVariables();
+ Set<ReportRunKey> keys = new HashSet<>();
+ if (reportService.getRunCourant() != null) {
+ keys.add(reportService.getRunCourant().getRunKey());
+ }
+ for (ReportRunVariableKey reportRunVariableKey : variables) {
+ keys.add(reportRunVariableKey.getRunKey());
+ }
+ return keys;
}
- }
-
- public EGGraphe getGraphe() {
- return uiController.getGraphe();
- }
- /**
- *
- * @param content
- * @param axeZ
- * @param courbeBuilder
- * @param progress
- * @return les courbes non dépendants du temps sélectionné.
- */
- private List<EGCourbeSimple> createNonTimeStepCourbes(ReportLongitudinalConfig content, EGAxeVertical axeZ,
- ReportLongitudinalGrapheBuilderCourbe courbeBuilder, ProgressHandle progress) {
- List<EGCourbeSimple> courbes = new ArrayList<>();
- ReportLongitudinalGrapheBuilderLimit limitBuilder = new ReportLongitudinalGrapheBuilderLimit(reportService.getCcm());
- final List<ReportRunVariableKey> variables = content.getProfilVariables();
- for (ReportRunVariableKey reportRunVariableKey : variables) {
- if (ReportVariableTypeEnum.LIMIT_PROFIL.equals(reportRunVariableKey.getVariable().getVariableType())) {
- if (progress != null) {
- progress.setDisplayName(reportRunVariableKey.getDisplayName());
+ EGAxeVertical getRightAxis(ReportLongitudinalConfig content, Map<String, EGAxeVertical> savedAxed) {
+ String variableDrawnOnRightAxis = content.getVariableDrawnOnRightAxis(reportResultProviderService);
+ EGAxeVertical rightAxis = null;
+ if (StringUtils.isNotBlank(variableDrawnOnRightAxis)) {
+ rightAxis = getOrCreateAxeVerticalConfigured(reportResultProviderService.getPropertyNature(variableDrawnOnRightAxis), content, savedAxed);
}
- LoiConstanteCourbeModel model = limitBuilder.build(reportRunVariableKey, result.getCartouches());
- if (model != null && model.getKey() != null && content.getCourbeconfigs() != null) {
- EGCourbeSimple courbe = new EGCourbeSimple(axeZ, model);
-
- AbstractReportGrapheBuilder.applyPersistConfig(content.getCourbeconfigs().get(model.getKey()), courbe);
- courbes.add(courbe);
+ if (rightAxis != null) {
+ rightAxis.setDroite(true);
}
- } else if (ReportVariableTypeEnum.RESULTAT_RPTI.equals(reportRunVariableKey.getVariable().getVariableType())) {
- if (progress != null) {
- progress.setDisplayName(reportRunVariableKey.getDisplayName());
+ return rightAxis;
+ }
+
+ void updateCourbeNames(ReportLongitudinalConfig content) {
+ EGCourbeSimple[] courbes = uiController.getEGGrapheSimpleModel().getCourbes();
+ for (EGCourbeSimple courbe : courbes) {
+ updateReadCourbeName(courbe);
+
}
- EGCourbeSimple courbe = courbeBuilder.createCourbe(reportRunVariableKey, null, false);
- courbes.add(courbe);
- }
}
- final List<ResultatTimeKey> times = content.getTimes();
- //contient les clés des courbes qui ne dépendent pas du temps et donc à ne créer qu'une seule fois
- Set<ReportRunVariableKey> timeIndependantVariable = new HashSet<>();
- for (ResultatTimeKey timeKey : times) {
- for (ReportRunVariableKey reportRunVariableKey : variables) {
- ResultatTimeKey timeKeyToUse = timeKey;
- if (reportRunVariableKey.isReadOrVariable()) {
- if (progress != null) {
- progress.setDisplayName(reportRunVariableKey.getDisplayName() + " " + timeKey.toString());
- }
- boolean isExpressionNotTimeDependant = isExpressionNotTimeDependant(reportRunVariableKey);
- boolean useCurrentTime = false;
- if (isExpressionNotTimeDependant) {
- //on ne construit pas la courbe si elle n'est pas dépendante du temps et déja construite
- //idem si le temps courant est affiché c'est pas la peine
- if (timeIndependantVariable.contains(reportRunVariableKey) || content.getCurrentTimeDisplayed()) {
- continue;
+
+ public EGGraphe getGraphe() {
+ return uiController.getGraphe();
+ }
+
+ /**
+ *
+ * @param content
+ * @param axeZ
+ * @param courbeBuilder
+ * @param progress
+ * @return les courbes non dépendants du temps sélectionné.
+ */
+ private List<EGCourbeSimple> createNonTimeStepCourbes(ReportLongitudinalConfig content, EGAxeVertical axeZ,
+ ReportLongitudinalGrapheBuilderCourbe courbeBuilder, ProgressHandle progress) {
+ List<EGCourbeSimple> courbes = new ArrayList<>();
+ ReportLongitudinalGrapheBuilderLimit limitBuilder = new ReportLongitudinalGrapheBuilderLimit(reportService.getCcm());
+ final List<ReportRunVariableKey> variables = content.getProfilVariables();
+ for (ReportRunVariableKey reportRunVariableKey : variables) {
+ if (isExpressionNotTimeDependant(reportRunVariableKey)) {
+ if (progress != null) {
+ progress.setDisplayName(reportRunVariableKey.getVariableName() + ": " + reportRunVariableKey.getReportRunKey().getDisplayName());
+ }
+ EGCourbeSimple courbe = courbeBuilder.createCourbe(reportRunVariableKey, null, true);
+ courbes.add(courbe);
}
- timeIndependantVariable.add(reportRunVariableKey);
- //si pas dépend du temps on utilise le temps courant: astuce pour ne pas afficher le temps dans le nom de la courbe
- useCurrentTime = true;
- timeKeyToUse = reportService.getSelectedTime();
- }
- EGCourbeSimple createCourbe = courbeBuilder.createCourbe(reportRunVariableKey, timeKeyToUse, useCurrentTime);
- courbes.add(createCourbe);
+ if (ReportVariableTypeEnum.LIMIT_PROFIL.equals(reportRunVariableKey.getVariable().getVariableType())) {
+ if (progress != null) {
+ progress.setDisplayName(reportRunVariableKey.getDisplayName());
+ }
+ LoiConstanteCourbeModel model = limitBuilder.build(reportRunVariableKey, result.getCartouches());
+ if (model != null && model.getKey() != null && content.getCourbeconfigs() != null) {
+ EGCourbeSimple courbe = new EGCourbeSimple(axeZ, model);
+
+ AbstractReportGrapheBuilder.applyPersistConfig(content.getCourbeconfigs().get(model.getKey()), courbe);
+ courbes.add(courbe);
+ }
+ } else if (ReportVariableTypeEnum.RESULTAT_RPTI.equals(reportRunVariableKey.getVariable().getVariableType())) {
+ if (progress != null) {
+ progress.setDisplayName(reportRunVariableKey.getDisplayName());
+ }
+ EGCourbeSimple courbe = courbeBuilder.createCourbe(reportRunVariableKey, null, false);
+ courbes.add(courbe);
+ }
}
- }
+ final List<ResultatTimeKey> times = content.getTimes();
+ //contient les clés des courbes qui ne dépendent pas du temps et donc à ne créer qu'une seule fois
+ Set<ReportRunVariableKey> timeIndependantVariable = new HashSet<>();
+ for (ResultatTimeKey timeKey : times) {
+ for (ReportRunVariableKey reportRunVariableKey : variables) {
+ ResultatTimeKey timeKeyToUse = timeKey;
+ if (reportRunVariableKey.isReadOrVariable()) {
+ if (progress != null) {
+ progress.setDisplayName(reportRunVariableKey.getDisplayName() + " " + timeKey.toString());
+ }
+ boolean isExpressionNotTimeDependant = isExpressionNotTimeDependant(reportRunVariableKey);
+ boolean useCurrentTime = false;
+ if (isExpressionNotTimeDependant) {
+ //on ne construit pas la courbe si elle n'est pas dépendante du temps et déja construite
+ //idem si le temps courant est affiché c'est pas la peine
+ if (timeIndependantVariable.contains(reportRunVariableKey) || content.getCurrentTimeDisplayed()) {
+ continue;
+ }
+ timeIndependantVariable.add(reportRunVariableKey);
+ //si pas dépend du temps on utilise le temps courant: astuce pour ne pas afficher le temps dans le nom de la courbe
+ useCurrentTime = true;
+ timeKeyToUse = reportService.getSelectedTime();
+ }
+ EGCourbeSimple createCourbe = courbeBuilder.createCourbe(reportRunVariableKey, timeKeyToUse, useCurrentTime);
+ courbes.add(createCourbe);
+ }
+ }
+ }
+ return courbes;
}
- return courbes;
- }
- /**
- *
- * @param reportRunVariableKey
- * @return true si la variable n'est pas dépendante du temps. C'est le cas des MaxSurTous..., MaxSurSelection,...
- */
- protected boolean isExpressionNotTimeDependant(ReportRunVariableKey reportRunVariableKey) {
- boolean isExpressionNotTimeDependant = false;
- if (reportRunVariableKey.getVariable().getVariableType().equals(ReportVariableTypeEnum.FORMULE)) {
- boolean containsTimeDependantVariable = reportResultProviderService.containsTimeDependantVariable(reportRunVariableKey.getVariable().
- getVariableName());
- isExpressionNotTimeDependant = !containsTimeDependantVariable;
-
+ /**
+ *
+ * @param reportRunVariableKey
+ * @return true si la variable n'est pas dépendante du temps. C'est le cas
+ * des MaxSurTous..., MaxSurSelection,...
+ */
+ protected boolean isExpressionNotTimeDependant(ReportRunVariableKey reportRunVariableKey) {
+ boolean isExpressionNotTimeDependant = false;
+ if (reportRunVariableKey.getVariable().getVariableType().equals(ReportVariableTypeEnum.FORMULE)) {
+ boolean containsTimeDependantVariable = reportResultProviderService.containsTimeDependantVariable(reportRunVariableKey.getVariable().
+ getVariableName());
+ isExpressionNotTimeDependant = !containsTimeDependantVariable;
+
+ }
+ return isExpressionNotTimeDependant;
}
- return isExpressionNotTimeDependant;
- }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
