Thread: [Fudaa-svn-commit] SF.net SVN: fudaa:[8211] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fud (Page 2)

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

Revision: 8211
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8211&view=rev
Author:   deniger
Date:     2013-01-16 21:24:26 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
optimisation maillage important

Modified Paths:
--------------
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrSupervisorImplementation.java
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrCommonImplementation.java
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java

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

--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrSupervisorImplementation.java	2013-01-15 00:17:30 UTC (rev 8210)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrSupervisorImplementation.java	2013-01-16 21:24:26 UTC (rev 8211)
@@ -24,6 +24,7 @@
 import org.fudaa.fudaa.commun.exec.FudaaExec;
 import org.fudaa.fudaa.commun.impl.FudaaLookPreferencesPanel;
 import org.fudaa.fudaa.commun.impl.FudaaStartupExitPreferencesPanel;
+import org.fudaa.fudaa.commun.trace2d.FudaaPerformancePreferencesPanel;
 import org.fudaa.fudaa.tr.common.TrApplicationManager;
 import org.fudaa.fudaa.tr.common.TrCommonImplementation;
 import org.fudaa.fudaa.tr.common.TrExplorer;
@@ -139,6 +140,7 @@
 
   @Override
   protected void buildPreferences(final List _prefs) {
+    _prefs.add(new FudaaPerformancePreferencesPanel(this));
     _prefs.add(new BuUserPreferencesPanel(this));
     _prefs.add(new BuBrowserPreferencesPanel(this));
     _prefs.add(new FudaaStartupExitPreferencesPanel(true));

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrCommonImplementation.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrCommonImplementation.java	2013-01-15 00:17:30 UTC (rev 8210)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrCommonImplementation.java	2013-01-16 21:24:26 UTC (rev 8211)
@@ -65,6 +65,7 @@
 import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
 import org.fudaa.fudaa.commun.impl.FudaaLookPreferencesPanel;
 import org.fudaa.fudaa.commun.impl.FudaaStartupExitPreferencesPanel;
+import org.fudaa.fudaa.commun.trace2d.FudaaPerformancePreferencesPanel;
 import org.fudaa.fudaa.fdico.FDicoPreferences;
 import org.fudaa.fudaa.sig.FSigLib;
 import org.fudaa.fudaa.sig.layer.FSigImageImportAction;
@@ -77,9 +78,7 @@
 public abstract class TrCommonImplementation extends FudaaCommonImplementation implements ItemListener {
 
   protected BArbreCalque arbre_;
-
   protected TrLauncher launcher_;
-
   BuTaskView taches_;
 
   public TrCommonImplementation() {
@@ -98,7 +97,9 @@
   }
 
   protected void addExportCurrentFrame(final BuMenu _m) {
-    if(_m==null) return;
+    if (_m == null) {
+      return;
+    }
     final BuMenu m = new BuMenu();
     m.setIcon(BuResource.BU.getIcon("bu_internalframe_corner_ocean"));
     m.setText(TrResource.getS("Fen\xEAtre active"));
@@ -138,8 +139,7 @@
   }
 
   /**
-   * Methode appelee une seule fois pour construire le menu d'export.
-   * Methods called once to build the export menu
+   * Methode appelee une seule fois pour construire le menu d'export. Methods called once to build the export menu
    */
   protected void buildExporterMenu() {
     addExportCurrentFrame((BuMenu) getMainMenuBar().getMenu(getExporterCmd()));
@@ -147,6 +147,7 @@
 
   @Override
   protected void buildPreferences(final List _prefs) {
+    _prefs.add(new FudaaPerformancePreferencesPanel(this));
     _prefs.add(new BuUserPreferencesPanel(this));
     _prefs.add(new BuBrowserPreferencesPanel(this));
     _prefs.add(new FudaaStartupExitPreferencesPanel(true));
@@ -171,7 +172,7 @@
     sp.setPreferredSize(new Dimension(150, 80));
     sp.setToolTipText(TrResource.getS("Les t\xE2ches en cours"));
     rc.addToggledComponent(BuResource.BU.getString("T\xE2ches"), "TOGGLE_TACHE", BuResource.BU.getToolIcon("tache"), sp,
-        true, this).setToolTipText(TrResource.getS("Cacher/Afficher les t\xE2ches"));
+            true, this).setToolTipText(TrResource.getS("Cacher/Afficher les t\xE2ches"));
     mp.setTaskView(taches_);
   }
 
@@ -210,8 +211,6 @@
     return null;
   }
 
- 
-
   protected abstract void ouvrir();
 
   protected void removeUnusedActions() {
@@ -220,7 +219,7 @@
       r.removeAll();
       r.addMenuItem(BuResource.BU.getString("D\xE9faire"), "DEFAIRE", false, KeyEvent.VK_Z);
       r.addMenuItem(BuResource.BU.getString("Refaire"), "REFAIRE", false).setAccelerator(
-          KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK));
+              KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK));
       // normalement Ctrl-Y
       // r.addSeparator();
       //
