|
@@ -91,37 +91,36 @@ public class Diagram {
|
|
|
/**
|
|
|
* 节点列表,运行时&显示态数据结构
|
|
|
*/
|
|
|
- @Expose //TODO 删掉
|
|
|
private List<DiagramNode> nodes = new ArrayList<>();
|
|
|
|
|
|
public void init(){
|
|
|
if (template != null) {
|
|
|
template.init();
|
|
|
|
|
|
-// List<Container> containers = template.getContainers();
|
|
|
-// for(Container con : containers) {
|
|
|
-// if(con.isEquipmentBox()) {
|
|
|
-// for(IComponent comp : con.getChildren()) {
|
|
|
-// if(comp instanceof DiagramNode){
|
|
|
-// nodes.add((DiagramNode) comp);
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
- }
|
|
|
-
|
|
|
- nodes.sort(new Comparator<DiagramNode>() {
|
|
|
- @Override
|
|
|
- public int compare(DiagramNode o1, DiagramNode o2) {
|
|
|
- return o1.getLayoutIndex() - o2.getLayoutIndex();
|
|
|
- }
|
|
|
- });
|
|
|
- for (DiagramNode node : nodes) {
|
|
|
- Container con = template.getContainerById(node.getContainerId());
|
|
|
- if (con != null) {
|
|
|
- con.addComp(node);
|
|
|
+ List<Container> containers = template.getContainers();
|
|
|
+ for(Container con : containers) {
|
|
|
+ if(con.isEquipmentBox()) {
|
|
|
+ for(IComponent comp : con.getChildren()) {
|
|
|
+ if(comp instanceof DiagramNode){
|
|
|
+ nodes.add((DiagramNode) comp);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+// nodes.sort(new Comparator<DiagramNode>() {
|
|
|
+// @Override
|
|
|
+// public int compare(DiagramNode o1, DiagramNode o2) {
|
|
|
+// return o1.getLayoutIndex() - o2.getLayoutIndex();
|
|
|
+// }
|
|
|
+// });
|
|
|
+// for (DiagramNode node : nodes) {
|
|
|
+// Container con = template.getContainerById(node.getContainerId());
|
|
|
+// if (con != null) {
|
|
|
+// con.addComp(node);
|
|
|
+// }
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
public void layout(CalcContext context){
|