Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac TrTelemacCommunParametres.java,1.7,1.8 TrTelemacCommunProjet.java,1.7,1.8 TrTelemacFilleVisu.java,1.8,1.9
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac
In directory sc8-pr-cvs1:/tmp/cvs-serv16044/tr/telemac
Modified Files:
TrTelemacCommunParametres.java TrTelemacCommunProjet.java
TrTelemacFilleVisu.java
Log Message:
Maj version prepro 0.04
Index: TrTelemacCommunParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacCommunParametres.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TrTelemacCommunParametres.java 19 Dec 2003 12:10:56 -0000 1.7
--- TrTelemacCommunParametres.java 21 Jan 2004 11:07:29 -0000 1.8
***************
*** 185,190 ****
DicoEntite entFile= getDicoFileFormatVersion().getCLEntiteFile();
if (entFile == null) {
! getUI().error(
! TrResource.getS("Conditions limites"),
TrResource.getS(
"Définition du fichier de conditions limites non trouvée"));
--- 185,189 ----
DicoEntite entFile= getDicoFileFormatVersion().getCLEntiteFile();
if (entFile == null) {
! FudaaLib.info(
TrResource.getS(
"Définition du fichier de conditions limites non trouvée"));
Index: TrTelemacCommunProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacCommunProjet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TrTelemacCommunProjet.java 19 Dec 2003 12:10:56 -0000 1.7
--- TrTelemacCommunProjet.java 21 Jan 2004 11:07:29 -0000 1.8
***************
*** 11,24 ****
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.Action;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
- import com.memoire.bu.BuButton;
import com.memoire.bu.BuCommonImplementation;
import com.memoire.bu.BuDynamicMenu;
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuMenu;
import com.memoire.bu.BuResource;
--- 11,26 ----
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+ import java.awt.event.KeyEvent;
import javax.swing.Action;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
+ import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;
import com.memoire.bu.BuCommonImplementation;
import com.memoire.bu.BuDynamicMenu;
import com.memoire.bu.BuGridLayout;
+ import com.memoire.bu.BuInternalFrame;
import com.memoire.bu.BuMenu;
import com.memoire.bu.BuResource;
***************
*** 26,31 ****
import com.memoire.bu.BuToolButton;
- import org.fudaa.dodico.commun.DodicoCmdMngListener;
import org.fudaa.dodico.commun.DodicoCommandComposite;
import org.fudaa.dodico.dico.DicoEntite;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
--- 28,33 ----
import com.memoire.bu.BuToolButton;
import org.fudaa.dodico.commun.DodicoCommandComposite;
+ import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.dico.DicoEntite;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
***************
*** 80,83 ****
--- 82,89 ----
actions_.setEnableCalcul(true);
}
+
+ public String getSoftwareID() {
+ return FileFormatSoftware.TELEMAC_IS.name;
+ }
public boolean isTransientAvailable() {
***************
*** 134,137 ****
--- 140,146 ----
change= true;
super.active(_impl);
+ if(change){
+ _impl.installContextHelp(entiteFille_.getRootPane(), "telemac/p-telemac-general.html");
+ }
_impl.addMenu(getProjectMenu(), _impl.getNbMenuInMenuBar() - 2);
if (change) {
***************
*** 194,198 ****
* Ajoute ou affiche la fenetre contenant les courbes temporelles.
*/
! protected synchronized void activeGrapheFille() {
if ((getImpl() == null)
|| (!isTransientAvailable())
--- 203,207 ----
* Ajoute ou affiche la fenetre contenant les courbes temporelles.
*/
! public synchronized void activeGrapheFille() {
if ((getImpl() == null)
|| (!isTransientAvailable())
***************
*** 202,205 ****
--- 211,215 ----
courbeFille_=
new TrGrapheFille(getImpl(), getInformationsDocument(), getEvolMng());
+ getImpl().installContextHelp(courbeFille_.getRootPane(), "telemac/p-telemac-time-curves.html");
getImpl().addInternalFrame(courbeFille_);
TrLib.initFrameDimensionWithPref(
***************
*** 221,224 ****
--- 231,235 ----
//initialization for the boundaries layer
impl.addInternalFrame(visu_);
+ impl.installContextHelp(visu_.getRootPane(), "telemac/p-telemac-editeur2D.html");
if (impl instanceof TrImplementation)
visu_.refreshArbreCalque(((TrImplementation)impl).getArbreCalque());
***************
*** 282,292 ****
*/
public void close() {
! BuCommonImplementation impl= getImpl();
! TrLib.closeInternalFrame(impl, entiteFille_, "general");
! entiteFille_= null;
! TrLib.closeInternalFrame(impl, visu_, "layer");
! visu_= null;
! TrLib.closeInternalFrame(impl, courbeFille_, "curve");
! courbeFille_= null;
}
--- 293,315 ----
*/
public void close() {
! final BuCommonImplementation impl= getImpl();
! Runnable runnable= new Runnable() {
! public void run() {
! impl.getMainMenuBar().removeMenu(getProjectMenu());
! TrLib.closeInternalFrame(impl, entiteFille_, "general");
! entiteFille_= null;
! if (visu_ != null)
! impl.getMainMenuBar().remove(visu_.getLayerMenu());
! TrLib.closeInternalFrame(impl, visu_, "layer");
! visu_= null;
! TrLib.closeInternalFrame(impl, courbeFille_, "curve");
! courbeFille_= null;
! }
! };
!
! if (!SwingUtilities.isEventDispatchThread())
! SwingUtilities.invokeLater(runnable);
! else
! runnable.run();
}
***************
*** 310,318 ****
Action.SHORT_DESCRIPTION,
TrResource.getS("Paramètres généraux"));
}
if (visuAction_ == null) {
visuAction_=
new EbliSimpleAction(
! TrResource.getS("Vue du maillage"),
BuResource.BU.getToolIcon("voir"),
"GRID_PROJECT_VIEW") {
--- 333,346 ----
Action.SHORT_DESCRIPTION,
TrResource.getS("Paramètres généraux"));
+ projectAction_.putValue(
+ Action.ACCELERATOR_KEY,
+ KeyStroke.getKeyStroke(
+ KeyEvent.VK_G,
+ KeyEvent.ALT_MASK + KeyEvent.CTRL_MASK));
}
if (visuAction_ == null) {
visuAction_=
new EbliSimpleAction(
! TrResource.getS("Editeur 2D"),
BuResource.BU.getToolIcon("voir"),
"GRID_PROJECT_VIEW") {
***************
*** 324,327 ****
--- 352,360 ----
Action.SHORT_DESCRIPTION,
TrResource.getS("Vue du maillage"));
+ visuAction_.putValue(
+ Action.ACCELERATOR_KEY,
+ KeyStroke.getKeyStroke(
+ KeyEvent.VK_V,
+ KeyEvent.ALT_MASK + KeyEvent.CTRL_MASK));
}
if (loadAction_ == null) {
***************
*** 354,357 ****
--- 387,395 ----
TrResource.getS("Afficher la fenêtres des courbes temporelles"));
courbeAction_.setEnabled(false);
+ courbeAction_.putValue(
+ Action.ACCELERATOR_KEY,
+ KeyStroke.getKeyStroke(
+ KeyEvent.VK_C,
+ KeyEvent.ALT_MASK + KeyEvent.CTRL_MASK));
}
}
***************
*** 456,458 ****
--- 494,503 ----
}
+ /**
+ *
+ */
+ public void loadAll(ProgressionInterface _inter) {
+ getTrTelemacParams().loadAll(_inter);
+ }
+
}
\ No newline at end of file
Index: TrTelemacFilleVisu.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacFilleVisu.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TrTelemacFilleVisu.java 12 Dec 2003 11:29:42 -0000 1.8
--- TrTelemacFilleVisu.java 21 Jan 2004 11:07:29 -0000 1.9
***************
*** 14,17 ****
--- 14,18 ----
import org.fudaa.ctulu.CtuluLib;
+ import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoCommand;
import org.fudaa.dodico.commun.DodicoCommandComposite;
***************
*** 367,371 ****
return;
if (getBcMng() == null) {
! p.setNoCL();
p.getDicoParams().setLoaded(e, null, true);
addBcLayerIfNot();
--- 368,374 ----
return;
if (getBcMng() == null) {
! DodicoAnalyze.Editor a=new DodicoAnalyze.Editor();
! p.setNoCL(a);
! getImpl().manageAnalyzeAndIsFatal(a.toAnalyze());
p.getDicoParams().setLoaded(e, null, true);
addBcLayerIfNot();
|