@@ -283,12 +282,14 @@
     pn.showHelp();
     if (EventQueue.isDispatchThread()) {
       showHelp(_s, _title, pn);
-    } else BuLib.invokeLater(new Runnable() {
-      @Override
-      public void run() {
-        showHelp(_s, _title, pn);
-      }
-    });
+    } else {
+      BuLib.invokeLater(new Runnable() {
+        @Override
+        public void run() {
+          showHelp(_s, _title, pn);
+        }
+      });
+    }
   }
 
   protected void showHelp(final String _s, final String _title, final FudaaHelpPanel _pn) {
@@ -301,13 +302,13 @@
     if ("SUPERVISEUR".equals(act)) {
       launcher_.openSupervisor();
     } /*
-       * else if ("CLEARSELECTION".equals(act)) { final JInternalFrame frame = getCurrentInternalFrame();
-       * 
-       * if (frame instanceof CtuluSelectionInterface) { ((CtuluSelectionInterface) frame).clearSelection(); } } else if
-       * ("INVERSESELECTION".equals(act)) { final JInternalFrame frame = getCurrentInternalFrame();
-       * 
-       * if (frame instanceof CtuluSelectionInterface) { ((CtuluSelectionInterface) frame).inverseSelection(); } }
-       */else if ("OUVRIR".equals(act)) {
+     * else if ("CLEARSELECTION".equals(act)) { final JInternalFrame frame = getCurrentInternalFrame();
+     * 
+     * if (frame instanceof CtuluSelectionInterface) { ((CtuluSelectionInterface) frame).clearSelection(); } } else if
+     * ("INVERSESELECTION".equals(act)) { final JInternalFrame frame = getCurrentInternalFrame();
+     * 
+     * if (frame instanceof CtuluSelectionInterface) { ((CtuluSelectionInterface) frame).inverseSelection(); } }
+     */ else if ("OUVRIR".equals(act)) {
       ouvrir();
     } else if ("AIDE".equals(act)) {
       // displayAide();
@@ -331,7 +332,7 @@
       }
     } else if ("LAUNCH_JAVAWS".equals(act)) {
       try {
-        FuLib.startProgram(new String[] { TrLib.getJavaws(), "-viewer" });
+        FuLib.startProgram(new String[]{TrLib.getJavaws(), "-viewer"});
       } catch (final IOException _ioEvt) {
         FuLog.error(_ioEvt);
 
@@ -354,14 +355,15 @@
 
   @Override
   public boolean confirmExit() {
-    if (FudaaStartupExitPreferencesPanel.isExitConfirmed()) { return question(BuResource.BU.getString("Quitter"),
-        BuResource.BU.getString("Voulez-vous vraiment quitter ce logiciel ?")); } //Do you really want to leave this software		
+    if (FudaaStartupExitPreferencesPanel.isExitConfirmed()) {
+      return question(BuResource.BU.getString("Quitter"),
+              BuResource.BU.getString("Voulez-vous vraiment quitter ce logiciel ?"));
+    } //Do you really want to leave this software		
     return true;
   }
 
   public ProgressionInterface createProgressionForMainPanel() {
     return new ProgressionInterface() {
-
       @Override
       public void reset() {
         unsetMainMessage();
@@ -397,7 +399,7 @@
     if (aide_ == null) {
       try {
         final URL url = new URL(getInformationsSoftware().http + "doc."
-            + (CtuluLib.isFrenchLanguageSelected() ? "fr" : "en") + ".html");
+                + (CtuluLib.isFrenchLanguageSelected() ? "fr" : "en") + ".html");
         aide_ = new FudaaHelpPanel(this, new URL(dir), url);
       } catch (final MalformedURLException _e) {
         error(BuResource.BU.getString("Aide"), _e.getMessage());
@@ -438,7 +440,8 @@
 
   public abstract String getSpecificName();
 
-  protected void buildImportMenu() {}
+  protected void buildImportMenu() {
+  }
 
   @Override
   protected boolean buildFudaaReportTool() {
@@ -458,13 +461,13 @@
     removeUnusedActions();
     final BuMenuBar b = getMainMenuBar();
     // on enleve le menu des look and feel : moche car tout n'est pas mis a jour
-	//we remove the look and feel from the menu : bad because all is not up to date 
+    //we remove the look and feel from the menu : bad because all is not up to date 
     final BuMenu mAide = (BuMenu) b.getMenu("MENU_AIDE");
 
     mAide.add(TrLib.buildAideContextItem(this), 0);
     TrLib.addJavawsForJnlp(mAide);
     mAide.addMenuItem(TrResource.getS("Soumettre une demande d'am\xE9lioration"), "SEND_COMMENT", BuResource.BU
-        .getIcon("envoyer"), true);
+            .getIcon("envoyer"), true);
     TrLib.addJava3DJMFTest(mAide);
 
     setEnabledForAction("QUITTER", true);
@@ -473,23 +476,23 @@
     setEnabledForAction("LAUNCH_JAVAWS", true);
     final BuMenu mFichier = (BuMenu) b.getMenu("MENU_FICHIER");
     mFichier.addMenuItem(TrResource.getS("Fermer toutes les applications"), "CLOSE_ALL", BuResource.BU
-        .getIcon("fermer"), true, 0);
+            .getIcon("fermer"), true, 0);
     final BuToolBar tb = getMainToolBar();
     if (!isSupervisor()) {
 
       tb.addToolButton(TrResource.getSupervisorName(), TrResource.getS("ouvrir le superviseur"), "SUPERVISEUR",
-          TrResource.getSupervisorIcon(), true).setVisible(true);
+              TrResource.getSupervisorIcon(), true).setVisible(true);
 
     }
     // les menus exporter et importer sont construit dynamiquement
-	// the exported and imported menus are dynamically built
+    // the exported and imported menus are dynamically built
     b.getMenu(getExporterCmd()).addItemListener(this);
     final BuMenu menu = (BuMenu) b.getMenu("IMPORTER");
     menu.addMenuItem(FSigImageImportAction.getCommonTitle(), "IMPORT_IMAGE", FSigImageImportAction.getCommonImage(),
-        this).setEnabled(false);
+            this).setEnabled(false);
     menu
-        .addMenuItem(FudaaLib.getS("Importer un projet"), "IMPORT_PROJECT", BuResource.BU.getMenuIcon("importer"), this)
-        .setEnabled(false);
+            .addMenuItem(FudaaLib.getS("Importer un projet"), "IMPORT_PROJECT", BuResource.BU.getMenuIcon("importer"), this)
+            .setEnabled(false);
     menu.addItemListener(this);
     setEnabledForAction(getExporterCmd(), true);
     menu.setEnabled(true);
@@ -504,10 +507,12 @@
   }
 
   @Override
-  public void installContextHelp(final JComponent _cp) {}
+  public void installContextHelp(final JComponent _cp) {
+  }
 
   @Override
-  public void installContextHelp(final JComponent _cp, final String _url) {}
+  public void installContextHelp(final JComponent _cp, final String _url) {
+  }
 
   @Override
   public void internalFrameDeactivated(final InternalFrameEvent _evt) {
@@ -529,7 +534,9 @@
   public void itemStateChanged(final ItemEvent _e) {
     if (_e.getStateChange() == ItemEvent.SELECTED) {
       final BuMenu menu = (BuMenu) _e.getSource();
-      if (menu.getMenuComponentCount() != 0) { return; }
+      if (menu.getMenuComponentCount() != 0) {
+        return;
+      }
       final String com = menu.getActionCommand();
       if ("IMPORTER".equals(com)) {
         buildImportMenu();

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java	2013-01-15 00:17:30 UTC (rev 8210)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java	2013-01-16 21:24:26 UTC (rev 8211)
@@ -814,16 +814,21 @@
   TrIsoModelEltDataAdapter eltAdapter_;
 
   private boolean isLineAllPaintedByNode(int minX, int maxX, int minY, int maxY, int[] x, int[] y, int nbPt) {
-    if (maxX - minX == 0 && maxY - minY < nbPt) {
-      boolean[] dots = new boolean[maxY - minY + 1];
+    final int deltaX = maxX - minX;
+    final int deltaY = maxY - minY;
+    if (deltaX <= 1 && deltaY <= 1) {
+      return true;
+    }
+    if (deltaX == 0 && deltaY < nbPt) {
+      boolean[] dots = new boolean[deltaY + 1];
       for (int i = 0; i < nbPt; i++) {
         dots[y[i] - minY] = true;
       }
       return isAllTrue(dots);
 
     }
-    if (maxX - minX < nbPt && maxY - minY == 0) {
-      boolean[] dots = new boolean[maxX - minX + 1];
+    if (deltaX < nbPt && deltaY == 0) {
+      boolean[] dots = new boolean[deltaX + 1];
       for (int i = 0; i < nbPt; i++) {
         dots[x[i] - minX] = true;
       }
@@ -859,11 +864,9 @@
     if (getIsoModelAbstract().getVariableSelected() == null) {
       return;
     }
-    boolean keepAntialias = false;
     MvIsoModelInterface modelToUse = getIsoModelAbstract();
     if (traceIsoLine_) {
       isos = new TraceIsoLignesAvecPlages(paletteCouleur_, alpha_, ligneModel_);
-      keepAntialias = true;
       if (isElement) {
         // TODO:a modifier null?
         if (eltAdapter_ == null) {
@@ -878,13 +881,14 @@
     } else if (!isElement) {
       isos = new TraceIsoSurfacesAvecPlages(paletteCouleur_, alpha_);
     }
+    isos.setRapide(isRapide());
+    isos.setClipEcran(_clipReel.applique(_versEcran));
+
     // pour les surfaces, on voudrait eviter d'utiliser l'anticrenelage
-    if (!keepAntialias && isAntialiasing()) {
-      final RenderingHints renderingHints = _g.getRenderingHints();
-      renderingHints.put(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
-      renderingHints.put(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
-      _g.setRenderingHints(renderingHints);
-    }
+    final RenderingHints renderingHints = _g.getRenderingHints();
+    renderingHints.put(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+    renderingHints.put(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
+    _g.setRenderingHints(renderingHints);
 
     final int n = modelToUse.getNbElt();
     int[] x = null;
@@ -892,6 +896,7 @@
     GrPoint pt = new GrPoint();
     int w = getWidth() + 1;
     CtuluListSelection memory = new CtuluListSelection(w * getHeight());
+    isos.setDimension(getWidth(), getHeight(), selection_);
     Envelope envReel = _clipReel.getEnv();
     for (idxElt = 0; idxElt < n; idxElt++) {
       if (!modelToUse.isPainted(idxElt)) {
@@ -910,7 +915,6 @@
       if (y == null || y.length < nbPt) {
         y = new int[nbPt];
       }
-      boolean isOnlyOnePoint = true;
       int maxX = -1;
       int minX = Integer.MAX_VALUE;
       int maxY = -1;
@@ -919,19 +923,19 @@
         pt.x_ = modelToUse.getX(idxElt, iPt);
         pt.y_ = modelToUse.getY(idxElt, iPt);
         pt.z_ = 0;
-        pt.autoApplique(_versEcran);
+        pt.autoApplique2D(_versEcran);
         final int xi = (int) pt.x_;
         final int yi = (int) pt.y_;
         x[iPt] = xi;
         y[iPt] = yi;
-        if (iPt > 0 && isOnlyOnePoint) {
-          isOnlyOnePoint = (xi == x[iPt - 1] && yi == y[iPt - 1]);
-        }
         maxX = Math.max(maxX, xi);
         maxY = Math.max(maxY, yi);
         minX = Math.min(minX, xi);
         minY = Math.min(minY, yi);
       }
+      final int deltaX = maxX - minX;
+      final int deltaY = maxY - minY;
+      boolean isOnlyOnePoint = deltaX == 0 && deltaY == 0;
       // Trace des isosurfaces / Isolignes (dans la couleur du fond si les isocouleurs sont
       // tracees).
       if (isElement && !traceIsoLine_) {
@@ -940,7 +944,7 @@
         final Color c = paletteCouleur_ == null ? null : ((BPalettePlage) paletteCouleur_).getColorFor(getIsoModelAbstract().getValue(
                 idxElt));
         if (c != null) {
-          _g.setColor(EbliLib.getAlphaColor(c, alpha_));
+          _g.setColor(rapide ? c : EbliLib.getAlphaColor(c, alpha_));
           _g.fillPolygon(p);
         }
 
@@ -952,7 +956,7 @@
             double value = modelToUse.getDatatFor(idxElt, 0);
             final Color c = paletteCouleur_ == null ? null : ((BPalettePlage) paletteCouleur_).getColorFor(value);
             if (c != null) {
-              _g.setColor(EbliLib.getAlphaColor(c, alpha_));
+              _g.setColor(rapide ? c : EbliLib.getAlphaColor(c, alpha_));
               _g.drawLine(x[0], y[0], x[0], y[0]);
             }
           }
@@ -962,8 +966,9 @@
             if (idxDone >= 0 && !memory.isSelected(idxDone)) {
               memory.add(idxDone);
               double value = modelToUse.getDatatFor(idxElt, iPt);
-              final Color c = EbliLib.getAlphaColor(paletteCouleur_ == null ? null : ((BPalettePlage) paletteCouleur_).getColorFor(
-                      value), alpha_);
+              final Color color = paletteCouleur_ == null ? null : ((BPalettePlage) paletteCouleur_).getColorFor(
+                      value);
+              final Color c = rapide ? color : EbliLib.getAlphaColor(color, alpha_);
               if (c != null) {
                 _g.setColor(c);
                 _g.drawLine(x[iPt], y[iPt], x[iPt], y[iPt]);
@@ -974,14 +979,17 @@
         } else {
           v_ = modelToUse.fillWithData(idxElt, v_);
           if (v_ != null) {
-            final Polygon p = new Polygon(x, y, nbPt);
-            isos.draw(_g, p, v_);
-            for (int iPoly = 0; iPoly < nbPt; iPoly++) {
-              final int memoryIndex = x[iPoly] + y[iPoly] * w;
-              if (memoryIndex >= 0) {
-                memory.add(memoryIndex);
-              }
+            if (rapide && deltaX <= 5 && deltaY <= 5) {
+              double moyenne = CtuluLibArray.getMoyenne(v_);
+              final Color c = paletteCouleur_ == null ? null : ((BPalettePlage) paletteCouleur_).getColorFor(
+                      moyenne);
+              _g.setColor(c);
+              _g.fillRect(minX, minY, deltaX + 1, deltaY + 1);
+            } else {
+              final Polygon p = new Polygon(x, y, nbPt);
+              isos.draw(_g, p, v_);
             }
+
           }
         }
       }

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:[8211] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fud (Page 2)

https://gitlab.com/fudaa

fudaa-svn-commit