Skip to content

Commit ccfb34f

Browse files
simonsteiner1984simonsteiner1984
committed
FOP-3135: Allow source resolution configuration by João André Gonçalves
1 parent 2ee8f32 commit ccfb34f

8 files changed

Lines changed: 20 additions & 113 deletions

File tree

‎batik-bridge/src/main/java/org/apache/batik/bridge/UserAgent.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,7 @@ void checkLoadExternalResource(ParsedURL resourceURL,
310310
/** Returns the Font Family Resolver */
311311
FontFamilyResolver getFontFamilyResolver();
312312

313-
float getTargetResolution();
314-
315313
float getSourceResolution();
316314

317-
void setTargetResolution(float targetResolution);
318-
319315
void setSourceResolution(float sourceResolution);
320316
}

‎batik-bridge/src/main/java/org/apache/batik/bridge/UserAgentAdapter.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ public class UserAgentAdapter implements UserAgent {
5555

5656
private float sourceResolution = 96;
5757

58-
private float targetResolution = UnitConv.IN2PT;
59-
6058
/**
6159
* Sets the BridgeContext to be used for error information.
6260
*/
@@ -154,7 +152,7 @@ public String getDefaultFontFamily() {
154152
* Returns the medium font size.
155153
*/
156154
public float getMediumFontSize() {
157-
return 9f * UnitConv.IN2MM / (getTargetResolution() * getPixelUnitToMillimeter());
155+
return 9f * UnitConv.IN2MM / (UnitConv.IN2PT * getPixelUnitToMillimeter());
158156
}
159157

160158
/**
@@ -471,13 +469,7 @@ public FontFamilyResolver getFontFamilyResolver() {
471469

472470
public float getSourceResolution() { return sourceResolution; }
473471

474-
public float getTargetResolution() { return targetResolution; }
475-
476472
public void setSourceResolution(float sourceResolution) {
477473
this.sourceResolution = sourceResolution;
478474
}
479-
480-
public void setTargetResolution(float targetResolution) {
481-
this.targetResolution = targetResolution;
482-
}
483475
}

‎batik-bridge/src/test/java/org/apache/batik/bridge/UserAgentAdapterTestCase.java‎

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,54 +26,34 @@ Licensed to the Apache Software Foundation (ASF) under one or more
2626
public class UserAgentAdapterTestCase {
2727

2828
@Test
29-
public void testEqualResolution_72() {
30-
checkGetMediumFontSize(72f, 72f, 9f);
29+
public void testMediumFontResolution_72() {
30+
checkGetMediumFontSize(72f, 9f);
3131
}
3232

3333
@Test
34-
public void testEqualResolution_96() {
35-
checkGetMediumFontSize(96f, 96f, 9f);
36-
}
37-
38-
@Test
39-
public void testDiffResolution_72_96() {
40-
checkGetMediumFontSize(72f, 96f, 6.74f);
41-
}
42-
43-
@Test
44-
public void testDiffResolution_96_72() {
45-
checkGetMediumFontSize(96f, 72f, 12f);
34+
public void testMediumFontResolution_96() {
35+
checkGetMediumFontSize(96f, 12f);
4636
}
4737

4838
@Test
4939
public void testPixelMM_72() {
50-
checkGetPixelUnitToMillimeter(72f, 72f);
40+
checkGetPixelUnitToMillimeter(72f);
5141
}
5242

5343
@Test
54-
public void testPixelMM_96() { checkGetPixelUnitToMillimeter(96f, 96f); }
55-
56-
@Test
57-
public void testPixelMM_72_96() { checkGetPixelUnitToMillimeter(72f, 96f); }
58-
59-
@Test
60-
public void testPixelMM_96_72() {
61-
checkGetPixelUnitToMillimeter(96f, 72f);
62-
}
44+
public void testPixelMM_96() { checkGetPixelUnitToMillimeter(96f); }
6345

64-
private void checkGetMediumFontSize(float sourceRes, float targetRes, float expectedSize) {
46+
private void checkGetMediumFontSize(float sourceRes, float expectedSize) {
6547
UserAgentAdapter adapter = new UserAgentAdapter();
6648
adapter.setSourceResolution(sourceRes);
67-
adapter.setTargetResolution(targetRes);
6849

6950
// Size must be calculated based on the dpi settings
7051
assertEquals(expectedSize, adapter.getMediumFontSize(), 0.01);
7152
}
7253

73-
private void checkGetPixelUnitToMillimeter(float sourceRes, float targetRes) {
54+
private void checkGetPixelUnitToMillimeter(float sourceRes) {
7455
UserAgentAdapter adapter = new UserAgentAdapter();
7556
adapter.setSourceResolution(sourceRes);
76-
adapter.setTargetResolution(targetRes);
7757

7858
// Pixel unit to mm must be calculated using the resolution set in the conf
7959
// instead of assuming what the resolution is

‎batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2747,8 +2747,6 @@ protected class UserAgent implements SVGUserAgent {
27472747

27482748
private float sourceResolution = 96;
27492749

2750-
private float targetResolution = UnitConv.IN2PT;
2751-
27522750
/**
27532751
* Creates a new SVGUserAgent.
27542752
*/
@@ -2847,7 +2845,7 @@ public String getDefaultFontFamily() {
28472845
*/
28482846
public float getMediumFontSize() {
28492847
// 9pt (72pt == 1in)
2850-
return 9f * UnitConv.IN2MM / (getTargetResolution() * getPixelUnitToMillimeter());
2848+
return 9f * UnitConv.IN2MM / (UnitConv.IN2PT * getPixelUnitToMillimeter());
28512849
}
28522850

28532851
/**
@@ -3084,21 +3082,11 @@ public void checkLoadScript(String scriptType,
30843082
}
30853083
}
30863084

3087-
@Override
3088-
public float getTargetResolution() {
3089-
return targetResolution;
3090-
}
3091-
30923085
@Override
30933086
public float getSourceResolution() {
30943087
return sourceResolution;
30953088
}
30963089

3097-
@Override
3098-
public void setTargetResolution(float targetResolution) {
3099-
this.targetResolution = targetResolution;
3100-
}
3101-
31023090
@Override
31033091
public void setSourceResolution(float sourceResolution) {
31043092
this.sourceResolution = sourceResolution;

‎batik-swing/src/main/java/org/apache/batik/swing/svg/JSVGComponent.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3102,17 +3102,10 @@ public float getSourceResolution() {
31023102
return userAgent.getSourceResolution();
31033103
}
31043104

3105-
public float getTargetResolution() {
3106-
return userAgent.getTargetResolution();
3107-
}
3108-
31093105
public void setSourceResolution(float sourceResolution) {
31103106
userAgent.setSourceResolution(sourceResolution);
31113107
}
31123108

3113-
public void setTargetResolution(float targetResolution) {
3114-
userAgent.setTargetResolution(targetResolution);
3115-
}
31163109
}
31173110

31183111
/**
@@ -3726,17 +3719,9 @@ public float getSourceResolution() {
37263719
return svgUserAgent.getSourceResolution();
37273720
}
37283721

3729-
public float getTargetResolution() {
3730-
return svgUserAgent.getTargetResolution();
3731-
}
3732-
37333722
public void setSourceResolution(float sourceResolution) {
37343723
svgUserAgent.setSourceResolution(sourceResolution);
37353724
}
3736-
3737-
public void setTargetResolution(float targetResolution) {
3738-
svgUserAgent.setTargetResolution(targetResolution);
3739-
}
37403725
}
37413726

37423727
protected static final Set FEATURES = new HashSet();

‎batik-swing/src/main/java/org/apache/batik/swing/svg/SVGUserAgent.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,7 @@ void checkLoadScript(String scriptType,
228228
void checkLoadExternalResource(ParsedURL resourceURL,
229229
ParsedURL docURL) throws SecurityException;
230230

231-
float getTargetResolution();
232-
233231
float getSourceResolution();
234232

235-
void setTargetResolution(float targetResolution);
236-
237233
void setSourceResolution(float sourceResolution);
238234
}

‎batik-swing/src/main/java/org/apache/batik/swing/svg/SVGUserAgentAdapter.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ public class SVGUserAgentAdapter implements SVGUserAgent {
5454

5555
private float sourceResolution = 96;
5656

57-
private float targetResolution = UnitConv.IN2PT;
58-
5957
public SVGUserAgentAdapter() { }
6058

6159
/**
@@ -136,7 +134,7 @@ public String getDefaultFontFamily() {
136134
* Returns the medium font size.
137135
*/
138136
public float getMediumFontSize() {
139-
return 9f * UnitConv.IN2MM / (getTargetResolution() * getPixelUnitToMillimeter());
137+
return 9f * UnitConv.IN2MM / (UnitConv.IN2PT * getPixelUnitToMillimeter());
140138
}
141139

142140
/**
@@ -360,15 +358,7 @@ public float getSourceResolution() {
360358
return sourceResolution;
361359
}
362360

363-
public float getTargetResolution() {
364-
return targetResolution;
365-
}
366-
367361
public void setSourceResolution(float sourceResolution) {
368362
this.sourceResolution = sourceResolution;
369363
}
370-
371-
public void setTargetResolution(float targetResolution) {
372-
this.targetResolution = targetResolution;
373-
}
374364
}

‎batik-swing/src/test/java/org/apache/batik/swing/svg/SVGUserAgentAdapterTestCase.java‎

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -26,54 +26,34 @@ Licensed to the Apache Software Foundation (ASF) under one or more
2626
public class SVGUserAgentAdapterTestCase {
2727

2828
@Test
29-
public void testEqualResolution_72() {
30-
checkGetMediumFontSize(72f, 72f, 9f);
29+
public void testMediumFontResolution_72() {
30+
checkGetMediumFontSize(72f, 9f);
3131
}
3232

3333
@Test
34-
public void testEqualResolution_96() {
35-
checkGetMediumFontSize(96f, 96f, 9f);
34+
public void testMediumFontResolution_96() {
35+
checkGetMediumFontSize(96f, 12f);
3636
}
3737

3838
@Test
39-
public void testDiffResolution_72_96() {
40-
checkGetMediumFontSize(72f, 96f, 6.74f);
41-
}
42-
43-
@Test
44-
public void testDiffResolution_96_72() {
45-
checkGetMediumFontSize(96f, 72f, 12f);
46-
}
47-
48-
@Test
49-
public void testPixelMM_72() {
50-
checkGetPixelUnitToMillimeter(72f, 72f);
51-
}
52-
53-
@Test
54-
public void testPixelMM_96() { checkGetPixelUnitToMillimeter(96f, 96f); }
55-
56-
@Test
57-
public void testPixelMM_72_96() { checkGetPixelUnitToMillimeter(72f, 96f); }
39+
public void testPixelMM_72() { checkGetPixelUnitToMillimeter(72f); }
5840

5941
@Test
60-
public void testPixelMM_96_72() {
61-
checkGetPixelUnitToMillimeter(96f, 72f);
42+
public void testPixelMM_96() {
43+
checkGetPixelUnitToMillimeter(96f);
6244
}
6345

64-
private void checkGetMediumFontSize(float sourceRes, float targetRes, float expectedSize) {
46+
private void checkGetMediumFontSize(float sourceRes, float expectedSize) {
6547
SVGUserAgentAdapter adapter = new SVGUserAgentAdapter();
6648
adapter.setSourceResolution(sourceRes);
67-
adapter.setTargetResolution(targetRes);
6849

6950
// Size must be calculated based on the dpi settings
7051
assertEquals(expectedSize, adapter.getMediumFontSize(), 0.01);
7152
}
7253

73-
private void checkGetPixelUnitToMillimeter(float sourceRes, float targetRes) {
54+
private void checkGetPixelUnitToMillimeter(float sourceRes) {
7455
SVGUserAgentAdapter adapter = new SVGUserAgentAdapter();
7556
adapter.setSourceResolution(sourceRes);
76-
adapter.setTargetResolution(targetRes);
7757

7858
// Pixel unit to mm must be calculated using the resolution set in the conf
7959
// instead of assuming what the resolution is

0 commit comments

Comments
 (0)