midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit is contained in:
armenrz 2009-02-10 14:22:05 +00:00
parent 8de0ea1bf6
commit 3f35202a01
2 changed files with 74 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
base/src/org/compiere/print/CPaper.java
View File

@ -37,6 +37,11 @@ import org.compiere.util.Msg;
/** /**
* Adempiere Paper * Adempiere Paper
* *
* Change log:
* <ul>
* <li>2009-02-10 - armen - [ 2580531 ] Custom Paper Support
* </ul>
*
* @author Jorg Janke * @author Jorg Janke
* @version $Id: CPaper.java,v 1.2 2006/07/30 00:53:02 jjanke Exp $ * @version $Id: CPaper.java,v 1.2 2006/07/30 00:53:02 jjanke Exp $
*/ */
@ -142,12 +147,45 @@ public class CPaper extends Paper
log.fine(mediaSize.getMediaSizeName() + ": " + m_mediaSize + " - Landscape=" + m_landscape); log.fine(mediaSize.getMediaSizeName() + ": " + m_mediaSize + " - Landscape=" + m_landscape);
} // setMediaSize } // setMediaSize
/**
* Get Media Size
* @return media size
*/
//AA Goodwill : Custom Paper Support
public CPaper (double x, double y, boolean landscape,
double left, double top, double right, double bottom)
{
super();
setMediaSize (x,y, landscape);
setImageableArea(left, top, getWidth()-left-right, getHeight()-top-bottom);
}
public void setMediaSize (double x, double y, boolean landscape)
{
if (x == 0 || y == 0)
throw new IllegalArgumentException("MediaSize is null");
m_landscape = landscape;
// Get Sise in Inch * 72
double width = x * 72;
double height = y * 72;
// Set Size
setSize (width, height);
log.fine("Width & Height" + ": " + String.valueOf(x) + "/" + String.valueOf(y) + " - Landscape=" + m_landscape);
} // setMediaSize
//End Of AA Goodwill
/** /**
* Get Media Size * Get Media Size
* @return media size * @return media size
*/ */
public MediaSizeName getMediaSizeName() public MediaSizeName getMediaSizeName()
{ {
//AA Goodwill: Custom Paper Support
if(m_mediaSize == null)
return MediaSizeName.ISO_A4;
//End Of AA Goodwill
return m_mediaSize.getMediaSizeName(); return m_mediaSize.getMediaSizeName();
} // getMediaSizeName } // getMediaSizeName
@ -224,7 +262,9 @@ public class CPaper extends Paper
else else
pratts.add(OrientationRequested.PORTRAIT); pratts.add(OrientationRequested.PORTRAIT);
// media = na-legal // media = na-legal
pratts.add(getMediaSizeName()); //Commented Lines By AA Goodwill: Custom Paper Support
//pratts.add(getMediaSizeName());
//End Of AA Goodwill
return pratts; return pratts;
} // getPrintRequestAttributes } // getPrintRequestAttributes
@ -313,18 +353,23 @@ public class CPaper extends Paper
{ {
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
// Print Media size // Print Media size
sb.append(m_mediaSize.getMediaSizeName()); //AA Goodwill : Custom Paper Support
// Print dimension if (m_mediaSize != null){
String name = m_mediaSize.getMediaSizeName().toString(); sb.append(m_mediaSize.getMediaSizeName());
if (!name.startsWith("iso")) // Print dimension
sb.append(" - ").append(m_mediaSize.toString(MediaSize.INCH,"\"")) String name = m_mediaSize.getMediaSizeName().toString();
.append(" (").append(getMediaPrintableArea().toString(MediaPrintableArea.INCH,"\"")); if (!name.startsWith("iso"))
if (!name.startsWith("na")) sb.append(" - ").append(m_mediaSize.toString(MediaSize.INCH,"\""))
sb.append(" - ").append(m_mediaSize.toString(MediaSize.MM,"mm")) .append(" (").append(getMediaPrintableArea().toString(MediaPrintableArea.INCH,"\""));
.append(" (").append(getMediaPrintableArea().toString(MediaPrintableArea.MM,"mm")); if (!name.startsWith("na"))
// Print Orientation sb.append(" - ").append(m_mediaSize.toString(MediaSize.MM,"mm"))
sb.append(") - ") .append(" (").append(getMediaPrintableArea().toString(MediaPrintableArea.MM,"mm"));
.append(Msg.getMsg(ctx, m_landscape ? "Landscape" : "Portrait")); // Print Orientation
sb.append(") - ")
.append(Msg.getMsg(ctx, m_landscape ? "Landscape" : "Portrait"));
}
else sb.append("Custom - ").append(toString());
//End Of AA Goodwill
return sb.toString(); return sb.toString();
} // toString } // toString

18
base/src/org/compiere/print/MPrintPaper.java
View File

@ -34,6 +34,11 @@ import org.compiere.util.Language;
/** /**
* AD_PrintPaper Print Paper Model * AD_PrintPaper Print Paper Model
* *
* Change log:
* <ul>
* <li>2009-02-10 - armen - [ 2580531 ] Custom Paper Support
* </ul>
*
* @author Jorg Janke * @author Jorg Janke
* @version $Id: MPrintPaper.java,v 1.3 2006/07/30 00:53:02 jjanke Exp $ * @version $Id: MPrintPaper.java,v 1.3 2006/07/30 00:53:02 jjanke Exp $
*/ */
@ -198,8 +203,17 @@ public class MPrintPaper extends X_AD_PrintPaper
*/ */
public CPaper getCPaper() public CPaper getCPaper()
{ {
CPaper retValue = new CPaper (getMediaSize(), isLandscape(), //Modify Lines By AA Goodwill : Custom Paper Support
getMarginLeft(), getMarginTop(), getMarginRight(), getMarginBottom()); CPaper retValue;
if (getCode().toLowerCase().startsWith("custom")){
retValue = new CPaper (getSizeX().doubleValue(), getSizeY().doubleValue(), isLandscape(),
getMarginLeft(), getMarginTop(), getMarginRight(), getMarginBottom());
}
else{
retValue = new CPaper (getMediaSize(), isLandscape(),
getMarginLeft(), getMarginTop(), getMarginRight(), getMarginBottom());
}
//End Of AA Goodwill
return retValue; return retValue;
} // getCPaper } // getCPaper