Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5477] trunk/soft/fudaa-prepro
|
From: <chr...@us...> - 2009-11-10 17:10:16
|
Revision: 5477
http://fudaa.svn.sourceforge.net/fudaa/?rev=5477&view=rev
Author: chrisc83
Date: 2009-11-10 17:10:07 +0000 (Tue, 10 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/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java
trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess.properties
trunk/soft/fudaa-prepro/meshview/src/test/java/org/fudaa/fudaa/meshviewer/gridprocess/TestGridProcess.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
Added Paths:
-----------
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/Messages.java
trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess_en.properties
trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess_fr.properties
Modified: trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java 2009-11-10 17:08:51 UTC (rev 5476)
+++ trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java 2009-11-10 17:10:07 UTC (rev 5477)
@@ -1,6 +1,7 @@
package org.fudaa.fudaa.meshviewer.gridprocess;
import java.awt.Color;
+import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
@@ -9,21 +10,27 @@
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
import javax.swing.border.TitledBorder;
import javax.swing.filechooser.FileFilter;
import org.fudaa.ctulu.CtuluActivity;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluIOOperationSynthese;
-import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.ProgressionUpdater;
import org.fudaa.ctulu.fileformat.FileFormat;
import org.fudaa.ctulu.gui.CtuluFileChooserPanel;
import org.fudaa.ctulu.gui.CtuluLibDialog;
import org.fudaa.ctulu.gui.CtuluLibSwing;
+import org.fudaa.ctulu.gui.CtuluOptionPane;
+import org.fudaa.ctulu.gui.CtuluUIDialog;
import org.fudaa.dodico.ef.EfDataAdapter;
import org.fudaa.dodico.ef.EfFrontierInterface;
import org.fudaa.dodico.ef.EfGridData;
@@ -47,7 +54,11 @@
import org.fudaa.dodico.telemac.io.TelemacCLFileFormat;
import org.fudaa.fudaa.commun.impl.FudaaPanelTaskModel;
+import com.memoire.bu.BuBorderLayout;
+import com.memoire.bu.BuButton;
import com.memoire.bu.BuCheckBox;
+import com.memoire.bu.BuContentFrame;
+import com.memoire.bu.BuDialog;
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuLabel;
import com.memoire.bu.BuNumericValueValidator;
@@ -147,11 +158,48 @@
{
return this.filePanel.getFileWithExt();
}
+
+ public void setHtmlToolTip(String message)
+ {
+ this.filePanel.setToolTipText("<HTML>" + message + "</HTML>");
+ }
}
@SuppressWarnings("serial")
private static class ChooseProcessPanel extends BuPanel implements ActionListener, Validator
{
+ private static class HelpButton extends BuButton implements ActionListener
+ {
+ public String message;
+
+ public HelpButton()
+ {
+ this.setIcon(BuResource.BU.getIcon("crystal_aide"));
+
+ this.addActionListener(this);
+ }
+
+ public void setHtmlMessage(String message)
+ {
+ if ((message == null) || (message.length() == 0))
+ {
+ this.message = null;
+ }
+ else
+ {
+ this.message = "<HTML>" + message + "</HTML>";
+ }
+ }
+
+ public void actionPerformed(ActionEvent e)
+ {
+ if (this.message != null)
+ {
+ CtuluOptionPane.showDialog(this, "Aide", new JOptionPane(message, JOptionPane.INFORMATION_MESSAGE));
+ }
+ }
+ }
+
private static final String MIN_DIST_CMD = "MIN_DIST_CMD";
private static final String BACK_DEP_CMD = "BACK_DEP_CMD";
@@ -176,6 +224,11 @@
this.backEliminationCheckBox.addActionListener(this);
}
+ private void setHtmlToolTip(JComponent component, String message)
+ {
+ component.setToolTipText("<HTML>" + message + "</HTML>");
+ }
+
public void actionPerformed(ActionEvent arg0)
{
String cmd = arg0.getActionCommand();
@@ -192,11 +245,11 @@
private void initComponent()
{
- this.cleanGridCheckBox = new BuCheckBox("Distance minimale");
- this.refineEdgeCheckBox = new BuCheckBox("Raffinage");
- this.overstressedCheckBox = new BuCheckBox("Surcontraint");
- this.renumerationCheckBox = new BuCheckBox("Renumeration");
- this.backEliminationCheckBox = new BuCheckBox("D\xE9pendance arri\xE8re");
+ this.cleanGridCheckBox = new BuCheckBox(Messages.getString("gridprocess.distMini.txt"));
+ this.refineEdgeCheckBox = new BuCheckBox(Messages.getString("gridprocess.refine.txt"));
+ this.overstressedCheckBox = new BuCheckBox(Messages.getString("gridprocess.overstressed.txt"));
+ this.renumerationCheckBox = new BuCheckBox(Messages.getString("gridprocess.renum.txt"));
+ this.backEliminationCheckBox = new BuCheckBox(Messages.getString("gridprocess.backDep.txt"));
this.minDistanceValue = new BuTextField();
this.vectorLengthValue = new BuTextField();
@@ -212,17 +265,31 @@
this.minDistanceValue.setEnabled(false);
this.vectorLengthValue.setEnabled(false);
- this.setBorder(BorderFactory.createTitledBorder("Process"));
+ this.setBorder(BorderFactory.createTitledBorder(Messages.getString("gridprocess.process.txt")));
this.setLayout(new BuVerticalLayout(2, true, false));
+
+ this.add(this.createPanelWithHelpButton(this.createSubpanel(this.cleanGridCheckBox, this.minDistanceValue), "Permet de nettoyer le maillage.<BR/>Les points non utilis\xE9s sont supprim\xE9s ainsi que ceux dont leur distance \xE0 un autre point est inf\xE9rieur \xE0 la <I>distance minimale</I>.<BR/>Les \xE9l\xE9ments d\xE9g\xE9n\xE9r\xE9s ou superpos\xE9s sont supprim\xE9s."));
+ this.add(this.createPanelWithHelpButton(this.refineEdgeCheckBox, "Permet de divis\xE9 des \xE9l\xE9ments de type T3 et Q4 en 4.<BR/>Ce r\xE9sultat est obtenu en ajoutant un nouveau point au centre de chaque segment.<BR/>Pour tout les autres types d'\xE9l\xE9ment un nouveau point est ajout\xE9 au centre de chaque segment et de chaque \xE9l\xE9ment.<BR/>Leurs points se trouvant sur leur pourtour sont reli\xE9 au point ajout\xE9 en leur centre."));
+ this.add(this.createPanelWithHelpButton(this.overstressedCheckBox, "Permet de modifier les \xE9l\xE9ments surcontraints (dont tout leurs points se trouvent sur la fronti\xE8re).<BR/>Ce r\xE9sultat est obtenu en ajoutant un point en leur centre et en reliant tout leurs autres points \xE0 celui-ci.<BR/>Les segments dont leurs points se trouvent sur la fronti\xE8re sont \xE9chang\xE9s."));
+ this.add(this.createPanelWithHelpButton(this.renumerationCheckBox, "Permet de modifier la num\xE9rotation des points afin d'utiliser le nouveau type de stockage des matrices.<BR/>Ils seront num\xE9rot\xE9s de celui appartenant au moins d'\xE9l\xE9ments \xE0 celui apparentant au plus d'\xE9l\xE9ments."));
+ this.add(this.createPanelWithHelpButton(this.createSubpanel(this.backEliminationCheckBox, this.vectorLengthValue), ""));
+ }
- this.add(this.createSubpanel(this.cleanGridCheckBox, this.minDistanceValue));
- this.add(this.refineEdgeCheckBox);
- this.add(this.overstressedCheckBox);
- this.add(this.renumerationCheckBox);
- this.add(this.createSubpanel(this.backEliminationCheckBox, this.vectorLengthValue));
+ private BuPanel createPanelWithHelpButton(JComponent component, String helpMsg)
+ {
+ BuBorderLayout layout = new BuBorderLayout(5, 5);
+ BuPanel panel = new BuPanel(layout);
+ HelpButton helpButton = new HelpButton();
+
+ helpButton.setHtmlMessage(helpMsg);
+
+ panel.add(component);
+ panel.add(helpButton, BuBorderLayout.EAST);
+
+ return panel;
}
-
+
private BuPanel createSubpanel(BuCheckBox checkbox, BuTextField value)
{
BuPanel panel = new BuPanel(new BuGridLayout(2, 5, 5));
@@ -261,7 +328,7 @@
private String getProcessErrorMessage()
{
((TitledBorder) this.getBorder()).setTitleColor(ERROR_COLOR);
- return "Un process au moins doit \xEAtre s\xE9lectionn\xE9";
+ return Messages.getString("gridprocess.processRule.msg");
}
private String getVectorLengthErrorMessage(String message)
@@ -269,7 +336,7 @@
if (this.backEliminationCheckBox.isSelected() && (this.vectorLengthValue.getValue() == null))
{
this.backEliminationCheckBox.setForeground(ERROR_COLOR);
- message = concatMessage(message, "D\xE9pendance arri\xE8re doit \xEAtre un entier positif");
+ message = concatMessage(message, Messages.getString("gridprocess.backDepRule.msg"));
}
return message;
}
@@ -279,7 +346,7 @@
if (this.cleanGridCheckBox.isSelected() && (this.minDistanceValue.getValue() == null))
{
this.cleanGridCheckBox.setForeground(ERROR_COLOR);
- message = concatMessage(message, "Distance minimale doit \xEAtre un r\xE9el positif");
+ message = concatMessage(message, Messages.getString("gridprocess.distMinRule.msg"));
}
return message;
}
@@ -362,9 +429,11 @@
this.stop = false;
this.currentActivity = null;
+ EfGridData resGridData = null;
+
try
{
- EfGridData resGridData = this.doProcess(prog, analyze);
+ resGridData = this.doProcess(prog, analyze);
}
catch (ProcessException e)
{
@@ -373,8 +442,9 @@
}
// TODO Voir comment afficher analyse (actuellement elle s'affiche que sur un fatal error, comment???).
- // TODO Utiliser la classe des messages et mettre les param\xE8tres (nb point, nb \xE9l\xE9ment).
- messages[0] = "gridprocess.result.msg";
+ messages[0] = Messages.getString("gridprocess.result1.msg");
+ messages[2] = Messages.getString("gridprocess.result2.msg", resGridData.getGrid().getPtsNb());
+ messages[4] = Messages.getString("gridprocess.result3.msg", resGridData.getGrid().getEltNb());
}
private EfGridData doProcess(ProgressionInterface prog, CtuluAnalyze analyze) throws ProcessException
@@ -410,8 +480,9 @@
if (this.stop)
{
- // TODO Utiliser la classe des messages
- message = "gridprocess.stop.msg.";
+ // TODO Utiliser la classe des messages
+ // TODO Y mettre dans messages et pas dans analyse.
+ message = Messages.getString("gridprocess.stop.msg");
globalAnalyze.addFatalError(message);
}
@@ -446,7 +517,7 @@
public void decoreBtApply(JButton bt)
{
- bt.setText("Executer");
+ bt.setText(Messages.getString("gridprocess.execute.txt"));
bt.setIcon(BuResource.BU.getIcon("crystal_executer"));
}
@@ -457,17 +528,22 @@
public int getNbMessageMax()
{
- return 1;
+ return 3;
}
private void initComponent()
{
this.panel = new BuPanel(new BuVerticalLayout(2, true, false));
- this.fileInGrid = new FileChooserPanel("Fichier de maillage en entr\xE9e:", SerafinFileFormat.getInstance(), true);
- this.fileInCL = new FileChooserPanel("Fichier de condition en entr\xE9e:", TelemacCLFileFormat.getInstance());
- this.fileOutGrid = new FileChooserPanel("Fichier de maillage en sortie:", SerafinFileFormat.getInstance(), true);
- this.fileOutCL = new FileChooserPanel("Fichier de condition en sortie:", TelemacCLFileFormat.getInstance());
+ this.fileInGrid = new FileChooserPanel(Messages.getString("gridprocess.gridFileIn.txt"), SerafinFileFormat.getInstance(), true);
+ this.fileInCL = new FileChooserPanel(Messages.getString("gridprocess.clFileIn.txt"), TelemacCLFileFormat.getInstance());
+ this.fileOutGrid = new FileChooserPanel(Messages.getString("gridprocess.gridFileOut.txt"), SerafinFileFormat.getInstance(), true);
+ this.fileOutCL = new FileChooserPanel(Messages.getString("gridprocess.clFileOut.txt"), TelemacCLFileFormat.getInstance());
this.chooser = new ChooseProcessPanel();
+
+ this.fileInGrid.setHtmlToolTip("Le chemin du fichier de maillage source");
+ this.fileInCL.setHtmlToolTip("Le chemin du fichier de conditions limites source");
+ this.fileOutGrid.setHtmlToolTip("Le chemin du fichier de maillage r\xE9sultat");
+ this.fileOutCL.setHtmlToolTip("Le chemin du fichier de conditions limites r\xE9sultat");
}
private void createUI()
@@ -495,7 +571,7 @@
public String getTitre()
{
- return "Traitement du maillage";
+ return Messages.getString("gridprocess.title.txt");
}
public String isValid()
@@ -529,7 +605,7 @@
if (!CtuluLibDialog.confirmeOverwriteFiles(this.panel, name.toString()))
{
//TODO Voir si tjs utiliser CtuluLib.getS
- return CtuluLib.getS("Modifier les fichiers cibles");
+ return Messages.getString("gridprocess.modifyTargetFiles.msg");
}
}
}
@@ -604,7 +680,7 @@
nbTotalPts += newFrontiers.getNbPt(i);
}
- updater.majProgessionStateOnly("gridprocess.calculatecl.msg");
+ updater.majProgessionStateOnly(Messages.getString("gridprocess.calculatecl.msg"));
updater.setValue(10, nbTotalPts);
for (int i = 0; i < nbFrontier; i++)
Added: trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/Messages.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/Messages.java (rev 0)
+++ trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/Messages.java 2009-11-10 17:10:07 UTC (rev 5477)
@@ -0,0 +1,41 @@
+package org.fudaa.fudaa.meshviewer.gridprocess;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Messages
+{
+ private static final String BUNDLE_NAME = "org.fudaa.fudaa.meshviewer.gridprocess.gridprocess"; //$NON-NLS-1$
+
+ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+ private Messages()
+ {
+ }
+
+ public static String getString(String key)
+ {
+ try
+ {
+ return RESOURCE_BUNDLE.getString(key);
+ }
+ catch (MissingResourceException e)
+ {
+ return '!' + key + '!';
+ }
+ }
+
+ public static String getString(String key,Object... args)
+ {
+ try
+ {
+ String string = RESOURCE_BUNDLE.getString(key);
+ return MessageFormat.format(string, args);
+ }
+ catch (MissingResourceException e)
+ {
+ return '!' + key + '!';
+ }
+ }
+}
Modified: trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess.properties
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess.properties 2009-11-10 17:08:51 UTC (rev 5476)
+++ trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess.properties 2009-11-10 17:10:07 UTC (rev 5477)
@@ -1,3 +1,21 @@
-gridprocess.result.msg=Le nouveau maillage contient {0} point(s) et {1} \xE9l\xE9ment(s)
-gridprocess.stop.msg=Op\xE9ration arr\xEAt\xE9e par l'utilisateur
-gridprocess.calculatecl.msg=Calcul des nouvelles conditions limites des points fronti\xE8res
+gridprocess.result1.msg=Le nouveau maillage contient :
+gridprocess.result2.msg={0} point(s)
+gridprocess.result3.msg={0} \u00E9l\u00E9ment(s)
+gridprocess.backDepRule.msg=D\u00E9pendance arri\u00E8re doit \u00EAtre un entier positif
+gridprocess.backDep.txt=D\u00E9pendance arri\u00E8re
+gridprocess.calculatecl.msg=Calcul des nouvelles conditions limites des points fronti\u00E8res
+gridprocess.clFileIn.txt=Fichier de condition en entr\u00E9e :
+gridprocess.clFileOut.txt=Fichier de condition en sortie :
+gridprocess.distMini.txt=Distance minimale
+gridprocess.distMinRule.msg=Distance minimale doit \u00EAtre un r\u00E9el positif
+gridprocess.execute.txt=Executer
+gridprocess.gridFileIn.txt=Fichier de maillage en entr\u00E9e :
+gridprocess.gridFileOut.txt=Fichier de maillage en sortie :
+gridprocess.modifyTargetFiles.msg=Modifier le(s) fichier(s) cible(s)
+gridprocess.overstressed.txt=Surcontraint
+gridprocess.process.txt=Process
+gridprocess.processRule.msg=Un process au moins doit \u00EAtre s\u00E9lectionn\u00E9
+gridprocess.refine.txt=Raffinage
+gridprocess.renum.txt=Renumeration
+gridprocess.stop.msg=Op\u00E9ration arr\u00EAt\u00E9e par l'utilisateur
+gridprocess.title.txt=Traitement du maillage
Added: trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess_en.properties
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess_en.properties (rev 0)
+++ trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess_en.properties 2009-11-10 17:10:07 UTC (rev 5477)
@@ -0,0 +1,21 @@
+gridprocess.result1.msg=The new grid has :
+gridprocess.result2.msg={0} node(s)
+gridprocess.result3.msg={0} element(s)
+gridprocess.backDepRule.msg=Back dependancy must be a positive integer
+gridprocess.backDep.txt=Back dependancy
+gridprocess.calculatecl.msg=New frontier nodes boundary limits calculation
+gridprocess.clFileIn.txt=In boundary limits file :
+gridprocess.clFileOut.txt=Out boundary limits file :
+gridprocess.distMini.txt=Minimal distance
+gridprocess.distMinRule.msg=Minimal distance must be a positive real
+gridprocess.execute.txt=Execute
+gridprocess.gridFileIn.txt=In grid file :
+gridprocess.gridFileOut.txt=Out grid file :
+gridprocess.modifyTargetFiles.msg=Modify target file(s)
+gridprocess.overstressed.txt=Overstressed
+gridprocess.process.txt=Process
+gridprocess.processRule.msg=One or more process must be selected
+gridprocess.refine.txt=Refine
+gridprocess.renum.txt=Renumeration
+gridprocess.stop.msg=Operation stopped by the user
+gridprocess.title.txt=Grid management
Added: trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess_fr.properties
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess_fr.properties (rev 0)
+++ trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess_fr.properties 2009-11-10 17:10:07 UTC (rev 5477)
@@ -0,0 +1,21 @@
+gridprocess.result1.msg=Le nouveau maillage contient :
+gridprocess.result2.msg={0} point(s)
+gridprocess.result3.msg={0} \u00E9l\u00E9ment(s)
+gridprocess.backDepRule.msg=D\u00E9pendance arri\u00E8re doit \u00EAtre un entier positif
+gridprocess.backDep.txt=D\u00E9pendance arri\u00E8re
+gridprocess.calculatecl.msg=Calcul des nouvelles conditions limites des points fronti\u00E8res
+gridprocess.clFileIn.txt=Fichier de condition en entr\u00E9e :
+gridprocess.clFileOut.txt=Fichier de condition en sortie :
+gridprocess.distMini.txt=Distance minimale
+gridprocess.distMinRule.msg=Distance minimale doit \u00EAtre un r\u00E9el positif
+gridprocess.execute.txt=Executer
+gridprocess.gridFileIn.txt=Fichier de maillage en entr\u00E9e :
+gridprocess.gridFileOut.txt=Fichier de maillage en sortie :
+gridprocess.modifyTargetFiles.msg=Modifier le(s) fichier(s) cible(s)
+gridprocess.overstressed.txt=Surcontraint
+gridprocess.process.txt=Process
+gridprocess.processRule.msg=Un process au moins doit \u00EAtre s\u00E9lectionn\u00E9
+gridprocess.refine.txt=Raffinage
+gridprocess.renum.txt=Renumeration
+gridprocess.stop.msg=Op\u00E9ration arr\u00EAt\u00E9e par l'utilisateur
+gridprocess.title.txt=Traitement du maillage
Modified: trunk/soft/fudaa-prepro/meshview/src/test/java/org/fudaa/fudaa/meshviewer/gridprocess/TestGridProcess.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/test/java/org/fudaa/fudaa/meshviewer/gridprocess/TestGridProcess.java 2009-11-10 17:08:51 UTC (rev 5476)
+++ trunk/soft/fudaa-prepro/meshview/src/test/java/org/fudaa/fudaa/meshviewer/gridprocess/TestGridProcess.java 2009-11-10 17:10:07 UTC (rev 5477)
@@ -1,5 +1,7 @@
package org.fudaa.fudaa.meshviewer.gridprocess;
+import java.util.Locale;
+
import javax.swing.JFrame;
import org.fudaa.ctulu.gui.CtuluUIDialog;
@@ -11,7 +13,10 @@
* @param args
*/
public static void main(String[] args) {
- JFrame frame = new JFrame();
+
+// Locale.setDefault(new Locale("fr", "ch"));
+
+ JFrame frame = new JFrame();
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
CtuluUIDialog dialog = new CtuluUIDialog(frame);
dialog.getMainProgression();
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:08:51 UTC (rev 5476)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrFileFormatManager.java 2009-11-10 17:10:07 UTC (rev 5477)
@@ -17,10 +17,12 @@
import com.memoire.bu.BuMenu;
import org.fudaa.ctulu.fileformat.FileFormat;
+import org.fudaa.dodico.ef.io.adcirc.AdcircFileFormat;
import org.fudaa.dodico.ef.io.corelebth.CorEleBthFileFormat;
import org.fudaa.dodico.ef.io.dunes.DunesMAIFileFormat;
import org.fudaa.dodico.ef.io.serafin.SerafinFileFormat;
import org.fudaa.dodico.ef.io.serafin.SerafinVolumeFileFormat;
+import org.fudaa.dodico.ef.io.supertab.SuperTabFileFormat;
import org.fudaa.dodico.ef.io.trigrid.TrigridFileFormat;
import org.fudaa.dodico.reflux.io.INPFileFormat;
import org.fudaa.dodico.reflux.io.RefluxRefondeSolutionFileFormat;
@@ -106,6 +108,8 @@
r.add(TrigridFileFormat.getInstance());
r.add(CorEleBthFileFormat.getInstance());
r.add(SerafinFileFormat.getInstance());
+ r.add(AdcircFileFormat.getInstance());
+ r.add(SuperTabFileFormat.getInstance());
return getArray(r);
}
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:08:51 UTC (rev 5476)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacAppliManager.java 2009-11-10 17:10:07 UTC (rev 5477)
@@ -11,6 +11,7 @@
import java.io.FileFilter;
import javax.swing.Icon;
+import javax.swing.JFrame;
import javax.swing.JPopupMenu;
import com.memoire.bu.BuMenu;
@@ -21,6 +22,7 @@
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.gui.CtuluDialogPanel;
+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;
@@ -30,7 +32,9 @@
import org.fudaa.fudaa.commun.FudaaUI;
import org.fudaa.fudaa.commun.calcul.FudaaCalculOp;
import org.fudaa.fudaa.commun.exec.FudaaExec;
+import org.fudaa.fudaa.commun.impl.FudaaPanelTask;
import org.fudaa.fudaa.fdico.FDicoCalculLocalBuilder;
+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.TrLauncher;
@@ -75,6 +79,50 @@
}
+
+
+ private class FudaaExecGridManagment extends FudaaExec {
+
+ /**
+ * Constructeur par defaut.
+ */
+ public FudaaExecGridManagment() {
+ super("Traitement du maillage");
+ }
+
+ @Override
+ public void execInDir(final File _dir, final FudaaUI _ui, final Runnable _nexProcess) {}
+
+ @Override
+ public void execOnFile(final File _target, final FudaaUI _ui, final Runnable _nexProcess)
+ {
+ JFrame frame = new JFrame();
+ CtuluUIDialog dialog = new CtuluUIDialog(frame);
+ dialog.getMainProgression();
+
+ FudaaPanelTask task = new FudaaPanelTask(dialog, new GridProcessTaskModel());
+
+ task.afficheDialog();
+ }
+
+ @Override
+ public Icon getIcon() {
+ return BuResource.BU.getIcon("executer");
+ }
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
/*
* protected class FudaaExecCreateProjectRubens extends FudaaExec {
*
@@ -164,6 +212,12 @@
_m.add(execTelemac_);
postItem_ = _explorer.createFileAction(new FudaaExecPostView(launcher_));
_m.add(postItem_);
+
+ //TODO Ajouter menu pour traitement maillage.
+ BuMenuItem toto = _explorer.createFileAction(new FudaaExecGridManagment());
+ _m.add(toto);
+
+
super.buildCmdForMenuFile(_m, _explorer);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
