From e5c54242bc9574af58729d9486637738bacc22de Mon Sep 17 00:00:00 2001 From: bancika Date: Tue, 30 Apr 2013 14:12:42 +0000 Subject: [PATCH] Select all within a layer --- .../diylc-core/library/main.jar | Bin 282366 -> 282363 bytes .../org/diylc/common/ISelectionProcessor.java | 5 ++++- .../src/org/diylc/presenter/Presenter.java | 16 ++++++++++++++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar index 270329fb9a418f01a7fdaebc04c5822401250aaf..ad37f99abb27532fee3206ab93a4fb997669bcd9 100644 GIT binary patch delta 5770 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 delta 5793 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 0, designates which layer to select. If <= 0 we + * should select all regardless of layer */ - void selectAll(); + void selectAll(int layer); /** * Rotates selection for 90 degrees. diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java index 8a494d18..28811558 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java @@ -616,7 +616,7 @@ public class Presenter implements IPlugInPort { return false; } LOG.debug(String.format("keyPressed(%s, %s, %s, %s)", key, ctrlDown, - shiftDown, altDown)); + shiftDown, altDown)); Map, Set> controlPointMap = new HashMap, Set>(); // If there aren't any control points, try to add all the selected // components with all their control points. That will allow the @@ -818,11 +818,23 @@ public class Presenter implements IPlugInPort { } @Override - public void selectAll() { + public void selectAll(int layer) { LOG.info("selectAll()"); List> newSelection = new ArrayList>( currentProject.getComponents()); newSelection.removeAll(getLockedComponents()); + if (layer > 0) { + Iterator> i = newSelection.iterator(); + while (i.hasNext()) { + IDIYComponent c = i.next(); + ComponentType type = ComponentProcessor.getInstance() + .extractComponentTypeFrom( + (Class>) c + .getClass()); + if ((int) type.getZOrder() != layer) + i.remove(); + } + } updateSelection(newSelection); // messageDispatcher.dispatchMessage(EventType.SELECTION_CHANGED, // selectedComponents);