Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4449] branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/ fudaa/tr/post
|
From: <had...@us...> - 2009-02-09 18:36:53
|
Revision: 4449
http://fudaa.svn.sourceforge.net/fudaa/?rev=4449&view=rev
Author: hadouxad
Date: 2009-02-09 18:36:49 +0000 (Mon, 09 Feb 2009)
Log Message:
-----------
Correction + connecteurs fleches
Modified Paths:
--------------
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/TrReplayCurvesData.java
Modified: 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/TrPostLayoutPanelController.java 2009-02-09 18:36:13 UTC (rev 4448)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java 2009-02-09 18:36:49 UTC (rev 4449)
@@ -52,6 +52,7 @@
import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorLegende;
import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque;
import org.fudaa.ebli.visuallibrary.creator.EbliWidgetCreatorArrowEditor;
+import org.fudaa.ebli.visuallibrary.creator.EbliWidgetCreatorConnectionWidget;
import org.fudaa.ebli.visuallibrary.creator.EbliWidgetCreatorShape;
import org.fudaa.ebli.visuallibrary.creator.EbliWidgetCreatorTextLabel;
import org.fudaa.ebli.visuallibrary.creator.ShapeCreatorCircle;
@@ -332,7 +333,9 @@
// nodeFleche.setCreator(new EbliWidgetCreatorShape(new ShapeCreatorFlecheSimple()));
nodeFleche.setCreator(new EbliWidgetCreatorArrowEditor(new EbliEditorArrow()));
-
+ // nodeFleche.setCreator(new EbliWidgetCreatorConnectionWidget());
+
+
nodeFleche.setPreferedSize(new Dimension(200, 150));
nodeFleche.setPreferedLocation(new Point(350, 125));
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrReplayCurvesData.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrReplayCurvesData.java 2009-02-09 18:36:13 UTC (rev 4448)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrReplayCurvesData.java 2009-02-09 18:36:49 UTC (rev 4449)
@@ -255,7 +255,7 @@
*/
private TrReplayDialog constructDialog(final TrPostVisuPanel vue2d, final TrPostCommonImplementation implementation,final EGModel modele,JComponent composantAdditionnel,boolean modeEdition,String title){
implementation.createTask(TrResource.getS("Origine ")+" "+modele.getTitle());
- final TrReplayDialog pn = new TrReplayDialog(false);
+ final TrReplayDialog pn = new TrReplayDialog(false,implementation.getParentComponent());
pn.setLayout(new BuBorderLayout());
pn.setBorder(BuBorders.EMPTY3333);
//pn.add(new BuLabel(CtuluLib.getS("S\xE9lectionner le fichier r\xE9sultat")), BuBorderLayout.NORTH);
@@ -315,7 +315,7 @@
//panelEAST.add(compEast,BorderLayout.CENTER);
// panelEAST.setTopComponent(dialog);
// panelEAST.setBottomComponent(compEast);
- panelEAST.addTab("Rechercher", dialog);
+ panelEAST.addTab("Rechercher", new JScrollPane(dialog));
panelEAST.addTab("Infos Points, Variables", compEast);
//pn.add(dialog,BorderLayout.WEST);
pn.add(panelEAST,BuBorderLayout.EAST);
@@ -350,8 +350,9 @@
panelSouth2.add(genereVue2d.buildButton(EbliComponentFactory.INSTANCE));
}
-
-
+ //pn.setSize(new Dimension(800,600));
+// if(pn.dialog_!=null)
+// pn.dialog_.pack();
return pn;
@@ -500,12 +501,14 @@
class TrReplayDialog extends CtuluDialogPanel{
CtuluDialog dialog_;
- TrReplayDialog(boolean b){
+ TrReplayDialog(boolean b,final Component _parent){
super(b);
+ dialog_= createDialog(_parent);
}
public int afficheModale(final Component _parent, final String _t, final int _option) {
- dialog_= createDialog(_parent);
+ if(dialog_==null)
+ dialog_= createDialog(_parent);
dialog_.setModal(false);
dialog_.setInitParent(_parent);
dialog_.setOption(_option);
@@ -607,10 +610,10 @@
String title=TrResource.getS("<html><body>Choisir le point et la variable qui seront utilis\xE9s pour refaire le calcul(interpolation possible).<br /> Le point rouge d\xE9signe le point d'origine.</body></html>");
dialog_=constructDialog(vue2d, implementation, modele,/*constructSelectorVariable(vars)*/null,true,title);
- dialog_.setPreferredSize(new Dimension(600,400));
+ dialog_.setPreferredSize(new Dimension(800,600));
//-- on restaure la vue --//
- vue2d.setSize(300, 300);
+ //vue2d.setSize(300, 300);
vue2d.restaurer();
//-- on positionne la bonne variable et le bon pas de temps --//
@@ -619,10 +622,13 @@
//-- on cr\xE9e le bouton de rejoue de donn\xE9es pour un autre fichier r\xE9sultat --//
-
+ boolean restaurationInitiale=true;
//-- on affiche tant que l'utilisateur valide des r\xE9sultats faux --//
while(CtuluDialogPanel.isOkResponse(dialog_.afficheModale(implementation.getParentComponent(), TrResource.getS("Rejouer ")+" "+modele.getTitle())) && !replayEvolutionFor(srcChoisie,vue2d,treeModel,modele,implementation)){
-
+ if(restaurationInitiale){
+ restaurationInitiale=false;
+ vue2d.restaurer();
+ }
}
@@ -801,7 +807,7 @@
//-- on rappelle l'interface --//
getProfilSpatialReplayData(newSrc, treeModel, modele, implementation);
-
+ return;
}
else return;
@@ -810,10 +816,10 @@
});
dialog_=constructDialog(vue2d, implementation, modele,/*constructSelectorVariable(vars)*/null,true,title);
- dialog_.setPreferredSize(new Dimension(600,400));
+ dialog_.setPreferredSize(new Dimension(800,600));
//-- on restaure la vue --//
- vue2d.setSize(300, 300);
+ //vue2d.setSize(300, 300);
vue2d.restaurer();
@@ -826,10 +832,14 @@
//final FSigLayerLineEditable cq4 = new FSigLayerLineEditable(new ZModeleLigneBriseeEditable(), vue2d.getGisEditor());
// cq4.setTitle("toto");
//vue2d.addCalque(cq4, true);
-
+ boolean restaurationInitiale=true;
//-- on affiche tant que l'utilisateur valide des r\xE9sultats faux --//
while(CtuluDialogPanel.isOkResponse(dialog_.afficheModale(implementation.getParentComponent(), TrResource.getS("Rejouer ")+" "+modele.getTitle())) && !replayProfilSpatialFor(srcChoisie,vue2d,treeModel,modele,implementation)){
+ if(restaurationInitiale){
+ restaurationInitiale=false;
+ vue2d.restaurer();
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
