Thread: [Fudaa-svn-commit] SF.net SVN: fudaa:[3997] branches/Prepro-0.92-SNAPSHOT (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3997
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3997&view=rev
Author:   deniger
Date:     2008-09-28 21:21:54 +0000 (Sun, 28 Sep 2008)

Log Message:
-----------


Modified Paths:
--------------
    branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/ef/operation/EfLineFlowrateResult.java
    branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/h2d/H2dParameters.java
    branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/ebli_en.fr_txt
    branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java
    branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionBloqueOuDebloqueWidget.java

Added Paths:
-----------
    branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/lock_16.png
    branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/unlock_16.png

Modified: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/ef/operation/EfLineFlowrateResult.java
===================================================================

--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/ef/operation/EfLineFlowrateResult.java	2008-09-28 08:49:32 UTC (rev 3996)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/ef/operation/EfLineFlowrateResult.java	2008-09-28 21:21:54 UTC (rev 3997)
@@ -9,18 +9,15 @@
 
 import java.io.IOException;
 
-import com.memoire.fu.FuLog;
-
 import org.fudaa.ctulu.CtuluLibGeometrie;
 import org.fudaa.ctulu.CtuluVariable;
 import org.fudaa.ctulu.ProgressionInterface;
 import org.fudaa.ctulu.ProgressionUpdater;
-import org.fudaa.ctulu.interpolation.InterpolationVectorContainer;
-
 import org.fudaa.dodico.ef.EfData;
-import org.fudaa.dodico.ef.EfDataInterpolationAdapter;
 import org.fudaa.dodico.ef.EfGridData;
 
+import com.memoire.fu.FuLog;
+
 /**
  * Une classe permettant de calculer le d\xE9bit \xE0 partir d'un profil.
  * 
@@ -112,49 +109,49 @@
    * @param _h la hauteur d'eau
    * @return le d\xE9bit
    */
-  double getQ(int _idxPtOnProfil, EfData _norme, EfData _theta, EfData _h, EfLineIntersectionsResultsI _res) {
+  double getQ(int _idxPtOnProfil, EfData _vx, EfData _vy, EfData _h, EfLineIntersectionsResultsI _res) {
     if (_idxPtOnProfil >= _res.getNbIntersect() - 1) return 0;
     // le point 1
     int idx = _idxPtOnProfil;
     calculator_.x1_ = _res.getIntersect(idx).getX();
     calculator_.y1_ = _res.getIntersect(idx).getY();
-    double n = _res.getIntersect(idx).getValueBadInterpolation(_norme);
-    double t = _res.getIntersect(idx).getValueBadInterpolation(_theta);
-    calculator_.vx1_ = InterpolationVectorContainer.getVx(n, t);
-    calculator_.vy1_ = InterpolationVectorContainer.getVy(n, t);
+    // double n = _res.getIntersect(idx).getValueBadInterpolation(_vx);
+    // double t = _res.getIntersect(idx).getValueBadInterpolation(_vy);
+    calculator_.vx1_ = _res.getIntersect(idx).getValueBadInterpolation(_vx);// InterpolationVectorContainer.getVx(n, t);
+    calculator_.vy1_ = _res.getIntersect(idx).getValueBadInterpolation(_vy);
     calculator_.h1_ = _res.getIntersect(idx).getValueBadInterpolation(_h);
     idx++;
     calculator_.x2_ = _res.getIntersect(idx).getX();
     calculator_.y2_ = _res.getIntersect(idx).getY();
-    n = _res.getIntersect(idx).getValueBadInterpolation(_norme);
-    t = _res.getIntersect(idx).getValueBadInterpolation(_theta);
-    calculator_.vx2_ = InterpolationVectorContainer.getVx(n, t);
-    calculator_.vy2_ = InterpolationVectorContainer.getVy(n, t);
+//    n = _res.getIntersect(idx).getValueBadInterpolation(_vx);
+//    t = _res.getIntersect(idx).getValueBadInterpolation(_vy);
+    calculator_.vx2_ = _res.getIntersect(idx).getValueBadInterpolation(_vx);
+    calculator_.vy2_ = _res.getIntersect(idx).getValueBadInterpolation(_vy);
     calculator_.h2_ = _res.getIntersect(idx).getValueBadInterpolation(_h);
     return calculator_.getQ();
   }
 
   public double getQ(EfGridData _data, int _tidx, ProgressionInterface _prog) {
-    EfData norme = null;
-    EfData theta = null;
+    EfData vx = null;
+    EfData vy = null;
     EfData h = null;
     try {
-      EfData vx = _data.getData(vx_, _tidx);
-      EfData vy = _data.getData(vy_, _tidx);
-      norme = new EfDataInterpolationAdapter.Norm(vx, vy);
-      theta = new EfDataInterpolationAdapter.Theta(vx, vy);
+      vx = _data.getData(vx_, _tidx);
+      vy = _data.getData(vy_, _tidx);
+      // norme = new EfDataInterpolationAdapter.Norm(vx, vy);
+      // theta = new EfDataInterpolationAdapter.Theta(vx, vy);
       h = _data.getData(h_, _tidx);
     } catch (IOException _evt) {
       FuLog.error(_evt);
 
     }
-    if (norme == null || theta == null || h == null) return 0;
+    if (vx == null || vy == null || h == null) return 0;
     double q = 0;
     EfLineIntersectionsResultsI res = res_.createResults(_tidx, _prog);
     ProgressionUpdater up = new ProgressionUpdater(_prog);
     up.setValue(10, res.getNbIntersect() - 1);
     for (int i = 0; i < res.getNbIntersect() - 1; i++) {
-      if (res.isSegmentIn(i)) q += getQ(i, norme, theta, h, res);
+      if (res.isSegmentIn(i)) q += getQ(i, vx, vy, h, res);
       up.majAvancement();
     }
     return q;

Modified: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/h2d/H2dParameters.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/h2d/H2dParameters.java	2008-09-28 08:49:32 UTC (rev 3996)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/h2d/H2dParameters.java	2008-09-28 21:21:54 UTC (rev 3997)
@@ -242,11 +242,11 @@
 
   public static InterpolationVectorContainer createDefaultVectorContainer() {
     InterpolationVectorContainer defaultC = new InterpolationVectorContainer();
-    defaultC.addVxVy(H2dVariableType.VENT_X, H2dVariableType.VENT_Y);
-    defaultC.addVxVy(H2dVariableType.VITESSE_U, H2dVariableType.VITESSE_V);
-    defaultC.addVxVy(H2dVariableType.VITESSE_NORMALE, H2dVariableType.VITESSE_TANGENTIELLE);
-    defaultC.addVxVy(H2dVariableType.DEBIT_NORMAL, H2dVariableType.DEBIT_TANGENTIEL);
-    defaultC.addVxVy(H2dVariableType.DEBIT_X, H2dVariableType.DEBIT_Y);
+//    defaultC.addVxVy(H2dVariableType.VENT_X, H2dVariableType.VENT_Y);
+//    defaultC.addVxVy(H2dVariableType.VITESSE_U, H2dVariableType.VITESSE_V);
+//    defaultC.addVxVy(H2dVariableType.VITESSE_NORMALE, H2dVariableType.VITESSE_TANGENTIELLE);
+//    defaultC.addVxVy(H2dVariableType.DEBIT_NORMAL, H2dVariableType.DEBIT_TANGENTIEL);
+//    defaultC.addVxVy(H2dVariableType.DEBIT_X, H2dVariableType.DEBIT_Y);
     return defaultC;
   }
 }
\ No newline at end of file

Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/ebli_en.fr_txt
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/ebli_en.fr_txt	2008-09-28 08:49:32 UTC (rev 3996)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/ebli_en.fr_txt	2008-09-28 21:21:54 UTC (rev 3997)
@@ -621,4 +621,6 @@
 Cliquez sur le graphe pour s\xE9lectionner le x voulu.=Click on the graph in order to select the proper x
 Fermer la palette pour quitter le mode s\xE9lection du graphe=Close the graphical ui in order to quit the graph's selection mode 
 X s\xE9lectionn\xE9:=Selected X:
-Interpolation Fusion=Fusion interpolation
\ No newline at end of file
+Interpolation Fusion=Fusion interpolation
+Bloquer la taille et la position de la frame=Lock the size and the location of the frame
+D\xE9bloquer la taille et la position de la frame=Unlock the size and the location of the frame
\ No newline at end of file


Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/lock_16.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/unlock_16.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java	2008-09-28 08:49:32 UTC (rev 3996)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java	2008-09-28 21:21:54 UTC (rev 3997)
@@ -115,17 +115,16 @@
           // -- raffraichissement de la scene --//
           widget_.getEbliScene().refresh();
         }
-        
+
         postActionDuplication(n, duplique);
 
       }
 
     });
   }
