fudaa-svn-commit

[Fudaa-svn-commit] SF.net SVN: fudaa:[7430] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv/action

[<bma...@us...>]

Revision: 7430
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7430&view=rev
Author:   bmarchan
Date:     2012-07-02 16:16:08 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
Fix : Bug palette d'edition

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivNewTransectAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoGRPAction.java

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivNewTransectAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivNewTransectAction.java	2012-07-02 16:15:26 UTC (rev 7429)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivNewTransectAction.java	2012-07-02 16:16:08 UTC (rev 7430)
@@ -270,6 +270,7 @@
   public JComponent buildContentPane() {
     if (palette_==null){
       palette_=new BPaletteEdition(pnCalques_.getScene());
+      palette_.buildComponents();
       palette_.setTargetClient(new BPaletteEditionClientInterface() {
         public void doAction(String _com, BPaletteEdition _emitter) {
           if (BPaletteEdition.ADD_POLYLINE_ACTION.equals(_com)) {

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoGRPAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoGRPAction.java	2012-07-02 16:15:26 UTC (rev 7429)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoGRPAction.java	2012-07-02 16:16:08 UTC (rev 7430)
@@ -282,6 +282,7 @@
   public JComponent buildContentPane() {
     if (palette_==null){
       palette_=new BPaletteEdition(pnCalques_.getScene());
+      palette_.buildComponents();
       palette_.setTargetClient(new BPaletteEditionClientInterface() {
         public void doAction(String _com, BPaletteEdition _emitter) {
           if (BPaletteEdition.ADD_MULTIPOINT_ACTION.equals(_com)) {

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[9002] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv/action

[<bma...@us...>]

Revision: 9002
          http://sourceforge.net/p/fudaa/svn/9002
Author:   bmarchan
Date:     2015-01-29 11:11:26 +0000 (Thu, 29 Jan 2015)
Log Message:
-----------
Ajout appliquer dans fenetre de definition du nombre de points de grille

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeGridDefinitionAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGridAction.java

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeGridDefinitionAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeGridDefinitionAction.java	2015-01-29 11:10:00 UTC (rev 9001)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeGridDefinitionAction.java	2015-01-29 11:11:26 UTC (rev 9002)
@@ -16,6 +16,7 @@
 import javax.swing.event.InternalFrameEvent;
 
 import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ctulu.gui.CtuluDialog;
 import org.fudaa.ebli.calque.dessin.DeForme;
 import org.fudaa.ebli.calque.edition.ZCalqueEditionInteraction;
 import org.fudaa.ebli.calque.edition.ZCalqueEditionInteractionTargetI;
@@ -25,6 +26,7 @@
 import org.fudaa.ebli.geometrie.GrPolygone;
 import org.fudaa.ebli.geometrie.GrPolyligne;
 import org.fudaa.fudaa.piv.PivComputeGridDefinitionPanel;
+import org.fudaa.fudaa.piv.PivImplementation;
 import org.fudaa.fudaa.piv.PivPaletteEditPolygon;
 import org.fudaa.fudaa.piv.PivResource;
 import org.fudaa.fudaa.piv.PivVisuPanel;
@@ -231,16 +233,23 @@
    * Affiche la fenetre pour la saisie des param\xE8tres de grille.
    */
   public void showPanelParameters() {
-    PivComputeGridDefinitionPanel pn=new PivComputeGridDefinitionPanel();
-    PivCntGrid params=pnCalques_.getProject().getComputeCntGrid();
+    final PivCntGrid params=pnCalques_.getProject().getComputeCntGrid();
+    PivComputeGridDefinitionPanel pn=new PivComputeGridDefinitionPanel() {
+
+      @Override
+      public void apply() {
+        retrieveParams(params);
+        PivGrid grid=PivGrid.computeFromShape(params.getContour(), params.getNbXPoints(), params.getNbYPoints());
+        pnCalques_.getProject().setComputeCntGrid(params);
+        pnCalques_.getProject().setComputeGrid(grid);
+      }
+      
+    };
     pn.setParams(params);
 
-    if (pn.afficheModaleOk(pnCalques_.getCtuluUI().getParentComponent(), PivResource.getS("D\xE9finition du nombre de points sur la grille"))) {
-      pn.retrieveParams(params);
-      PivGrid grid=PivGrid.computeFromShape(params.getContour(), params.getNbXPoints(), params.getNbYPoints());
-      pnCalques_.getProject().setComputeCntGrid(params);
-      pnCalques_.getProject().setComputeGrid(grid);
-    }
+//    pnCalques_.get
+//    if (pn.afficheModaleOk(pnCalques_.getCtuluUI().getParentComponent(), PivResource.getS("D\xE9finition du nombre de points sur la grille"))) {
+    pn.affiche(pnCalques_, PivResource.getS("D\xE9finition du nombre de points sur la grille"), CtuluDialog.OK_CANCEL_APPLY_OPTION);
   }
 
   @Override

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGridAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGridAction.java	2015-01-29 11:10:00 UTC (rev 9001)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGridAction.java	2015-01-29 11:11:26 UTC (rev 9002)
@@ -55,7 +55,7 @@
     boolean keepPreviousGrid=false;
     if (impl.getCurrentProject().getComputeGrid()!=null) {
       keepPreviousGrid=impl.question(
-              PivResource.getS("Modification du contour de grille"),
+              PivResource.getS("Import d'une grille"),
               PivResource.getS("Une grille existe d\xE9j\xE0.\nVoulez vous ajouter les points de la nouvelle grille \xE0 la pr\xE9c\xE9dente ?"));
     }
 

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