[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui PopupMenu.java, 1.30, 1.31

[Nordholt <nor...@us...>]

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27681/src/net/sourceforge/bprocessor/gui

Modified Files:
	PopupMenu.java 
Log Message:
added simplify geometry and merge surfaces to the popup menu

Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** PopupMenu.java	14 Apr 2007 15:00:42 -0000	1.30
--- PopupMenu.java	15 Apr 2007 11:08:37 -0000	1.31
***************
*** 14,17 ****
--- 14,18 ----
  import java.util.LinkedList;
  import java.util.Map;
+ import java.util.Set;
  
  import javax.swing.AbstractAction;
***************
*** 100,103 ****
--- 101,121 ----
        jm.add(relate);
      }
+     
+     JMenuItem mergeItem = new JMenuItem("Merge Surfaces");
+     mergeItem.addActionListener(new CollectionMenuAction(c, "Merge Surfaces") {
+       public void actionPerformed(ActionEvent event) {
+         Set<Surface> surfaces = new HashSet<Surface>();
+         Iterator it = col.iterator();
+         while (it.hasNext()) {
+           Object o = it.next();
+           if (o instanceof Surface) {
+             surfaces.add((Surface)o);
+           }
+         }
+         Geometry.mergeAllPossibleSurfaces(surfaces);
+       }
+     }
+     );
+     jm.add(mergeItem);
      return jm;
    }
***************
*** 361,364 ****
--- 379,389 ----
      menu.add(allConnected);
      
+     AbstractAction simplify = new EntitiesMenuAction(entities, "Simplify Geometry") {
+       public void actionPerformed(ActionEvent arg0) {
+         Geometry.simplifyGeometry(entities);
+       }
+     };
+     menu.add(simplify);
+     
      AbstractAction makeUnion = new EntitiesMenuAction(entities, "Make Union") {
        public void actionPerformed(ActionEvent e) {