Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4346] branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/ fudaa
|
From: <had...@us...> - 2009-01-12 19:51:33
|
Revision: 4346
http://fudaa.svn.sourceforge.net/fudaa/?rev=4346&view=rev
Author: hadouxad
Date: 2009-01-12 19:51:23 +0000 (Mon, 12 Jan 2009)
Log Message:
-----------
Corrections Compte rendu des 2 lots + fiches de recettes LNHE
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeWizardImportScope.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileBuilder.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostSourceComparatorBuilder.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostActionChooseAndCreateCalque.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeWizardImportScope.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeWizardImportScope.java 2009-01-12 19:48:55 UTC (rev 4345)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeWizardImportScope.java 2009-01-12 19:51:23 UTC (rev 4346)
@@ -688,7 +688,7 @@
impl_.setMainProgression(30);
impl_.setMainMessage(CtuluLib.getS("Cr\xE9ation du graphe"));
//on cree les evol reguliere SPECIFIQUES pour ces courbes.
- FudaaCourbeImporterScope.createGraphe(target_, dataG().returnEvolRegulierePourTemporelles(), null, prog,false);
+ FudaaCourbeImporterScope.createGraphe(target_, dataG().returnEvolRegulierePourTemporelles(xchoosen), null, prog,false);
}else{
//correlation
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileBuilder.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileBuilder.java 2009-01-12 19:48:55 UTC (rev 4345)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileBuilder.java 2009-01-12 19:51:23 UTC (rev 4346)
@@ -8,6 +8,8 @@
package org.fudaa.fudaa.meshviewer.profile;
import java.awt.Color;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
import java.util.HashMap;
import java.util.Map;
@@ -215,7 +217,15 @@
_prog), _prog);
EGCourbeChild child;
if (isTime) {
- model.setTitle(var.toString() + CtuluLibString.ESPACE + timeModel_.getElementAt(time[t]));
+ String title=var.toString() + CtuluLibString.ESPACE ;
+ if(var.getCommonUnit()!=null)
+ title+="("+var.getCommonUnit()+")"+ CtuluLibString.ESPACE ;
+ title+=timeModel_.getElementAt(time[t]);
+ //-- on ajoute les extremites du segment choisi --//
+ title+=", P1("+format(this.selectedLine_.getCoordinateN(0).x,2)+";"+format(this.selectedLine_.getCoordinateN(0).y,2)+")"+sep+"P"+this.selectedLine_.getNumPoints()+"("+format(this.selectedLine_.getCoordinateN(this.selectedLine_.getNumPoints()-1).x,2)+";"+format(this.selectedLine_.getCoordinateN(this.selectedLine_.getNumPoints()-1).y,2)+")";
+
+
+ model.setTitle(title);
child = new MvProfileCourbeTime(gri, model, timeModel_);
} else {
child = new MvProfileCourbe(gri, model);
@@ -233,6 +243,23 @@
}
+
+ public String format(double value,int nbChiffresSignificatifs){
+
+ double val=0;
+
+ String forme="#.";
+
+ for(int i=0;i<nbChiffresSignificatifs;i++)
+ forme+="0";
+
+ DecimalFormat df = new DecimalFormat(forme);
+
+
+
+ return df.format(value);
+ }
+
/**
* Methode qui permet d ajouter une courbe spatiale poru un grapeh deja existant.
*
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java 2009-01-12 19:48:55 UTC (rev 4345)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java 2009-01-12 19:51:23 UTC (rev 4346)
@@ -20,6 +20,7 @@
import org.fudaa.fudaa.commun.courbe.FudaaCourbeTimeModel;
import com.memoire.fu.FuLog;
+import com.vividsolutions.jts.geom.Coordinate;
/**
* @author Fred Deniger
@@ -160,10 +161,15 @@
final TrPostSource _src) {
final TrPostCourbeModel model = new TrPostCourbeModel.Node(_src, _idxPt, _var, _src.getTime().getTimeListModel()
.getTimesInSec());
-
final EGCourbeChild courbe = new FudaaCourbeTime(_group, model, _src.getNewTimeListModel());
_group.addEGComponent(courbe);
- courbe.getModel().setTitle(courbe.getModel().getTitle() + CtuluLibString.ESPACE + (_idxPt + 1));
+ String title=courbe.getModel().getTitle()+ CtuluLibString.ESPACE ;
+ if(_var.getCommonUnitString()!=null)
+ title+="("+_var.getCommonUnitString()+")"+CtuluLibString.ESPACE;
+ Coordinate coor=_src.getGrid().getCoor(_idxPt);
+ title+= _idxPt + ":" + " (" + _src.getPrecisionModel().round(coor.x) + ", "
+ + _src.getPrecisionModel().round(coor.y) + ")";
+ courbe.getModel().setTitle(title);
return courbe;
}
@@ -173,7 +179,7 @@
final EGCourbeChild courbe = new FudaaCourbeTime(_group, model, _src.getNewTimeListModel());
_group.addEGComponent(courbe);
courbe.getModel().setTitle(
- courbe.getModel().getTitle() + " (" + _src.getPrecisionModel().round(_idxPt.getX()) + ", "
+ courbe.getModel().getTitle()+"("+_var.getCommonUnitString()+")" + " (" + _src.getPrecisionModel().round(_idxPt.getX()) + ", "
+ _src.getPrecisionModel().round(_idxPt.getY()) + ')');
return courbe;
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java 2009-01-12 19:48:55 UTC (rev 4345)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java 2009-01-12 19:51:23 UTC (rev 4346)
@@ -59,7 +59,9 @@
import org.fudaa.ebli.visuallibrary.EbliNode;
import org.fudaa.ebli.visuallibrary.EbliNodeDefault;
import org.fudaa.ebli.visuallibrary.calque.CalqueLegendeWidgetAdapter;
+import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetControllerGraphe;
import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorGraphe;
+import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetGrapheController;
import org.fudaa.fudaa.commun.courbe.FudaaGrapheTimeAnimatedVisuPanel;
import org.fudaa.fudaa.fdico.FDicoLib;
import org.fudaa.fudaa.meshviewer.MvResource;
@@ -915,6 +917,7 @@
final TrPostVisuPanel calque) {
final EGGraphe graphe = new EGGraphe(_model);
graphe.setXAxe(EGAxeHorizontal.buildDefautTimeAxe(calque.getSource().getTimeFormatter()));
+ graphe.getModel().getAxeX().setUnite("s");
graphe.setCmd(new CtuluCommandManager());
addEbliNode(new FudaaGrapheTimeAnimatedVisuPanel(graphe), calque);
}
@@ -950,11 +953,19 @@
_pn.getGraphe().restore();
if (_desc != null) nodeG.getWidget().getController().setDescription(_desc);
currentLayoutFilleOrFirst.getScene().setSelectedObjects(Collections.emptySet());
+
+ //-- ajout syst\xE9matique de la legende associee --//
+ EbliWidgetControllerGraphe controller=(EbliWidgetControllerGraphe)nodeG.getWidget().getIntern().getController();
+ controller.ajoutLegende();
}
});
- getImpl().getCurrentLayoutFilleOrFirst().getScene().refresh();
+ //getImpl().getCurrentLayoutFilleOrFirst().getScene().refresh();
+
+
+
+
}
protected void buildTimeUpdater() {
@@ -1132,7 +1143,7 @@
final Point location = pnVisu.getLocation();
location.x += 10;
location.y += 10;
- filleLayout.addCalque("Calque", location, pnVisu.getPreferredSize(), pnVisu, legendeCalque);
+ filleLayout.addCalque("Calque "+(filleLayout.getScene().getAllVue2d().size()+1), location, pnVisu.getPreferredSize(), pnVisu, legendeCalque);
// -- decoration de la fille layout --//
filleLayout.setFrameIcon(EbliResource.EBLI.getToolIcon("lissage"));
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostSourceComparatorBuilder.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostSourceComparatorBuilder.java 2009-01-12 19:48:55 UTC (rev 4345)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostSourceComparatorBuilder.java 2009-01-12 19:51:23 UTC (rev 4346)
@@ -224,7 +224,7 @@
final Point location = pnVisu.getLocation();
location.x += 10;
location.y += 10;
- impl.getCurrentLayoutFille().addCalque(TrPostSourceComparatorBuilder.getComparaisonTitle(), location,
+ impl.getCurrentLayoutFille().addCalque(TrPostSourceComparatorBuilder.getComparaisonTitle()+" "+impl.getCurrentLayoutFille().getScene().getAllVue2d().size()+1, location,
pnVisu.getPreferredSize(), pnVisu, legendeCalque);
pnVisu.restaurer();
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostActionChooseAndCreateCalque.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostActionChooseAndCreateCalque.java 2009-01-12 19:48:55 UTC (rev 4345)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostActionChooseAndCreateCalque.java 2009-01-12 19:51:23 UTC (rev 4346)
@@ -52,7 +52,7 @@
final CalqueLegendeWidgetAdapter legendeCalque = new CalqueLegendeWidgetAdapter(getScene(), null);
final TrPostVisuPanel pnVisu = new TrPostVisuPanel(projet_.getImpl(), projet_, legendeCalque, srcChoisie);
- final EbliNode node = controller_.addCalque(TrResource.getS("Calque"), pnVisu.getLocation(), pnVisu
+ final EbliNode node = controller_.addCalque(TrResource.getS("Calque")+(controller_.getSceneCourante().getAllVue2d().size()+1), pnVisu.getLocation(), pnVisu
.getPreferredSize(), pnVisu, legendeCalque);
// -- ajout de l INFO de la source utilis\xE9e --//
node.getWidget().getController().setDescription("Source: " + projet_.formatInfoSource(srcChoisie));
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java 2009-01-12 19:48:55 UTC (rev 4345)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java 2009-01-12 19:51:23 UTC (rev 4346)
@@ -414,6 +414,9 @@
modelTotal.mergeWithAnotherTreeModel(modelPointsInt);
} else if (modelPointsInt != null) modelTotal = modelPointsInt;
+
+ modelTotal.getAxeX().setUnite("s");
+
// -- creation du widget avec model total --//
return modelTotal;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
