Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor annotation rectangle code and add unit tests #6239

Merged
merged 1 commit into from
Jul 20, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions src/core/annotation.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,11 @@ var Annotation = (function AnnotationClosure() {
var data = this.data = {};

data.subtype = dict.get('Subtype').name;
var rect = dict.get('Rect') || [0, 0, 0, 0];
data.rect = Util.normalizeRect(rect);
data.annotationFlags = dict.get('F');

this.setRectangle(dict.get('Rect'));
data.rect = this.rectangle;

this.setColor(dict.get('C'));
data.color = this.color;

Expand All @@ -91,6 +92,21 @@ var Annotation = (function AnnotationClosure() {
}

Annotation.prototype = {
/**
* Set the rectangle.
*
* @public
* @memberof Annotation
* @param {Array} rectangle - The rectangle array with exactly four entries
*/
setRectangle: function Annotation_setRectangle(rectangle) {
if (isArray(rectangle) && rectangle.length === 4) {
this.rectangle = Util.normalizeRect(rectangle);
} else {
this.rectangle = [0, 0, 0, 0];
}
},

/**
* Set the color and take care of color space conversion.
*
Expand Down
18 changes: 18 additions & 0 deletions test/unit/annotation_layer_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,24 @@

describe('Annotation layer', function() {
describe('Annotation', function() {
it('should set and get a valid rectangle', function() {
var dict = new Dict();
dict.set('Subtype', '');
var annotation = new Annotation({ dict: dict, ref: 0 });
annotation.setRectangle([117, 694, 164.298, 720]);

expect(annotation.rectangle).toEqual([117, 694, 164.298, 720]);
});

it('should not set and get an invalid rectangle', function() {
var dict = new Dict();
dict.set('Subtype', '');
var annotation = new Annotation({ dict: dict, ref: 0 });
annotation.setRectangle([117, 694, 164.298]);

expect(annotation.rectangle).toEqual([0, 0, 0, 0]);
});

it('should reject a color if it is not an array', function() {
var dict = new Dict();
dict.set('Subtype', '');
Expand Down