Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4006] branches/Prepro-0.92-SNAPSHOT
|
From: <had...@us...> - 2008-09-29 15:44:18
|
Revision: 4006
http://fudaa.svn.sourceforge.net/fudaa/?rev=4006&view=rev
Author: hadouxad
Date: 2008-09-29 15:43:55 +0000 (Mon, 29 Sep 2008)
Log Message:
-----------
- correction bug legende
- convertisseur structure scope en evolutionReguliere
- Creation de l action et de l'interface des bilans
- Correction des appelation multi fichier
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeGENEFileFormat.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeReaderGene.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeReaderSorT.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeSFileFormat.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeStructure.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeTFileFormat.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGrapheModel.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/CalqueLegendeWidgetAdapter.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorVueCalque.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeImporter.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaWriterScopeS.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileTreeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/TrImportCourbeScopeManager.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/tr_en.fr_txt
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionController.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.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/TrPostProjetsManagerFille.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostBilanAction.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostDialogBilan.java
Modified: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeGENEFileFormat.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeGENEFileFormat.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeGENEFileFormat.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -1,6 +1,7 @@
package org.fudaa.dodico.telemac.io;
import java.io.File;
+import java.util.Map;
import org.fudaa.ctulu.CtuluIOOperationSynthese;
import org.fudaa.ctulu.ProgressionInterface;
@@ -9,6 +10,7 @@
import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
+import org.fudaa.dodico.mesure.EvolutionFileFormatVersion;
/**
* Manager de fichiers au format scope. Utilis\xE9 pour la cr\xE9ation des graphes. au
@@ -17,7 +19,7 @@
* @author Adrien Hadoux
*
*/
-public class ScopeGENEFileFormat extends FileFormatUnique {
+public class ScopeGENEFileFormat extends FileFormatUnique implements EvolutionFileFormatVersion {
static final ScopeGENEFileFormat INSTANCE = new ScopeGENEFileFormat();
@@ -48,5 +50,9 @@
public FileWriteOperationAbstract createWriter() {
return new ScopeWriterGENE(this);
}
+
+ public CtuluIOOperationSynthese readEvolutions(File _f, ProgressionInterface _prog, Map _options) {
+ return super.read(_f, _prog);
+ }
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeReaderGene.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeReaderGene.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeReaderGene.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -9,6 +9,7 @@
import org.fudaa.ctulu.fileformat.FileFormatVersionInterface;
import org.fudaa.dodico.fortran.FileOpReadCharSimpleAbstract;
import org.fudaa.dodico.h2d.resource.H2dResource;
+import org.fudaa.dodico.mesure.EvolutionReguliere;
/**
* Classe reader de fichier au format scope Gene, evolu\xE9 par rapport a s ou t.
@@ -60,7 +61,7 @@
*
* @return
*/
- ScopeStructure readStructure() {
+ EvolutionReguliere[] readStructure() {
if (super.in_ == null) {
analyze_.addError(H2dResource.getS("Flux d'entr\xE9e non trouv\xE9"), 0);
@@ -118,7 +119,7 @@
}
} catch (EOFException Exc) {
- return structure;
+ return structure.returnEvolReguliere();
}
} catch (IOException e) {
Modified: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeReaderSorT.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeReaderSorT.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeReaderSorT.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -9,6 +9,7 @@
import org.fudaa.ctulu.fileformat.FileFormatVersionInterface;
import org.fudaa.dodico.fortran.FileOpReadCharSimpleAbstract;
import org.fudaa.dodico.h2d.resource.H2dResource;
+import org.fudaa.dodico.mesure.EvolutionReguliere;
/**
* Classe reader de fichier au format scope. Utilise fortranReader
@@ -59,7 +60,7 @@
*
* @return
*/
- ScopeStructure readStructure() {
+ EvolutionReguliere[] readStructure() {
if (super.in_ == null) {
@@ -93,7 +94,7 @@
}catch(EOFException Exc){
- return structure;
+ return structure.returnEvolReguliere();
}
Modified: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeSFileFormat.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeSFileFormat.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeSFileFormat.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -1,6 +1,7 @@
package org.fudaa.dodico.telemac.io;
import java.io.File;
+import java.util.Map;
import org.fudaa.ctulu.CtuluIOOperationSynthese;
import org.fudaa.ctulu.ProgressionInterface;
@@ -9,6 +10,7 @@
import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
+import org.fudaa.dodico.mesure.EvolutionFileFormatVersion;
/**
* Manager de fichiers au format scope. Utilis\xE9 pour la cr\xE9ation des graphes. au
@@ -17,7 +19,7 @@
* @author Adrien Hadoux
*
*/
-public class ScopeSFileFormat extends FileFormatUnique {
+public class ScopeSFileFormat extends FileFormatUnique implements EvolutionFileFormatVersion {
static final ScopeSFileFormat INSTANCE = new ScopeSFileFormat();
@@ -48,5 +50,9 @@
public FileWriteOperationAbstract createWriter() {
return new ScopeWriterSorT(this);
}
+
+ public CtuluIOOperationSynthese readEvolutions(File _f, ProgressionInterface _prog, Map _options) {
+ return super.read(_f, _prog);
+ }
}
Modified: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeStructure.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeStructure.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeStructure.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -5,6 +5,8 @@
import java.util.List;
import java.util.Map;
+import org.fudaa.dodico.mesure.EvolutionReguliere;
+
/**
* Structure de donn\xE9es utilis\xE9e pour la lecture des fichiers scope.
*
@@ -145,6 +147,37 @@
return brochetteVal;
}
+ /**
+ * Transforme la structure en evol regulieres.
+ *
+ * @return
+ */
+ public EvolutionReguliere[] returnEvolReguliere() {
+ EvolutionReguliere[] evolReg = new EvolutionReguliere[getNbVariables()];
+
+ // -- on parcours toutes les variables --//
+ for (int i = 0; i < getNbVariables(); i++) {
+ String nomVar = getVariable(i);
+
+ List<Double> listeX = getAllX();
+ List<Double> listeY = getListValueForVariable(i);
+
+ double[] tabX = new double[listeX.size()];
+ double[] tabY = new double[listeY.size()];
+
+ for (int j = 0; j < listeX.size(); j++) {
+ tabX[i] = listeX.get(i);
+ tabY[i] = listeY.get(i);
+
+ }
+
+ evolReg[i] = new EvolutionReguliere(tabX, tabY, false);
+ evolReg[i].setNom("courbe de " + nomVar);
+ }
+ return evolReg;
+ }
+
+
@Override
public void printResults() {
System.err.print("\n Contenu du fichier scope");
@@ -344,7 +377,39 @@
return titles_.get(i);
}
+
+ public EvolutionReguliere[] returnEvolReguliere() {
+ EvolutionReguliere[] evolReg = new EvolutionReguliere[getNbPasDeTemps() * getNbVariables()];
+ // -- on parcours tous les pas de temps --//
+ for (int h = 0; h < getNbPasDeTemps(); h++) {
+
+ String pdt = getPasDeTemps(h);
+
+ // -- on parcours toutes les variables --//
+ for (int i = 0; i < getNbVariables(); i++) {
+ String nomVar = getVariable(i);
+
+ List<Double> listeX = getAllX(pdt);
+ List<Double> listeY = getListValueForVariableForPDT(pdt, i);
+
+ double[] tabX = new double[listeX.size()];
+ double[] tabY = new double[listeY.size()];
+
+ for (int j = 0; j < listeX.size(); j++) {
+ tabX[i] = listeX.get(i);
+ tabY[i] = listeY.get(i);
+
+ }
+
+ evolReg[i] = new EvolutionReguliere(tabX, tabY, false);
+ evolReg[i].setNom("courbe de " + nomVar);
+ }
+
+ }
+ return evolReg;
+ }
+
@Override
public void printResults() {
// titres
Modified: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeTFileFormat.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeTFileFormat.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeTFileFormat.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -1,6 +1,7 @@
package org.fudaa.dodico.telemac.io;
import java.io.File;
+import java.util.Map;
import org.fudaa.ctulu.CtuluIOOperationSynthese;
import org.fudaa.ctulu.ProgressionInterface;
@@ -9,6 +10,7 @@
import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
+import org.fudaa.dodico.mesure.EvolutionFileFormatVersion;
/**
* Manager de fichiers au format scope. Utilis\xE9 pour la cr\xE9ation des graphes. au
@@ -17,7 +19,7 @@
* @author Adrien Hadoux
*
*/
-public class ScopeTFileFormat extends FileFormatUnique {
+public class ScopeTFileFormat extends FileFormatUnique implements EvolutionFileFormatVersion {
static final ScopeTFileFormat INSTANCE = new ScopeTFileFormat();
@@ -48,5 +50,9 @@
public FileWriteOperationAbstract createWriter() {
return new ScopeWriterSorT(this);
}
+
+ public CtuluIOOperationSynthese readEvolutions(File _f, ProgressionInterface _prog, Map _options) {
+ return super.read(_f, _prog);
+ }
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -153,6 +153,11 @@
if (standardActionGroup_ == null) {
buildButtonGroupStandard();
}
+ if (standardActionGroup_ == null) {
+ buildButtonGroupSpecifique();
+ }
+
+
}
protected EbliActionInterface createRepereAction() {
@@ -318,6 +323,11 @@
// this.updateMapKeyStroke(standardActionGroup_);
}
+
+ public EbliActionInterface[] buildButtonGroupSpecifique() {
+ return null;
+ }
+
protected final EbliActionInterface[] getSpecificActionGroup() {
return specificActionGroup_;
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGrapheModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGrapheModel.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGrapheModel.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -52,6 +52,9 @@
*/
boolean isStructureModifiable();
+
+
+
/**
* @return true si le contenu de courbe peut etre modifie
*/
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/CalqueLegendeWidgetAdapter.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/CalqueLegendeWidgetAdapter.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/CalqueLegendeWidgetAdapter.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -20,7 +20,6 @@
import org.fudaa.ebli.visuallibrary.EbliNode;
import org.fudaa.ebli.visuallibrary.EbliNodeDefault;
import org.fudaa.ebli.visuallibrary.EbliScene;
-import org.fudaa.ebli.visuallibrary.EbliWidget;
import org.fudaa.ebli.visuallibrary.EbliWidgetWithBordure;
import org.netbeans.api.visual.border.BorderFactory;
import org.netbeans.api.visual.layout.LayoutFactory.SerialAlignment;
@@ -187,6 +186,14 @@
EbliScene scene_;
+ public EbliScene getScene() {
+ return scene_;
+ }
+
+ public void setScene(EbliScene _scene) {
+ scene_ = _scene;
+ }
+
public CalqueLegendeWidgetAdapter(EbliScene _scene, BArbreCalqueModel model) {
super();
scene_ = _scene;
@@ -210,16 +217,16 @@
*
* @return EbliNode cree ajoute a la scene.
*/
- public EbliNode createLegende(Point _location) {
-
+ public EbliNode createLegende(Point _location, EbliScene _scene) {
+ setScene(_scene);
EbliNodeDefault def = new EbliNodeDefault();
def.setPreferedLocation(_location);
// def.setPreferedSize(new Dimension(150, 250));
def.setCreator(new EbliWidgetCreatorLegende(legendePanel_));
def.setTitle("L\xE9gende calque");
// TODO non stable
- scene_.addNode(def);
- scene_.refresh();
+ _scene.addNode(def);
+ _scene.refresh();
return def;
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -25,6 +25,7 @@
import org.fudaa.ebli.calque.action.EbliCalqueActionTimeChooser;
import org.fudaa.ebli.commun.EbliActionInterface;
import org.fudaa.ebli.commun.EbliActionPaletteAbstract;
+import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.ebli.commun.EbliComponentFactory;
import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.controle.BSelecteurListComboBox;
@@ -64,7 +65,7 @@
BuMenuBar menuCalque_;
JComponent panelTreeCalque_;
-
+ public boolean alreadyCreate_;
BuToolBar toolbarCalque_;
EbliWidgetVueCalque widgetCalque_;
@@ -87,7 +88,26 @@
}
+
/**
+ * ajoute des toolsbuton specifiques si pas deja ajoutes.
+ */
+ public void addFonctionsSpecific(ArrayList<EbliActionSimple> _listeActions) {
+
+ if (!fonctionsAlreadySpecified()) {
+ alreadyCreate_ = true;
+
+ for (Iterator<EbliActionSimple> it = _listeActions.iterator(); it.hasNext();) {
+ EbliActionSimple action = it.next();
+ toolbarCalque_.add(action.buildToolButton(EbliComponentFactory.INSTANCE));
+ menuCalque_.getMenu(0).add(new JMenuItem(action));
+ }
+
+ }
+
+ }
+
+ /**
* Methode a surcharger si on veut effectuer un traitement particulier apres duplication du widget.
*/
@Override
@@ -134,7 +154,7 @@
if (widget_.getBounds() != null && widget_.getPreferredLocation() != null) {
positionLegende.x = widget_.getPreferredLocation().x + widget_.getBounds().width + 20;
positionLegende.y = widget_.getPreferredLocation().y;
- setNodeLegende(legendeWidget_.createLegende(positionLegende));
+ setNodeLegende(legendeWidget_.createLegende(positionLegende, widget_.getEbliScene()));
}
widget_.getEbliScene().refresh();
} else if (getNodeLegende().hasWidget())
@@ -427,5 +447,7 @@
public void setNodeLegende(final EbliNode node) {
widgetCalque_.nodeLegende = node;
}
-
+ public boolean fonctionsAlreadySpecified() {
+ return alreadyCreate_;
+ }
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorVueCalque.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorVueCalque.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorVueCalque.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -45,7 +45,7 @@
positionLegende.x = _dest.getLocation().x + _dest.getIntern().getPreferredSize().width + 5;
positionLegende.y = _dest.getPreferredLocation().y;
EbliWidgetVueCalque vue = (EbliWidgetVueCalque) _dest.getIntern();
- vue.nodeLegende = _legende.createLegende(positionLegende);
+ vue.nodeLegende = _legende.createLegende(positionLegende, _legende.getScene());
((EbliWidgetControllerCalque) vue.getController()).setLegendeWidget(_legende);
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeImporter.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeImporter.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeImporter.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -103,8 +103,9 @@
} else {
if (op.getSource() instanceof EvolutionReguliereInterface[])
_target.importCourbes((EvolutionReguliereInterface[]) op.getSource(), _mng, prog);
- else
- _target.importCourbes((ScopeStructure) op.getSource(), _mng, prog);
+ // else
+ // _target.importCourbes((ScopeStructure) op.getSource(), _mng,
+ // prog);
}
}
_ui.unsetMainMessage();
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaWriterScopeS.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaWriterScopeS.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaWriterScopeS.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -75,7 +75,10 @@
// -- data qui contient les courbes choisies --//
EGExportData data = (EGExportData) _model;
EGGraphe graphe_ = data.getGraphe();
- EGCourbe[] listeChoixUser = data.getCourbes();
+
+ // -- on prends UNIQUEMENT la premiere courbe choisie --//
+ EGCourbe[] listeChoixUser = new EGCourbe[1];
+ listeChoixUser[0] = data.getCourbes()[0];
// -- on ajoute la var des x, debut de chaque ligne de valeurs --//
structure_.addVariable("X");
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileTreeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileTreeModel.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileTreeModel.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -98,6 +98,15 @@
}
+
+
+ public H2dVariableType[] getVariables() {
+
+ List values = getShownVar();
+
+ return null;
+ }
+
public boolean isStructureModifiable() {
return true;
}
@@ -212,7 +221,12 @@
return true;
}
- List getShownVar() {
+ /**
+ * retourne la liste des variables du graphe.
+ *
+ * @return
+ */
+ public List getShownVar() {
final List res = new ArrayList(getNbEGObject() - 1);
for (int i = getNbEGObject() - 1; i >= 0; i--) {
final EGGroup g = getGroup(i);
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/TrImportCourbeScopeManager.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/TrImportCourbeScopeManager.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/TrImportCourbeScopeManager.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -1,7 +1,10 @@
package org.fudaa.fudaa.tr.common;
+import java.util.List;
+
import org.fudaa.ctulu.CtuluCommandManager;
import org.fudaa.ctulu.ProgressionInterface;
+import org.fudaa.dodico.mesure.EvolutionReguliere;
import org.fudaa.dodico.mesure.EvolutionReguliereInterface;
import org.fudaa.dodico.telemac.io.ScopeStructure;
import org.fudaa.dodico.telemac.io.ScopeStructure.Gene;
@@ -19,7 +22,7 @@
public class TrImportCourbeScopeManager implements FudaaCourbeImporter.Target {
EGGraphe graphe_;
- MvProfileTreeModel modelGraphe_;
+
/**
* indique si la courbe a importer est correcte
*/
@@ -31,10 +34,7 @@
super();
graphe_ = _graphe;
impl_ = _impl;
- // if (_graphe.getModel() instanceof MvProfileTreeModel)
- modelGraphe_ = (MvProfileTreeModel) _graphe.getModel();
- // else
- // enabled = false;
+
}
public void importCourbes(EvolutionReguliereInterface[] _crb, CtuluCommandManager _mng, ProgressionInterface _prog) {
@@ -69,15 +69,31 @@
*/
public void importCourbesSorT(ScopeStructure.SorT s, CtuluCommandManager _mng, ProgressionInterface _prog) {
+ EvolutionReguliere[] evolReg=new EvolutionReguliere[s.getNbVariables()];
+
// -- on parcours toutes les variables --//
for (int i = 0; i < s.getNbVariables(); i++) {
-
- // --on recherche si cette variable n'existe pas deja dans le graphe --//
- // graphe_.getModel().get
+ String nomVar = s.getVariable(i);
- }
+ List<Double> listeX=s.getAllX();
+ List<Double> listeY=s.getListValueForVariable(i);
+
+ double[] tabX=new double[listeX.size()];
+ double[] tabY=new double[listeY.size()];
+
+ for(int j=0;j<listeX.size();j++){
+ tabX[i]=listeX.get(i);
+ tabY[i]=listeY.get(i);
+
+ }
+
+ evolReg[i]=new EvolutionReguliere(tabX,tabY,false);
-
+
+
+
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionController.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionController.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionController.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -45,6 +45,8 @@
super(_ui);
}
+
+
@Override
protected void buildButtonGroupNavigation() {
if (navigationActionGroup_ != null) { return; }
@@ -66,6 +68,24 @@
standardActionGroup_ = removePalettes(standardActionGroup_);
}
+
+ protected void buildButtonGroupSpecifiques() {
+ if (standardActionGroup_ != null)
+ return;
+ super.buildButtonGroupStandard();
+ standardActionGroup_ = removePalettes(standardActionGroup_);
+
+
+
+
+
+
+
+
+
+
+ }
+
/**
* recupere les palettes et initialise les actions
*/
Added: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostBilanAction.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostBilanAction.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostBilanAction.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -0,0 +1,61 @@
+package org.fudaa.fudaa.tr.post;
+
+import java.awt.event.ActionEvent;
+
+import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.fudaa.meshviewer.MvResource;
+import org.fudaa.fudaa.meshviewer.profile.MvProfileTreeModel;
+
+import com.vividsolutions.jts.geom.LineString;
+
+/**
+ * Action pour le calcul des bilans. Cette action peut etre executee depuis le
+ * mode edition du calque pu le mode edition d'un profil spoatial.
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public class TrPostBilanAction extends EbliActionSimple {
+
+ // final MvProfileTarget src_;
+ final TrPostVisuPanel panel_;
+ final MvProfileTreeModel modelGraphe_;
+ final boolean startWithCalque;
+ TrPostCommonImplementation impl_;
+
+ public TrPostBilanAction(final TrPostVisuPanel _visu, TrPostCommonImplementation impl) {
+ super(MvResource.getS("Calcul des bilans"), MvResource.MV.getIcon("profile"), "BILAN");
+ panel_ = _visu;
+ modelGraphe_ = null;
+ startWithCalque = true;
+ impl_ = impl;
+ }
+
+ public TrPostBilanAction(final MvProfileTreeModel _model, TrPostCommonImplementation impl) {
+ super(MvResource.getS("Calcul des bilans"), MvResource.MV.getIcon("profile"), "BILAN");
+ modelGraphe_ = _model;
+ panel_ = null;
+ startWithCalque = false;
+ impl_ = impl;
+ }
+
+ public void actionPerformed(final ActionEvent _e) {
+ // -- creation du wizard depusi le calque --//
+ if (startWithCalque) {
+ new TrPostDialogBilan(panel_, impl_);
+ } else {
+ new TrPostDialogBilan(modelGraphe_, impl_);
+ }
+ }
+
+
+ protected LineString getSelectedLine() {
+ // pas de calque s\xE9lectionn\xE9
+ if (!(panel_.getArbreCalqueModel().getSelectedCalque() instanceof ZCalqueAffichageDonneesInterface)) {
+ return null;
+ }
+ return ((ZCalqueAffichageDonneesInterface) panel_.getArbreCalqueModel().getSelectedCalque()).getSelectedLine();
+ }
+}
+
Added: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostDialogBilan.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostDialogBilan.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostDialogBilan.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -0,0 +1,319 @@
+package org.fudaa.fudaa.tr.post;
+
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ListModel;
+import javax.swing.ListSelectionModel;
+
+import org.fudaa.ctulu.gui.CtuluLibSwing;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
+import org.fudaa.ebli.ressource.EbliResource;
+import org.fudaa.fudaa.meshviewer.profile.MvProfileTreeModel;
+import org.fudaa.fudaa.tr.common.TrResource;
+
+import com.memoire.bu.BuCharValidator;
+import com.memoire.bu.BuStringValidator;
+import com.memoire.bu.BuTextField;
+import com.memoire.bu.BuValueValidator;
+import com.vividsolutions.jts.geom.LineString;
+
+/**
+ * Wizard pour gerer les bilans des courbes.
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public class TrPostDialogBilan {
+
+ /**
+ * booleen qui indique si le wizard a \xE9t\xE9t lanc\xE9 depuis un calque
+ */
+
+ private boolean startWithCalque_ = true;
+ TrPostSource source_;
+ TrPostVisuPanel calque_;
+ MvProfileTreeModel modelGraphe_;
+ TrPostCommonImplementation impl_;
+
+ // donnees graphiques
+ JDialog dialog_;
+
+ // variables
+ private JPanel panelVariables_;
+ ListModel modelVariables_;
+ JList listVar_;
+
+ // isolignes
+ private JPanel panelIsolignes_;
+ JCheckBox boxSelectLineAuto_ = new JCheckBox(TrResource.getS("Choisir l'isoligne du calque"));
+ JCheckBox boxSelectLineManu_ = new JCheckBox(TrResource.getS("Cr\xE9er manuellement lisoligne"));
+ BuTextField textX1 = new BuTextField(10);
+ BuTextField textX2 = new BuTextField(10);
+ BuTextField textY1 = new BuTextField(10);
+ BuTextField textY2 = new BuTextField(10);
+
+ // results
+ JPanel panelResults_;
+ JLabel results_;
+ JButton ajouter = new JButton("Valider", EbliResource.EBLI.getIcon("crystal_valider"));
+ /**
+ * Constructeur reserv\xE9 au calques
+ *
+ * @param _builderParams
+ * @param _calque
+ * @param _modelGraphe
+ * @param _panelVariables
+ * @param _source
+ */
+ public TrPostDialogBilan(TrPostVisuPanel _calque, TrPostCommonImplementation impl) {
+ impl_ = impl;
+ calque_ = _calque;
+ modelGraphe_ = null;
+ source_ = calque_.getSource();
+ modelVariables_ = source_.getNewVarListModel();
+ startWithCalque_ = true;
+
+ // -- construction de la dialog --//
+ buildDialog();
+ }
+
+ /**
+ * constructeur reserv\xE9 aux graphes spatiaux
+ *
+ * @param _builderParams
+ * @param _calque
+ * @param _modelGraphe
+ * @param _panelVariables
+ * @param _source
+ */
+ public TrPostDialogBilan(MvProfileTreeModel _modelGraphe, TrPostCommonImplementation impl) {
+ calque_ = null;
+ impl_ = impl;
+ modelGraphe_ = _modelGraphe;
+ source_ = (TrPostSource) _modelGraphe.target_.getData();
+ startWithCalque_ = false;
+ modelVariables_ = source_.getNewVarListModel();
+
+ // -- construction de la dialog --//
+ buildDialog();
+ }
+
+ /**
+ * Construit le panel des variables
+ *
+ * @return
+ */
+ private JPanel buildIsoLignes() {
+ JPanel content=new JPanel(new BorderLayout());
+ JPanel panelChek = new JPanel(new FlowLayout(FlowLayout.CENTER));
+ panelChek.add(new JLabel(TrResource.getS("Choisir l'isoligne du calque")));
+ panelChek.add(boxSelectLineAuto_);
+ panelChek.add(new JLabel(TrResource.getS("Cr\xE9er manuellement l'isoligne")));
+ panelChek.add(boxSelectLineManu_);
+ content.add(panelChek, BorderLayout.NORTH);
+
+ JPanel center = new JPanel(new GridLayout(2, 1));
+ JPanel center1 = new JPanel(new FlowLayout(FlowLayout.CENTER));
+ center1.add(new JLabel("Point 1 X:"));
+ center1.add(textX1);
+ center1.add(new JLabel("Y:"));
+ center1.add(textY1);
+ JPanel center2 = new JPanel(new FlowLayout(FlowLayout.CENTER));
+ center2.add(new JLabel("Point 2 X:"));
+ center2.add(textX2);
+ center2.add(new JLabel("Y:"));
+ center2.add(textY2);
+ center.add(center1);
+ center.add(center2);
+ content.add(center, BorderLayout.CENTER);
+ content.setBorder(BorderFactory.createTitledBorder(TrResource.getS("Choix de l'isoligne")));
+
+ // -- init et gestion des evenements --//
+ textX1.setCharValidator(BuCharValidator.FLOAT);
+ textX1.setStringValidator(BuStringValidator.FLOAT);
+ textX1.setValueValidator(BuValueValidator.FLOAT);
+
+ textX2.setCharValidator(BuCharValidator.FLOAT);
+ textX2.setStringValidator(BuStringValidator.FLOAT);
+ textX2.setValueValidator(BuValueValidator.FLOAT);
+
+ textY1.setCharValidator(BuCharValidator.FLOAT);
+ textY1.setStringValidator(BuStringValidator.FLOAT);
+ textY1.setValueValidator(BuValueValidator.FLOAT);
+
+ textY2.setCharValidator(BuCharValidator.FLOAT);
+ textY2.setStringValidator(BuStringValidator.FLOAT);
+ textY2.setValueValidator(BuValueValidator.FLOAT);
+
+ boxSelectLineAuto_.setAction(new AbstractAction() {
+ public void actionPerformed(ActionEvent _e) {
+ boolean enabled = false;
+ textX1.setEnabled(enabled);
+ textX2.setEnabled(enabled);
+ textY1.setEnabled(enabled);
+ textY2.setEnabled(enabled);
+ boxSelectLineManu_.setSelected(false);
+ if (boxSelectLineAuto_.isSelected())
+ ajouter.setEnabled(true);
+ else
+ ajouter.setEnabled(false);
+ }
+
+ });
+ boxSelectLineManu_.setAction(new AbstractAction() {
+ public void actionPerformed(ActionEvent _e) {
+ boolean enabled = true;
+ textX1.setEnabled(enabled);
+ textX2.setEnabled(enabled);
+ textY1.setEnabled(enabled);
+ textY2.setEnabled(enabled);
+ boxSelectLineAuto_.setSelected(false);
+ if (boxSelectLineManu_.isSelected())
+ ajouter.setEnabled(true);
+ else
+ ajouter.setEnabled(false);
+ }
+
+ });
+
+ // -- test si une ligne a ete au prealable selectionnee par l user sur le
+ // calque --//
+ if (calque_ != null && getSelectedLineOfCalque() != null) {
+ boxSelectLineAuto_.setSelected(true);
+ boolean enabled = false;
+ textX1.setEnabled(enabled);
+ textX2.setEnabled(enabled);
+ textY1.setEnabled(enabled);
+ textY2.setEnabled(enabled);
+ boxSelectLineManu_.setSelected(false);
+
+ } else {
+ boxSelectLineAuto_.setSelected(false);
+ boxSelectLineManu_.setSelected(true);
+ // impossible de choisir cetet checkbox
+ boxSelectLineAuto_.setEnabled(false);
+ }
+
+ return content;
+ }
+
+
+ private JPanel buildresults() {
+ JPanel content = new JPanel(new FlowLayout(FlowLayout.LEFT));
+
+ results_ = new JLabel("");
+ content.add(ajouter);
+ content.add(new JLabel(TrResource.getS("R\xE9sultat:")));
+ content.add(results_);
+
+ content.setBorder(BorderFactory.createTitledBorder(TrResource.getS("R\xE9sultats")));
+ return content;
+ }
+
+ protected LineString getSelectedLineOfCalque() {
+ // pas de calque s\xE9lectionn\xE9
+ if (!(calque_.getArbreCalqueModel().getSelectedCalque() instanceof ZCalqueAffichageDonneesInterface)) {
+ return null;
+ }
+ return ((ZCalqueAffichageDonneesInterface) calque_.getArbreCalqueModel().getSelectedCalque()).getSelectedLine();
+ }
+
+ private JPanel buildVariables() {
+ JPanel content = new JPanel(new BorderLayout());
+ listVar_ = new JList(modelVariables_);
+ listVar_.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ content.add(new JScrollPane(listVar_), BorderLayout.CENTER);
+ content.setBorder(BorderFactory.createTitledBorder(TrResource.getS("Choix de la variable")));
+ content.add(new JLabel(TrResource.getS("Veuillez s\xE9lectionner la variable sur laquelle appliquer le calcul")),
+ BorderLayout.NORTH);
+ return content;
+ }
+
+
+ /**
+ * Creation du panel graphique.
+ *
+ * @return
+ */
+ public Box buildContent() {
+
+ Box content = Box.createVerticalBox();
+
+ // -- panel des isolignes --//
+ if (panelIsolignes_ == null)
+ panelIsolignes_ = buildIsoLignes();
+ content.add(panelIsolignes_);
+
+ // -- panel des variables --//
+ if (panelVariables_ == null)
+ panelVariables_ = buildVariables();
+ content.add(panelVariables_);
+
+ // -- panel des resultats --//
+ if (panelResults_ == null)
+ panelResults_ = buildresults();
+ content.add(panelResults_);
+
+
+
+ return content;
+ }
+
+
+ public void buildDialog() {
+
+
+ // CtuluUIDialog ui_ = new
+ // CtuluUIDialog(listeWidgetCalque_.get(0).getCalqueController
+ // ().getVisuPanel());
+
+ final Frame f = CtuluLibSwing.getFrameAncestorHelper(impl_.getCurrentInternalFrame());
+ dialog_ = new JDialog(f);
+
+ dialog_.addWindowListener(new WindowAdapter() {
+ public void windowClosed(WindowEvent _e) {
+ // on desactive l action de suivi sur le graphe
+ dialog_ = null;
+ }
+
+ public void windowClosing(WindowEvent _e) {
+ dialog_ = null;
+ }
+ });
+
+ dialog_.setModal(true);
+ dialog_.pack();
+ dialog_.setTitle(getTitle());
+ JPanel container = new JPanel(new BorderLayout());
+ container.add(buildContent(), BorderLayout.CENTER);
+ container.add(new JLabel("<html> <body><b><center>" + getTitle() + "</center></b> </body></html>"),
+ BorderLayout.NORTH);
+ dialog_.setContentPane(container);
+ dialog_.setSize(400, 450);
+ dialog_.setLocationRelativeTo(CtuluLibSwing.getFrameAncestor(impl_.getCurrentInternalFrame()));
+ dialog_.setVisible(true);
+
+ }
+
+ public String getTitle() {
+ return TrResource.getS("Bilans");
+
+ }
+
+}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -17,7 +17,6 @@
import javax.swing.JPanel;
import org.fudaa.ctulu.CtuluCommandManager;
-import org.fudaa.ctulu.CtuluResource;
import org.fudaa.ctulu.CtuluUndoRedoInterface;
import org.fudaa.ctulu.gui.CtuluFilleWithComponent;
import org.fudaa.ctulu.image.CtuluImageProducer;
@@ -39,7 +38,7 @@
import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorGraphe;
import org.fudaa.fudaa.commun.courbe.FudaaCourbeImporter;
import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
-import org.fudaa.fudaa.tr.common.TrImportCourbeScopeManager;
+import org.fudaa.fudaa.meshviewer.profile.MvProfileTreeModel;
import org.fudaa.fudaa.tr.common.TrLib;
import org.fudaa.fudaa.tr.common.TrResource;
import org.netbeans.api.visual.widget.Widget;
@@ -447,6 +446,7 @@
// -- etape 2: rechargement de la toolbar specifique dans this --//
changeToolbar(node.getWidget().getController());
+ changeToolbarSpecifiqueCalque(node.getWidget().getController(), (EbliWidgetCreatorVueCalque) node.getCreator());
setTitle(previousTitleFrame + " " + node.getWidget().getController().getDescription(), false);
} else if (node.getCreator() instanceof EbliWidgetCreatorGraphe) {
FuLog.debug("change tree GRAPHE");
@@ -565,11 +565,21 @@
// TrPostVisuPanel _calque = (TrPostVisuPanel) creator.getCalquepanelProvenance();
// TODO trop dangereux...
// listeActions.add(new TrPostCourbeAddPointsAction(projet_.impl_, _graphe.getGraphe(), _calque));
+ if (!(_graphe.getGraphe().getModel() instanceof MvProfileTreeModel))
listeActions.add(new TrPostCourbeAddVariableAction(projet_.impl_, _graphe.getGraphe()));
+ if (_graphe.getGraphe().getModel() instanceof MvProfileTreeModel) {
+ listeActions
+ .add(new TrPostBilanAction(((MvProfileTreeModel) _graphe.getGraphe().getModel()), projet_.getImpl()));
+ }
+
//--ajout des actions import export format scope --//
- listeActions.add(new FudaaCourbeImporter.ImportAction(new TrImportCourbeScopeManager(_graphe.getGraphe(),
- projet_.impl_), projet_.impl_, creator.getGraphe().getCmd()));
+
+ // FIXME comment recuperer les parametres H2DParameter
+ // TrCourbeTemporelleManager manager = new
+ // TrCourbeTemporelleManager(null);
+ // listeActions.add(new FudaaCourbeImporter.ImportAction(manager,
+ // projet_.impl_, creator.getGraphe().getCmd()));
listeActions.add( new FudaaCourbeImporter.ExportAction(creator.getGraphe(), projet_.impl_));
_controller.addFonctionsSpecific(listeActions);
@@ -579,7 +589,28 @@
// mise a jour des params
this.revalidate();
}
+
+
+ private void changeToolbarSpecifiqueCalque(final EbliWidgetController _controller,
+ final EbliWidgetCreatorVueCalque creator) {
+ // -- change la toolbar avec els actions generiques du controller --//
+ changeToolbar(_controller);
+
+ if (!_controller.fonctionsAlreadySpecified()) {
+ // -- ajout des actions tr --//
+ final ArrayList<EbliActionSimple> listeActions = new ArrayList<EbliActionSimple>();
+
+ listeActions.add(new TrPostBilanAction((TrPostVisuPanel) creator.getCalque(), projet_.getImpl()));
+ _controller.addFonctionsSpecific(listeActions);
+
+ }
+
+ // mise a jour des params
+ this.revalidate();
+ }
+
+
public void changeToolbarScene() {
// nettoyage de la toolbar
this.remove(toolBarModifiable_);
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 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -77,7 +77,6 @@
import com.memoire.bu.BuScrollPane;
import com.memoire.bu.BuTable;
import com.memoire.bu.BuVerticalLayout;
-import com.memoire.fu.FuLib;
import com.memoire.fu.FuLog;
/**
@@ -597,8 +596,25 @@
menubar.add(menuPost_, 2);
+
+
+
+ menuPost_.addSeparator(TrResource.getS("Layout"));
+ // -- ajout de l action de creation du calque --//
+ // menuPost_.add(new TrPostActionChooseAndCreateCalque(this));
+ menuPost_.addMenuItem(TrResource.getS("Vue 2D"), "VIEW_2D", BuResource.BU.getIcon("aucun"), TrPostProjet.this);
+ menuPost_.addMenuItem(TrResource.getS(("Ajouter une nouvelle fen\xEAtre")), "AJOUTFRAME", CtuluResource.CTULU
+ .getIcon("crystal_ajouter"), new ActionListener() {
+
+ public void actionPerformed(final ActionEvent _e) {
+ createNewLayoutFrame();
+
+ }
+ });
+
+ menuPost_.addSeparator(TrResource.getS("Gestion"));
// -- ajout de l action de gestion des simus dans post --//
- final BuMenuItem item = new BuMenuItem("Gestion Multi-projets");
+ final BuMenuItem item = new BuMenuItem(TrResource.getS("Gestion Multi-Fichiers r\xE9sultats"));
item.addActionListener(new ActionListener() {
public void actionPerformed(final ActionEvent e) {
@@ -614,22 +630,8 @@
}
});
-
menuPost_.add(item);
- menuPost_.addSeparator(TrResource.getS("Vue 2D"));
- // -- ajout de l action de creation du calque --//
- // menuPost_.add(new TrPostActionChooseAndCreateCalque(this));
- menuPost_.addMenuItem(TrResource.getS("Vue 2D"), "VIEW_2D", BuResource.BU.getIcon("aucun"), TrPostProjet.this);
- menuPost_.addMenuItem(TrResource.getS(("Ajouter une nouvelle fen\xEAtre")), "AJOUTFRAME", CtuluResource.CTULU
- .getIcon("crystal_ajouter"), new ActionListener() {
-
- public void actionPerformed(final ActionEvent _e) {
- createNewLayoutFrame();
-
- }
- });
-
- menuPost_.addSeparator("Liste des projets");
+ menuPost_.addSeparator("Liste des Fichiers r\xE9sultats");
// -- init de la liste des menus --//
listeMenuProjets_ = new ArrayList<BuMenu>();
@@ -839,7 +841,10 @@
* @param calque
*/
private void addEbliNode(final EGFillePanel pn, final TrPostVisuPanel calque) {
+ if (calque != null)
addGrapheNodeInCurrentScene(pn, formatInfoSource(calque.getSource()));
+ else
+ addGrapheNodeInCurrentScene(pn, "profil spatial");
}
public void addGrapheNodeInCurrentScene(final EGFillePanel _pn, final String _desc) {
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjetsManagerFille.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjetsManagerFille.java 2008-09-29 10:28:00 UTC (rev 4005)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjetsManagerFille.java 2008-09-29 15:43:55 UTC (rev 4006)
@@ -173,7 +173,7 @@
// --creation graphique --//
// setSize(500, 250);
// setPreferredSize(new Dimension(500, 250));
- setTitle(TrResource.getS("Gestion multi-projets"));
+ setTitle(TrResource.getS("Gestion Multi-Fichiers r\xE9sultats"));
setLayout(new BorderLayout());
// Box centrePanel = Box.createHorizontalBox();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
