import org.simantics.Simantics;
import org.simantics.db.ReadGraph;
+import org.simantics.db.RequestProcessor;
import org.simantics.db.Resource;
import org.simantics.db.exception.DatabaseException;
import org.simantics.db.request.Read;
private static Map<String,Instruction> cache = new HashMap<String, Instruction>();
- public static void preloadCache(String libUri) throws Exception {
- List<Item> items = P3DUtil.getEnds(libUri);
- items.addAll(P3DUtil.getInlines(libUri));
- items.addAll(P3DUtil.getNozzles(libUri));
- items.addAll(P3DUtil.getTurns(libUri));
+ public static void preloadCache(RequestProcessor session, String libUri) throws Exception {
+ List<Item> items = P3DUtil.getEnds(session, libUri);
+ items.addAll(P3DUtil.getInlines(session, libUri));
+ items.addAll(P3DUtil.getNozzles(session, libUri));
+ items.addAll(P3DUtil.getTurns(session, libUri));
for (Item item : items) {
- Instruction inst = createInstruction(item.getUri());
+ Instruction inst = createInstruction(session, item.getUri());
cache.put(item.getUri(), inst);
}
}
public static PipeControlPoint create(PipelineComponent component) throws Exception {
Instruction inst = cache.get(component.getType());
if (inst == null) {
- inst = createInstruction(component.getType());
+ inst = createInstruction(Simantics.getSession(), component.getType());
cache.put(component.getType(), inst);
}
if (inst == null) {
PipeControlPoint pcp = new PipeControlPoint(component);
pcp.setType(inst.type);
pcp.setFixed(inst.fixed);
+ pcp.setMod(inst.mod);
pcp.setRotate(inst.isRotate);
pcp.setReverse(inst.isReverse);
switch(inst.type) {
sub.parent = pcp;
sub.setType(inst.type);
sub.setFixed(inst.fixed);
+ sub.setMod(inst.mod);
sub.setSub(true);
sub.setDeletable(false);
if (inst.isOffset)
private static class Instruction {
PointType type;
boolean fixed;
+ boolean mod;
boolean isOffset;
boolean isSizeChange;
boolean isRotate;
}
- private static Instruction createInstruction(final String type) throws Exception {
- return Simantics.getSession().syncRequest(new Read<Instruction>() {
+ private static Instruction createInstruction(RequestProcessor session, final String type) throws Exception {
+ return session.syncRequest(new Read<Instruction>() {
@Override
public Instruction perform(ReadGraph graph) throws DatabaseException {
Resource res = graph.getResource(type);
i.isRotate = false;
i.isReverse = false;
i.type = PointType.INLINE;
+ i.mod = false;
if (graph.isInheritedFrom(res, p3d.Nozzle)) {
i.fixed = true;
i.isOffset = false;
i.fixed = false;
} else if (graph.hasStatement(res,p3d.FixedLengthInlineComponent)) {
i.fixed = true;
+ } else if (graph.hasStatement(res,p3d.AdjustableLengthInlineComponent)) {
+ i.fixed = true;
+ i.mod = true;
+ } else {
+ throw new DatabaseException("Inline component type " + res + " does not have length configuration.");
}
if (graph.hasStatement(res,p3d.SizeChangeComponent)) {
i.fixed = false;
} else if (graph.hasStatement(res,p3d.FixedAngleTurnComponent)) {
i.fixed = true;
+ } else {
+ throw new DatabaseException("Turn component type " + res + " does not have angle configuration.");
}
} else if (graph.isInheritedFrom(res, p3d.EndComponent)) {
i.fixed = false;