Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2013-06-05 20:22:45
|
Revision: 8414
http://sourceforge.net/p/fudaa/svn/8414
Author: deniger
Date: 2013-06-05 20:22:41 +0000 (Wed, 05 Jun 2013)
Log Message:
-----------
axe horizontal peut utiliser nom de variable et non uniquement la nature
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java
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/ReportLongitudinalCourbesUiResController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java 2013-06-05 20:21:51 UTC (rev 8413)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java 2013-06-05 20:22:41 UTC (rev 8414)
@@ -23,6 +23,7 @@
tableAction.setAddOptions(false);
tableAction.setDisplayAll(true);
tableAction.setShowLabel(true);
+ setUseVariableForAxeH(true);
}
@Override
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 2013-06-05 20:21:51 UTC (rev 8413)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java 2013-06-05 20:22:41 UTC (rev 8414)
@@ -47,7 +47,6 @@
super(uiController, loiLabelsManager);
}
-// }
protected EGAxeVertical getOrCreateAxeVerticalZ() {
return getOrCreateAxeVertical(getVariableZ());
}
@@ -68,7 +67,7 @@
public List<EGCourbeSimple> getInternCourbes(ReportLongitudinalConfig content, ProgressHandle progress) {
ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content);
EGAxeVertical axeZ = courbeBuilder.getAxeZ();
- uiController.configureAxeH(reportService.getCcm().getProperty(CrueConfigMetierConstants.PROP_XP).getNature(), true);
+ uiController.configureAxeH(reportService.getCcm().getProperty(CrueConfigMetierConstants.PROP_XP), true);
double xpInit = 0;
result = new ReportLongitudinalPositionBrancheContent();
Set<ReportRunKey> keys = getRunKeysToUse(content);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-03-25 11:44:10
|
Revision: 8682
http://sourceforge.net/p/fudaa/svn/8682
Author: deniger
Date: 2014-03-25 11:44:06 +0000 (Tue, 25 Mar 2014)
Log Message:
-----------
update des traductions
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooserUI.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheConfigNode.java
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooserUI.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooserUI.java 2014-03-25 10:33:04 UTC (rev 8681)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooserUI.java 2014-03-25 11:44:06 UTC (rev 8682)
@@ -97,15 +97,15 @@
view.getOutline().setRootVisible(false);
List<String> columns = new ArrayList<String>();
columns.add(ReportLongitudinalBrancheConfig.PROP_NAME);
- columns.add(NbBundle.getMessage(ReportLongitudinalBrancheConfig.class, "name.property"));
+ columns.add(NbBundle.getMessage(ReportLongitudinalBrancheChooserUI.class, "name.property"));
columns.add(ReportLongitudinalBrancheConfig.PROP_SENS);
- columns.add(NbBundle.getMessage(ReportLongitudinalBrancheConfig.class, "sens.property"));
+ columns.add(NbBundle.getMessage(ReportLongitudinalBrancheChooserUI.class, "sens.property"));
columns.add(ReportLongitudinalBrancheConfig.PROP_LENGTH);
- columns.add(NbBundle.getMessage(ReportLongitudinalBrancheConfig.class, "length.property"));
+ columns.add(NbBundle.getMessage(ReportLongitudinalBrancheChooserUI.class, "length.property"));
columns.add(ReportLongitudinalBrancheConfig.PROP_DECAL);
- columns.add(NbBundle.getMessage(ReportLongitudinalBrancheConfig.class, "decalXp.property"));
+ columns.add(NbBundle.getMessage(ReportLongitudinalBrancheChooserUI.class, "decalXp.property"));
columns.add(ReportLongitudinalBrancheConfig.PROP_LENGTH_HYD);
- columns.add(NbBundle.getMessage(ReportLongitudinalBrancheConfig.class, "lengthHyd.property"));
+ columns.add(NbBundle.getMessage(ReportLongitudinalBrancheChooserUI.class, "lengthHyd.property"));
view.setPropertyColumns(columns.toArray(new String[columns.size()]));
view.setNodePopupFactory(new CustomNodePopupFactory());
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheConfigNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheConfigNode.java 2014-03-25 10:33:04 UTC (rev 8681)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheConfigNode.java 2014-03-25 11:44:06 UTC (rev 8682)
@@ -111,7 +111,8 @@
protected Sheet createSheet() {
ReportLongitudinalBrancheConfig brancheConfig = getLookup().lookup(ReportLongitudinalBrancheConfig.class);
PropertyNodeBuilder builder = new PropertyNodeBuilder();
- List<PropertySupportReflection> createFromPropertyDesc = builder.createFromPropertyDesc(DecimalFormatEpsilonEnum.PRESENTATION, brancheConfig, this);
+ List<PropertySupportReflection> createFromPropertyDesc = builder.
+ createFromPropertyDesc(DecimalFormatEpsilonEnum.PRESENTATION, brancheConfig, this);
Sheet res = Sheet.createDefault();
Sheet.Set set = Sheet.createPropertiesSet();
res.put(set);
@@ -131,9 +132,11 @@
}
CatEMHBranche branche = (CatEMHBranche) reportService.getRunCourant().getEMH(brancheConfig.getName());
if (branche != null) {
- String value = TransformerEMHHelper.formatFromPropertyName(CrueConfigMetierConstants.PROP_XP, branche.getLength(), reportService.getCcm(), DecimalFormatEpsilonEnum.PRESENTATION);
- String valueDetail = TransformerEMHHelper.formatFromPropertyName(CrueConfigMetierConstants.PROP_XP, branche.getLength(), reportService.getCcm(), DecimalFormatEpsilonEnum.PRESENTATION);
- String displayName = NbBundle.getMessage(ReportLongitudinalBrancheConfig.class, "lengthHyd.property");
+ String value = TransformerEMHHelper.formatFromPropertyName(CrueConfigMetierConstants.PROP_XP, branche.getLength(), reportService.getCcm(),
+ DecimalFormatEpsilonEnum.PRESENTATION);
+ String valueDetail = TransformerEMHHelper.formatFromPropertyName(CrueConfigMetierConstants.PROP_XP, branche.getLength(), reportService.getCcm(),
+ DecimalFormatEpsilonEnum.PRESENTATION);
+ String displayName = NbBundle.getMessage(ReportLongitudinalBrancheConfigNode.class, "lengthHyd.property");
PropertyStringReadOnly lenghtHyd = new PropertyStringReadOnly(value, ReportLongitudinalBrancheConfig.PROP_LENGTH_HYD, displayName, displayName);
lenghtHyd.setShortDescription(valueDetail);
set.put(lenghtHyd);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-11-25 22:19:46
|
Revision: 9202
http://sourceforge.net/p/fudaa/svn/9202
Author: deniger
Date: 2015-11-25 22:19:43 +0000 (Wed, 25 Nov 2015)
Log Message:
-----------
CRUE-667
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java 2015-11-25 22:19:36 UTC (rev 9201)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java 2015-11-25 22:19:43 UTC (rev 9202)
@@ -18,45 +18,46 @@
*
* @author Frederic Deniger
*/
-public class ReportLongitudinalCourbesUiResController extends CourbesUiResController {
-
+public final class ReportLongitudinalCourbesUiResController extends CourbesUiResController {
+
public ReportLongitudinalCourbesUiResController() {
EGTableAction tableAction = (EGTableAction) getActions("TABLE").get(0);
tableAction.setAddOptions(false);
- tableAction.setAddCheckbox(true);
+ tableAction.setAddCheckbox(false);
tableAction.setShowColumnToExport(false);
tableAction.setDisplayAll(true);
tableAction.setShowLabel(true);
setUseVariableForAxeH(true);
+ getGraphe().setExportDataBuilder(new ReportLongitudinalExportDataBuilder());
}
-
+
@Override
protected AbstractTableModel createTableModel() {
return new ReportLongitudinalTableModel(getTableGraphePanel());
}
-
+
@Override
protected void configureTablePanel() {
super.configureTablePanel();
tableGraphePanel.getTable().getColumnModel().getColumn(0).setCellRenderer(new CtuluCellTextRenderer());
}
-
+
protected static class ReportLongitudinalTableModel extends EGTableGraphePanel.SpecTableModel {
-
+
public static final int COLUMN_BRANCHE = 0;
public static final int COLUMN_SECTION = 1;
-
+
public ReportLongitudinalTableModel(EGTableGraphePanel graphePanel) {
super(graphePanel);
xColIndex = 2;
yColIndex = 3;
}
-
+
@Override
public int getColumnCount() {
return 4;
}
-
+
@Override
public Object getValueAt(int _rowIndex, int _columnIndex) {
if (_columnIndex == COLUMN_SECTION || _columnIndex == COLUMN_BRANCHE) {
@@ -74,7 +75,7 @@
}
return super.getValueAt(_rowIndex, _columnIndex);
}
-
+
@Override
public String getColumnName(int _column) {
if (_column == COLUMN_SECTION) {
@@ -85,7 +86,7 @@
}
return super.getColumnName(_column);
}
-
+
@Override
public Class getColumnClass(int _columnIndex) {
if (_columnIndex <= COLUMN_SECTION) {
@@ -93,7 +94,7 @@
}
return Double.class;
}
-
+
@Override
public void setValueAt(Object _value, int _rowIndex, int _columnIndex) {
}
Added: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java 2015-11-25 22:19:43 UTC (rev 9202)
@@ -0,0 +1,123 @@
+/*
+GPL 2
+ */
+package org.fudaa.fudaa.crue.report.longitudinal;
+
+import gnu.trove.TIntObjectHashMap;
+import java.awt.color.ColorSpace;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.dodico.crue.metier.factory.CruePrefix;
+import org.fudaa.ebli.courbe.EGAxeHorizontal;
+import org.fudaa.ebli.courbe.EGCourbe;
+import org.fudaa.ebli.courbe.EGExportData;
+import org.fudaa.ebli.courbe.EGExportDataBuilder;
+import org.fudaa.ebli.commun.EbliDataCellDoubleValue;
+import org.fudaa.ebli.courbe.EGGraphe;
+import org.fudaa.ebli.courbe.EGModel;
+import org.fudaa.ebli.courbe.EGTimeLabel;
+import org.fudaa.ebli.courbe.EgModelLabelNamed;
+import org.fudaa.fudaa.crue.loi.common.LoiConstanteCourbeModel;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class ReportLongitudinalExportDataBuilder implements EGExportDataBuilder {
+
+ @Override
+ public EGExportData createExportData(EGCourbe[] courbesInitiales, EGGraphe _g, boolean _isSameH, boolean showLabel) {
+ return new LongitudinalExportData(EGExportData.prepareCourbesForExport(courbesInitiales), _g, showLabel);
+ }
+
+ private static class LongitudinalExportData extends EGExportData {
+
+ protected static final int COLUMN_X = 2;
+ protected static final int COLUMN_SECTION = 1;
+ protected static final int COLUMN_BRANCHE = 0;
+
+ private double[] time_;
+ private List<String> branches;
+ private List<String> sections;
+
+ LongitudinalExportData(final EGCourbe[] _cs, final EGGraphe _g, boolean showLabel) {
+ super(_cs, _g, showLabel);
+ //nombre de courbe + branche+ section + x
+ if (cs_.length > 0) {
+ maxCol_ = cs_.length + 3;
+ Set<EGTimeLabel> set = new HashSet<>();
+ final EGAxeHorizontal h = g_.getTransformer().getXAxe();
+ for (int i = cs_.length - 1; i >= 0; i--) {
+ final EGCourbe c = cs_[i];
+ final LoiConstanteCourbeModel model = (LoiConstanteCourbeModel) c.getModel();
+ final TIntObjectHashMap<String> subLabelsBranches = model.getSubLabels(CruePrefix.P_BRANCHE);
+ final TIntObjectHashMap<String> subLabelsSection = model.getSubLabels(CruePrefix.P_SECTION);
+ for (int j = model.getNbValues() - 1; j >= 0; j--) {
+ final double x = model.getX(j);
+ EGTimeLabel value = new EGTimeLabel(x);
+ set.add(value);
+ value.setLabel(subLabelsBranches.get(j));
+ value.setSubLabel(subLabelsSection.get(j));
+ }
+ }
+ List<EGTimeLabel> values = new ArrayList<>(set);
+ Collections.sort(values);
+ time_ = new double[values.size()];
+ for (int i = 0; i < time_.length; i++) {
+ time_[i] = values.get(i).getX();
+ }
+ Arrays.sort(time_);
+ maxLine_ = time_.length;
+ column_ = new String[maxCol_];
+ column_[COLUMN_BRANCHE] = NbBundle.getMessage(ReportLongitudinalExportDataBuilder.class, "BrancheColumn.Name");
+ column_[COLUMN_SECTION] = NbBundle.getMessage(ReportLongitudinalExportDataBuilder.class, "SectionColumn.Name");
+ column_[COLUMN_X] = h.getTitre();
+ branches = new ArrayList<>();
+ sections = new ArrayList<>();
+ for (EGTimeLabel value : values) {
+ branches.add(value.getLabel());
+ sections.add(value.getSubLabel());
+ }
+ int offset = 3;
+ for (int i = 0; i < _cs.length; i++) {
+ column_[i + offset] = _cs[i].getTitle();
+ }
+ }
+ }
+
+ @Override
+ public Class getColumnClass(int _i) {
+ if (_i == COLUMN_BRANCHE || _i == COLUMN_SECTION) {
+ return String.class;
+ }
+ return EbliDataCellDoubleValue.class;
+ }
+
+ @Override
+ public Object getValue(int _row, int _col) {
+ if (_col == COLUMN_BRANCHE) {
+ return branches.get(_row);
+ }
+ if (_col == COLUMN_SECTION) {
+ return sections.get(_row);
+ }
+ final double x = time_[_row];
+ if (_col == COLUMN_X) {
+ return getXValueFor(x);
+ }
+ if (cs_.length > 0) {
+ EGCourbe c = cs_[_col - 3];
+ return getYValueFor(c, c.interpol(x));
+ }
+ return StringUtils.EMPTY;
+ }
+
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X