Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[9204] trunk/framework
|
From: <de...@us...> - 2015-11-25 23:30:03
|
Revision: 9204
http://sourceforge.net/p/fudaa/svn/9204
Author: deniger
Date: 2015-11-25 23:30:00 +0000 (Wed, 25 Nov 2015)
Log Message:
-----------
CRUE-667
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportData.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDateCellDoubleValueCellRenderer.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java
Added Paths:
-----------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableCellDoubleValue.java
Removed Paths:
-------------
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDataCellDoubleValue.java
Copied: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableCellDoubleValue.java (from rev 9201, trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDataCellDoubleValue.java)
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableCellDoubleValue.java (rev 0)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableCellDoubleValue.java 2015-11-25 23:30:00 UTC (rev 9204)
@@ -0,0 +1,70 @@
+/*
+GPL 2
+ */
+package org.fudaa.ctulu.table;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class CtuluTableCellDoubleValue implements Comparable<CtuluTableCellDoubleValue> {
+
+ private final String formattedValue;
+ private final double value;
+
+ public CtuluTableCellDoubleValue(String formattedValue, double value) {
+ this.formattedValue = formattedValue == null ? Double.toString(value) : formattedValue;
+ this.value = value;
+ }
+
+ public String getFormattedValue() {
+ return formattedValue;
+ }
+
+ public double getValue() {
+ return value;
+ }
+
+ @Override
+ public String toString() {
+ return formattedValue;
+ }
+
+
+ @Override
+ public int hashCode() {
+ int hash = 3;
+ hash = 37 * hash + (int) (Double.doubleToLongBits(this.value) ^ (Double.doubleToLongBits(this.value) >>> 32));
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final CtuluTableCellDoubleValue other = (CtuluTableCellDoubleValue) obj;
+ if (Double.doubleToLongBits(this.value) != Double.doubleToLongBits(other.value)) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public int compareTo(CtuluTableCellDoubleValue o) {
+ if (o == null) {
+ return 1;
+ }
+ if (o == this) {
+ return 0;
+ }
+ return value > o.value ? 1 : (value < o.value ? -1 : 0);
+ }
+
+}
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java 2015-11-25 22:57:46 UTC (rev 9203)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java 2015-11-25 23:30:00 UTC (rev 9204)
@@ -86,6 +86,8 @@
createCell.setCellValue(((Number) value).doubleValue());
} else if (Date.class.equals(dataClass)) {
createCell.setCellValue(((Date) value));
+ } else if (CtuluTableCellDoubleValue.class.equals(dataClass)) {
+ createCell.setCellValue(((CtuluTableCellDoubleValue) value).getValue());
} else {
createCell.setCellValue(value.toString());
}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportData.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportData.java 2015-11-25 22:57:46 UTC (rev 9203)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGExportData.java 2015-11-25 23:30:00 UTC (rev 9204)
@@ -11,7 +11,7 @@
*/
package org.fudaa.ebli.courbe;
-import org.fudaa.ebli.commun.EbliDataCellDoubleValue;
+import org.fudaa.ctulu.table.CtuluTableCellDoubleValue;
import gnu.trove.TIntArrayList;
import java.util.ArrayList;
import java.util.Arrays;
@@ -23,7 +23,6 @@
import jxl.write.Label;
import jxl.write.Number;
import jxl.write.WritableCell;
-import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.ProgressionInterface;
@@ -62,12 +61,12 @@
return Double.toString(yValue);
}
- public EbliDataCellDoubleValue getXValueFor(final double xValue) {
- return new EbliDataCellDoubleValue(getStringXValueFor(xValue), xValue);
+ public CtuluTableCellDoubleValue getXValueFor(final double xValue) {
+ return new CtuluTableCellDoubleValue(getStringXValueFor(xValue), xValue);
}
public Object getYValueFor(final EGCourbe courbe, final double yValue) {
- return new EbliDataCellDoubleValue(getStringYValueFor(courbe, yValue), yValue);
+ return new CtuluTableCellDoubleValue(getStringYValueFor(courbe, yValue), yValue);
}
final static class AllData extends EGExportData {
@@ -89,7 +88,7 @@
@Override
public Class getColumnClass(int _col) {
boolean label = showLabel && (_col % 3 == 0);
- return label ? String.class : EbliDataCellDoubleValue.class;
+ return label ? String.class : CtuluTableCellDoubleValue.class;
}
@Override
@@ -167,7 +166,7 @@
@Override
public Class getColumnClass(int _col) {
- return EbliDataCellDoubleValue.class;
+ return CtuluTableCellDoubleValue.class;
}
@Override
@@ -244,7 +243,7 @@
if (showLabel && _col == 0) {
return String.class;
}
- return EbliDataCellDoubleValue.class;
+ return CtuluTableCellDoubleValue.class;
}
@Override
@@ -350,6 +349,10 @@
final Double d = (Double) value;
return new Number(_colInXls, _rowInXls, d.doubleValue());
}
+ if (value instanceof CtuluTableCellDoubleValue) {
+ final CtuluTableCellDoubleValue d = (CtuluTableCellDoubleValue) value;
+ return new Number(_colInXls, _rowInXls, d.getValue());
+ }
String asString = value.toString();
try {
double d = Double.parseDouble(asString.replace(',', '.'));
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java 2015-11-25 22:57:46 UTC (rev 9203)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java 2015-11-25 23:30:00 UTC (rev 9204)
@@ -11,7 +11,7 @@
*/
package org.fudaa.ebli.courbe;
-import org.fudaa.ebli.commun.EbliDataCellDoubleValue;
+import org.fudaa.ctulu.table.CtuluTableCellDoubleValue;
import org.fudaa.ebli.commun.EbliDateCellDoubleValueCellRenderer;
import com.memoire.bu.BuMenu;
import com.memoire.bu.BuResource;
@@ -158,7 +158,7 @@
final EGMultiCourbeTableModel tableModel = new EGMultiCourbeTableModel(cs, (EGCourbe[]) courbesSelected.toArray(new EGCourbe[courbesSelected
.size()]), graphe_, showLabel);
final CtuluTable table = new CtuluTable(tableModel);
- table.setDefaultRenderer(EbliDataCellDoubleValue.class, new EbliDateCellDoubleValueCellRenderer());
+ table.setDefaultRenderer(CtuluTableCellDoubleValue.class, new EbliDateCellDoubleValueCellRenderer());
String title = null;
final JInternalFrame iframe = (JInternalFrame) SwingUtilities.getAncestorOfClass(JInternalFrame.class, graphe_);
if (iframe == null) {
Deleted: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDataCellDoubleValue.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDataCellDoubleValue.java 2015-11-25 22:57:46 UTC (rev 9203)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDataCellDoubleValue.java 2015-11-25 23:30:00 UTC (rev 9204)
@@ -1,64 +0,0 @@
-/*
-GPL 2
- */
-package org.fudaa.ebli.commun;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class EbliDataCellDoubleValue implements Comparable<EbliDataCellDoubleValue> {
-
- private final String formattedValue;
- private final double value;
-
- public EbliDataCellDoubleValue(String formattedValue, double value) {
- this.formattedValue = formattedValue;
- this.value = value;
- }
-
- public String getFormattedValue() {
- return formattedValue;
- }
-
- public double getValue() {
- return value;
- }
-
- @Override
- public int hashCode() {
- int hash = 3;
- hash = 37 * hash + (int) (Double.doubleToLongBits(this.value) ^ (Double.doubleToLongBits(this.value) >>> 32));
- return hash;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final EbliDataCellDoubleValue other = (EbliDataCellDoubleValue) obj;
- if (Double.doubleToLongBits(this.value) != Double.doubleToLongBits(other.value)) {
- return false;
- }
- return true;
- }
-
- @Override
- public int compareTo(EbliDataCellDoubleValue o) {
- if (o == null) {
- return 1;
- }
- if (o == this) {
- return 0;
- }
- return value > o.value ? 1 : (value < o.value ? -1 : 0);
- }
-
-}
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDateCellDoubleValueCellRenderer.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDateCellDoubleValueCellRenderer.java 2015-11-25 22:57:46 UTC (rev 9203)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliDateCellDoubleValueCellRenderer.java 2015-11-25 23:30:00 UTC (rev 9204)
@@ -3,6 +3,7 @@
*/
package org.fudaa.ebli.commun;
+import org.fudaa.ctulu.table.CtuluTableCellDoubleValue;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.gui.CtuluCellTextRenderer;
@@ -14,7 +15,9 @@
@Override
protected void setValue(final Object _value) {
- setText((_value == null) ? CtuluLibString.EMPTY_STRING : ((EbliDataCellDoubleValue) _value).getFormattedValue());
+ setHorizontalTextPosition(RIGHT);
+ setHorizontalAlignment(RIGHT);
+ setText((_value == null) ? CtuluLibString.EMPTY_STRING : ((CtuluTableCellDoubleValue) _value).getFormattedValue());
}
}
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java 2015-11-25 22:57:46 UTC (rev 9203)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java 2015-11-25 23:30:00 UTC (rev 9204)
@@ -7,6 +7,7 @@
*/
package org.fudaa.ebli.commun;
+import org.fudaa.ctulu.table.CtuluTableCellDoubleValue;
import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import java.awt.Component;
import java.awt.event.ActionListener;
@@ -39,6 +40,7 @@
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.gui.CtuluCellTextDecimalRenderer;
+import org.fudaa.ctulu.gui.CtuluCellTextRenderer;
import org.fudaa.ctulu.gui.CtuluDialogPreferences;
import org.fudaa.ctulu.gui.CtuluLibSwing;
import org.fudaa.ctulu.gui.CtuluTableExportPanel;
@@ -194,6 +196,7 @@
final int nb = init.getColumnCount();
// TODO a continuer
EbliDateCellDoubleValueCellRenderer doubleValueRenderer = new EbliDateCellDoubleValueCellRenderer();
+ CtuluCellTextRenderer textRenderer = new CtuluCellTextRenderer();
for (int i = 0; i < nb; i++) {
TableColumn column = init.getColumn(i);
int modelIdx = column.getModelIndex();
@@ -208,9 +211,10 @@
renderer.setFormatter(_defs[2].getFormatter().getXYFormatter());
}
column.setCellRenderer(renderer);
- } else if (columnClass.equals(EbliDataCellDoubleValue.class)) {
+ } else if (columnClass.equals(CtuluTableCellDoubleValue.class)) {
column.setCellRenderer(doubleValueRenderer);
-
+ } else if (columnClass.equals(String.class)) {
+ column.setCellRenderer(textRenderer);
}
colModel_.addColumn(column);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
