mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
printing: don't access displayed_dive in printing code
To phase out this global variable, avoid access of displayed_dive in the printing code. This is used when printing a plan. Instead, when in plan-mode, pass the planned dive to the printing code as a single dive to be printed. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
80df790efc
commit
d51589b9a7
8 changed files with 44 additions and 29 deletions
|
|
@ -5,6 +5,7 @@
|
|||
#include "printoptions.h"
|
||||
#include "templateedit.h"
|
||||
|
||||
struct dive;
|
||||
class ProfileScene;
|
||||
class QPainter;
|
||||
class QPaintDevice;
|
||||
|
|
@ -27,10 +28,11 @@ private:
|
|||
const template_options &templateOptions;
|
||||
QSize pageSize;
|
||||
PrintMode printMode;
|
||||
bool inPlanner;
|
||||
struct dive *singleDive;
|
||||
int done;
|
||||
void render(int Pages);
|
||||
void flowRender();
|
||||
std::vector<dive *> getDives() const;
|
||||
void putProfileImage(const QRect &box, const QRect &viewPort, QPainter *painter,
|
||||
struct dive *dive, ProfileScene *profile);
|
||||
|
||||
|
|
@ -38,7 +40,9 @@ private slots:
|
|||
void templateProgessUpdated(int value);
|
||||
|
||||
public:
|
||||
Printer(QPaintDevice *paintDevice, const print_options &printOptions, const template_options &templateOptions, PrintMode printMode, bool inPlanner);
|
||||
// If singleDive is non-null, then only print this particular dive.
|
||||
Printer(QPaintDevice *paintDevice, const print_options &printOptions, const template_options &templateOptions,
|
||||
PrintMode printMode, dive *singleDive);
|
||||
~Printer();
|
||||
void print();
|
||||
void previewOnePage();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue