Menu
▾
▴
fudaa-svn-commit
|
From: <bma...@us...> - 2011-10-11 08:42:34
|
Revision: 6515
http://fudaa.svn.sourceforge.net/fudaa/?rev=6515&view=rev
Author: bmarchan
Date: 2011-10-11 08:42:27 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Add : EGCourbe.setLigneModel()
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2011-10-11 07:29:35 UTC (rev 6514)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2011-10-11 08:42:27 UTC (rev 6515)
@@ -687,6 +687,22 @@
return lineModel_;
}
+ /**
+ * Definit le modele de ligne pour le trac\xE9 de la courbe. Conditionne aussi
+ * l'encadrement des labels.
+ *
+ * @param _ic Le modele.
+ * @return True : Le mod\xE8le a \xE9t\xE9 accept\xE9.
+ */
+ public boolean setLigneModel(final TraceLigneModel _ic) {
+ final boolean r = lineModel_.updateData(_ic);
+ if (r) {
+ fireCourbeAspectChanged(false);
+ super.firePropertyChange(BSelecteurIconModel.DEFAULT_PROPERTY, null, lineModel_);
+ }
+ return r;
+ }
+
public TraceLigneModel getMarkLigneModel() {
return tLigneMarqueur_;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-10-02 08:12:50
|
Revision: 7685
http://fudaa.svn.sourceforge.net/fudaa/?rev=7685&view=rev
Author: deniger
Date: 2012-10-02 08:12:41 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
correction position labels
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2012-10-01 15:03:51 UTC (rev 7684)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2012-10-02 08:12:41 UTC (rev 7685)
@@ -124,8 +124,8 @@
tbox_.setColorFond(Color.WHITE);
tbox_.setHMargin(1);
tbox_.setVMargin(1);
- tbox_.setHPosition(SwingConstants.LEFT);
- tbox_.setVPosition(SwingConstants.CENTER);
+ tbox_.setHPosition(SwingConstants.CENTER);
+ tbox_.setVPosition(SwingConstants.BOTTOM);
tbox_.setColorText(Color.BLACK);
tbox_.setDrawBox(true);
tbox_.setDrawFond(true);
@@ -138,8 +138,8 @@
tboxLabels_.setColorFond(Color.WHITE);
tboxLabels_.setHMargin(1);
tboxLabels_.setVMargin(1);
- tboxLabels_.setHPosition(SwingConstants.LEFT);
- tboxLabels_.setVPosition(SwingConstants.CENTER);
+ tboxLabels_.setHPosition(SwingConstants.CENTER);
+ tboxLabels_.setVPosition(SwingConstants.BOTTOM);
tboxLabels_.setDrawBox(true);
tboxLabels_.setDrawFond(true);
}
@@ -227,14 +227,7 @@
} else {
str = getAxeX().getStringAffiche(marqueur.getValue());
}
- // if (getAxeX().isDroite()) {
- // x = xmax - 6 - _g.getFontMetrics().stringWidth(str);
- // }
tbox_.paintBox(_g, xie, y, str);
- // int widthBox=5;
- // if(tbox_.currentWidth_!=-1)
- // widthBox=tbox_.currentWidth_;
-
new TraceLigne(marqueur.model_).dessineTrait(_g, xie/* +widthBox/2 */, y, xie/* +widthBox/2 */, ymax);
}
@@ -496,9 +489,9 @@
initLabelsTraceBox(trLigne.getCouleur());
Rectangle view = new Rectangle();
view.x = _t.getMinEcranX();
- view.y = 0;
- view.height = _t.getH();
- view.width = _t.getW();
+ view.y = _t.getMinEcranY();
+ view.height = _t.getHSansMarges();
+ view.width = _t.getWSansMarges();
for (int i = 0; i < nbPt; i++) {
xi = model_.getX(i);
yi = model_.getY(i);
@@ -519,22 +512,9 @@
if (pLabel != null) {
// Dessin de la boite et du label
// X
- int xBox;
- if (((int) xie) <= _t.getMinEcranX()) {
- xBox = ((int) xie);
- } else if (((int) xie) >= _t.getMaxEcranX()) {
- xBox = ((int) xie) - _g.getFontMetrics().stringWidth(pLabel) - 3;
- } else {
- xBox = ((int) xie) - _g.getFontMetrics().stringWidth(pLabel) / 2 - 2;
- }
+ int xBox = ((int) xie);
// Y
- int yBox;
- if (((int) yie) >= _t.getMaxEcranY()) {
- yBox = ((int) yie) - 10;
- } else {
- yBox = ((int) yie) + 10;
- }
-
+ int yBox = (int) yie;
paintLabelBox(i, _g, xBox, yBox, pLabel, _t, view);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-14 15:55:23
|
Revision: 8328
http://fudaa.svn.sourceforge.net/fudaa/?rev=8328&view=rev
Author: deniger
Date: 2013-03-14 15:55:16 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2013-03-14 15:49:17 UTC (rev 8327)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2013-03-14 15:55:16 UTC (rev 8328)
@@ -608,9 +608,7 @@
canDraw = range.isValueContained(yi) || range.isValueContained(ypeVal);
}
if (canDraw) {
-// double newyie = getYEcran(yi, _t);
double newyie = yie;
-// double newyie2 = getYEcran(ypeVal, _t);
double newyie2 = ype;
trLigne.dessineTrait(_g, xie, newyie, xpe, newyie2);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-04-04 09:36:42
|
Revision: 8378
http://fudaa.svn.sourceforge.net/fudaa/?rev=8378&view=rev
Author: deniger
Date: 2013-04-04 09:36:34 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
lors du calcul des min max prend en compte les modeles vides.
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2013-04-03 21:41:01 UTC (rev 8377)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2013-04-04 09:36:34 UTC (rev 8378)
@@ -431,16 +431,18 @@
public boolean ajusteX(final CtuluRange _r) {
double x = getXMin();
boolean r = false;
- final boolean mustChange = _r.isNill();
- if (mustChange || x < _r.min_) {
- r = true;
- _r.min_ = x;
+ if (model_.getNbValues() > 0) {
+ final boolean mustChange = _r.isNill();
+ if (mustChange || x < _r.min_) {
+ r = true;
+ _r.min_ = x;
+ }
+ x = getXMax();
+ if (mustChange || x > _r.max_) {
+ r = true;
+ _r.max_ = x;
+ }
}
- x = getXMax();
- if (mustChange || x > _r.max_) {
- r = true;
- _r.max_ = x;
- }
return r;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-04-12 10:50:38
|
Revision: 8395
http://fudaa.svn.sourceforge.net/fudaa/?rev=8395&view=rev
Author: deniger
Date: 2013-04-12 10:50:32 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
Corrections et am?\195?\169liorations multiples
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2013-04-12 07:17:54 UTC (rev 8394)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2013-04-12 10:50:32 UTC (rev 8395)
@@ -513,7 +513,11 @@
final Shape oldClip = _g.getClip();
final int minX = _t.getMinEcranX();
final int adjust = 3;
- _g.setClip(minX - adjust, _t.getMinEcranY(), _t.getMaxEcranX() - minX + adjust * 2, _t.getMaxEcranY() - _t.getMinEcranY());
+ if (getAxeY() == null) {
+ _g.setClip(minX - adjust, 0, _t.getMaxEcranX() - minX + adjust * 2, _t.getMaxEcranY());
+ } else {
+ _g.setClip(minX - adjust, _t.getMinEcranY(), _t.getMaxEcranX() - minX + adjust * 2, _t.getMaxEcranY() - _t.getMinEcranY());
+ }
final int nbPt = model_.getNbValues();
double xi, yi, xie, yie;
boolean xiVisible;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-09-09 22:20:52
|
Revision: 8497
http://sourceforge.net/p/fudaa/svn/8497
Author: deniger
Date: 2013-09-09 22:20:50 +0000 (Mon, 09 Sep 2013)
Log Message:
-----------
maj librairie de graph
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2013-09-09 22:20:42 UTC (rev 8496)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2013-09-09 22:20:50 UTC (rev 8497)
@@ -706,17 +706,23 @@
}
}
+ boolean silent;
+ public void setSilent(boolean silent) {
+ this.silent = silent;
+ }
+
+
@Override
public final void fireCourbeAspectChanged(final boolean _visibility) {
- if (getEGParent() != null) {
+ if (!silent && getEGParent() != null) {
getEGParent().fireCourbeAspectChanged(this, _visibility);
}
}
@Override
public final void fireCourbeContentChanged() {
- if (getEGParent() != null) {
+ if (!silent && getEGParent() != null) {
getEGParent().fireCourbeContentChanged(this, false);
}
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