[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool ExtrusionTool.java,1.11,1.12
Status: Pre-Alpha
Brought to you by:
henryml
From: Nordholt <nor...@us...> - 2005-09-20 12:24:17
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6222 Modified Files: ExtrusionTool.java Log Message: Now sets the back domain of the extruded surfaces Index: ExtrusionTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrusionTool.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ExtrusionTool.java 16 Sep 2005 13:01:04 -0000 1.11 --- ExtrusionTool.java 20 Sep 2005 12:23:59 -0000 1.12 *************** *** 20,24 **** import net.sourceforge.bprocessor.model.ConstructionSpaceFacade; import net.sourceforge.bprocessor.model.FunctionalSpace; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Plane; --- 20,24 ---- import net.sourceforge.bprocessor.model.ConstructionSpaceFacade; import net.sourceforge.bprocessor.model.FunctionalSpace; ! import net.sourceforge.bprocessor.model.Domain; import net.sourceforge.bprocessor.model.Plane; *************** *** 72,76 **** dragSurface = selectedSurface; } else { - log.info("IS NOT EXTRUDABLE!!!"); dragSurface = createExtension(selectedSurface); } --- 72,75 ---- *************** *** 192,196 **** private Surface extendSurface(Surface extendSurf) { ConstructionSpace newCSpace = new ConstructionSpace("innerSpace"); ! Space outer = extendSurf.getFrontSpace(); Edge previousEdge = null; Vertex previousVertex = null; --- 191,196 ---- private Surface extendSurface(Surface extendSurf) { ConstructionSpace newCSpace = new ConstructionSpace("innerSpace"); ! newCSpace = ConstructionSpaceFacade.getInstance().create(newCSpace); ! Domain outer = extendSurf.getFrontDomain(); Edge previousEdge = null; Vertex previousVertex = null; *************** *** 200,203 **** --- 200,204 ---- List top = new ArrayList(edges.size()); newCSpace.addSurface(extendSurf); + extendSurf.setBackDomain(newCSpace); Iterator i = edges.iterator(); Edge current = null; *************** *** 255,260 **** --- 256,263 ---- Surface sur = createSurface(newEdges); newCSpace.addSurface(sur); + sur.setBackDomain(newCSpace); if (outer != null) { outer.addSurface(sur); + sur.setBackDomain(outer); } newEdges = new ArrayList(); *************** *** 273,282 **** } } ! ConstructionSpaceFacade.getInstance().create(newCSpace); Surface topSurf = createSurface(top); if (outer != null) { outer.addSurface(topSurf); } newCSpace.addSurface(topSurf); Notification n = new Notification(Notification.SURFACE_SELECTED, topSurf.getId()); Notifier.getInstance().sendNotification(n); --- 276,289 ---- } } ! //moving this line to the top ! //ConstructionSpaceFacade.getInstance().create(newCSpace); ! ConstructionSpaceFacade.getInstance().update(newCSpace); Surface topSurf = createSurface(top); if (outer != null) { outer.addSurface(topSurf); + topSurf.setBackDomain(outer); } newCSpace.addSurface(topSurf); + topSurf.setBackDomain(newCSpace); Notification n = new Notification(Notification.SURFACE_SELECTED, topSurf.getId()); Notifier.getInstance().sendNotification(n); |