Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5769] trunk/soft/fudaa-prepro
|
From: <de...@us...> - 2010-06-24 07:27:53
|
Revision: 5769
http://fudaa.svn.sourceforge.net/fudaa/?rev=5769&view=rev
Author: deniger
Date: 2010-06-24 07:27:46 +0000 (Thu, 24 Jun 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GridVisuPanelController.java
trunk/soft/fudaa-prepro/grid/src/test/java/org/fudaa/fudaa/fgrid/layer/ExampleGridVisuPanel.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostBuilderSuiteCalcul.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCommonImplementation.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeBuilder.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostMultiSourceActivator.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostMultiSourceActivator2.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostProjet.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrReplayCurvesData.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java
trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt
Added Paths:
-----------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostCourbeAddVariableAction.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostCourbeRemoveVariableAction.java
Removed Paths:
-------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeAddVariableAction.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeRemoveVariableAction.java
Modified: trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GridVisuPanelController.java
===================================================================
--- trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GridVisuPanelController.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GridVisuPanelController.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -110,6 +110,6 @@
}
public JComponent getPaletteInfoModel() {
- return mapTabPalettes_.get("PALETTE_EDTION").buildContentPane();
+ return mapTabPalettes_.get("PALETTE_EDTION").getPaletteContent();
}
}
Modified: trunk/soft/fudaa-prepro/grid/src/test/java/org/fudaa/fudaa/fgrid/layer/ExampleGridVisuPanel.java
===================================================================
--- trunk/soft/fudaa-prepro/grid/src/test/java/org/fudaa/fudaa/fgrid/layer/ExampleGridVisuPanel.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/grid/src/test/java/org/fudaa/fudaa/fgrid/layer/ExampleGridVisuPanel.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -40,7 +40,7 @@
static JComponent buildComponent(Collection<EbliActionPaletteAbstract> acts) {
final BuTabbedPane tb = new BuTabbedPane();
for (final EbliActionPaletteAbstract pals : acts) {
- final JComponent component = pals.buildContentPane();
+ final JComponent component = pals.getPaletteContent();
if (component instanceof BCalquePaletteInfo) {
((BCalquePaletteInfo) component).setAvailable(true);
((BCalquePaletteInfo) component).updateState();
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -111,7 +111,7 @@
infoSoft = new BuInformationsSoftware();
infoSoft.name = "prepro";
- infoSoft.version = "1.1RC6";
+ infoSoft.version = "1.1RC7";
infoSoft.date = "2010-06-10";
// infoSoft.version = "1.00";
// infoSoft.date = "2010-01-27";
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostBuilderSuiteCalcul.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostBuilderSuiteCalcul.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostBuilderSuiteCalcul.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -81,7 +81,7 @@
// -- on ajoute la nouvelle src r\xE9sultat comme \xE9tant une suite de calcul --//
- proj.getImpl().c_.ajouterSource(suiteCalcul, suiteCalcul.getTitle());
+ proj.getImpl().project.ajouterSource(suiteCalcul, suiteCalcul.getTitle());
// -- on cree la vue 2d correspondante --//
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCommonImplementation.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCommonImplementation.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCommonImplementation.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -37,14 +37,14 @@
*/
public abstract class TrPostCommonImplementation extends TrCommonImplementation {
- TrPostProjet c_;
+ TrPostProjet project;
public final TrPostProjet getCurrentProject() {
- return c_;
+ return project;
}
public final void setCurrentProject(TrPostProjet _c) {
- c_ = _c;
+ project = _c;
}
/**
@@ -118,22 +118,22 @@
@Override
public void close() {
- if (c_ != null) {
- c_.close();
+ if (project != null) {
+ project.close();
}
removeInternalFrames(getAllInternalFrames());
}
public void setProjet(final TrPostProjet _c) {
- if (c_ == _c) { return; }
+ if (project == _c) { return; }
new CtuluTaskOperationGUI(null, CtuluLibString.EMPTY_STRING) {
@Override
public void act() {
saveAndCloseProjet(createProgressionInterface(this));
- c_ = _c;
- if (c_ != null) {
- c_.active(TrPostCommonImplementation.this);
+ project = _c;
+ if (project != null) {
+ project.active(TrPostCommonImplementation.this);
BuLib.invokeNowOrLater(new Runnable() {
public void run() {
setEnabledForAction("CREER", true);
@@ -152,19 +152,19 @@
}
public boolean saveAndCloseProjet(final ProgressionInterface _interface) {
- if (c_ != null) {
+ if (project != null) {
// -- enregistrement sauce widget --//
- if (c_.isModified()) {
+ if (project.isModified()) {
final int i = CtuluLibDialog.confirmExitIfProjectisModified(getFrame());
if (i == JOptionPane.CANCEL_OPTION) { return false; }
if (i != JOptionPane.NO_OPTION) {
- c_.getManager().saveProject(false);
+ project.getManager().saveProject(false);
// c_.save(this, _interface);
}
}
- c_.close();
- c_ = null;
+ project.close();
+ project = null;
SwingUtilities.invokeLater(new Runnable() {
public void run() {
@@ -183,7 +183,7 @@
@Override
public boolean confirmExit() {
final boolean b = super.confirmExit();
- if (b && c_ != null && !saveAndCloseProjet(null)) { return false; }
+ if (b && project != null && !saveAndCloseProjet(null)) { return false; }
return b;
}
@@ -193,45 +193,45 @@
if ("CREER".equals(com)) {
- if (c_ != null) {
+ if (project != null) {
final int reponse = JOptionPane.showConfirmDialog(this.getParentComponent(), TrResource
.getS("Le projet courant va \xEAtre ferm\xE9. \n Voulez vous sauvegarder le projet courant avant sa fermeture?"));
if (reponse == JOptionPane.CANCEL_OPTION) { return; }
if (reponse == JOptionPane.OK_OPTION) {
- c_.getManager().saveProject(false);
+ project.getManager().saveProject(false);
}
// -- nettoyage du projet pr\xE9c\xE9dent --//
- c_.getManager().clearProject();
+ project.getManager().clearProject();
} else {
- c_ = new TrPostProjet(this);
- c_.setMenuPost();
+ project = new TrPostProjet(this);
+ project.setMenuPost();
}
// -- ouverture d'un fichier r\xE9sultat qui sera automatiquement ajout\xE9 dans la layout courante --//
- c_.createNewLayoutFrame();
+ project.createNewLayoutFrame();
// -- ouverture d'un fichier r\xE9sultat --//
- TrPostActionChooseAndCreateCalque chooserSource = new TrPostActionChooseAndCreateCalque(c_, c_.getImpl()
+ TrPostActionChooseAndCreateCalque chooserSource = new TrPostActionChooseAndCreateCalque(project, project.getImpl()
.getCurrentLayoutFille().controller_);
chooserSource.actionPerformed(null);
} else if ("OUVRIR".equals(com)) {
// -- ouverture d un nouveau projet --//
- if (c_ != null) {
+ if (project != null) {
final int reponse = JOptionPane.showConfirmDialog(this.getParentComponent(), TrResource
.getS("Le projet courant va \xEAtre ferm\xE9. \n Voulez vous sauvegarder le projet courant avant sa fermeture?"));
if (reponse == JOptionPane.CANCEL_OPTION) { return; }
if (reponse == JOptionPane.OK_OPTION) {
- c_.getManager().saveProject(false);
+ project.getManager().saveProject(false);
}
// -- nettoyage du projet pr\xE9c\xE9dent --//
- c_.getManager().clearProject();
+ project.getManager().clearProject();
} else {
- c_ = new TrPostProjet(this);
- c_.setMenuPost();
+ project = new TrPostProjet(this);
+ project.setMenuPost();
}
- c_.getManager().loadProject(false, null);
+ project.getManager().loadProject(false, null);
// new TrPostFusionProjet(c_);
} else
@@ -244,7 +244,7 @@
saveAndCloseProjet(createProgressionInterface(this));
}
}.start();
- } else if ("ENREGISTRER".equals(com) && c_ != null) {
+ } else if ("ENREGISTRER".equals(com) && project != null) {
new CtuluTaskOperationGUI(this, TrResource.getS("Enregistrement")) {
@Override
@@ -252,11 +252,11 @@
// c_.save(TrPostCommonImplementation.this, createProgressionInterface(this));
// -- enregistrement sauce widget --//
- c_.getManager().saveProject(false);
+ project.getManager().saveProject(false);
}
}.start();
- } else if ("ENREGISTRERSOUS".equals(com) && c_ != null) {
+ } else if ("ENREGISTRERSOUS".equals(com) && project != null) {
new CtuluTaskOperationGUI(this, TrResource.getS("Enregistrement Sous")) {
@Override
@@ -264,7 +264,7 @@
// c_.save(TrPostCommonImplementation.this, createProgressionInterface(this));
// -- enregistrement sauce widget --//
- c_.getManager().saveProject(true);
+ project.getManager().saveProject(true);
}
}.start();
@@ -295,10 +295,10 @@
*/
public void cmdOuvrirLayoutFile(final File _f) {
- if (c_ == null) {
+ if (project == null) {
// setProjet(new TrPostProjet(TrPostCommonImplementation.this));
- c_ = new TrPostProjet(TrPostCommonImplementation.this);
- c_.active(TrPostCommonImplementation.this);
+ project = new TrPostProjet(TrPostCommonImplementation.this);
+ project.active(TrPostCommonImplementation.this);
BuLib.invokeNowOrLater(new Runnable() {
public void run() {
setEnabledForAction("ENREGISTRER", true);
@@ -313,7 +313,7 @@
BuLib.invokeLater(new Runnable() {
public void run() {
- c_.getManager().loadProject(true, _f);
+ project.getManager().loadProject(true, _f);
}
});
@@ -321,10 +321,10 @@
public void cmdOuvrirScopFile(final File _f) {
- if (c_ == null) {
+ if (project == null) {
// setProjet(new TrPostProjet(TrPostCommonImplementation.this));
- c_ = new TrPostProjet(TrPostCommonImplementation.this);
- c_.active(TrPostCommonImplementation.this);
+ project = new TrPostProjet(TrPostCommonImplementation.this);
+ project.active(TrPostCommonImplementation.this);
BuLib.invokeNowOrLater(new Runnable() {
public void run() {
setEnabledForAction("ENREGISTRER", true);
@@ -408,4 +408,11 @@
}
}
+ /**
+ * @return the project
+ */
+ public TrPostProjet getProject() {
+ return project;
+ }
+
}
\ No newline at end of file
Deleted: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeAddVariableAction.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeAddVariableAction.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeAddVariableAction.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -1,136 +0,0 @@
-/*
- * @creation 1 sept. 06
- * @modification $Date: 2007-01-19 13:14:11 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.fudaa.tr.post;
-
-import java.awt.Component;
-import java.awt.EventQueue;
-import java.awt.event.ActionEvent;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.swing.Action;
-
-import com.memoire.bu.BuBorderLayout;
-import com.memoire.bu.BuBorders;
-import com.memoire.bu.BuLabel;
-import com.memoire.bu.BuList;
-import com.memoire.bu.BuResource;
-import com.memoire.bu.BuScrollPane;
-import com.memoire.fu.FuComparator;
-
-import org.fudaa.ctulu.CtuluLib;
-import org.fudaa.ctulu.CtuluLibArray;
-import org.fudaa.ctulu.ProgressionBuAdapter;
-import org.fudaa.ctulu.gui.CtuluDialogPanel;
-import org.fudaa.ctulu.gui.CtuluLibSwing;
-import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
-import org.fudaa.dodico.h2d.type.H2dVariableType;
-import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.courbe.EGCourbe;
-import org.fudaa.ebli.courbe.EGGraphe;
-
-//TODO a modifier
-class TrPostCourbeAddVariableAction extends EbliActionSimple {
-
- final TrPostCommonImplementation impl_;
- final EGGraphe model_;
-
- public TrPostCourbeAddVariableAction(final TrPostCommonImplementation _impl, final EGGraphe _model) {
- super(CtuluLib.getS("Ajouter des variables"), BuResource.BU.getToolIcon("ajouter"), "ADD_VARIALBES");
- impl_ = _impl;
- model_ = _model;
-
- }
-
- public static Object[] select(final Object[] _init, final String _title, final Component _parent) {
- Arrays.sort(_init, FuComparator.STRING_COMPARATOR);
- final BuList l = CtuluLibSwing.createBuList(_init);
- final CtuluDialogPanel pn = new CtuluDialogPanel(false);
- pn.setLayout(new BuBorderLayout());
- pn.setBorder(BuBorders.EMPTY3333);
- pn.add(new BuLabel(CtuluLib.getS("S\xE9lectionner les variables \xE0 ajouter")), BuBorderLayout.NORTH);
- pn.add(new BuScrollPane(l));
- if (CtuluDialogPanel.isOkResponse(pn.afficheModale(_parent, _title))) { return l.getSelectedValues(); }
- return null;
- }
-
-
- public static int selectSource(final Object[] _init, final String _title, final Component _parent) {
- Arrays.sort(_init, FuComparator.STRING_COMPARATOR);
- final BuList l = CtuluLibSwing.createBuList(_init);
- final CtuluDialogPanel pn = new CtuluDialogPanel(false);
- pn.setLayout(new BuBorderLayout());
- pn.setBorder(BuBorders.EMPTY3333);
- pn.add(new BuLabel(CtuluLib.getS("S\xE9lectionner le fichier r\xE9sultat")), BuBorderLayout.NORTH);
- pn.add(new BuScrollPane(l));
- if (CtuluDialogPanel.isOkResponse(pn.afficheModale(_parent, _title))) { return l.getSelectedIndex(); }
- return -1;
- }
-
- @Override
- public void actionPerformed(final ActionEvent _e) {
- final TrPostCourbeTreeModel model = (TrPostCourbeTreeModel) model_.getModel();
- final EGCourbe selectedComponent = model_.getSelectedComponent();
- // final EGCourbe selectedComponent = model_.getModel().getCourbes()[0];
- TrPostSource src = null;
-// if (selectedComponent != null && selectedComponent.getModel() instanceof TrPostCourbeModel) {
-// src = ((TrPostCourbeModel) selectedComponent.getModel()).getSource();
-// }
-
- if(selectedComponent==null || !(selectedComponent.getModel() instanceof TrPostCourbeModel)){
- impl_.error("Impossibe, on ne peut ajouter des variables que pour une \xE9volution temporelle. \n La courbe choisie n'est pas une \xE9volution temporelle.");
- return;
- }
-
- final TrPostCourbeModel modelEvol=(TrPostCourbeModel)selectedComponent.getModel();
-
- //-- creation d'un lister de fichier source --//
- final String[] values = impl_.c_.getListSources(false);
-
- final int selectedSource = selectSource(values, (String) getValue(Action.NAME), impl_.getFrame());
- if(selectedSource !=-1)
- src=impl_.c_.getSource(selectedSource);
- if (src == null) return;
- final TrPostSource finalSrc = src;
-
-
-
- final Set var = new HashSet(Arrays.asList(src.getAllVariablesNonVec()));
- if(model.varSupported_!=null)
- var.removeAll(model.varSupported_);
-
-
-// if(model.objIdx_==null){
-// model.objIdx_=new int[src.getTime().getNbTimeStep()];
-// for(int i=0;i<src.getTime().getNbTimeStep();i++)
-// model.objIdx_[i]=i;
-// }
-// if(model.intepolPt_==null)
-// model.intepolPt_ = new HashSet();
-
- final H2dVariableType[] vars = (H2dVariableType[]) var.toArray(new H2dVariableType[var.size()]);
- final Object[] selected = select(vars, (String) getValue(Action.NAME), impl_.getFrame());
- if (!CtuluLibArray.isEmpty(selected)) {
- new CtuluTaskOperationGUI(impl_, (String) getValue(Action.NAME)) {
-
- @Override
- public void act() {
- model.addVariables(modelEvol,finalSrc, Arrays.asList(selected), new ProgressionBuAdapter(this), model_.getCmd());
- EventQueue.invokeLater(new Runnable() {
-
- public void run() {
- model_.restore();
- }
- });
- }
- }.start();
- }
-
- }
-}
\ No newline at end of file
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeBuilder.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeBuilder.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeBuilder.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -20,6 +20,8 @@
import org.fudaa.fudaa.meshviewer.export.MvExportChooseVarAndTime;
import org.fudaa.fudaa.tr.common.TrResource;
import org.fudaa.fudaa.tr.post.actions.TrPostCourbeAddPointsAction;
+import org.fudaa.fudaa.tr.post.actions.TrPostCourbeAddVariableAction;
+import org.fudaa.fudaa.tr.post.actions.TrPostCourbeRemoveVariableAction;
import org.fudaa.fudaa.tr.post.dialogSpec.TrPostWizardCourbeTemporelle;
/**
Deleted: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeRemoveVariableAction.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeRemoveVariableAction.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeRemoveVariableAction.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -1,78 +0,0 @@
-/*
- * @creation 1 sept. 06
- * @modification $Date: 2007-01-19 13:14:11 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.fudaa.tr.post;
-
-import java.awt.EventQueue;
-import java.awt.event.ActionEvent;
-import java.util.Arrays;
-
-import javax.swing.Action;
-
-import com.memoire.bu.BuBorderLayout;
-import com.memoire.bu.BuBorders;
-import com.memoire.bu.BuLabel;
-import com.memoire.bu.BuList;
-import com.memoire.bu.BuResource;
-import com.memoire.bu.BuScrollPane;
-import com.memoire.fu.FuComparator;
-
-import org.fudaa.ctulu.CtuluLib;
-import org.fudaa.ctulu.gui.CtuluDialogPanel;
-import org.fudaa.ctulu.gui.CtuluLibSwing;
-import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
-import org.fudaa.dodico.h2d.type.H2dVariableType;
-import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.courbe.EGGraphe;
-import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
-
-class TrPostCourbeRemoveVariableAction extends EbliActionSimple {
-
- final FudaaCommonImplementation impl_;
- final EGGraphe model_;
-
- public TrPostCourbeRemoveVariableAction(final FudaaCommonImplementation _impl, final EGGraphe _model) {
- super(CtuluLib.getS("Enlever des variables"), BuResource.BU.getToolIcon("enlever"), "ADD_VARIALBES");
- impl_ = _impl;
- model_ = _model;
-
- }
-
- @Override
- public void actionPerformed(final ActionEvent _e) {
- final TrPostCourbeTreeModel model = (TrPostCourbeTreeModel) model_.getModel();
- final H2dVariableType[] vars = (H2dVariableType[]) model.varSupported_
- .toArray(new H2dVariableType[model.varSupported_.size()]);
- Arrays.sort(vars, FuComparator.STRING_COMPARATOR);
- final BuList l = CtuluLibSwing.createBuList(vars);
- final CtuluDialogPanel pn = new CtuluDialogPanel(false);
- pn.setLayout(new BuBorderLayout());
- pn.setBorder(BuBorders.EMPTY3333);
- pn.add(new BuLabel(CtuluLib.getS("S\xE9lectionner les variables \xE0 enlever")), BuBorderLayout.NORTH);
- pn.add(new BuScrollPane(l));
- final String title = (String) getValue(Action.NAME);
- if (CtuluDialogPanel.isOkResponse(pn.afficheModale(impl_.getFrame(), title))) {
- final Object[] val = l.getSelectedValues();
- if (val != null && val.length > 0) {
- new CtuluTaskOperationGUI(impl_, title) {
-
- @Override
- public void act() {
- model.removeVariables(Arrays.asList(val), model_.getCmd());
- EventQueue.invokeLater(new Runnable() {
-
- public void run() {
- model_.restore();
- }
- });
- }
- }.start();
- }
- }
-
- }
-}
\ No newline at end of file
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -37,6 +37,7 @@
import org.fudaa.fudaa.tr.common.TrLib;
import org.fudaa.fudaa.tr.common.TrResource;
import org.fudaa.fudaa.tr.common.TrCourbeImporter.Target;
+import org.fudaa.fudaa.tr.post.actions.TrPostCourbeAddVariableAction;
@SuppressWarnings("serial")
public class TrPostCourbeTreeModel extends EGGrapheTreeModel implements TrPostTimeContentListener, Target {
@@ -69,6 +70,10 @@
// isAllTimeStep_ = true;
}
+ public H2dVariableType[] getVarSupportedArray() {
+ return (H2dVariableType[]) varSupported_.toArray(new H2dVariableType[varSupported_.size()]);
+ }
+
public TrPostCourbeTreeModel(final FudaaCommonImplementation _impl, final TrPostSource _src, final int[] _timeIdx,
final TrPostInterpolatePoint _interpol, final H2dVariableType[] _vars, final TrPostProjet _projet) {
this(_vars, _projet);
@@ -414,7 +419,7 @@
* @param _prog
* @param _cmd
*/
- protected void addVariables(TrPostCourbeModel modelCourbe, final TrPostSource _src, final List _var,
+ public void addVariables(TrPostCourbeModel modelCourbe, final TrPostSource _src, final List _var,
final ProgressionInterface _prog, final CtuluCommandContainer _cmd) {
// buildTimeSteps();
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostMultiSourceActivator.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostMultiSourceActivator.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostMultiSourceActivator.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -109,8 +109,8 @@
public void active(final File _f, final TrPostCommonImplementation _impl){
String uniqueId;
- if(_impl.c_!=null)
- uniqueId=_impl.c_.deliverSourceId(_f.getName());
+ if(_impl.project!=null)
+ uniqueId=_impl.project.deliverSourceId(_f.getName());
else
uniqueId=CtuluLibGenerator.getInstance().deliverUniqueStringId();
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostMultiSourceActivator2.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostMultiSourceActivator2.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostMultiSourceActivator2.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -79,8 +79,8 @@
public void active(final File _f, final TrPostCommonImplementation _impl) {
String uniqueId;
- if (_impl.c_ != null) {
- uniqueId = _impl.c_.deliverSourceId(_f.getName());
+ if (_impl.project != null) {
+ uniqueId = _impl.project.deliverSourceId(_f.getName());
} else {
uniqueId = CtuluLibGenerator.getInstance().deliverUniqueStringId();
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostProjet.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostProjet.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostProjet.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -15,8 +15,10 @@
import java.awt.event.ActionListener;
import java.io.File;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Observable;
import java.util.Observer;
@@ -595,11 +597,11 @@
final EbliWidgetControllerGraphe controller = (EbliWidgetControllerGraphe) nodeG.getWidget().getIntern()
.getController();
controller.ajoutLegende();
+ currentLayoutFilleOrFirst.getScene().setSelectedObjects(new HashSet(Arrays.asList(nodeG)));
}
});
- // getImpl().getCurrentLayoutFilleOrFirst().getScene().refresh();
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrReplayCurvesData.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrReplayCurvesData.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrReplayCurvesData.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -34,6 +34,7 @@
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuBorders;
import com.memoire.bu.BuButton;
+import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuLabel;
import com.memoire.bu.BuList;
import com.memoire.bu.BuRadioButton;
@@ -148,7 +149,7 @@
return memoire_;
BCalqueLegende legende=new BCalqueLegende();
- TrPostVisuPanel vue2d=new TrPostVisuPanel(implementation,implementation.c_,legende,src);
+ TrPostVisuPanel vue2d=new TrPostVisuPanel(implementation,implementation.project,legende,src);
vue2d.removeCalqueLegend();
vue2d.restaurer();
@@ -180,7 +181,6 @@
public JToolBar constructToolBarVue2d(final TrPostVisuPanel vue2d,boolean modeEdition){
JToolBar toolbarCalque = new BuToolBar();
AbstractButton boutonSelection=null;
- //final EbliActionInterface[] actions =vue2d.getController().getSelectedNavigationAndStandardActionGroup();
final List actions = vue2d.getController().getNonSpecificsActions();//getSelectedNavigationAndStandardActionGroup();
int i=0;
for (final Iterator iterator = actions.iterator(); iterator.hasNext();) {
@@ -321,7 +321,12 @@
panelSouth.add(this.ajouter_);
if(this.rejouerSrc_!=null){
TrPostCourbeModel postModel=(TrPostCourbeModel)modele;
- panelSouth2.add(new JLabel(TrResource.TR.getString("Le fichier r\xE9sultat actuel est {0}",postModel.getSource().getMainFile().getName())));
+ JPanel pnEtat=new JPanel(new BuGridLayout(2));
+ pnEtat.add(new JLabel(TrResource.TR.getString("Le fichier r\xE9sultat utilis\xE9 actuellement:")));
+ pnEtat.add(new JLabel(postModel.getSource().getMainFile().getName()));
+ pnEtat.add(new JLabel(TrResource.TR.getString("Le fichier r\xE9sultat qui sera utilis\xE9:")));
+ pnEtat.add(new JLabel(srcMemoire_.getMainFile().getName()));
+
panelSouth2.add(rejouerSrc_);
}
@@ -439,10 +444,7 @@
dataP[i][1]=listePoints.getCoordinateN(i).y;
}
- //ZModelePointEditable modelePointEdit=new ZModelePointEditable(collectionPoint);
-
BCalque memoire=vue2d.getCalqueActif();
- //ZCalquePoint calqueZ=new ZCalquePoint(modelePointEdit);
GISZoneCollectionLigneBrisee ligneBrisee=new GISZoneCollectionLigneBrisee();
@@ -452,11 +454,8 @@
- //calqueZ.setVisible(true);
- //calqueZ.setLineModel(0, new TraceLigneModel(1,2,Color.BLACK));
calqueZ.setIconModel(0, new TraceIconModel(TraceIcon.CARRE_SELECTION,3,Color.blue));
calqueZ.setTitle("Origine courbe de "+modele.getTitle());
- //vue2d.addCalque(calqueZ, true);
FSigLayerGroup group=TrPostWizardProfilSpatial.getGroup(TrPostWizardProfilSpatial.idSpatial, vue2d);
group.add(calqueZ);
@@ -468,15 +467,9 @@
vect[0]="X";
vect[1]="Y";
JTable tableauVal=new JTable(new DefaultTableModel(dataP,vect));
- //tableauVal.setMaximumSize(new Dimension(200,300));
tableauVal.setPreferredSize(new Dimension(200,300));
JScrollPane pane=new JScrollPane(tableauVal);
- //pane.setMaximumSize(new Dimension(200,300));
pane.setPreferredSize(new Dimension(200,300));
-
-
-
-
CtuluDialogPanel panel=constructDialog(vue2d, implementation, modele,pane,false,"<html><body>"+TrResource.getS("Origine ")+" "+modele.getTitle()+".<br />Les points de la polyligne sont encadr\xE9s en bleu </body></html>");
//-- on positionne la bonne variable et le bon pas de temps --//
comboVar_.getCb().setSelectedItem(modele.getVariable());
@@ -562,17 +555,10 @@
layer2.setEnabled(true);
- //groupeCalque.addPointLayerAct("Origine", new GISZoneCollectionPoint());
BCalque resultatsCalque=vue2d.getCalqueActif();
- //vue2d.addCalque(layer2, true);
vue2d.getGroupGIS().add(layer2);
vue2d.setCalqueActif(resultatsCalque);
- //vue2d.addCalque(layer2, true);
-
-
-
-
//-- creation du panel de choix des variables a selectionner --//
rejouerSrc_=new BuButton();
Copied: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostCourbeAddVariableAction.java (from rev 5758, trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeAddVariableAction.java)
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostCourbeAddVariableAction.java (rev 0)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostCourbeAddVariableAction.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -0,0 +1,135 @@
+/*
+ * @creation 1 sept. 06
+ *
+ * @modification $Date: 2007-01-19 13:14:11 $
+ *
+ * @license GNU General Public License 2
+ *
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ *
+ * @mail de...@fu...
+ */
+package org.fudaa.fudaa.tr.post.actions;
+
+import java.awt.Component;
+import java.awt.EventQueue;
+import java.awt.event.ActionEvent;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.swing.Action;
+
+import com.memoire.bu.BuBorderLayout;
+import com.memoire.bu.BuBorders;
+import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuList;
+import com.memoire.bu.BuResource;
+import com.memoire.bu.BuScrollPane;
+import com.memoire.fu.FuComparator;
+
+import org.fudaa.ctulu.CtuluLib;
+import org.fudaa.ctulu.CtuluLibArray;
+import org.fudaa.ctulu.ProgressionBuAdapter;
+import org.fudaa.ctulu.gui.CtuluDialogPanel;
+import org.fudaa.ctulu.gui.CtuluLibSwing;
+import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
+import org.fudaa.dodico.h2d.type.H2dVariableType;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.courbe.EGCourbe;
+import org.fudaa.ebli.courbe.EGGraphe;
+import org.fudaa.fudaa.tr.post.TrPostCommonImplementation;
+import org.fudaa.fudaa.tr.post.TrPostCourbeModel;
+import org.fudaa.fudaa.tr.post.TrPostCourbeTreeModel;
+import org.fudaa.fudaa.tr.post.TrPostSource;
+
+ /**
+ * @author deniger
+ *
+ */
+public class TrPostCourbeAddVariableAction extends EbliActionSimple {
+
+ final TrPostCommonImplementation impl_;
+ final EGGraphe model_;
+
+ public TrPostCourbeAddVariableAction(final TrPostCommonImplementation _impl, final EGGraphe _model) {
+ super(CtuluLib.getS("Ajouter des variables"), BuResource.BU.getToolIcon("ajouter"), "ADD_VARIALBES");
+ impl_ = _impl;
+ model_ = _model;
+
+ }
+
+ public static Object[] select(final Object[] _init, final String _title, final Component _parent) {
+ Arrays.sort(_init, FuComparator.STRING_COMPARATOR);
+ final BuList l = CtuluLibSwing.createBuList(_init);
+ final CtuluDialogPanel pn = new CtuluDialogPanel(false);
+ pn.setLayout(new BuBorderLayout());
+ pn.setBorder(BuBorders.EMPTY3333);
+ pn.add(new BuLabel(CtuluLib.getS("S\xE9lectionner les variables \xE0 ajouter")), BuBorderLayout.NORTH);
+ pn.add(new BuScrollPane(l));
+ if (CtuluDialogPanel.isOkResponse(pn.afficheModale(_parent, _title))) { return l.getSelectedValues(); }
+ return null;
+ }
+
+ public static int selectSource(final Object[] _init, final String _title, final Component _parent) {
+ Arrays.sort(_init, FuComparator.STRING_COMPARATOR);
+ final BuList l = CtuluLibSwing.createBuList(_init);
+ final CtuluDialogPanel pn = new CtuluDialogPanel(false);
+ pn.setLayout(new BuBorderLayout());
+ pn.setBorder(BuBorders.EMPTY3333);
+ pn.add(new BuLabel(CtuluLib.getS("S\xE9lectionner le fichier r\xE9sultat")), BuBorderLayout.NORTH);
+ pn.add(new BuScrollPane(l));
+ if (CtuluDialogPanel.isOkResponse(pn.afficheModale(_parent, _title))) { return l.getSelectedIndex(); }
+ return -1;
+ }
+
+ @Override
+ public void actionPerformed(final ActionEvent _e) {
+ final TrPostCourbeTreeModel model = (TrPostCourbeTreeModel) model_.getModel();
+ final EGCourbe selectedComponent = model_.getSelectedComponent();
+ // final EGCourbe selectedComponent = model_.getModel().getCourbes()[0];
+ TrPostSource src = null;
+ // if (selectedComponent != null && selectedComponent.getModel() instanceof TrPostCourbeModel) {
+ // src = ((TrPostCourbeModel) selectedComponent.getModel()).getSource();
+ // }
+
+ if (selectedComponent == null || !(selectedComponent.getModel() instanceof TrPostCourbeModel)) {
+ impl_
+ .error("Impossibe, on ne peut ajouter des variables que pour une \xE9volution temporelle. \n La courbe choisie n'est pas une \xE9volution temporelle.");
+ return;
+ }
+
+ final TrPostCourbeModel modelEvol = (TrPostCourbeModel) selectedComponent.getModel();
+
+ // -- creation d'un lister de fichier source --//
+ final String[] values = impl_.getCurrentProject().getListSources(false);
+
+ final int selectedSource = selectSource(values, (String) getValue(Action.NAME), impl_.getFrame());
+ if (selectedSource != -1) src = impl_.getCurrentProject().getSource(selectedSource);
+ if (src == null) return;
+ final TrPostSource finalSrc = src;
+
+ final Set var = new HashSet(Arrays.asList(src.getAllVariablesNonVec()));
+ if (model.getVarSupported() != null) var.removeAll(model.getVarSupported());
+
+ final H2dVariableType[] vars = (H2dVariableType[]) var.toArray(new H2dVariableType[var.size()]);
+ final Object[] selected = select(vars, (String) getValue(Action.NAME), impl_.getFrame());
+ if (!CtuluLibArray.isEmpty(selected)) {
+ new CtuluTaskOperationGUI(impl_, (String) getValue(Action.NAME)) {
+
+ @Override
+ public void act() {
+ model.addVariables(modelEvol, finalSrc, Arrays.asList(selected), new ProgressionBuAdapter(this), model_
+ .getCmd());
+ EventQueue.invokeLater(new Runnable() {
+
+ public void run() {
+ model_.restore();
+ }
+ });
+ }
+ }.start();
+ }
+
+ }
+}
\ No newline at end of file
Copied: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostCourbeRemoveVariableAction.java (from rev 5758, trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeRemoveVariableAction.java)
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostCourbeRemoveVariableAction.java (rev 0)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostCourbeRemoveVariableAction.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -0,0 +1,78 @@
+/*
+ * @creation 1 sept. 06
+ * @modification $Date: 2007-01-19 13:14:11 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.fudaa.tr.post.actions;
+
+import java.awt.EventQueue;
+import java.awt.event.ActionEvent;
+import java.util.Arrays;
+
+import javax.swing.Action;
+
+import com.memoire.bu.BuBorderLayout;
+import com.memoire.bu.BuBorders;
+import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuList;
+import com.memoire.bu.BuResource;
+import com.memoire.bu.BuScrollPane;
+import com.memoire.fu.FuComparator;
+
+import org.fudaa.ctulu.CtuluLib;
+import org.fudaa.ctulu.gui.CtuluDialogPanel;
+import org.fudaa.ctulu.gui.CtuluLibSwing;
+import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
+import org.fudaa.dodico.h2d.type.H2dVariableType;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.courbe.EGGraphe;
+import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
+import org.fudaa.fudaa.tr.post.TrPostCourbeTreeModel;
+
+public class TrPostCourbeRemoveVariableAction extends EbliActionSimple {
+
+ final FudaaCommonImplementation impl_;
+ final EGGraphe model_;
+
+ public TrPostCourbeRemoveVariableAction(final FudaaCommonImplementation _impl, final EGGraphe _model) {
+ super(CtuluLib.getS("Enlever des variables"), BuResource.BU.getToolIcon("enlever"), "ADD_VARIALBES");
+ impl_ = _impl;
+ model_ = _model;
+
+ }
+
+ @Override
+ public void actionPerformed(final ActionEvent _e) {
+ final TrPostCourbeTreeModel model = (TrPostCourbeTreeModel) model_.getModel();
+ final H2dVariableType[] vars = model.getVarSupportedArray();
+ Arrays.sort(vars, FuComparator.STRING_COMPARATOR);
+ final BuList l = CtuluLibSwing.createBuList(vars);
+ final CtuluDialogPanel pn = new CtuluDialogPanel(false);
+ pn.setLayout(new BuBorderLayout());
+ pn.setBorder(BuBorders.EMPTY3333);
+ pn.add(new BuLabel(CtuluLib.getS("S\xE9lectionner les variables \xE0 enlever")), BuBorderLayout.NORTH);
+ pn.add(new BuScrollPane(l));
+ final String title = (String) getValue(Action.NAME);
+ if (CtuluDialogPanel.isOkResponse(pn.afficheModale(impl_.getFrame(), title))) {
+ final Object[] val = l.getSelectedValues();
+ if (val != null && val.length > 0) {
+ new CtuluTaskOperationGUI(impl_, title) {
+
+ @Override
+ public void act() {
+ model.removeVariables(Arrays.asList(val), model_.getCmd());
+ EventQueue.invokeLater(new Runnable() {
+
+ public void run() {
+ model_.restore();
+ }
+ });
+ }
+ }.start();
+ }
+ }
+
+ }
+}
\ No newline at end of file
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -136,13 +136,6 @@
if (label_ != null) label_.setText("Nb points: " + listePoints_.size());
}
- // @Override
- // public void setValueAt(final Object _value, final int _rowIndex, final int _columnIndex) {
- // if (_columnIndex == 0 || _columnIndex == 3) return;
- // // cas normal de modif de val --//
- // if (_columnIndex == 2 || _columnIndex == 1) saisirPoints("" + getValueAt(_rowIndex, 1), ""
- // + getValueAt(_rowIndex, 2), false, _rowIndex, this);
- // }
}
private static int cptGraphe = 1;
@@ -159,7 +152,6 @@
.getString("Cr\xE9er calque avec points d'origine de la courbe:"));
private final MvExportChooseVarAndTime chooserVarTime_;
- // TrPostActionAddPointFromWidgetCalque.Temporel actionChoixGraphes_;
BuLabel indicateurPoints_ = new BuLabel("");
@@ -183,9 +175,8 @@
@SuppressWarnings("unchecked")
public TrPostWizardCourbeTemporelle(final TrPostVisuPanel _calque, final MvExportChooseVarAndTime _chooserVarTime,
- /* Temporel _actionChoixGraphes, */final int[] _ptIdx, final TrPostInterpolatePoint _pt) {
+ final int[] _ptIdx, final TrPostInterpolatePoint _pt) {
super();
- // actionChoixGraphes_ = _actionChoixGraphes;
chooserVarTime_ = _chooserVarTime;
calque_ = _calque;
@@ -576,42 +567,8 @@
return null;
}
+
/**
- * Methode qui verifie que le nouveau point peut etre une sonde et le remplace par l actuel ou alors l ajoute dans le
- * tableau selon l indice.
- */
- // public boolean checkAndReplaceSonde(String xs, String ys, ModelListePoints
- // model, int _indiceTableauAmodif) {
- // double x = Double.parseDouble(xs);
- // double y = Double.parseDouble(ys);
- // GrPoint point = new GrPoint(x, y, 0);
- // // -- verification que le point peut etre une sonde --//
- // int idxElt = TrIsoLayerDefault.sondeSelection(point, (TrPostModelInterface)
- // calque_.getIsoLayer().getIsoModel());
- // if (idxElt > -1) {
- // // --on remoplace la sonde actuelle --//
- // pt_ = new TrPostInterpolatePoint(idxElt, x, y, new GISPrecision());
- //
- // if (_indiceTableauAmodif < ptIdx_.length)
- // this.ptIdx_[_indiceTableauAmodif] = pt_.idxElt_;
- //
- // else {
- // // -- il faut reconstruire le tableau avec size +1 en ajoutant le point
- // int[] newVal = new int[ptIdx_.length + 1];
- // for (int i = 0; i < ptIdx_.length; i++) {
- // newVal[i] = ptIdx_[i];
- // FuLog.warning("ptIdx_[" + i + "]=" + newVal[i]);
- // }
- // newVal[ptIdx_.length] = pt_.idxElt_;
- // ptIdx_ = newVal;
- //
- // }
- // model.fireTableDataChanged();
- // return true;
- // }
- // return false;
- // }
- /**
* MEthode qui recherche si le point est exact pour les params x et y donnes
*
* @param x
Modified: trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt 2010-06-24 07:27:46 UTC (rev 5769)
@@ -1,3 +1,5 @@
+Le fichier r\xE9sultat utilis\xE9 actuellement=The current source used
+Le fichier r\xE9sultat qui sera utilis\xE9=The next source that will be used
Afficher les \xE9volutions temporelles dans une nouvelle fen\xEAtre=Display time evolutions in a new frame
Choisir un autre fichier r\xE9sultat=Choose another result file
Un seul r\xE9sultat est charg\xE9=only one file is loaded
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
