CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-02-19 08:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1053 -- Rotation support in reportlab renderer

Browse Source
This commit is contained in:
Raphael Michel
2020-01-03 19:16:19 +01:00
parent 244e0695b1
commit 8704a7f3dd
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/pretix/base/pdf.py
View File

@@ -472,10 +472,15 @@ class Renderer:
text = "<br/>".join(get_display(reshaper.reshape(l)) for l in text.split("<br/>"))
p = Paragraph(text, style=style)
p.wrapOn(canvas, float(o['width']) * mm, 1000 * mm)
w, h = p.wrapOn(canvas, float(o['width']) * mm, 1000 * mm)
# p_size = p.wrap(float(o['width']) * mm, 1000 * mm)
ad = getAscentDescent(font, float(o['fontsize']))
p.drawOn(canvas, float(o['left']) * mm, float(o['bottom']) * mm - ad[1])
canvas.saveState()
canvas.translate(float(o['left']) * mm, float(o['bottom']) * mm + h)
canvas.rotate(o['rotation'] * -1)
# Debugging: canvas.rect(0, - h, w, h)
p.drawOn(canvas, 0, -h - ad[1])
canvas.restoreState()
def draw_page(self, canvas: Canvas, order: Order, op: OrderPosition):
for o in self.layout:

7
src/pretix/control/templates/pretixcontrol/pdf/index.html
View File

@@ -306,11 +306,16 @@
</div>
</div>
<div class="row control-group text">
<div class="col-sm-12">
<div class="col-sm-6">
<label>{% trans "Width (mm)" %}</label><br>
<input type="number" value="13" class="input-block-level form-control" step="0.01"
id="toolbox-textwidth">
</div>
<div class="col-sm-6">
<label>{% trans "Rotation (°)" %}</label><br>
<input type="number" value="0" class="input-block-level form-control" step="0.1"
id="toolbox-textrotation">
</div>
</div>
<div class="row control-group poweredby">
<div class="col-sm-12">

9
src/pretix/static/pretixcontrol/js/ui/editor.js
View File

@@ -131,6 +131,7 @@ var editor = {
width: editor._px2mm(o.width).toFixed(2),
content: o.content,
text: o.text,
rotation: o.angle,
align: o.textAlign,
});
} else if (o.type === "barcodearea") {
@@ -174,6 +175,7 @@ var editor = {
o.setWidth(editor._mm2px(d.width));
o.content = d.content;
o.setTextAlign(d.align);
o.rotate(d.rotation);
if (d.content === "other") {
o.setText(d.text);
} else {
@@ -268,6 +270,7 @@ var editor = {
editor.fabric.on('object:selected', editor._update_toolbox);
editor.fabric.on('object:moving', editor._update_toolbox_values);
editor.fabric.on('object:modified', editor._update_toolbox_values);
editor.fabric.on('object:rotating', editor._update_toolbox_values);
editor.fabric.on('object:scaling', editor._update_toolbox_values);
editor._update_toolbox();
@@ -342,6 +345,7 @@ var editor = {
$("#toolbox").find("button[data-action=center]").toggleClass('active', o.textAlign === 'center');
$("#toolbox").find("button[data-action=right]").toggleClass('active', o.textAlign === 'right');
$("#toolbox-textwidth").val(editor._px2mm(o.width).toFixed(2));
$("#toolbox-textrotation").val((o.angle || 0.0).toFixed(1));
if (o.type === "textarea") {
$("#toolbox-content").val(o.content);
$("#toolbox-content-other").toggle($("#toolbox-content").val() === "other");
@@ -404,6 +408,7 @@ var editor = {
o.setTextAlign(align);
}
o.setWidth(editor._mm2px($("#toolbox-textwidth").val()));
o.rotate(parseFloat($("#toolbox-textrotation").val()));
$("#toolbox-content-other").toggle($("#toolbox-content").val() === "other");
o.content = $("#toolbox-content").val();
if ($("#toolbox-content").val() === "other") {
@@ -452,7 +457,7 @@ var editor = {
left: 100,
top: 100,
width: editor._mm2px(50),
lockRotation: true,
lockRotation: false,
fontFamily: 'Open Sans',
lineHeight: 1,
content: 'item',
@@ -468,7 +473,7 @@ var editor = {
'mb': false,
'mr': true,
'ml': true,
'mtr': false
'mtr': true
});
editor.fabric.add(text);
editor._create_savepoint();