Close #41

Author: Open Lowcode SAS

src/org/openlowcode/tools/pdf/PDFMultiPageTable.java

@@ -78,6 +78,7 @@ public String getText() {
 	private float[] columnrelativewidth;
 	private String[] headertexts;
 	private ArrayList<CellText[]> cellscontent;
+	private ArrayList<Boolean> linehasbarabove;
 	protected float[] columnwidthinmm;
 	private int columnnumber;
 	private int indexlastlineprinted;
@@ -164,6 +165,7 @@ private void constructorcontent(float leftmargin, float rightmargin, float[] col
 				throw new RuntimeException("Column Relative Width should be strictly positive");
 		this.columnnumber = columnrelativewidth.length;
 		this.cellscontent = new ArrayList<CellText[]>();
+		this.linehasbarabove = new ArrayList<Boolean>();
 		this.indexlastlineprinted = -1;
 
 	}
@@ -207,16 +209,26 @@ public void addOneLineContent(String[] linecontent) {
 		}
 		this.cellscontent.add(celltexts);
 	}
-
+	
 	/**
 	 * Creates a new line without content. Content can then be added by
-	 * setCellContent
-	 */
-	public void addBlankLine() {
+	 * setCellContent. The new line is created with or without a
+	 * bar above
+	 */	
+	public void addBlankLine(boolean drawlineabove) {
 		CellText[] blankline = new CellText[columnnumber];
 		for (int i = 0; i < blankline.length; i++)
 			blankline[i] = new CellText("");
 		this.cellscontent.add(blankline);
+		this.linehasbarabove.add(new Boolean(drawlineabove));
+	}
+	
+	/**
+	 * Creates a new line without content. Content can then be added by
+	 * setCellContent. The new line is created with a bar above
+	 */
+	public void addBlankLine() {
+		addBlankLine(true);
 	}
 
 	/**
@@ -344,8 +356,12 @@ private float printOneRow(PDFPage currentpage, int rowindex, float mmfromtopfors
 		float currentleft = leftinmm;
 		for (int i = 0; i < columnwidthinmm.length; i++) {
 			float currentcolumnwidth = columnwidthinmm[i];
+			boolean drawtop=this.linehasbarabove.get(rowindex).booleanValue();
+			boolean drawbottom=true;
+			if (rowindex+1<this.linehasbarabove.size()) drawbottom = this.linehasbarabove.get(rowindex+1).booleanValue();
+			
 			currentpage.drawBoxWithWidthAndHeight(false, currentleft, mmfromtopforsection, currentcolumnwidth,
-					rowheight);
+					rowheight,drawtop,drawbottom,true,true);
 			printOneCell(currentpage, rowindex, i, mmfromtopforsection, currentleft, currentcolumnwidth);
 			currentleft += currentcolumnwidth;
 

src/org/openlowcode/tools/pdf/PDFPage.java

@@ -420,6 +420,33 @@ protected void print(PDDocument document) throws IOException {
 
 	}
 
+	/**
+	 * @param fatline fatline true if line is fat, false if line is standard
+	 *                (thinner)
+	 * @param left    left coordinates in mm (note: in PDF, left starts at zero)
+	 * @param top     top coordinates in mm (note: in PDF, bottom starts at zero
+	 *                except if topatzero is set)
+	 * @param width   width in mm, a positive number
+	 * @param height  height in mm, a positive number
+	 * @param drawtop if true, draw the top line
+	 * @param drawbottom if true, draw the bottom line
+	 * @param drawleft if true, draw the left line
+	 * @param drawright if true, draw the right line
+	 * @throws IOException
+	 */
+	
+	public void drawBoxWithWidthAndHeight(boolean fatline, float left, float top, float width, float height,
+			boolean drawtop,boolean drawbottom,boolean drawleft,boolean drawright)
+			throws IOException {
+
+		float right = left + width;
+		float bottom = top - height;
+		if (this.topatzero) {
+			bottom = top + height;
+		}
+		drawBox(fatline, left, top, right, bottom,Color.BLACK,drawtop,drawbottom,drawleft,drawright);
+	}	
+	
 	/**
 	 * @param fatline fatline true if line is fat, false if line is standard
 	 *                (thinner)
@@ -489,37 +516,42 @@ public void drawCircle(Color bordercolor, Color fillcolor, float centerx, float
 	 * @param bottom  bottom coordinates in mm (note: in PDF, bottom starts at zero
 	 *                except if topatzero is set)
 	 * @param color   color of the box.
-	 * @throws IOException
+	 * @param drawtop if true, draw the top line of the box
+	 * @param drawbottom if bottom, draw  the bottom line of the box
+	 * @param drawleft if left ... well, draw the left line of the box
+	 * @param drawright if right (I think you got it) draw the right line of the box
+	 * @throws IOException if anything bad happens with the file being printed
 	 */
-	public void drawBox(boolean fatline, float left, float top, float right, float bottom, Color color)
+	
+	public void drawBox(boolean fatline, float left, float top, float right, float bottom, Color color,
+			boolean drawtop,boolean drawbottom,boolean drawleft,boolean drawright)
 			throws IOException {
 		this.widgetstoprint.add(() -> {
-			contentStream.setStrokingColor(color);
-			contentStream.setNonStrokingColor(color);
-
-			if (!fatline)
-				contentStream.setLineWidth(NORMAL_LINE_WIDTH);
-			if (fatline)
-				contentStream.setLineWidth(FAT_LINE_WIDTH);
-
-			float newtop = top;
-			float newbottom = bottom;
-			if (this.topatzero) {
-				newtop = height - top;
-				newbottom = height - bottom;
-			}
-
-			contentStream.moveTo(left * MM_TO_POINT, newtop * MM_TO_POINT);
-			contentStream.lineTo(right * MM_TO_POINT, newtop * MM_TO_POINT);
-			contentStream.lineTo(right * MM_TO_POINT, newbottom * MM_TO_POINT);
-			contentStream.lineTo(left * MM_TO_POINT, newbottom * MM_TO_POINT);
-			contentStream.lineTo(left * MM_TO_POINT, newtop * MM_TO_POINT);
-			contentStream.closeAndStroke();
-			contentStream.setStrokingColor(Color.BLACK);
-			contentStream.setNonStrokingColor(Color.BLACK);
+			
+			if (drawtop) this.drawLine(fatline, left,top, right,top, color);
+			if (drawbottom) this.drawLine(fatline, left,bottom, right,bottom, color);
+			if (drawleft) this.drawLine(fatline, left,top,left,bottom, color);
+			if (drawright) this.drawLine(fatline, right,top,right,bottom, color);
 		});
 
 	}
+	
+	/**
+	 * @param fatline true if line is fat, false if line is standard (thinner)
+	 * @param left    left coordinates in mm (note: in PDF, left starts at zero)
+	 * @param top     top coordinates in mm (note: in PDF, bottom starts at zero
+	 *                except if topatzero is set)
+	 * @param right   right coordinates in mm (note: in PDF, left starts at zero)
+	 * @param bottom  bottom coordinates in mm (note: in PDF, bottom starts at zero
+	 *                except if topatzero is set)
+	 * @param color   color of the box.
+	 * @throws IOException
+	 */
+	public void drawBox(boolean fatline, float left, float top, float right, float bottom, Color color)
+			throws IOException {
+		drawBox(fatline,left,top,right,bottom,color,true,true,true,true);
+
+	}
 
 	/**
 	 * Draws a rectangular box
@@ -1164,7 +1196,7 @@ public static BoxTextContent calculateBoxAndMaybeWriteText(float left, float top
 			if (i > 0)
 				currentsplitparagraph = false;
 			String paragraphtext = paragraphs[i];
-			logger.severe("audit on line "+paragraphtext);
+			logger.finest("audit on line "+paragraphtext);
 			ArrayList<String> paragraphlines = new ArrayList<String>();
 			int lastspace = -1;
 			// in this version, tab is treated as any other space