Thread: [Fudaa-svn-commit] SF.net SVN: fudaa:[5478] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fud

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5478
          http://fudaa.svn.sourceforge.net/fudaa/?rev=5478&view=rev
Author:   chrisc83
Date:     2009-11-11 17:36:57 +0000 (Wed, 11 Nov 2009)

Log Message:
-----------
OPEN - issue PREPRO-53: Ajout d'un panel pour le traitement du maillage 
http://www.fudaa.fr/jira/browse/PREPRO-53

Modified Paths:
--------------
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrApplicationManager.java
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrFileFormatManager.java
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacAppliManager.java

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrApplicationManager.java
===================================================================

--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrApplicationManager.java	2009-11-10 17:10:07 UTC (rev 5477)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrApplicationManager.java	2009-11-11 17:36:57 UTC (rev 5478)
@@ -15,12 +15,14 @@
 
 import javax.swing.AbstractButton;
 import javax.swing.Icon;
+import javax.swing.JFrame;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 
 import org.fudaa.ctulu.CtuluLibString;
 import org.fudaa.ctulu.fileformat.FileFormat;
 import org.fudaa.ctulu.gui.CtuluLibDialog;
+import org.fudaa.ctulu.gui.CtuluUIDialog;
 import org.fudaa.dodico.ef.io.serafin.SerafinFileFilter;
 import org.fudaa.dodico.ef.io.serafin.SerafinFileFormat;
 import org.fudaa.dodico.fichiers.FileFormatSoftware;
@@ -37,6 +39,8 @@
 import org.fudaa.fudaa.commun.exec.FudaaAppliManagerImpl;
 import org.fudaa.fudaa.commun.exec.FudaaEditor;
 import org.fudaa.fudaa.commun.exec.FudaaExec;
+import org.fudaa.fudaa.commun.impl.FudaaPanelTask;
+import org.fudaa.fudaa.meshviewer.gridprocess.GridProcessTaskModel;
 import org.fudaa.fudaa.ressource.FudaaResource;
 import org.fudaa.fudaa.tr.TrEditorImplementation;
 import org.fudaa.fudaa.tr.post.TrPostAnalyze;

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrFileFormatManager.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrFileFormatManager.java	2009-11-10 17:10:07 UTC (rev 5477)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrFileFormatManager.java	2009-11-11 17:36:57 UTC (rev 5478)
@@ -133,6 +133,9 @@
 
     r.add(INPFileFormat.getInstance());
     r.add(DunesMAIFileFormat.getInstance());
+
+    r.add(AdcircFileFormat.getInstance());
+    r.add(SuperTabFileFormat.getInstance());
     return getArray(r);
   }
 
@@ -152,6 +155,10 @@
       r.add(DunesMAIFileFormat.getInstance());
       r.add(SerafinFileFormat.getInstance());
     }
+    
+    r.add(AdcircFileFormat.getInstance());
+    r.add(SuperTabFileFormat.getInstance());
+
     return getArray(r);
   }
 
@@ -212,6 +219,20 @@
     _m.addSubMenu(me, true);
   }
 
+  public boolean isGridFile(final String _file)
+  {
+      FileFormat[] formats = getAllGridFormat();
+      
+      for (int i = 0; i < formats.length; i++)
+      {
+          if (formats[i].isAccepted(_file))
+          {
+              return true;
+          }
+      }
+      
+      return false;
+  }
   public boolean isCasFile(final String _file) {
     return (_file.startsWith("cas")) || _file.endsWith(".cas");
   }

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacAppliManager.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacAppliManager.java	2009-11-10 17:10:07 UTC (rev 5477)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacAppliManager.java	2009-11-11 17:36:57 UTC (rev 5478)
@@ -14,13 +14,10 @@
 import javax.swing.JFrame;
 import javax.swing.JPopupMenu;
 
-import com.memoire.bu.BuMenu;
-import com.memoire.bu.BuMenuItem;
-import com.memoire.bu.BuResource;
-
 import org.fudaa.ctulu.CtuluLibMessage;
 import org.fudaa.ctulu.CtuluLibString;
 import org.fudaa.ctulu.ProgressionInterface;
