X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Factions%2FAddComponentAction.java;h=a39d84c8ebd31d7706d2848472c38464ce3293a6;hb=53d55c24c779745f188bdb18d32f71d20acb61b2;hp=5187025fc58c88fc42fa91e81812c38537d023e3;hpb=88a7de6c4dd0a7c601bfffe701e68589ff169ba2;p=simantics%2F3d.git diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java b/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java index 5187025f..a39d84c8 100644 --- a/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java +++ b/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java @@ -17,6 +17,7 @@ import org.simantics.plant3d.Activator; import org.simantics.plant3d.dialog.ComponentSelectionDialog; import org.simantics.plant3d.gizmo.TerminalSelectionGizmo; import org.simantics.plant3d.scenegraph.InlineComponent; +import org.simantics.plant3d.scenegraph.Nozzle; import org.simantics.plant3d.scenegraph.P3DRootNode; import org.simantics.plant3d.scenegraph.PipeRun; import org.simantics.plant3d.scenegraph.PipelineComponent; @@ -26,6 +27,7 @@ import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint.PositionTy import org.simantics.plant3d.scenegraph.controlpoint.PipingRules; import org.simantics.plant3d.utils.ComponentUtils; import org.simantics.plant3d.utils.Item; +import org.simantics.plant3d.utils.ComponentUtils.InsertInstruction; import org.simantics.plant3d.utils.Item.Type; import org.simantics.utils.threads.ThreadUtils; import org.simantics.utils.ui.ExceptionUtils; @@ -44,6 +46,9 @@ public class AddComponentAction extends vtkSwtAction { private Set allowed = new HashSet(); private Item toAdd = null; + private PositionType insertPosition; + private boolean insertAdjustable; + private boolean lengthAdjustable; public AddComponentAction(InteractiveVtkComposite panel, P3DRootNode root) { super(panel); @@ -58,14 +63,20 @@ public class AddComponentAction extends vtkSwtAction { this.component = component; allowed.clear(); - if (component.getNext() == null) { - allowed.add(PositionType.NEXT); - } - if (component.getPrevious() == null) { - allowed.add(PositionType.PREVIOUS); - } - if (component instanceof InlineComponent && !component.getControlPoint().isFixed()){ - allowed.add(PositionType.SPLIT); + if (component instanceof Nozzle) { + if (component.getNext() == null && component.getPrevious() == null) { + allowed.add(PositionType.NEXT); + } + } else { + if (component.getNext() == null) { + allowed.add(PositionType.NEXT); + } + if (component.getPrevious() == null) { + allowed.add(PositionType.PREVIOUS); + } + if (component instanceof InlineComponent && !component.getControlPoint().isFixed()){ + allowed.add(PositionType.SPLIT); + } } setEnabled(allowed.size() > 0); } @@ -77,12 +88,16 @@ public class AddComponentAction extends vtkSwtAction { @Override public void run() { - ComponentSelectionDialog dialog = new ComponentSelectionDialog(Display.getCurrent().getActiveShell(), allowed); + + ComponentSelectionDialog dialog = new ComponentSelectionDialog(Display.getCurrent().getActiveShell(), allowed, component); if (dialog.open() == ComponentSelectionDialog.CANCEL) return; toAdd = dialog.getSelected(); if (toAdd == null) return; + this.insertPosition = dialog.getInsertPosition(); + this.insertAdjustable = dialog.isInsertAdjustable(); + this.lengthAdjustable = dialog.isLenghtAdjustable(); this.length = dialog.getLength(); this.angle = dialog.getAngle(); this.diameter = dialog.getDiameter(); @@ -117,7 +132,7 @@ public class AddComponentAction extends vtkSwtAction { public void deattach() { // deactivate(); component = null; - nodeMap.commit(); + nodeMap.commit("Add component"); deattachUI(); super.deattach(); panel.refresh(); @@ -155,102 +170,174 @@ public class AddComponentAction extends vtkSwtAction { public void doInsert(PositionType position) { try { - PipelineComponent newComponent = ComponentUtils.createComponent(root,toAdd.getUri()); - PipeControlPoint newPcp = newComponent.getControlPoint(); - - PipeControlPoint toPcp = component.getControlPoint(); - - - switch (position) { - case NEXT: - if (toPcp.isDualInline()) - toPcp = toPcp.getSubPoint().get(0); - - break; - case PREVIOUS: - if (toPcp.isDualSub()) - toPcp = toPcp.parent; - } - - Vector3d start = new Vector3d(); - Vector3d end = new Vector3d(); - Vector3d dir = new Vector3d(); - toPcp.getInlineControlPointEnds(start, end, dir); - dir.normalize(); - - PipeRun pipeRun = toPcp.getPipeRun(); - - if (!toAdd.isSizeChange()) { - String name = component.getPipeRun().getUniqueName(toAdd.getName()); - newComponent.setName(name); - - pipeRun.addChild(newComponent); - if (toAdd.isVariable()) { - // TODO: these options are not stored into DB. Should they?! - if (toAdd.getType() == Type.INLINE) { - newPcp.setLength(length); -// newPcp.setFixed(true); - } else if (toAdd.getType() == Type.TURN) { - newPcp.setTurnAngle(angle); -// newPcp.setFixed(true); - } - } - newComponent.updateParameters(); - - dir.scale(newComponent.getControlPoint().getLength()*0.5); - start.sub(dir); - end.add(dir); - switch (position) { - case NEXT: - if (toPcp.isDualInline()) - toPcp = toPcp.getSubPoint().get(0); - newPcp.insert(toPcp, Direction.NEXT); - newPcp.setWorldPosition(end); - break; - case PREVIOUS: - if (toPcp.isDualSub()) - toPcp = toPcp.parent; - newPcp.insert(toPcp, Direction.PREVIOUS); - newPcp.setWorldPosition(start); - break; - case SPLIT: - PipingRules.splitVariableLengthComponent(newComponent, (InlineComponent)component, true); - } - } else { - - - PipeRun other = new PipeRun(); - String n = root.getUniqueName("PipeRun"); - other.setName(n); - other.setPipeDiameter(diameter); - other.setTurnRadius(turnRadius); - root.addChild(other); - - - - if (position == PositionType.NEXT) { - PipingRules.addSizeChange(false, pipeRun, other, (InlineComponent)newComponent, toPcp, null); - newPcp.setWorldPosition(end); - } else if (position == PositionType.PREVIOUS){ - PipingRules.addSizeChange(true, pipeRun, other, (InlineComponent)newComponent, toPcp, null); - newPcp.setWorldPosition(start); - } - // TODO : chicken-egg problem - newComponent.updateParameters(); - dir.scale(newComponent.getControlPoint().getLength()*0.5); - start.sub(dir); - end.add(dir); - if (position == PositionType.NEXT) { - newPcp.setWorldPosition(end); - } else if (position == PositionType.PREVIOUS){ - newPcp.setWorldPosition(start); - } - } - - + InsertInstruction inst = new InsertInstruction(); + inst.typeUri = toAdd.getUri(); + inst.angle = angle; + inst.diameter = diameter; + inst.length = length; + inst.turnRadius = turnRadius; + inst.insertPosition = insertPosition; + inst.position = position; + ComponentUtils.addComponent(root, component, inst); } catch (Exception e) { ExceptionUtils.logAndShowError("Cannot add component", e); } +// try { +// PipelineComponent newComponent = ComponentUtils.createComponent(root,toAdd.getUri()); +// PipeControlPoint newPcp = newComponent.getControlPoint(); +// +// PipeControlPoint toPcp = component.getControlPoint(); +// PipeRun pipeRun = toPcp.getPipeRun(); +// +// Vector3d dir = null; +// Vector3d pos = null; +// +// +// if (toPcp.isInline()) { +// switch (position) { +// case NEXT: +// if (toPcp.isDualInline()) +// toPcp = toPcp.getSubPoint().get(0); +// +// break; +// case PREVIOUS: +// if (toPcp.isDualSub()) +// toPcp = toPcp.parent; +// } +// Vector3d start = new Vector3d(); +// Vector3d end = new Vector3d(); +// dir = new Vector3d(); +// toPcp.getInlineControlPointEnds(start, end, dir); +// dir.normalize(); +// switch (position) { +// case NEXT: +// pos = new Vector3d(end); +// break; +// case PREVIOUS: +// pos = new Vector3d(start); +// break; +// case SPLIT: +// pos = new Vector3d(toPcp.getWorldPosition()); +// break; +// } +// +// } else if (toPcp.isDirected()) { +// dir = new Vector3d(toPcp.getDirection(Direction.NEXT)); +// pos = new Vector3d(toPcp.getWorldPosition()); +// } else if (toPcp.isTurn() && toPcp.isFixed()) { +// dir = new Vector3d(toPcp.getDirection(position == PositionType.NEXT ? Direction.NEXT : Direction.PREVIOUS)); +// pos = new Vector3d(toPcp.getWorldPosition()); +// if (!lengthAdjustable) { +// Vector3d v = new Vector3d(dir); +// v.scale(toPcp.getInlineLength()); +// pos.add(v); +// } else { +// if (insertPosition == PositionType.NEXT) { +// Vector3d v = new Vector3d(dir); +// v.scale(toPcp.getInlineLength()); +// pos.add(v); +// } else if (insertPosition == PositionType.SPLIT) { +// // scale 0.5*length so that we don't remove the length twice from the new component +// Vector3d v = new Vector3d(dir); +// v.scale(toPcp.getInlineLength()*0.5); +// pos.add(v); +// } +// } +// } +// +// +// if (!toAdd.isSizeChange()) { +// String name = component.getPipeRun().getUniqueName(toAdd.getName()); +// newComponent.setName(name); +// +// pipeRun.addChild(newComponent); +// if (toAdd.isVariable()) { +// // TODO: these options are not stored into DB. Should they?! +// if (toAdd.getType() == Type.INLINE) { +// newPcp.setLength(length); +//// newPcp.setFixed(true); +// } else if (toAdd.getType() == Type.TURN) { +// newPcp.setTurnAngle(angle); +//// newPcp.setFixed(true); +// } +// } +// newComponent.updateParameters(); +// +// Vector3d v = new Vector3d(dir); +// if (insertAdjustable) { +// if (insertPosition == PositionType.NEXT) +// v.scale(newComponent.getControlPoint().getInlineLength()); +// else if (insertPosition == PositionType.SPLIT) +// v.set(0, 0, 0); +// else if (insertPosition == PositionType.PREVIOUS) +// v.scale(-newComponent.getControlPoint().getInlineLength()); +// } else { +// v.scale(newComponent.getControlPoint().getInlineLength()); +// } +// switch (position) { +// case NEXT: +// pos.add(v); +// break; +// case PREVIOUS: +// pos.sub(v); +// break; +// case SPLIT: +// break; +// } +// +// switch (position) { +// case NEXT: +// if (toPcp.isDualInline()) +// toPcp = toPcp.getSubPoint().get(0); +// newPcp.insert(toPcp, Direction.NEXT); +// newPcp.setWorldPosition(pos); +// break; +// case PREVIOUS: +// if (toPcp.isDualSub()) +// toPcp = toPcp.parent; +// newPcp.insert(toPcp, Direction.PREVIOUS); +// newPcp.setWorldPosition(pos); +// break; +// case SPLIT: +// PipingRules.splitVariableLengthComponent(newComponent, (InlineComponent)component, true); +// } +// } else { +// PipeRun other = new PipeRun(); +// String n = root.getUniqueName("PipeRun"); +// other.setName(n); +// other.setPipeDiameter(diameter); +// other.setTurnRadius(turnRadius); +// root.addChild(other); +// +// +// if (position == PositionType.NEXT) { +// PipingRules.addSizeChange(false, pipeRun, other, (InlineComponent)newComponent, toPcp, null); +// } else if (position == PositionType.PREVIOUS){ +// PipingRules.addSizeChange(true, pipeRun, other, (InlineComponent)newComponent, toPcp, null); +// } +// newPcp.setWorldPosition(pos); +// // TODO : chicken-egg problem +// newComponent.updateParameters(); +// Vector3d v = new Vector3d(dir); +// v.scale(newComponent.getControlPoint().getLength()*0.5); +// switch (position) { +// case NEXT: +// pos.add(v); +// break; +// case PREVIOUS: +// pos.sub(v); +// break; +// case SPLIT: +// break; +// } +// newPcp.setWorldPosition(pos); +// +// } +// +// +// } catch (Exception e) { +// ExceptionUtils.logAndShowError("Cannot add component", e); +// } } public boolean mouseClicked(MouseEvent e) { @@ -273,6 +360,6 @@ public class AddComponentAction extends vtkSwtAction { @Override public boolean mouseWheelMoved(MouseWheelEvent e) { - return getDefaultAction().mouseWheelMoved(e); + return getDefaultAction().mouseWheelMoved(e); } }