-  
+
   /**
-   * Methode a surcharger si on veut effectuer un traitement particulier apres
-   * duplication du widget.
+   * Methode a surcharger si on veut effectuer un traitement particulier apres duplication du widget.
    */
   public void postActionDuplication(EbliNode node, EbliNode duplique) {
 
@@ -246,17 +245,15 @@
       }
 
     });
-
+    _popup.addSeparator();
     constructMenuMasquer(_popup, cmd_);
-
+    constructMenuBloquer(_popup, cmd_);
+    constructMenuSupprimer(_popup, cmd_);
     if (canDuplicate_) {
+      _popup.addSeparator();
       constructMenuDupliquer(_popup, cmd_);
     }
 
-    constructMenuBloquer(_popup, cmd_);
-
-    constructMenuSupprimer(_popup, cmd_);
-
   }
 
   /**
@@ -305,9 +302,9 @@
   }
 
   public String getDescription() {
-   
+
     return description_;
-  
+
   }
 
   public BuMenuBar getMenubarComponent() {

Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionBloqueOuDebloqueWidget.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionBloqueOuDebloqueWidget.java	2008-09-28 08:49:32 UTC (rev 3996)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionBloqueOuDebloqueWidget.java	2008-09-28 21:21:54 UTC (rev 3997)
@@ -25,7 +25,7 @@
   final CtuluCommandContainer cmd_;
   boolean bloque_ = true;
   EbliWidget widget_;
-  
+
   public EbliWidgetActionBloqueOuDebloqueWidget(String name, Icon ic, String id, EbliWidget _widget, boolean bloque) {
     super(_widget.getEbliScene(), name, ic, id);
 
@@ -34,20 +34,26 @@
     bloque_ = bloque;
   }
 
+  @SuppressWarnings("serial")
   public static class Bloque extends EbliWidgetActionBloqueOuDebloqueWidget {
 
     public Bloque(EbliWidget _widget) {
-      super(EbliResource.EBLI.getString("Bloquer la frame"), CtuluResource.CTULU
-          .getIcon("crystal_tuer"), "BLOQUEWIDGET", _widget, true);
+      super(EbliResource.EBLI.getString("Bloquer la frame"), EbliResource.EBLI.getIcon("lock_16"), "BLOQUEWIDGET",
+          _widget, true);
+      setDefaultToolTip(EbliResource.EBLI.getString("Bloquer la taille et la position de la frame"));
+
     }
 
   }
 
+  @SuppressWarnings("serial")
   public static class DeBloque extends EbliWidgetActionBloqueOuDebloqueWidget {
 
     public DeBloque(EbliWidget _widget) {
-      super(EbliResource.EBLI.getString("Debloquer la frame"), CtuluResource.CTULU
-          .getIcon("crystal_valider"), "DEBLOQUEWIDGET", _widget, false);
+      super(EbliResource.EBLI.getString("Debloquer la frame"), EbliResource.EBLI.getIcon("unblock_16"),
+          "DEBLOQUEWIDGET", _widget, false);
+      setDefaultToolTip(EbliResource.EBLI.getString("D\xE9bloquer la taille et la position de la frame"));
+
     }
 
   }
@@ -55,40 +61,32 @@
   public void actionPerformed(ActionEvent e) {
 
     EbliWidgetController controller = null;
-    
-  
-     if (widget_ instanceof EbliWidgetBordureSingle) {
 
-       controller = ((EbliWidgetBordureSingle) widget_).getBordureController();
-    } else
-      if (widget_.getParentWidget() instanceof EbliWidgetBordureSingle) {
-        controller = ((EbliWidgetBordureSingle) widget_.getParentWidget()).getBordureController();
-    } else
-      controller = widget_.getController();
-    
-    
-       if (bloque_) {
+    if (widget_ instanceof EbliWidgetBordureSingle) {
+
+      controller = ((EbliWidgetBordureSingle) widget_).getBordureController();
+    } else if (widget_.getParentWidget() instanceof EbliWidgetBordureSingle) {
+      controller = ((EbliWidgetBordureSingle) widget_.getParentWidget()).getBordureController();
+    } else controller = widget_.getController();
+
+    if (bloque_) {
       controller.removeActionResizeAndMove();
-      
+
       // -- on change l action du bouton du controller --//
       // -- ACHTUNG!! il faut toujours utilsier el controller de la widget car
       // le controlelr de la bordure ne contient pas de menus
       widget_.getController().boutonBloque.setAction(new EbliWidgetActionBloqueOuDebloqueWidget.DeBloque(widget_));
       widget_.getController().isBlocked = true;
-      
-       } else {
-          controller.replaceActionResizeAndMove();
-          // -- on change l action du bouton du controller --//
+
+    } else {
+      controller.replaceActionResizeAndMove();
+      // -- on change l action du bouton du controller --//
       widget_.getController().boutonBloque.setAction(new EbliWidgetActionBloqueOuDebloqueWidget.Bloque(widget_));
-      widget_.getController().isBlocked = false;  
-       }
-        // -- rafraichissement de la scene --//
-        scene_.refresh();
+      widget_.getController().isBlocked = false;
+    }
+    // -- rafraichissement de la scene --//
+    scene_.refresh();
 
-      
-
-    
-
     // -- enregistrement de la commande undoRedo --//
     if (cmd_ != null) {
       cmd_.addCmd(new CommandUndoRedoBloque(controller, bloque_));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Fudaa-svn-commit] SF.net SVN: fudaa:[3997] branches/Prepro-0.92-SNAPSHOT (Page 3)

https://gitlab.com/fudaa

fudaa-svn-commit