Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[9203] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2015-11-25 22:57:49
|
Revision: 9203
http://sourceforge.net/p/fudaa/svn/9203
Author: deniger
Date: 2015-11-25 22:57:46 +0000 (Wed, 25 Nov 2015)
Log Message:
-----------
CRUE-667
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/longitudinal/ReportLongitudinalConfig.java
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/ReportLongitudinalTimeChooser.java
trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/longitudinal/Bundle.properties
Modified: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/longitudinal/ReportLongitudinalConfig.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/longitudinal/ReportLongitudinalConfig.java 2015-11-25 22:19:43 UTC (rev 9202)
+++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/longitudinal/ReportLongitudinalConfig.java 2015-11-25 22:57:46 UTC (rev 9203)
@@ -65,6 +65,9 @@
@XStreamAlias("Vue-Config")
ViewCourbeConfig loiLegendConfig = new ViewCourbeConfig();
+ @XStreamAlias("Temps-courant-affiche")
+ Boolean currentTimeDisplayed = Boolean.TRUE;
+
@Override
public ViewCourbeConfig getLoiLegendConfig() {
return loiLegendConfig;
@@ -74,7 +77,6 @@
return courbeconfigs;
}
-
@Override
protected void cleanUnusedCourbesConfig(Set<ReportKeyContract> usedKeys) {
for (Iterator<ReportRunVariableTimeKey> it = courbeconfigs.keySet().iterator(); it.hasNext();) {
@@ -97,6 +99,15 @@
return modified;
}
+ public Boolean getCurrentTimeDisplayed() {
+ return currentTimeDisplayed == null ? Boolean.TRUE : currentTimeDisplayed;
+ }
+
+ public void setCurrentTimeDisplayed(Boolean currentTimeDisplayed) {
+ this.currentTimeDisplayed = currentTimeDisplayed;
+ }
+
+
public List<ResultatTimeKey> getTimes() {
return times;
}
@@ -139,6 +150,9 @@
if (times == null) {
times = new ArrayList<ResultatTimeKey>();
}
+ if (currentTimeDisplayed == null) {
+ currentTimeDisplayed = Boolean.TRUE;
+ }
if (courbeconfigs == null) {
courbeconfigs = new HashMap<ReportRunVariableTimeKey, EGCourbePersist>();
}
@@ -171,7 +185,8 @@
for (ReportRunVariableKey vKey : profilVariables) {
//pour eviter les limites -> vKey.isReadVariable()
//uniquement Qini pour les RESULTAT_RPTI sur l'axe de droite
- if (vKey.getVariableName().equals(CrueConfigMetierConstants.QINI) || (vKey.isReadOrVariable() && ReportRunVariableHelper.isNotAZNOrDzNature(vKey.getVariable(), service))) {
+ if (vKey.getVariableName().equals(CrueConfigMetierConstants.QINI) || (vKey.isReadOrVariable() && ReportRunVariableHelper.isNotAZNOrDzNature(
+ vKey.getVariable(), service))) {
return vKey.getVariable().getVariableName();
}
}
@@ -182,7 +197,8 @@
for (Iterator<ReportRunVariableKey> it = profilVariables.iterator(); it.hasNext();) {
ReportRunVariableKey vKey = it.next();
//pour eviter les limites -> vKey.isReadVariable()
- if (vKey.getVariableName().equals(CrueConfigMetierConstants.QINI) || (vKey.isReadOrVariable() && ReportRunVariableHelper.isNotAZNOrDzNature(vKey.getVariable(), service))) {
+ if (vKey.getVariableName().equals(CrueConfigMetierConstants.QINI) || (vKey.isReadOrVariable() && ReportRunVariableHelper.isNotAZNOrDzNature(
+ vKey.getVariable(), service))) {
it.remove();
}
}
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 2015-11-25 22:19:43 UTC (rev 9202)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java 2015-11-25 22:57:46 UTC (rev 9203)
@@ -129,12 +129,15 @@
}
private List<EGCourbeSimple> createCourbesOnCurrentTimeStep(ReportLongitudinalConfig content, ProgressHandle progress) {
+ if (Boolean.FALSE.equals(content.getCurrentTimeDisplayed())) {
+ return Collections.emptyList();
+ }
ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content);
if (result == null) {
return Collections.emptyList();
}
List<ReportRunVariableKey> var = content.getProfilVariables();
- List<EGCourbeSimple> courbes = new ArrayList<EGCourbeSimple>();
+ List<EGCourbeSimple> courbes = new ArrayList<>();
ResultatTimeKey selectedTime = reportService.getSelectedTime();
if (selectedTime != null) {
for (ReportRunVariableKey reportRunVariableKey : var) {
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalTimeChooser.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalTimeChooser.java 2015-11-25 22:19:43 UTC (rev 9202)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalTimeChooser.java 2015-11-25 22:57:46 UTC (rev 9203)
@@ -9,7 +9,9 @@
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.List;
+import javax.swing.BorderFactory;
import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import org.fudaa.dodico.crue.common.transformer.ToStringTransformer;
@@ -48,7 +50,7 @@
list.addCheckBoxListSelectedIndex(i);
}
}
- JPanel pn = new JPanel(new BorderLayout(0, 5));
+ JPanel pnCenter = new JPanel(new BorderLayout(0, 5));
final JCheckBox selectAll = new JCheckBox(NbBundle.getMessage(ReportLongitudinalTimeChooser.class, "ChooseTime.SelectAllNone"));
selectAll.addItemListener(new ItemListener() {
@@ -62,13 +64,29 @@
}
}
});
- pn.add(new JScrollPane(list));
- pn.add(selectAll, BorderLayout.NORTH);
+ pnCenter.add(new JScrollPane(list));
+ pnCenter.add(selectAll, BorderLayout.NORTH);
+ pnCenter.setBorder(BorderFactory.createEmptyBorder(10, 3, 0, 3));
+ JPanel pn = new JPanel(new BorderLayout(0, 5));
+ JComboBox currentTimeDisplayed = new JComboBox(new String[]{
+ org.openide.util.NbBundle.getMessage(ReportLongitudinalTimeChooser.class, "ChooseTime.DisplayCurrentTime"),
+ org.openide.util.NbBundle.getMessage(ReportLongitudinalTimeChooser.class, "ChooseTime.NotDisplayCurrentTime")
+
+ });
+ currentTimeDisplayed.setSelectedIndex(0);
+ if (Boolean.FALSE.equals(config.getCurrentTimeDisplayed())) {
+ currentTimeDisplayed.setSelectedIndex(1);
+
+ }
+ pn.add(currentTimeDisplayed, BorderLayout.NORTH);
+ pn.add(pnCenter);
+
String title = org.openide.util.NbBundle.getMessage(ReportLongitudinalTimeChooser.class, "ChooseTime.DialogTitle");
boolean ok = DialogHelper.showQuestionAndSaveDialogConf(title, pn, getClass(), "vueProfilLongitudinal_ConfigurationPasDeTemps",
PerspectiveEnum.REPORT, true);
if (ok) {
config.getTimes().clear();
+ config.setCurrentTimeDisplayed(currentTimeDisplayed.getSelectedIndex() == 0);
final Object[] selectedValues = list.getCheckBoxListSelectedValues();
for (Object object : selectedValues) {
config.getTimes().add((ResultatTimeKey) object);
Modified: trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/longitudinal/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/longitudinal/Bundle.properties 2015-11-25 22:19:43 UTC (rev 9202)
+++ trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/longitudinal/Bundle.properties 2015-11-25 22:57:46 UTC (rev 9203)
@@ -35,3 +35,5 @@
BrancheSectionColumn.Name=Branche / Section
SectionColumn.Name=Section
BrancheColumn.Name=Branche
+ChooseTime.DisplayCurrentTime=Afficher au pas de temps courant
+ChooseTime.NotDisplayCurrentTime=Ne pas afficher au pas de temps courant
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