+import org.fudaa.ctulu.fileformat.FileFormat;
 import org.fudaa.ctulu.gui.CtuluDialogPanel;
 import org.fudaa.ctulu.gui.CtuluUIDialog;
 import org.fudaa.dodico.ef.io.serafin.SerafinFileFilter;
@@ -37,6 +34,7 @@
 import org.fudaa.fudaa.meshviewer.gridprocess.GridProcessTaskModel;
 import org.fudaa.fudaa.tr.common.TrApplicationManager;
 import org.fudaa.fudaa.tr.common.TrExplorer;
+import org.fudaa.fudaa.tr.common.TrFileFormatManager;
 import org.fudaa.fudaa.tr.common.TrLauncher;
 import org.fudaa.fudaa.tr.common.TrLib;
 import org.fudaa.fudaa.tr.common.TrPreferences;
@@ -44,6 +42,10 @@
 import org.fudaa.fudaa.tr.post.TrPostInspector;
 import org.fudaa.fudaa.tr.post.TrPostInspectorReaderSerafin;
 
+import com.memoire.bu.BuMenu;
+import com.memoire.bu.BuMenuItem;
+import com.memoire.bu.BuResource;
+
 /**
  * @author Fred Deniger
  * @version $Id: TrTelemacAppliManager.java,v 1.36 2007-06-28 09:28:19 deniger Exp $
@@ -77,17 +79,18 @@
       return BuResource.BU.getIcon("executer");
     }
 
-  }
-
+  }  
   
-  
-  private class FudaaExecGridManagment extends FudaaExec {
+  private class FudaaExecGridManagement extends FudaaExec {
 
+      private FileFormat[] fileFormat;
       /**
        * Constructeur par defaut.
        */
-      public FudaaExecGridManagment() {
+      public FudaaExecGridManagement(FileFormat[] fileFormat) {
         super("Traitement du maillage");
+        
+        this.fileFormat = fileFormat;
       }
 
       @Override
@@ -111,18 +114,7 @@
       }
 
     }
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+
   /*
    * protected class FudaaExecCreateProjectRubens extends FudaaExec {
    * 
@@ -143,6 +135,7 @@
   protected BuMenuItem createH2dProject_;
   protected BuMenuItem createRubensProject_;
   protected TrExplorer.ExplorerMenuItem execTelemac_;
+  private BuMenuItem execGridManage_;
 
   /**
    * @param _l le lanceur d'appli
@@ -157,6 +150,7 @@
     super.buildCmdForMenuFileOpenWith(_m, _explor);
     _m.addSeparator();
     _m.add(_explor.createFileAction(new FudaaExecCreateProjectH2d(TrResource.getS("Cr\xE9er projet Telemac"), launcher_)));
+    _m.add(_explor.createFileAction(new FudaaExecGridManagement(TrFileFormatManager.getAllGridFormat())));
   }
 
   @Override
@@ -186,6 +180,7 @@
     super.updateMenuFiles(_nbFileChoosen, _f);
     createH2dProject_.setEnabled((_nbFileChoosen == 1) && (isSerafinFile(_f)));
     execTelemac_.setEnabled((_nbFileChoosen == 1) && (launcher_.getFileFormatManager().isCasFile(_f.getName())));
+    execGridManage_.setEnabled((_nbFileChoosen == 1) && (launcher_.getFileFormatManager().isGridFile(_f.getName())));
   }
 
   protected boolean isSerafinFile(final File _f) {
@@ -214,11 +209,13 @@
     _m.add(postItem_);
     
     //TODO Ajouter menu pour traitement maillage.
-    BuMenuItem toto = _explorer.createFileAction(new FudaaExecGridManagment());
-    _m.add(toto);
+    execGridManage_ = _explorer.createFileAction(new FudaaExecGridManagement(TrFileFormatManager.getAllGridFormat()));
+    _m.add(execGridManage_);
     
     
     super.buildCmdForMenuFile(_m, _explorer);
+    
+    
   }
 
   /**


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:[5478] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fud

https://gitlab.com/fudaa

fudaa-svn-commit