From 099ff61240307bc9aa2d374a65971bd10f6699bd Mon Sep 17 00:00:00 2001 From: schirmerc Date: Tue, 8 Dec 2015 20:12:14 -0500 Subject: [PATCH] Created back-end functionality for printing selected plan views; removed debugging system console outs --- .../swing/HomePrintableComponent$1.class | Bin 2279 -> 2279 bytes .../swing/HomePrintableComponent.class | Bin 15756 -> 15766 bytes .../sweethome3d/swing/PageSetupPanel.class | Bin 17336 -> 17125 bytes .../swing/HomePrintableComponent.java | 44 ++++++++++++++++-- .../sweethome3d/swing/PageSetupPanel.java | 7 +-- 5 files changed, 41 insertions(+), 10 deletions(-) diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/swing/HomePrintableComponent$1.class b/SweetHome3D/classes/com/eteks/sweethome3d/swing/HomePrintableComponent$1.class index 1d19d71fb3124ab2d612569310457ab5e63779eb..a1afd16d6c7dd9e77c8aa9802679da7a9fdb439b 100644 GIT binary patch delta 55 zcmaDZ_*`&92RmcLL0z)=qB0~*h J{Nz-QCIF0c4DJ8` diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/swing/HomePrintableComponent.class b/SweetHome3D/classes/com/eteks/sweethome3d/swing/HomePrintableComponent.class index 3a03c24dbc5da168271e7af7b4f03c41f4590b13..6fedcdf781d7c2bba83cdda959eed0f61233f92f 100644 GIT binary patch delta 4002 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 diff --git a/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel.class b/SweetHome3D/classes/com/eteks/sweethome3d/swing/PageSetupPanel.class index 390b45bebe73aa45f72ebd9508e1794e23317b56..807ebede5fd21643fe6dffc7021d6840c77cefff 100644 GIT binary patch delta 917 zcmZXRTTE0}6o%LTpTl9e4Iqda3OWWgGNS>TMvbYAf|A%Y)o5cwVx-dqErg&!Q4$|` zP@{=Wnr6Q=rcJ%zW$;3Al#8QOD{4Eah+{OhRbRY|N>ghgUYGZW<~;o0+WX&Yt+Q79 zI$U3iwCJ;gogy-Uv3McG_ubJf)9=r0nKFE=-^E5q(wypGjdy-!#mZ$v?SsjTn8m&=I2um$AAx-q;(uM-F_Em)@Zh+wQxj4oQ(Pj}OjGr7xodnx z9+qWrt4W^f$2K#0Y9Dr((M7!pAzy?|Wo_JTo)>u$GTuO5Zpi1`FV7c;jRPsK9M1n8n*w>7sVgwb9cs}5QA$LxP`)sa0tF3GsX@1_M^rZ8 zlx)Ol39Gi^jC7z!V(67iI46%(2N9De=z)U^NWewp;Scz538kvD@Fzaiv-!A!1-Obj z)q32(I^4v!xP{Hijkt|HxPt?@i<8Px^dZ)Odz#|DVjmvpH-LT${-z5Ln1p|riHFR= zzZ|bzi2pbd11!QIXDiReV=lxKF2YmRE3d+HuAy)P!5@@=BDs?mf2PfL

>iF`nIY z@h|18Okl$;CbFMN9MIq~Q!JZqD~YLAj`9emS!0=Q6>^9*U3msGWQI;~?(0p;OexjK zZB61HJ%Qw^doP=H!s9HDmTeYG%6Wq=+$Xkl@EbI$FHT~TkKHmv9OSv*qJUxUH__=M zCLP!)>ALZcPDtWQX=TT|wMn)(xAk-BmB-AA;t5t4kDI3ALhA%in#&sh#@|hPN#W?I k`l-`9rCO!c{W#Cl(>(GS_VJABHTJOAEGn68otx%)0W7}sX#fBK delta 1090 zcmZvae@xVM7{{OY`@`LF2V5YcgZu%rA8xi z#oWra+V_tZf7JX@WLe3N4uMkAB7_t%kR*SU)rut3WZJ4h&)t^&(?6g0>-+rpJkR%e zK0h|$&`u-|Om`m^k$isZ5JEiGZjYz6U_o}+$$fm=!M7mETYOLZ@&dlvO?j0&>O=mT zM7Ho9h^cD`LDC+IxvT5)RtKwVLzSVR-&a!@&vzk75BLLty4=jhx?teRdtE%h4;*|S zlKMXxiTqHiAdYR(O9Hj=RcwVMtk$ZTk5>B|>kH!94oRtK2-a4I8iM}JHNK4jf7JXD z#C0pKz$M^r2MdY;Y>5{!&svj(8_L_bHT72U39ON<9&{8Nk*itlhoT6JfXauL)@m9?TcFWfJiaa@`( zD6gnCG04Z|{p({N)1X&6Pm>QbD+GPRZBELLJ1>v0Z#oX2yj zFW>@ps_j*Lhu3fk2UXiKfur~Z1Guaa6S#;;{2a!wxQZ(zCTYWObmJ=1aE*5>d+jmXzoN>JwM&9kK7$LM21&y4!gY z$N7?^n#u)|!G)5=EbHOYxy8phAV`kqAivbsyxQnp+89;s9&aa4{CAUG{UXoDeog(F zGsIKY-qL(C%+uCb>0 planLevels = homePrint.getPlanViewList(); PlanView planToPrint; + + + int numPlansPrinted = page-this.furniturePageCount; + if(numPlansPrinted < planLevels.size() && pageExists == NO_SUCH_PAGE) + { + int count = 0; + for(int i = 0; i= 0; i++) + { + if(planLevels.get(i) && (count == numPlansPrinted)) + { + home.setSelectedLevel(home.getLevels().get(i)); + planToPrint = this.controller.getPlanController().getView(); + // Try to print next plan view page + pageExists = ((Printable)planToPrint).print(g2D, pageFormat, 0);//page - this.furniturePageCount); + if (pageExists == PAGE_EXISTS && !this.printablePages.contains(page)) + { + this.printablePages.add(page); + this.planPageCount++; + //System.out.print("printed a page: "); + //System.out.print(page); + //System.out.print(" with i: "); + //System.out.println(i); + } + + count = -1; + } + else if(planLevels.get(i)) + { + count++; + } + } + } // Loop through levels to be printed - for (int i = 0; i < planLevels.size(); i++) { + /*for (int i = 0; i < planLevels.size(); i++) { if (planLevels.get(i)) { home.setSelectedLevel(home.getLevels().get(i)); planToPrint = this.controller.getPlanController().getView(); - if (pageExists == NO_SUCH_PAGE ) { + if (pageExists == NO_SUCH_PAGE) { // Try to print next plan view page - pageExists = ((Printable)planToPrint).print(g2D, pageFormat, page - this.furniturePageCount); + pageExists = ((Printable)planToPrint).print(g2D, pageFormat, 0);//page - this.furniturePageCount); if (pageExists == PAGE_EXISTS && !this.printablePages.contains(page)) { this.printablePages.add(page); @@ -387,7 +421,7 @@ public class HomePrintableComponent extends JComponent implements Printable { } } } - } + }*/ home.setSelectedLevel(tempLevel); @@ -402,7 +436,7 @@ public class HomePrintableComponent extends JComponent implements Printable { this.printablePages.add(page); } } - System.out.println("Test here"); + //System.out.println("Test here"); view3D = this.controller.getHomeController3D().getView(); if (pageExists == NO_SUCH_PAGE && view3D != null diff --git a/SweetHome3D/src/com/eteks/sweethome3d/swing/PageSetupPanel.java b/SweetHome3D/src/com/eteks/sweethome3d/swing/PageSetupPanel.java index 221d676..46d007d 100644 --- a/SweetHome3D/src/com/eteks/sweethome3d/swing/PageSetupPanel.java +++ b/SweetHome3D/src/com/eteks/sweethome3d/swing/PageSetupPanel.java @@ -453,11 +453,8 @@ public class PageSetupPanel extends JPanel implements DialogView { GridBagConstraints.NONE, new Insets(0, 0, 10, 0) , 0, 0)); Insets lastComponentInsets = new Insets(0, 0, 5, 0); - System.out.println("Hello, world."); - for(Level curLvl : controller.getHomeLevels()) - { - System.out.println(curLvl.getName()); - } + + checkListPanel.add(new JLabel("Plan Views:"), new GridBagConstraints( 0,0,2,1,0,0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(0,0,0,20),0,0)); checkListPanel.add(new JLabel("Furniture Tables:"), new GridBagConstraints(