Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8253] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fudaa/tr
|
From: <de...@us...> - 2013-01-24 07:46:11
|
Revision: 8253
http://fudaa.svn.sourceforge.net/fudaa/?rev=8253&view=rev
Author: deniger
Date: 2013-01-24 07:46:01 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
PREPRO-338
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageLayer.java
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2013-01-24 07:44:05 UTC (rev 8252)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2013-01-24 07:46:01 UTC (rev 8253)
@@ -1,6 +1,9 @@
/**
- * @creation 24 mai 2004 @modification $Date: 2007-12-04 09:09:26 $ @license GNU General Public License 2 @copyright (c)1998-2001
- * CETMEF 2 bd Gambetta F-60231 Compiegne @mail de...@fu...
+ * @creation 24 mai 2004
+ * @modification $Date: 2007-12-04 09:09:26 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
*/
package org.fudaa.fudaa.tr;
@@ -69,8 +72,8 @@
infoSoft = new BuInformationsSoftware();
infoSoft.name = "prepro";
- infoSoft.version = "1.2-RC20";
- infoSoft.date = "2013-01-22";
+ infoSoft.version = "1.2-RC21";
+ infoSoft.date = "2013-01-24";
infoSoft.rights = TrResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)2003-2009";
infoSoft.contact = "fre...@fu...";
infoSoft.license = "GPL2";
@@ -120,7 +123,6 @@
}
_impl.setLauncher(launcher);
final Runnable r = new Runnable() {
-
@Override
public void run() {
f.startApp(_impl);
@@ -251,7 +253,7 @@
final String init = TrPreferences.TR.getStringProperty("tr.code.id", null);
final String[] choix = getChoices();
final BuDialogChoice dialc = new BuDialogChoice(null, TrEditorImplementation.informationsSoftware(),
- TrResource.getS("Configuration cha\xEEne de calcul"), TrResource.getS(
+ TrResource.getS("Configuration cha\xEEne de calcul"), TrResource.getS(
"Veuillez s\xE9lectionner la cha\xEEne de calcul utilis\xE9e"), choix);
dialc.setSize(200, 200);
if (init != null) {
@@ -330,7 +332,6 @@
public void openLogFrame(final File _f) {
if (tail_ == null) {
new CtuluTaskOperationGUI(null, FudaaLib.getS("Console")) {
-
@Override
public void act() {
try {
@@ -381,7 +382,6 @@
final TrPostImplementation post = (TrPostImplementation) launch(null, TrLauncherDefault.this, new TrPostImplementation());
BuLib.invokeLater(new Runnable() {
-
@Override
public void run() {
if (_f != null) {
@@ -414,7 +414,6 @@
final TrPostImplementation post = (TrPostImplementation) launch(null, TrLauncherDefault.this, new TrPostImplementation());
BuLib.invokeLater(new Runnable() {
-
@Override
public void run() {
if (_f != null) {
@@ -445,7 +444,6 @@
final TrPostImplementation post = (TrPostImplementation) launch(null, TrLauncherDefault.this, new TrPostImplementation());
BuLib.invokeLater(new Runnable() {
-
@Override
public void run() {
if (_f != null) {
@@ -461,7 +459,6 @@
public void openSupervisor() {
if (supervisor_ == null) {
BuLib.invokeLater(new Runnable() {
-
@Override
public void run() {
supervisor_ = (TrSupervisorImplementation) launch(null, TrLauncherDefault.this, new TrSupervisorImplementation());
@@ -510,7 +507,7 @@
final TrEditorImplementation alreadyOpened = findImplWithOpenedFile(_projectFile);
if (alreadyOpened != null) {
alreadyOpened.warn(TrResource.getS("Ouverture"), TrResource.getS("Le fichier {0} est d\xE9j\xE0 ouvert", _projectFile.getName()),
- false);
+ false);
alreadyOpened.getFrame().setVisible(true);
alreadyOpened.getFrame().setState(Frame.NORMAL);
alreadyOpened.getFrame().requestFocus();
@@ -518,13 +515,11 @@
}
BuLib.invokeNow(new Runnable() {
-
@Override
public void run() {
final TrEditorImplementation impl = (TrEditorImplementation) launch(null, TrLauncherDefault.this,
- new TrEditorImplementation());
+ new TrEditorImplementation());
BuLib.invokeLater(new Runnable() {
-
@Override
public void run() {
if (_projectFile != null) {
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageLayer.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageLayer.java 2013-01-24 07:44:05 UTC (rev 8252)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageLayer.java 2013-01-24 07:46:01 UTC (rev 8253)
@@ -76,29 +76,18 @@
private final GrPolygone p_ = new GrPolygone();
private boolean showMeshes_ = true;
TraceBox boxNb_;
-
GrBoite domaine_;
TraceIcon inputIc_;
TraceIcon outputIc_;
-
Set ouvToDisplay_;
-
int[] paintTempo_;
-
List paletteId_;
-
boolean showEdgeDesc_;
-
boolean showEdges_ = true;
-
boolean showElementDesc_;
-
boolean showMeshesCenter_ = true;
-
boolean showWorkNumber_;
-
TraceLigne tlPoly_;
-
TraceLigne tlPolyInterne_;
public TrRubarOuvrageLayer(final TrRubarOuvrageLayerModel _m) {
@@ -542,7 +531,7 @@
final BConfigurableInterface[] sect = new BConfigurableInterface[getNbSet() + 2];
for (int i = 1; i < sect.length; i++) {
- ZCalqueAffichageDonneesTraceConfigure traceConfigure = new ZCalqueAffichageDonneesTraceConfigure(this, i-1);
+ ZCalqueAffichageDonneesTraceConfigure traceConfigure = new ZCalqueAffichageDonneesTraceConfigure(this, i - 1);
traceConfigure.setShowColor(false);
traceConfigure.setShowIconType(false);
sect[i] = traceConfigure;
@@ -648,8 +637,7 @@
@Override
/**
- * Devrait \xEAtre remplac\xE9 par getDomaineOnSelected(). Je ne touche pas a cet ajustement, le calcul de la marge autour
- * du zoom me semble douteux. B.M.
+ * Devrait \xEAtre remplac\xE9 par getDomaineOnSelected(). Je ne touche pas a cet ajustement, le calcul de la marge autour du zoom me semble douteux. B.M.
*/
public GrBoite getDomaineOnSelected() {
if (isSelectionEmpty()) {
@@ -900,7 +888,7 @@
@Override
public void doPaintSelection(final Graphics2D _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran, final GrBoite _clipReel) {
if (getM().isModeElt()) {
- super.paintSelection(_g, _trace, _versEcran, _clipReel);
+ super.doPaintSelection(_g, _trace, _versEcran, _clipReel);
return;
}
if (isSelectionEmpty() || getM().isEmpty()) {
@@ -1033,7 +1021,7 @@
getM().getElt(p_, o.getElt1());
p_.boite(tmp);
if ((polyEnv.contains(tmp.e_.x_, tmp.e_.y_)) && (polyEnv.contains(tmp.o_.x_, tmp.o_.y_))
- && VecteurGrPoint.estSelectionneEnv(c, polyEnv, _poly, tester, p_.sommets_, _mode)) {
+ && VecteurGrPoint.estSelectionneEnv(c, polyEnv, _poly, tester, p_.sommets_, _mode)) {
// on teste l'element 2
boolean goOne = true;
if (o.isElt2Set()) {
@@ -1050,7 +1038,7 @@
getM().getElt(p_, o.getMailleIntern(iInt));
p_.boite(tmp);
if ((polyEnv.contains(tmp.e_.x_, tmp.e_.y_)) && (polyEnv.contains(tmp.o_.x_, tmp.o_.y_))
- && !VecteurGrPoint.estSelectionneEnv(c, polyEnv, _poly, tester, p_.sommets_, _mode)) {
+ && !VecteurGrPoint.estSelectionneEnv(c, polyEnv, _poly, tester, p_.sommets_, _mode)) {
all = false;
}
}
@@ -1090,7 +1078,6 @@
*/
@Override
public void setForeground(final Color _v) {
-
}
/**
@@ -1116,5 +1103,4 @@
}
repaint();
}
-
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
