From 3b23fb8b211c3fbedadc8b67bf294b65ed2ddf2d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc=20V=C3=A9ron?= Date: Sat, 2 May 2015 07:20:22 +0200 Subject: [PATCH] Bug 14107: Patron cards: Make barcode width and height scaling editable The size of the barcode in patron card creator was hardcoded to 1% of the card height and 80% of the card width. This patch exposes both values in the layout editor. If no values are given, the previousely hard coded values (0.01 / 0.8) are used in order to work with existing card definitions. To test: - Go to Home > Tools > Patron card creator - Export a patron card (PDF) from en existing definition - Apply patch - Export patron card again, compare results (should be the same) - Go to Home > Tools > Patron card creator > Manage card layouts - Edit the layout you use for testing and set barcode scaling values e.g. to 0.03 for height and 0.4 for widht - Export patron card again, verify that barcode size changed Signed-off-by: Chris Nighswonger Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi --- C4/Patroncards/Patroncard.pm | 13 ++++++++----- .../prog/en/modules/patroncards/edit-layout.tt | 8 ++++++++ patroncards/create-pdf.pl | 3 ++- patroncards/edit-layout.pl | 2 ++ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/C4/Patroncards/Patroncard.pm b/C4/Patroncards/Patroncard.pm index d7806074a9..f6a18127c6 100644 --- a/C4/Patroncards/Patroncard.pm +++ b/C4/Patroncards/Patroncard.pm @@ -45,6 +45,8 @@ sub new { width => $params{'width'}, layout => $params{'layout'}, text_wrap_cols => $params{'text_wrap_cols'}, + barcode_height_scale => $params{'layout'}->{'barcode'}[0]->{'height_scale'} || 0.01, + barcode_width_scale => $params{'layout'}->{'barcode'}[0]->{'width_scale'} || 0.8, }; bless ($self, $type); return $self; @@ -52,14 +54,15 @@ sub new { sub draw_barcode { my ($self, $pdf) = @_; -#FIXME: We do some scaling foo on the barcode here which probably should be done by the one invoking draw_barcode - my $barcode_width = 0.8 * $self->{'width'}; # this scales the barcode width to 80% of the label width - my $barcode_y_scale_factor = 0.01 * $self->{'height'}; # this scales the barcode height to 1% of the label height + # Default values for barcode scaling are set in constructor to work with pre-existing installations + my $barcode_height_scale = $self->{'barcode_height_scale'}; + my $barcode_width_scale = $self->{'barcode_width_scale'}; + _draw_barcode( $self, llx => $self->{'llx'} + $self->{'layout'}->{'barcode'}->[0]->{'llx'}, lly => $self->{'lly'} + $self->{'layout'}->{'barcode'}->[0]->{'lly'}, - width => $barcode_width, - y_scale_factor => $barcode_y_scale_factor, + width => $self->{'width'} * $barcode_width_scale, + y_scale_factor => $self->{'height'} * $barcode_height_scale, barcode_type => $self->{'layout'}->{'barcode'}->[0]->{'type'}, barcode_data => $self->{'layout'}->{'barcode'}->[0]->{'data'}, text => $self->{'layout'}->{'barcode'}->[0]->{'text_print'}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt index 606a6ac314..3394a67323 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt @@ -383,6 +383,14 @@ +
  • + + +
  • +
  • + + +