[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view PopupMenu.java, 1.22, 1.23

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19464/src/net/sourceforge/bprocessor/gl/view

Modified Files:
	PopupMenu.java 
Log Message:


Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** PopupMenu.java	21 Apr 2008 12:23:15 -0000	1.22
--- PopupMenu.java	13 Oct 2008 10:54:08 -0000	1.23
***************
*** 38,41 ****
--- 38,42 ----
  import net.sourceforge.bprocessor.model.Classification;
  import net.sourceforge.bprocessor.model.ClassificationType;
+ import net.sourceforge.bprocessor.model.ClippingPlane;
  import net.sourceforge.bprocessor.model.Command;
  import net.sourceforge.bprocessor.model.Component;
***************
*** 52,55 ****
--- 53,57 ----
  import net.sourceforge.bprocessor.model.Selection;
  import net.sourceforge.bprocessor.model.Space;
+ import net.sourceforge.bprocessor.model.SpaceAnalysis;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.SurfaceAnalysis;
***************
*** 111,114 ****
--- 113,128 ----
        
        { 
+         AbstractAction action = new EntityMenuAction(s, "Assign from Neighbours") {
+           public void actionPerformed(ActionEvent event) {
+             Surface surface = (Surface) entity;
+             SpaceAnalysis analysis = new SpaceAnalysis();
+             analysis.subsume(surface, 1);
+             analysis.subsume(surface, -1);
+           }
+         };
+         menu.add(action);
+       }
+       
+       { 
          AbstractAction action = new GeometricMenuAction(surfaces, "Smooth...") {
            public void actionPerformed(ActionEvent event) {
***************
*** 968,973 ****
--- 982,1009 ----
    }
    
+   
+   /**
+    * 
+    * @param planes collection of clippingplanes
+    * @return menu
+    */
+   public JPopupMenu getClippingPlaneMenu(Collection<ClippingPlane> planes) {
+     JPopupMenu menu = new JPopupMenu();
+     AbstractAction action = new GeometricMenuAction(planes, "Insert Section") {   
+       public void actionPerformed(ActionEvent arg0) {
+         for (Geometric geomeric : entities) {
+           ClippingPlane clip = (ClippingPlane) geomeric;
+           Container silhouette = clip.getSilhouette();
+           Project.getInstance().getActiveSpace().add(silhouette);
+         }
+       }
+     };
+     menu.add(action);
+     return menu;
+   }
+   
    /** {@inheritDoc} */
    public JPopupMenu menuFor(Collection<? extends Entity> geometrics) {
+    
      if (geometrics.isEmpty()) {
        return getBackgroundMenu();
***************
*** 981,985 ****
          } 
        }
!       if (type instanceof Container) {
          return getSpaceMenu(new LinkedList<Container>((Collection<Container>)geometrics));
        } else if (type instanceof Surface) {
--- 1017,1023 ----
          } 
        }
!       if (type instanceof ClippingPlane) {
!         return getClippingPlaneMenu(new LinkedList(geometrics));
!       } else if (type instanceof Container) {
          return getSpaceMenu(new LinkedList<Container>((Collection<Container>)geometrics));
        } else if (type instanceof Surface) {
***************
*** 1002,1005 ****
--- 1040,1044 ----
    /** {@inheritDoc} */
    public JPopupMenu menuFor(Entity entity) {
+     System.out.println("get menu for " + entity);
      Collection<Entity> c = new LinkedList<Entity>();
      c.add(entity);