| Revision | ed61148babb1bd2790a1d30dea3336bc78166097 (tree) |
|---|---|
| Time | 2013-03-27 22:05:41 |
| Author | nekora <nekora@user...> |
| Commiter | nekora |
PUT位置が上にずれるバグ修正
src/nekora/cwn/MDPSMain.java (diff) src/nekora/cwn/paper/InputPaper.java (diff)| @@ -471,7 +471,7 @@ public class MDPSMain extends Application{ | ||
| 471 | 471 | try { |
| 472 | 472 | logger.info(outsize+" / "+curConfFile.getCanonicalPath()); |
| 473 | 473 | points = readOutputConfig(curConfFile, dpi); |
| 474 | - logger.info("L="+points[L_PAGE]+" R="+points[R_PAGE]+" 全体の大きさ＝"+points[ALL_PAGE]); | |
| 474 | + logger.info("Put位置 L="+points[L_PAGE]+" R="+points[R_PAGE]+" 全体の大きさ＝"+points[ALL_PAGE]); | |
| 475 | 475 | } catch (IOException | JDOMException e1) { |
| 476 | 476 | java.awt.Toolkit.getDefaultToolkit().beep(); |
| 477 | 477 | String msg="定義ファイル読み込み失敗 ファイル＝" +curConfFile+ " エラー＝"+e1.getLocalizedMessage(); |
| @@ -96,8 +96,9 @@ public class InputPaper { | ||
| 96 | 96 | logger.info("出力紙の高さ＝その他なので内枠と出力紙の中心を合わせる"); |
| 97 | 97 | double a = inner.y+(inner.height/2); |
| 98 | 98 | double b = h/2; |
| 99 | - cropR.y=(int)(inner.y+((a-b)/2)); | |
| 100 | - if(h <paper.height){ | |
| 99 | + // cropR.y=(int)(inner.y+((a-b)/2)); | |
| 100 | + cropR.y=(int)Math.round(a-b); | |
| 101 | + if(h<=paper.height){ | |
| 101 | 102 | cropR.height=h; |
| 102 | 103 | putR.y = 0; |
| 103 | 104 | }else{ |
| @@ -131,6 +132,8 @@ public class InputPaper { | ||
| 131 | 132 | putL = new Point(); |
| 132 | 133 | putL.y=putR.y; |
| 133 | 134 | putL.x = putR.x - cropR.width; |
| 135 | + | |
| 136 | + logger.info("cropL="+cropL+" cropR="+cropR+" putL="+putL+" putR="+putR); | |
| 134 | 137 | } |
| 135 | 138 | |
| 136 | 139 | /** |
| @@ -207,7 +210,8 @@ public class InputPaper { | ||
| 207 | 210 | logger.info("出力紙の高さ＝その他なので内枠と出力紙の中心を合わせる"); |
| 208 | 211 | double a = inner.y+(inner.height/2); |
| 209 | 212 | double b = h/2; |
| 210 | - cropC.y=(int)(inner.y+((a-b)/2)); | |
| 213 | + //cropC.y=(int)(inner.y+((a-b)/2)); | |
| 214 | + cropC.y=(int)(Math.round(a-b)); | |
| 211 | 215 | if(h <paper.height){ |
| 212 | 216 | cropC.height=h; |
| 213 | 217 | putC.y = 0; |
| @@ -217,7 +221,7 @@ public class InputPaper { | ||
| 217 | 221 | } |
| 218 | 222 | } |
| 219 | 223 | |
| 220 | - | |
| 224 | + logger.info("cropC="+cropC+" putC="+putC); | |
| 221 | 225 | } |
| 222 | 226 | |
| 223 | 227 | /** |
nekora
Fork