Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[3993] branches/Prepro-0.92-SNAPSHOT
|
From: <de...@us...> - 2008-09-26 22:34:58
|
Revision: 3993
http://fudaa.svn.sourceforge.net/fudaa/?rev=3993&view=rev
Author: deniger
Date: 2008-09-26 22:34:47 +0000 (Fri, 26 Sep 2008)
Log Message:
-----------
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestEGGraphe.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/meshviewer/profile/MvProfileBuilderFromLine.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileBuilderFromTree.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/TrLauncherDefault.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLineAction.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLineWizard.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLineWizardListValue.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionAddPointFromWidgetCalque.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionChangeSceneForWidget.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionDuplicate.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostAnalyze.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCommonImplementation.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeBuilder.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostDataCreationPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostInspector.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostInspectorReaderReflux.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostInspectorReaderRubar.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostInspectorReaderSerafin.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/TrPostLayoutPanelController.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostMultiSourceActivator.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProfileAction.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/TrPostProjetChooser.java
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/TrPostRubarEdgesResults.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostRubarLimniMng.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostRubarLoader.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostSource.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostSourceAbstract.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/TrPostSourceReflux.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostSourceRubar.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostSourceSerafin.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostTimeFmtPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostVisuPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostVisuPanelRubar.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostWizardCourbeTemporelle.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostWizardProfilSpatial.java
branches/Prepro-0.92-SNAPSHOT/fudaa/test/org/fudaa/fudaa/mv/TestProfile.java
branches/Prepro-0.92-SNAPSHOT/fudaa/test/org/fudaa/fudaa/tr/Test3D.java
branches/Prepro-0.92-SNAPSHOT/fudaa/test/org/fudaa/fudaa/tr/TestJTrPostProject.java
branches/Prepro-0.92-SNAPSHOT/fudaa/test/org/fudaa/fudaa/tr/TrTestPostWatcherRubar.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/CtuluCommandAction.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostRubarSpecificAction.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostSourceBuilder.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/save/
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/save/TrPostProjetSaver.java
Removed Paths:
-------------
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionChangeSrc.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjetRubar.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostSourceActivator.java
Added: branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/CtuluCommandAction.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/CtuluCommandAction.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/CtuluCommandAction.java 2008-09-26 22:34:47 UTC (rev 3993)
@@ -0,0 +1,86 @@
+/**
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.ctulu;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.KeyStroke;
+
+import com.memoire.bu.BuResource;
+
+/**
+ * @author deniger
+ */
+@SuppressWarnings("serial")
+public abstract class CtuluCommandAction extends AbstractAction {
+
+ /**
+ * Action de undo
+ *
+ * @author deniger
+ */
+ public static class Undo extends CtuluCommandAction {
+
+ public Undo(CtuluCommandManager _mng) {
+ super(CtuluLib.getS("D\xE9faire"), BuResource.BU.getIcon("defaire"), _mng);
+ putValue(Action.ACTION_COMMAND_KEY, KeyStroke.getKeyStroke("ctrl z"));
+ }
+
+ @Override
+ protected void updateState() {
+ setEnabled(mng_.canUndo());
+ }
+
+ public void actionPerformed(ActionEvent _e) {
+ mng_.undo();
+
+ }
+
+ }
+
+ /**
+ * action de redo.
+ *
+ * @author deniger
+ */
+ public static class Redo extends CtuluCommandAction {
+
+ public Redo(CtuluCommandManager _mng) {
+ super(CtuluLib.getS("Refaire"), BuResource.BU.getIcon("refaire"), _mng);
+ putValue(Action.ACTION_COMMAND_KEY, KeyStroke.getKeyStroke("ctrl shift Z"));
+ }
+
+ @Override
+ protected void updateState() {
+ setEnabled(mng_.canRedo());
+ }
+
+ public void actionPerformed(ActionEvent _e) {
+ mng_.redo();
+ }
+
+ }
+
+ final CtuluCommandManager mng_;
+
+ protected CtuluCommandAction(String _name, Icon _icon, CtuluCommandManager _mng) {
+ super(_name, _icon);
+ putValue(Action.SHORT_DESCRIPTION, getValue(Action.NAME));
+ mng_ = _mng;
+ mng_.setListener(new CtuluCmdMngListener() {
+
+ public void undoredoStateChange(CtuluCommandManager _source) {
+ updateState();
+ }
+ });
+ }
+
+ protected void updateState() {}
+
+}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java 2008-09-26 15:21:04 UTC (rev 3992)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java 2008-09-26 22:34:47 UTC (rev 3993)
@@ -113,7 +113,7 @@
public ZCalquePoint getIsoLayer() {
return null;
}
-
+
/**
* @author Fred Deniger
* @version $Id: ZEbliCalquesPanel.java,v 1.55 2007-06-05 08:58:38 deniger Exp $
@@ -274,6 +274,10 @@
this(_cq, new ZEbliCalquePanelController(_ui));
}
+ public CtuluUI getCtuluUI() {
+ return getController().getUI();
+ }
+
BuLabel info_;
/**
@@ -858,8 +862,7 @@
}
protected void removeCalqueLegend() {
- if(getCqLegend()!=null)
- getCqInfos().remove(getCqLegend());
+ if (getCqLegend() != null) getCqInfos().remove(getCqLegend());
// getCqLegend().setVisible(false);
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestEGGraphe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestEGGraphe.java 2008-09-26 15:21:04 UTC (rev 3992)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestEGGraphe.java 2008-09-26 22:34:47 UTC (rev 3993)
@@ -146,12 +146,12 @@
g.axeUpdated();
g.fullRepaint();
-// EventQueue.invokeLater(new Runnable() {
-// public void run() {
-// g.axeUpdated();
-// // g.restore();
-//
-// }
-// });
+ EventQueue.invokeLater(new Runnable() {
+ public void run() {
+ g.axeUpdated();
+ // g.restore();
+
+ }
+ });
}
}
\ No newline at end of file
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 2008-09-26 15:21:04 UTC (rev 3992)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileBuilder.java 2008-09-26 22:34:47 UTC (rev 3993)
@@ -83,7 +83,7 @@
public final CtuluUI ui_;
- public MvProfileBuilder(final MvProfileTarget _data, final CtuluUI _ui, final ZEbliCalquesPanel _panel,
+ public MvProfileBuilder(final MvProfileTarget _data, final ZEbliCalquesPanel _panel,
EfLineIntersectionsCorrectionTester _tester) {
super();
data_ = _data;
@@ -91,7 +91,7 @@
tester_ = _tester;
initVar_ = CtuluLibSwing.createListModel(data_.getVars());
act_ = new EfLineIntersectorActivity(data_.getData(), data_.getInterpolator());
- ui_ = _ui;
+ ui_ = panel_.getCtuluUI();
timeModel_ = _data.getTimeModel();
}
@@ -235,8 +235,7 @@
}
/**
- * Methode qui permet d ajouter une courbe spatiale poru un grapeh deja
- * existant.
+ * Methode qui permet d ajouter une courbe spatiale poru un grapeh deja existant.
*
* @author Adrien Hadoux
* @param _prog
@@ -244,129 +243,129 @@
*/
public MvProfileFillePanel actAddGroupForExistingModel(final ProgressionInterface _prog,
final MvExportChooseVarAndTime _selected) {
- int[] time = _selected.getSelectedTimeStepIdx();
- final CtuluVariable[] vs = _selected.getSelectedVar();
+ int[] time = _selected.getSelectedTimeStepIdx();
+ final CtuluVariable[] vs = _selected.getSelectedVar();
- final int nbVar = vs == null ? 0 : vs.length;
- final boolean isTime = timeModel_ != null;
- if (time == null) {
- time = new int[] { 0 };
- }
- boolean addXYForNode = false;
- boolean addXYForMesh = false;
- for (int i = initVar_.getSize() - 1; i >= 0; i--) {
- if (data_.getData().isElementVar((CtuluVariable) initVar_.getElementAt(i))) {
- addXYForMesh = true;
- } else {
- addXYForNode = true;
+ final int nbVar = vs == null ? 0 : vs.length;
+ final boolean isTime = timeModel_ != null;
+ if (time == null) {
+ time = new int[] { 0 };
}
- // les 2 sont a true
- if (addXYForMesh && addXYForNode) {
- break;
+ boolean addXYForNode = false;
+ boolean addXYForMesh = false;
+ for (int i = initVar_.getSize() - 1; i >= 0; i--) {
+ if (data_.getData().isElementVar((CtuluVariable) initVar_.getElementAt(i))) {
+ addXYForMesh = true;
+ } else {
+ addXYForNode = true;
+ }
+ // les 2 sont a true
+ if (addXYForMesh && addXYForNode) {
+ break;
+ }
}
- }
- final int nbTIme = time.length;
- final MvProfileTreeModel tree = new MvProfileTreeModel(this.data_, tester_);
- if (addXYForNode) {
- tree.setNodesResults(getNodeResultsMng(_prog), getNodeResultBuilder(_prog));
- }
- if (addXYForMesh) {
- tree.setMeshesResults(getMeshResultsMng(_prog), getMeshesResultBuilder(_prog));
+ final int nbTIme = time.length;
+ final MvProfileTreeModel tree = new MvProfileTreeModel(this.data_, tester_);
+ if (addXYForNode) {
+ tree.setNodesResults(getNodeResultsMng(_prog), getNodeResultBuilder(_prog));
+ }
+ if (addXYForMesh) {
+ tree.setMeshesResults(getMeshResultsMng(_prog), getMeshesResultBuilder(_prog));
- }
- final EGGroup grCoord = new EGGroup();
- final String s = EbliLib.getS("Coordonn\xE9es");
- grCoord.setTitle(s);
- final EGAxeVertical yCoordonnees = new EGAxeVertical();
- yCoordonnees.setTitre(s);
- yCoordonnees.setUnite("m");
- grCoord.setAxeY(yCoordonnees);
- final String sep = " - ";
- if (addXYForNode) {
- final EGCourbeChild courbeChild = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(
- getNodeResultsMng(_prog).getDefaultRes(), true));
- final EGCourbeChild courbeChild2 = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(
- getNodeResultsMng(_prog).getDefaultRes(), false));
- if (addXYForNode && addXYForMesh) {
- courbeChild.setTitle(courbeChild.getTitle() + sep + MvResource.getS("Noeuds"));
- courbeChild2.setTitle(courbeChild2.getTitle() + sep + MvResource.getS("Noeuds"));
}
- grCoord.addEGComponent(courbeChild);
+ final EGGroup grCoord = new EGGroup();
+ final String s = EbliLib.getS("Coordonn\xE9es");
+ grCoord.setTitle(s);
+ final EGAxeVertical yCoordonnees = new EGAxeVertical();
+ yCoordonnees.setTitre(s);
+ yCoordonnees.setUnite("m");
+ grCoord.setAxeY(yCoordonnees);
+ final String sep = " - ";
+ if (addXYForNode) {
+ final EGCourbeChild courbeChild = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(
+ getNodeResultsMng(_prog).getDefaultRes(), true));
+ final EGCourbeChild courbeChild2 = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(
+ getNodeResultsMng(_prog).getDefaultRes(), false));
+ if (addXYForNode && addXYForMesh) {
+ courbeChild.setTitle(courbeChild.getTitle() + sep + MvResource.getS("Noeuds"));
+ courbeChild2.setTitle(courbeChild2.getTitle() + sep + MvResource.getS("Noeuds"));
+ }
+ grCoord.addEGComponent(courbeChild);
- grCoord.addEGComponent(courbeChild2);
+ grCoord.addEGComponent(courbeChild2);
- }
- if (addXYForMesh) {
- final EGCourbeChild courbeChild = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(
- getMeshResultsMng(_prog).getDefaultRes(), true));
- final EGCourbeChild courbeChild2 = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(
- getMeshResultsMng(_prog).getDefaultRes(), false));
- if (addXYForNode && addXYForMesh) {
- courbeChild.setTitle(courbeChild.getTitle() + sep + MvResource.getS("Elements"));
- courbeChild2.setTitle(courbeChild2.getTitle() + sep + MvResource.getS("Elements"));
}
- grCoord.addEGComponent(courbeChild);
+ if (addXYForMesh) {
+ final EGCourbeChild courbeChild = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(
+ getMeshResultsMng(_prog).getDefaultRes(), true));
+ final EGCourbeChild courbeChild2 = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(
+ getMeshResultsMng(_prog).getDefaultRes(), false));
+ if (addXYForNode && addXYForMesh) {
+ courbeChild.setTitle(courbeChild.getTitle() + sep + MvResource.getS("Elements"));
+ courbeChild2.setTitle(courbeChild2.getTitle() + sep + MvResource.getS("Elements"));
+ }
+ grCoord.addEGComponent(courbeChild);
- grCoord.addEGComponent(courbeChild2);
+ grCoord.addEGComponent(courbeChild2);
- }
- grCoord.setVisible(false);
- tree.add(grCoord);
- // map permettant de stocker la correspondance var -> groupe
- final Map varGroup = new HashMap();
- if (vs != null) {
- for (int i = 0; i < nbVar; i++) {
- // pas null
- final CtuluVariable var = vs[i];
- MvProfileCourbeGroup gri = null;
- // dans ce cas, on va g\xE9rer les variables parents: inutile de creer des groupe different
- // pour des variables de meme type
- Color c = null;
- boolean mustAddGr = true;
- if (var instanceof H2dVariableType) {
- H2dVariableType parent = ((H2dVariableType) var).getParentVariable();
- if (parent == null) {
- parent = (H2dVariableType) var;
+ }
+ grCoord.setVisible(false);
+ tree.add(grCoord);
+ // map permettant de stocker la correspondance var -> groupe
+ final Map varGroup = new HashMap();
+ if (vs != null) {
+ for (int i = 0; i < nbVar; i++) {
+ // pas null
+ final CtuluVariable var = vs[i];
+ MvProfileCourbeGroup gri = null;
+ // dans ce cas, on va g\xE9rer les variables parents: inutile de creer des groupe different
+ // pour des variables de meme type
+ Color c = null;
+ boolean mustAddGr = true;
+ if (var instanceof H2dVariableType) {
+ H2dVariableType parent = ((H2dVariableType) var).getParentVariable();
+ if (parent == null) {
+ parent = (H2dVariableType) var;
+ }
+ c = MvProfileFillePanel.getColorFor(i, parent);
+ gri = (MvProfileCourbeGroup) varGroup.get(parent);
+ if (gri == null) {
+ gri = MvProfileFillePanel.createGroupFor(parent);
+ varGroup.put(parent, gri);
+ } else {
+ mustAddGr = false;
+ }
}
- c = MvProfileFillePanel.getColorFor(i, parent);
- gri = (MvProfileCourbeGroup) varGroup.get(parent);
if (gri == null) {
- gri = MvProfileFillePanel.createGroupFor(parent);
- varGroup.put(parent, gri);
- } else {
- mustAddGr = false;
+ gri = MvProfileFillePanel.createGroupFor(var);
}
- }
- if (gri == null) {
- gri = MvProfileFillePanel.createGroupFor(var);
- }
- if (c == null) {
- c = MvProfileFillePanel.getColorFor(i, var);
- }
- // on doit construire les courbes
- for (int t = 0; t < nbTIme; t++) {
- final MVProfileCourbeModel model = new MVProfileCourbeModel(var, data_.getData(), time[t], getResBuilder(var,
- _prog), _prog);
- EGCourbeChild child;
- if (isTime) {
- model.setTitle(var.toString() + CtuluLibString.ESPACE + timeModel_.getElementAt(time[t]));
- child = new MvProfileCourbeTime(gri, model, timeModel_);
- } else {
- child = new MvProfileCourbe(gri, model);
+ if (c == null) {
+ c = MvProfileFillePanel.getColorFor(i, var);
}
- child.setAspectContour(c);
- gri.addEGComponent(child);
+ // on doit construire les courbes
+ for (int t = 0; t < nbTIme; t++) {
+ final MVProfileCourbeModel model = new MVProfileCourbeModel(var, data_.getData(), time[t], getResBuilder(var,
+ _prog), _prog);
+ EGCourbeChild child;
+ if (isTime) {
+ model.setTitle(var.toString() + CtuluLibString.ESPACE + timeModel_.getElementAt(time[t]));
+ child = new MvProfileCourbeTime(gri, model, timeModel_);
+ } else {
+ child = new MvProfileCourbe(gri, model);
+ }
+ child.setAspectContour(c);
+ gri.addEGComponent(child);
+ }
+ if (mustAddGr) {
+ tree.add(gri);
+ }
}
- if (mustAddGr) {
- tree.add(gri);
- }
}
- }
- return new MvProfileFillePanel(tree, ui_);
+ return new MvProfileFillePanel(tree, ui_);
}
-
+
protected void close() {
if (tmp_ != null) {
tmp_.detruire();
@@ -383,23 +382,17 @@
}
protected EfLineIntersectionsResultsI getRes(final CtuluVariable _o, final int _tidx, final ProgressionInterface _prog) {
- if (data_.getData().isElementVar(_o)) {
- return getMeshResults(_prog, _tidx);
- }
+ if (data_.getData().isElementVar(_o)) { return getMeshResults(_prog, _tidx); }
return getNodeResults(_prog, _tidx);
}
protected EfLineIntersectionsResultsBuilder getResBuilder(final CtuluVariable _o, final ProgressionInterface _prog) {
- if (data_.getData().isElementVar(_o)) {
- return getMeshesResultBuilder(_prog);
- }
+ if (data_.getData().isElementVar(_o)) { return getMeshesResultBuilder(_prog); }
return getNodeResultBuilder(_prog);
}
public EfLineIntersectionsResultsI getDefaultRes(final CtuluVariable _o, final ProgressionInterface _prog) {
- if (data_.getData().isElementVar(_o)) {
- return getMeshResultsMng(_prog).getDefaultRes();
- }
+ if (data_.getData().isElementVar(_o)) { return getMeshResultsMng(_prog).getDefaultRes(); }
return getNodeResultsMng(_prog).getDefaultRes();
}
@@ -415,9 +408,7 @@
protected abstract void stepOne();
protected void update(final LineString _s, final boolean _zoom) {
- if (panel_ == null) {
- return;
- }
+ if (panel_ == null) { return; }
if (_s == null) {
if (tmp_ != null) {
tmp_.setVisible(false);
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileBuilderFromLine.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileBuilderFromLine.java 2008-09-26 15:21:04 UTC (rev 3992)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileBuilderFromLine.java 2008-09-26 22:34:47 UTC (rev 3993)
@@ -26,7 +26,7 @@
public MvProfileBuilderFromLine(final MvProfileTarget _data, final CtuluUI _ui, final LineString _line,
final ZEbliCalquesPanel _panel, EfLineIntersectionsCorrectionTester _tester) {
- super(_data, _ui, _panel, _tester);
+ super(_data, _panel, _tester);
selectedLine_ = _line;
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileBuilderFromTree.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileBuilderFromTree.java 2008-09-26 15:21:04 UTC (rev 3992)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileBuilderFromTree.java 2008-09-26 22:34:47 UTC (rev 3993)
@@ -73,7 +73,7 @@
public MvProfileBuilderFromTree(final MvProfileTarget _data, final CtuluUI _ui, final LineString _selected,
final ZEbliCalquesPanel _panel, EfLineIntersectionsCorrectionTester _tester) {
- super(_data, _ui, _panel, _tester);
+ super(_data, _panel, _tester);
lineTreeModel_ = new CalqueFindCourbeTreeModel(null, _panel.getDonneesCalque());
initSelected_ = _selected;
calque_ = _panel;
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/TrLauncherDefault.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/TrLauncherDefault.java 2008-09-26 15:21:04 UTC (rev 3992)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/TrLauncherDefault.java 2008-09-26 22:34:47 UTC (rev 3993)
@@ -431,7 +431,7 @@
alreadyOpened.getFrame().setState(Frame.NORMAL);
alreadyOpened.getFrame().requestFocus();
// pour Rubar
- alreadyOpened.getCurrentProject().activate(_f);
+// alreadyOpened.getCurrentProject().activate(_f);
return alreadyOpened;
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLineAction.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLineAction.java 2008-09-26 15:21:04 UTC (rev 3992)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLineAction.java 2008-09-26 22:34:47 UTC (rev 3993)
@@ -29,11 +29,11 @@
public TrIsoLineAction(final TrPostVisuPanel _dest) {
super(TrResource.getS("Rechercher les isolignes"), null, "FIND_ISOS");
dest_ = _dest;
- project_ = dest_.srcCont_;
+ project_ = dest_.projet_;
}
public void actionPerformed(final ActionEvent _e) {
- final BuWizardDialog dialog = new BuWizardDialog(dest_.getImpl().getFrame(), new TrIsoLineWizard(dest_, project_));
+ final BuWizardDialog dialog = new BuWizardDialog(dest_.getImpl().getFrame(), new TrIsoLineWizard(dest_));
dialog.pack();
dialog.setModal(true);
dialog.setLocationRelativeTo(dest_.getImpl().getFrame());
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLineWizard.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLineWizard.java 2008-09-26 15:21:04 UTC (rev 3992)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLineWizard.java 2008-09-26 22:34:47 UTC (rev 3993)
@@ -49,28 +49,34 @@
*/
public class TrIsoLineWizard extends BuWizardTask {
+ BuCheckBox cbOneLayer_;
+
BuComboBox cbVariables_;
+
+ CtuluListEditorPanel ctuluListEditorPanel_;
CtuluVariable currentVariable_;
final TrPostVisuPanel dest_;
- BuList listTimes_;
+ MvExportPanelFilter filter_;
- BuPanel pnValues_;
+ BuLabel lbTime_;
- BuPanel pnVars_;
+ BuList listTimes_;
BuPanel pnFinish_;
- final TrPostProjet project_;
+ BuPanel pnValues_;
+ BuPanel pnVars_;
+
BuTextField tfPrec_;
+
final TrIsoLineWizardListValue values_;
- Map varIsoValues_ = new HashMap();
+ Map<CtuluVariable, List> varIsoValues_ = new HashMap<CtuluVariable, List>();
- public TrIsoLineWizard(final TrPostVisuPanel _dest, final TrPostProjet _project) {
+ public TrIsoLineWizard(final TrPostVisuPanel _dest) {
super();
dest_ = _dest;
- project_ = _project;
- final ListModel newVarListModel = project_.getSource().getNewVarListModel();
+ final ListModel newVarListModel = dest_.getSource().getNewVarListModel();
// rien !
Object selected = getSelectedVarInLayer();
// on recherche si la variable selectionn\xE9 dans le calque courant est bien dispo
@@ -85,7 +91,7 @@
cbModel.setSelectedItem(selected);
cbVariables_ = new BuComboBox(cbModel);
- final ListModel time = project_.getSource().getNewTimeListModel();
+ final ListModel time = dest_.getSource().getNewTimeListModel();
final int idx = getSelectedTimeInLayer();
listTimes_ = new BuList(time);
listTimes_.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
@@ -105,12 +111,34 @@
}
- BuLabel lbTime_;
+ private void buildFinishPn() {
+ if (pnFinish_ != null) { return; }
+ pnFinish_ = new BuPanel(new BuBorderLayout(0, 10));
+ BuPanel pnCommon = new BuPanel();
+ pnCommon.setLayout(new BuGridLayout(2, 5, 5));
+ tfPrec_ = BuTextField.createDoubleField();
+ final CtuluValueValidator min = new CtuluValueValidator.DoubleMin(0);
+ tfPrec_.setValueValidator(min);
+ tfPrec_.setToolTipText(min.getDescription());
+ tfPrec_.setValue(new Double(1E-4));
+ pnCommon.add(new BuLabel(TrLib.getString("Pr\xE9cision des isolignes")));
+ pnCommon.add(tfPrec_);
+ pnCommon.add(new BuLabel(TrLib.getString("Cr\xE9er un calque par valeur")));
+ cbOneLayer_ = new BuCheckBox();
+ pnCommon.add(cbOneLayer_);
+ pnFinish_.add(pnCommon, BuBorderLayout.NORTH);
+ pnCommon = new BuPanel();
+ pnCommon.setLayout(new BuVerticalLayout(1));
+ pnCommon.add(new BuLabel(TrLib
+ .getString("Utiliser un filtre pour extraire les isoslignes que sur une partie du maillage:")));
+ filter_ = TrExportPanelFilterFactory.buildFilterForEachTimeStep(dest_.getCurrentSelection(), dest_.getSource());
+ pnCommon.add(filter_.getComponent());
+ pnFinish_.add(pnCommon, BuBorderLayout.CENTER);
+ }
+
private void buildFirstPn() {
- if (pnVars_ != null) {
- return;
- }
+ if (pnVars_ != null) { return; }
pnVars_ = new BuPanel();
pnVars_.setLayout(new BuVerticalLayout(5));
BuPanel pn = new BuPanel(new BuBorderLayout());
@@ -135,9 +163,7 @@
}
private void buildValuesPn() {
- if (pnValues_ != null) {
- return;
- }
+ if (pnValues_ != null) { return; }
pnValues_ = new BuPanel();
pnValues_.setLayout(new BuBorderLayout(5, 5, false, true));
final BuButton bt = new BuButton(BuResource.BU.getIcon("effacer"));
@@ -155,45 +181,37 @@
pnValues_.add(ctuluListEditorPanel_, BuBorderLayout.CENTER);
}
- CtuluListEditorPanel ctuluListEditorPanel_;
- BuCheckBox cbOneLayer_;
- MvExportPanelFilter filter_;
-
- private void buildFinishPn() {
- if (pnFinish_ != null) {
- return;
+ public void doTask() {
+ final H2dVariableType var = (H2dVariableType) cbVariables_.getSelectedItem();
+ final int[] times = listTimes_.getSelectedIndices();
+ final TDoubleHashSet set = new TDoubleHashSet(values_.getRowCount());
+ for (int i = 0; i < values_.getRowCount(); i++) {
+ set.add(Double.parseDouble((String) values_.getValueAt(i)));
}
- pnFinish_ = new BuPanel(new BuBorderLayout(0, 10));
- BuPanel pnCommon = new BuPanel();
- pnCommon.setLayout(new BuGridLayout(2, 5, 5));
- tfPrec_ = BuTextField.createDoubleField();
- final CtuluValueValidator min = new CtuluValueValidator.DoubleMin(0);
- tfPrec_.setValueValidator(min);
- tfPrec_.setToolTipText(min.getDescription());
- tfPrec_.setValue(new Double(1E-4));
- pnCommon.add(new BuLabel(TrLib.getString("Pr\xE9cision des isolignes")));
- pnCommon.add(tfPrec_);
- pnCommon.add(new BuLabel(TrLib.getString("Cr\xE9er un calque par valeur")));
- cbOneLayer_ = new BuCheckBox();
- pnCommon.add(cbOneLayer_);
- pnFinish_.add(pnCommon, BuBorderLayout.NORTH);
- pnCommon = new BuPanel();
- pnCommon.setLayout(new BuVerticalLayout(1));
- pnCommon.add(new BuLabel(TrLib
- .getString("Utiliser un filtre pour extraire les isoslignes que sur une partie du maillage:")));
- filter_ = TrExportPanelFilterFactory.buildFilterForEachTimeStep(dest_.getCurrentSelection(), project_.getSource());
- pnCommon.add(filter_.getComponent());
- pnFinish_.add(pnCommon, BuBorderLayout.CENTER);
+ final double[] values = set.toArray();
+ Arrays.sort(values);
+ final TrIsoLineAdder trIsoLineAdder = new TrIsoLineAdder(dest_.getSource(), dest_, values, times, var,
+ ((Double) tfPrec_.getValue()).doubleValue());
+ trIsoLineAdder.setUseOnValueByLayer(cbOneLayer_.isSelected());
+ trIsoLineAdder.setFilter(filter_.getFilter(dest_.getSource()));
+ trIsoLineAdder.go();
+ done_ = true;
+ }
+ /**
+ * @return
+ * @see org.fudaa.fudaa.tr.post.TrPostVisuPanel#getProjet()
+ */
+ public TrPostProjet getProjet() {
+ return dest_.getProjet();
}
private int getSelectedTimeInLayer() {
final BCalque cq = dest_.getCalqueActif();
- if (cq instanceof BSelecteurListTimeTarget) {
- return ((BSelecteurListTimeTarget) cq).getTimeListSelectionModel().getMaxSelectionIndex();
- }
- return project_.getSource().getNbTimeStep() - 1;
+ if (cq instanceof BSelecteurListTimeTarget) { return ((BSelecteurListTimeTarget) cq).getTimeListSelectionModel()
+ .getMaxSelectionIndex(); }
+ return dest_.getSource().getNbTimeStep() - 1;
}
private Object getSelectedVarInLayer() {
@@ -201,55 +219,19 @@
if (cq instanceof BSelecteurListTarget) {
final BSelecteurListTarget selecteurListTarget = (BSelecteurListTarget) cq;
final int idx = selecteurListTarget.getListSelectionModel().getMaxSelectionIndex();
- if (idx >= 0) {
- return selecteurListTarget.getListModel().getElementAt(idx);
- }
+ if (idx >= 0) { return selecteurListTarget.getListModel().getElementAt(idx); }
}
return H2dVariableType.HAUTEUR_EAU;
}
- boolean isCurrentValide() {
- if (current_ == 0) {
- final boolean res = !listTimes_.isSelectionEmpty();
- if (res) {
- lbTime_.setText(CtuluLibString.ESPACE);
- } else {
- lbTime_.setText(TrLib.getString("S\xE9lectionner au moins un pas de temps"));
- }
- return res;
- }
- return true;
+ /**
+ * @return
+ * @see org.fudaa.fudaa.tr.post.TrPostVisuPanel#getSource()
+ */
+ public TrPostSource getSource() {
+ return dest_.getSource();
}
- void varChanged() {
- // on sauvegarde les anciennes valeurs
- varIsoValues_.put(currentVariable_, values_.getValuesInList());
- currentVariable_ = (CtuluVariable) cbVariables_.getSelectedItem();
- final List saved = (List) varIsoValues_.get(currentVariable_);
- if (saved == null) {
- values_.updateOrCreateValues();
- } else {
- values_.setData(saved);
- }
- }
-
- public void doTask() {
- final H2dVariableType var = (H2dVariableType) cbVariables_.getSelectedItem();
- final int[] times = listTimes_.getSelectedIndices();
- final TDoubleHashSet set = new TDoubleHashSet(values_.getRowCount());
- for (int i = 0; i < values_.getRowCount(); i++) {
- set.add(Double.parseDouble((String) values_.getValueAt(i)));
- }
- final double[] values = set.toArray();
- Arrays.sort(values);
- final TrIsoLineAdder trIsoLineAdder = new TrIsoLineAdder(project_.getSource(), dest_, values, times, var,
- ((Double) tfPrec_.getValue()).doubleValue());
- trIsoLineAdder.setUseOnValueByLayer(cbOneLayer_.isSelected());
- trIsoLineAdder.setFilter(filter_.getFilter(project_.getSource()));
- trIsoLineAdder.go();
- done_ = true;
- }
-
public JComponent getStepComponent() {
// pour prendre en compte les modifications dans le tableau au cas ou la cellule serait toujours en \xE9dition
if (ctuluListEditorPanel_ != null) {
@@ -277,22 +259,16 @@
}
public String getStepText() {
- if (current_ == 0) {
- return TrLib.getString("Vous devez choisir une variable et un ou plusieurs pas de temps");
- }
- if (current_ == 1) {
- return TrLib.getString("Choisir les valeurs \xE0 utiliser pour construire les isolignes");
- }
- if (current_ == 2) {
- return "+ "
- + TrLib.getString("La pr\xE9cision permet de prendre en compte les impr\xE9cisions num\xE9riques.")
- + CtuluLibString.LINE_SEP_SIMPLE
- + " "
- + TrLib
- .getString("2 valeurs seront suppos\xE9es \xE9gales si leur diff\xE9rence est inf\xE9rieure \xE0 la pr\xE9cision ci-dessus.")
- + CtuluLibString.LINE_SEP_SIMPLE + CtuluLibString.ESPACE + CtuluLibString.LINE_SEP_SIMPLE + "+ "
- + TrLib.getString("La case \xE0 cocher permet de cr\xE9er un calque par valeurs sp\xE9cifi\xE9es pr\xE9c\xE9demment.");
- }
+ if (current_ == 0) { return TrLib.getString("Vous devez choisir une variable et un ou plusieurs pas de temps"); }
+ if (current_ == 1) { return TrLib.getString("Choisir les valeurs \xE0 utiliser pour construire les isolignes"); }
+ if (current_ == 2) { return "+ "
+ + TrLib.getString("La pr\xE9cision permet de prendre en compte les impr\xE9cisions num\xE9riques.")
+ + CtuluLibString.LINE_SEP_SIMPLE
+ + " "
+ + TrLib
+ .getString("2 valeurs seront suppos\xE9es \xE9gales si leur diff\xE9rence est inf\xE9rieure \xE0 la pr\xE9cision ci-dessus.")
+ + CtuluLibString.LINE_SEP_SIMPLE + CtuluLibString.ESPACE + CtuluLibString.LINE_SEP_SIMPLE + "+ "
+ + TrLib.getString("La case \xE0 cocher permet de cr\xE9er un calque par valeurs sp\xE9cifi\xE9es pr\xE9c\xE9demment."); }
return CtuluLibString.EMPTY_STRING;
}
@@ -303,9 +279,7 @@
} else if (current_ == 1) {
return TrLib.getString("Choisir les valeurs des isolignes");
- } else if (current_ == 2) {
- return TrLib.getString("Pr\xE9cision et calques");
- }
+ } else if (current_ == 2) { return TrLib.getString("Pr\xE9cision et calques"); }
return CtuluLibString.EMPTY_STRING;
}
@@ -313,10 +287,35 @@
return TrLib.getString("Rechercher les isolignes");
}
+ boolean isCurrentValide() {
+ if (current_ == 0) {
+ final boolean res = !listTimes_.isSelectionEmpty();
+ if (res) {
+ lbTime_.setText(CtuluLibString.ESPACE);
+ } else {
+ lbTime_.setText(TrLib.getString("S\xE9lectionner au moins un pas de temps"));
+ }
+ return res;
+ }
+ return true;
+ }
+
public void nextStep() {
if (isCurrentValide()) {
super.nextStep();
}
}
+ void varChanged() {
+ // on sauvegarde les anciennes valeurs
+ varIsoValues_.put(currentVariable_, values_.getValuesInList());
+ currentVariable_ = (CtuluVariable) cbVariables_.getSelectedItem();
+ final List saved = varIsoValues_.get(currentVariable_);
+ if (saved == null) {
+ values_.updateOrCreateValues();
+ } else {
+ values_.setData(saved);
+ }
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLineWizardListValue.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLineWizardListValue.java 2008-09-26 15:21:04 UTC (rev 3992)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLineWizardListValue.java 2008-09-26 22:34:47 UTC (rev 3993)
@@ -39,7 +39,7 @@
try {
final int idx = support_.listTimes_.getSelectedIndex();
if (idx >= 0) {
- currentData_ = support_.project_.getSource().getData(support_.currentVariable_, idx);
+ currentData_ = support_.getSource().getData(support_.currentVariable_, idx);
}
} catch (final IOException _evt) {
FuLog.error(_evt);
@@ -80,9 +80,7 @@
}
public void initFor(final EfData _data, final List _l) {
- if (_data == null || _l == null) {
- return;
- }
+ if (_data == null || _l == null) { return; }
_l.clear();
final NumberIterator it = new NumberIterator();
it.init(_data.getMin(), _data.getMax(), 10);
@@ -99,7 +97,7 @@
final CtuluVariable var = (CtuluVariable) support_.cbVariables_.getModel().getSelectedItem();
if (idx >= 0 && var != null) {
try {
- currentData_ = support_.project_.getSource().getData(var, idx);
+ currentData_ = support_.getSource().getData(var, idx);
if (currentData_ != null) {
initFor(currentData_, newValue);
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionAddPointFromWidgetCalque.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionAddPointFromWidgetCalque.java 2008-09-26 15:21:04 UTC (rev 3992)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionAddPointFromWidgetCalque.java 2008-09-26 22:34:47 UTC (rev 3993)
@@ -43,7 +43,6 @@
import org.fudaa.fudaa.tr.common.TrResource;
import com.memoire.bu.BuDialogError;
-import com.memoire.fu.FuLog;
/**
* Action qui: - recupere la liste des calques potentiels - recupere la liste des graphes potentiels - propose a l
@@ -52,6 +51,7 @@
*
* @author Adrien Hadoux
*/
+@SuppressWarnings("serial")
public abstract class TrPostActionAddPointFromWidgetCalque extends EbliWidgetActionSimple {
/**
@@ -125,10 +125,10 @@
@Override
public void executeAction(TrPostCommonImplementation _impl, EGGraphe _graphe, TrPostVisuPanel _calque) {
- /**
- * @see TrPostWizardProfilSpatiaux.java pour savoir comment fusionenr une
- * courbe spatiale dans un graphe existant. methode doTask()
- */
+ /**
+ * @see TrPostWizardProfilSpatiaux.java pour savoir comment fusionenr une courbe spatiale dans un graphe existant.
+ * methode doTask()
+ */
}
@@ -138,9 +138,9 @@
// creation automatique d un graphe avec les spatiales poru le calque
// vhoisi
- new MvProfileBuilderFromTree(_calqueChoisi.getProjet(), impl_, ((ZCalqueAffichageDonneesInterface) _calqueChoisi
- .getArbreCalqueModel().getSelectedCalque()).getSelectedLine(), _calqueChoisi, new MvProfileCoteTester())
- .start();
+ new MvProfileBuilderFromTree(TrPostProfileAction.createProfileAdapter(_calqueChoisi), impl_,
+ ((ZCalqueAffichageDonneesInterface) _calqueChoisi.getArbreCalqueModel().getSelectedCalque())
+ .getSelectedLine(), _calqueChoisi, new MvProfileCoteTester()).start();
}
@@ -244,10 +244,10 @@
// -- creation d un nouveau graphe --//
if (boxCalques_ != null) {
- TrPostVisuPanel calqueChoisi = (TrPostVisuPanel) listeCalquesPossibles.get(boxCalques_.getSelectedIndex());
+ TrPostVisuPanel calqueChoisi = (TrPostVisuPanel) listeCalquesPossibles.get(boxCalques_.getSelectedIndex());
- // -- methode appelee qui doit creer un graphe avec la selection --//
- createNewGraphe(calqueChoisi);
+ // -- methode appelee qui doit creer un graphe avec la selection --//
+ createNewGraphe(calqueChoisi);
} else {
createNewGraphe(listeCalquesPossibles.get(0));
}
@@ -257,7 +257,7 @@
} else {
rechercheGrapheAndCalque();
-
+
// -- affichage de al dialog --//
constructDialog().setVisible(true);
}
@@ -318,13 +318,10 @@
* TrResource .getS("Il n'y a pas de graphes disponibles.")).activate(); return; }
*/
-
}
public abstract boolean isCorrectGraph(EGGrapheModel _model);
-
-
/**
* construit l interface
*
@@ -332,19 +329,19 @@
*/
public JComponent constructInterface(boolean chooserCalque, boolean closeDialog, boolean valideAjoutCourbe,
boolean canCreate) {
-
+
JPanel content = new JPanel(new BorderLayout());
-
+
if (chooserCalque) {
- boxCalques_ = new JComboBox();
- for (Iterator<JLabel> it = listeObjetsCalques.iterator(); it.hasNext();) {
- boxCalques_.addItem(it.next());
+ boxCalques_ = new JComboBox();
+ for (Iterator<JLabel> it = listeObjetsCalques.iterator(); it.hasNext();) {
+ boxCalques_.addItem(it.next());
+ }
+ boxCalques_.setRenderer(new GrapheCellRenderer());
+ boxCalques_.setBorder(BorderFactory.createTitledBorder(TrResource.TR.getString("Liste des calques de la scene")));
+ content.add(boxCalques_, BorderLayout.NORTH);
+
}
- boxCalques_.setRenderer(new GrapheCellRenderer());
- boxCalques_.setBorder(BorderFactory.createTitledBorder(TrResource.TR.getString("Liste des calques de la scene")));
- content.add(boxCalques_, BorderLayout.NORTH);
-
- }
jlisteGraphesChoix = new JList(modelGraphesPossibles);
jlisteGraphesChoix.setCellRenderer(new GrapheCellRenderer());
@@ -356,16 +353,15 @@
jlisteGraphesSelections.setCellRenderer(new GrapheCellRenderer());
JPanel panelControle = new JPanel(new FlowLayout(FlowLayout.CENTER));
-
-
+
select = new JButton(TrResource.TR.getString("Ajouter"), EbliResource.EBLI.getIcon("crystal22_avancervite"));
unselect = new JButton(TrResource.TR.getString("Enlever"), EbliResource.EBLI.getIcon("crystal22_reculervite"));
select.addActionListener(this);
unselect.addActionListener(this);
if (closeDialog) {
- quitter = new JButton(TrResource.TR.getString("Quitter"), EbliResource.EBLI.getIcon("crystal_detruire"));
- quitter.addActionListener(this);
- panelControle.add(quitter);
+ quitter = new JButton(TrResource.TR.getString("Quitter"), EbliResource.EBLI.getIcon("crystal_detruire"));
+ quitter.addActionListener(this);
+ panelControle.add(quitter);
}
if (canCreate) {
creationNewGraphe = new JButton(TrResource.TR.getString("Cr\xE9er un nouveau graphe"), EbliResource.EBLI
@@ -393,26 +389,15 @@
box.add(boxButton);
box.add(jlisteGraphesSelections);
-
-
content.add(box, BorderLayout.CENTER);
-
-
-
-
-
-
-
content.add(panelControle, BorderLayout.SOUTH);
-
+
return content;
}
public JDialog constructDialog() {
-
-
frame_ = new JDialog();
frame_.setContentPane(constructInterface(true, true, true, true));
@@ -425,11 +410,8 @@
return frame_;
}
-
-
/**
- * Methode qui construit le panel de selection ou creation des graphes pour
- * les points du calque selectionnes
+ * Methode qui construit le panel de selection ou creation des graphes pour les points du calque selectionnes
*
* @return
*/
@@ -437,24 +419,22 @@
rechercheGrapheAndCalque();
return constructInterface(true, closeDialog, valideAjoutCourbe, canCreate);
}
-
+
public JComponent getInterfacePartielle(boolean closeDialog, boolean valideAjoutCourbe, boolean canCreate) {
rechercheGrapheAndCalque();
-
+
return constructInterface(false, closeDialog, valideAjoutCourbe, canCreate);
}
-
-
+
public void setEnabled(boolean enabled) {
- if (this.boxCalques_ != null)
- this.boxCalques_.setEnabled(enabled);
+ if (this.boxCalques_ != null) this.boxCalques_.setEnabled(enabled);
this.jlisteGraphesChoix.setEnabled(enabled);
this.jlisteGraphesSelections.setEnabled(enabled);
this.select.setEnabled(enabled);
this.unselect.setEnabled(enabled);
}
-
+
public abstract void setTitleForFrame();
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionChangeSceneForWidget.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionChangeSceneForWidget.java 2008-09-26 15:21:04 UTC (rev 3992)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionChangeSceneForWidget.java 2008-09-26 22:34:47 UTC (rev 3993)
@@ -3,6 +3,7 @@
import java.awt.event.ActionEvent;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import java.util.Set;
import org.fudaa.ctulu.CtuluResource;
@@ -62,17 +63,14 @@
scene_.refresh();
-
String previousDescr = "";
- if (currentNode.getWidget() != null)
- previousDescr = currentNode.getWidget().getController().getDescription();
-
+ if (currentNode.getWidget() != null) previousDescr = currentNode.getWidget().getController().getDescription();
+
// -- ajout du node dans la scene destination --//
sceneDestination.addNode(currentNode);
- if (previousDescr != null)
- currentNode.getWidget().getController().setDescription(previousDescr);
-
+ if (previousDescr != null) currentNode.getWidget().getController().setDescription(previousDescr);
+
// -- rafraichissement de la scene --//
sceneDestination.refresh();
@@ -88,17 +86,19 @@
private EbliScene selectionneSceneNode() {
TrPostLayoutFille fenetre = null;
- if (projet_.listeFillesLayout.size() <= 1) {
- fenetre = projet_.getSelectedFilleLayout();
+ TrPostCommonImplementation impl = projet_.getImpl();
+ List<TrPostLayoutFille> ls = impl.getAllLayoutFille();
+ if (ls.size() == 1) {
+ fenetre = ls.get(0);
} else {
// recuperation de toutes les noms des frames post du projet --//
- String[] listeFillesLayout = formatteFilles();
+ String[] listeFillesLayout = TrPostActionDuplicate.formatteFilles(ls);
int indiceFilleelect = CtuluLibSwing.chooseValue(listeFillesLayout, projet_.getImpl().getFrame(), TrLib
.getString("Dupliquer l'objet"), TrLib.getString("S\xE9lectionnez la fen\xEAtre dans laquelle dupliquer l'objet"),
true);
if (indiceFilleelect < 0) return null;
- fenetre = projet_.listeFillesLayout.get(indiceFilleelect);
+ fenetre = ls.get(indiceFilleelect);
}
return fenetre.controller_.getSceneCourante();
// EbliScene dest = null;
@@ -126,22 +126,13 @@
}
- public String[] formatteFilles() {
- String[] noms = new String[projet_.listeFillesLayout.size()];
- int cpt = 0;
- for (Iterator<TrPostLayoutFille> it = projet_.listeFillesLayout.iterator(); it.hasNext();) {
- noms[cpt++] = it.next().getTitle();
- }
- return noms;
- }
+ // public String[] formatteLayout(TrPostLayoutPanelController _controller) {
+ // String[] noms = new String[_controller.listeScenes_.size()];
+ //
+ // for (int cpt = 0; cpt < _controller.listeScenes_.size(); cpt++) {
+ // noms[cpt] = "Layout " + (cpt + 1);
+ // }
+ // return noms;
+ // }
-// public String[] formatteLayout(TrPostLayoutPanelController _controller) {
-// String[] noms = new String[_controller.listeScenes_.size()];
-//
-// for (int cpt = 0; cpt < _controller.listeScenes_.size(); cpt++) {
-// noms[cpt] = "Layout " + (cpt + 1);
-// }
-// return noms;
-// }
-
}
Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionChangeSrc.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionChangeSrc.java 2008-09-26 15:21:04 UTC (rev 3992)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionChangeSrc.java 2008-09-26 22:34:47 UTC (rev 3993)
@@ -1,73 +0,0 @@
-package org.fudaa.fudaa.tr.post;
-
-import java.awt.event.ActionEvent;
-import java.util.Iterator;
-
-import org.fudaa.ebli.commun.EbliActionSimple;
-
-import com.memoire.bu.BuDialogConfirmation;
-import com.memoire.bu.BuDialogMessage;
-import com.memoire.bu.BuResource;
-import com.memoire.fu.FuLog;
-
-public class TrPostActionChangeSrc extends EbliActionSimple {
- /**
- * projet en cours contenant les multi projets.
- */
- TrPostProjet projet_;
-
- /**
- * Activator multi source permettant de gerer une nouvelle source pour
- * trpostProjet
- */
- TrPostMultiSourceActivator multiProjectActivator_;
-
- public TrPostActionChangeSrc(TrPostProjet _projet) {
- super("Changer de donn\xE9es", BuResource.BU.getIcon("crystal_valider"), "Changer de donn\xE9es");
- projet_ = _projet;
-
- // -- creation de l activator multi-source avec le projet param --//
- this.multiProjectActivator_ = new TrPostMultiSourceActivator(_projet);
- }
-
- public void actionPerformed(ActionEvent e) {
-
-
- // -- recuperation de la source a supprimer --//
-
- // -- cas rien de selectionnee --//
- if (projet_.filleProjetctManager_.listProjets_.getSelectedRow() == -1) {
- new BuDialogMessage(projet_.impl_.getApp(), projet_.impl_.getInformationsSoftware(),
- "Il faut selectionner le fichier dans la liste avant de cliquer.").activate();
- } else {
-
- // -- recupeation de la source a enlever --//
- TrPostSource src = (TrPostSource) projet_.getSource(projet_.filleProjetctManager_.listProjets_.getSelectedRow());
-
- // -- demande confirmationa l user --//
- int confirmation = new BuDialogConfirmation(projet_.impl_.getApp(), projet_.impl_.getInformationsSoftware(),
- "\xCAtes-vous sur de vouloir changer les donn\xE9es par celles \n du fichier " + src.getTitle() + " ?")
- .activate();
-
- if (confirmation == 0) {
- if (projet_.changeSource(src)) {
- new BuDialogMessage(projet_.impl_.getApp(), projet_.impl_.getInformationsSoftware(),
- "Les donn\xE9es ont \xE9t\xE9 correctement charg\xE9es.").activate();
- } else {
- new BuDialogMessage(projet_.impl_.getApp(), projet_.impl_.getInformationsSoftware(),
- "Les donn\xE9es n'ont pas \xE9t\xE9 correctement charg\xE9es.").activate();
- }
-
- testAfficheMesSimu();
- }
- }
-
- }
-
- public void testAfficheMesSimu() {
- int i = 0;
- for (Iterator<TrPostSource> it = projet_.listeSrc_.iterator(); it.hasNext();) {
- TrPostSource src = it.next();
- }
- }
-}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionDuplicate.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionDuplicate.java 2008-09-26 15:21:04 UTC (rev 3992)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionDuplicate.java 2008-09-26 22:34:47 UTC (rev 3993)
@@ -1,6 +1,7 @@
package org.fudaa.fudaa.tr.post;
import java.util.Iterator;
+import java.util.List;
import org.fudaa.ebli.visuallibrary.EbliScene;
import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionDuplicate;
@@ -9,101 +10,96 @@
import com.memoire.bu.BuDialogChoice;
/**
- * Refonte de l action duplicate qui g\xE8re le multi-layout. Chooser qui demande
- * la fille layout puis autre chooser qui demande l'onglet. Si la fille est
- * unique pas de chooser idem pour l onglet de la fille selectionnee.
+ * Refonte de l action duplicate qui g\xE8re le multi-layout. Chooser qui demande la fille layout puis autre chooser qui
+ * demande l'onglet. Si la fille est unique pas de chooser idem pour l onglet de la fille selectionnee.
*
* @author Adrien Hadoux
- *
*/
+@SuppressWarnings("serial")
public class TrPostActionDuplicate extends EbliWidgetActionDuplicate {
-
TrPostProjet projet_;
-
+
public TrPostActionDuplicate(EbliScene _scene, TrPostProjet _projet) {
super(_scene);
-
+
projet_ = _projet;
}
-
-
-/**
- * surcharge de la methode. Envoie de la liste des frame layout + interne
- * layout si il y e na plusieurs
+ /**
+ * surcharge de la methode. Envoie de la liste des frame layout + interne layout si il y e na plusieurs
*/
protected EbliScene selectionneSceneNode() {
TrPostLayoutFille fenetre = null;
EbliScene dest = null;
+ TrPostCommonImplementation impl = projet_.getImpl();
+ List<TrPostLayoutFille> ls = impl.getAllLayoutFille();
- if (projet_.listeFillesLayout.size() <= 1) {
- fenetre = projet_.getSelectedFilleLayout();
+ if (ls.size() == 1) {
+ fenetre = ls.get(0);
} else {
-
-
- // recuperation de toutes les noms des frames post du projet --//
- String[] listeFillesLayout = formatteFilles();
-
- BuDialogChoice chooser = new BuDialogChoice(projet_.impl_.getApp(), projet_.impl_.getInformationsSoftware(),
- TrResource.TR.getS("S\xE9lectionnez"), TrResource.TR
- .getS("S\xE9lectionnez la fen\xEAtre dans laquelle dupliquer l'objet "), listeFillesLayout);
- int response = chooser.activate();
+ // recuperation de toutes les noms des frames post du projet --//
+ String[] listeFillesLayout = formatteFilles(ls);
- if (response == 0) {
- int indiceFilleelect = chooser.getSelectedIndex();
- fenetre = projet_.listeFillesLayout.get(indiceFilleelect);
+ BuDialogChoice chooser = new BuDialogChoice(impl.getApp(), impl.getInformationsSoftware(), TrResource.TR
+ .getS("S\xE9lectionnez"), TrResource.TR.getS("S\xE9lectionnez la fen\xEAtre dans laquelle dupliquer l'objet "),
+ listeFillesLayout);
+
+ int response = chooser.activate();
+
+ if (response == 0) {
+ int indiceFilleelect = chooser.getSelectedIndex();
+ fenetre = ls.get(indiceFilleelect);
+ }
+
}
-
- }
-
+
// -- on recherche si dans la fille selectionne il existe plusieurs sous
// layout --//
-// if (fenetre.controller_.listeScenes_.size() <= 1) {
- dest = fenetre.controller_.getSceneCourante();
-// } else {
-//
-// // recuperation de toutes les noms des frames post du projet --//
-// String[] listeLayout = formatteLayout(fenetre.controller_);
-//
-// BuDialogChoice chooser = new BuDialogChoice(projet_.impl_.getApp(), projet_.impl_.getInformationsSoftware(),
-// TrResource.TR.getS("S\xE9lectionnez"), TrResource.TR.getS("S\xE9lectionnez le layout de la fen\xEAtre")
-// + fenetre.getTitle()
-// + TrResource.TR.getS(" dans laquelle dupliquer l'objet "), listeLayout);
-//
-// int response = chooser.activate();
-//
-// if (response == 0) {
-// int indiceLayoutelect = chooser.getSelectedIndex();
-// dest = fenetre.controller_.getScene(indiceLayoutelect);
-// }
-//
-//
-//
-// }
-
-
+ // if (fenetre.controller_.listeScenes_.size() <= 1) {
+ dest = fenetre.controller_.getSceneCourante();
+ // } else {
+ //
+ // // recuperation de toutes les noms des frames post du projet --//
+ // String[] listeLayout = formatteLayout(fenetre.controller_);
+ //
+ // BuDialogChoice chooser = new BuDialogChoice(projet_.impl_.getApp(), projet_.impl_.getInformationsSoftware(),
+ // TrResource.TR.getS("S\xE9lectionnez"), TrResource.TR.getS("S\xE9lectionnez le layout de la fen\xEAtre")
+ // + fenetre.getTitle()
+ // + TrResource.TR.getS(" dans laquelle dupliquer l'objet "), listeLayout);
+ //
+ // int response = chooser.activate();
+ //
+ // if (response == 0) {
+ // int indiceLayoutelect = chooser.getSelectedIndex();
+ // dest = fenetre.controller_.getScene(indiceLayoutelect);
+ // }
+ //
+ //
+ //
+ // }
+
return dest;
}
-
- public String[] formatteFilles() {
- String[] noms = new String[projet_.listeFillesLayout.size()];
- int cpt=0;
- for (Iterator<TrPostLayoutFille> it = projet_.listeFillesLayout.iterator(); it.hasNext();) {
+
+ public static String[] formatteFilles(List<TrPostLayoutFille> ls) {
+ String[] noms = new String[ls.size()];
+ int cpt = 0;
+ for (Iterator<TrPostLayoutFille> it = ls.iterator(); it.hasNext();) {
noms[cpt++] = it.next().getTitle();
}
return noms;
}
-
-// public String[] formatteLayout(TrPostLayoutPanelController _controller) {
-// String[] noms = new String[_controller.listeScenes_.size()];
-//
-// for (int cpt = 0; cpt < _controller.listeScenes_.size(); cpt++) {
-// noms[cpt] = "Layout " + (cpt + 1);
-// }
-// return noms;
-// }
-
+
+ // public String[] formatteLayout(TrPostLayoutPanelController _controller) {
+ // String[] noms = new String[_controller.listeScenes_.size()];
+ //
+ // for (int cpt = 0; cpt < _controller.listeScenes_.size(); cpt++) {
+ // noms[cpt] = "Layout " + (cpt + 1);
+ // }
+ // return noms;
+ // }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostAnalyze.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostAnalyze.java 2008-09-26 15:21:04 UTC (rev 3992)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostAnalyze.java 2008-09-26 22:34:47 UTC (rev 3993)
@@ -64,7 +64,7 @@
protected void loadPost(final File _f) {
final Map m = new HashMap();
- src_ = TrPostSourceActivator.activeSourceAction(_f, ui_, prefId_, ui_.getMainProgression(), m);
+ src_ = TrPostSourceBuilder.activeSourceAction(_f, ui_, prefId_, ui_.getMainProgression(), m);
ipobo_ = (int[]) m.get("IPOBO");
iparams_ = (int[]) m.get("IPARAMS");
if (src_ == null) {
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCommonImplementation.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCommonImplementation.java 2008-09-26 15:21:04 UTC (rev 3992)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCommonImplementation.java 2008-09-26 22:34:47 UTC (rev 3993)
@@ -9,7 +9,11 @@
import java.awt.event.ActionEvent;
import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.swing.JInternalFrame;
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
@@ -36,6 +40,42 @@
return c_;
}
+ /**
+ * @return toutes les fenetres de PostLayout
+ */
+ public List<TrPostLayoutFille> getAllLayoutFille() {
+ JInternalFrame[] allInternalFrames = get...
[truncated message content] |
