Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added InkDensity and DitherType; distinguish between page and job settings

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6580 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Pfeiffer 2004-02-13 23:54:17 +00:00
parent ef68644905
commit 7566478beb
2 changed files with 57 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
headers/private/print/libprint/JobData.h
View File

@ -10,6 +10,8 @@
#include <GraphicsDefs.h>
#include <Rect.h>
#include "Halftone.h"
class BMessage;
class PrinterCap;
@ -206,6 +208,10 @@ public:
kColor
};
enum Settings {
kPageSettings,
kJobSettings
};
private:
Paper fPaper;
@ -218,7 +224,8 @@ private:
int32 fNup;
int32 fFirstPage;
int32 fLastPage;
float fGamma;
float fGamma; // 1 identiy, < 1 brigther, > 1 darker
float fInkDensity; // [0, 255] lower means higher density
PaperSource fPaperSource;
int32 fCopies;
bool fCollate;
@ -226,17 +233,19 @@ private:
PrintStyle fPrintStyle;
BindingLocation fBindingLocation;
PageOrder fPageOrder;
Settings fSettings;
BMessage *fMsg;
bool fColor;
Halftone::DitherType fDitherType;
public:
JobData(BMessage *msg, const PrinterCap *cap);
JobData(BMessage *msg, const PrinterCap *cap, Settings settings);
~JobData();
JobData(const JobData &job_data);
JobData &operator = (const JobData &job_data);
void load(BMessage *msg, const PrinterCap *cap);
void load(BMessage *msg, const PrinterCap *cap, Settings settings);
void save(BMessage *msg = NULL);
Paper getPaper() const { return fPaper; }
@ -278,6 +287,9 @@ public:
float getGamma() const { return fGamma; }
void setGamma(float gamma) { fGamma = gamma; }
float getInkDensity() const { return fInkDensity; }
void setInkDensity(float inkDensity) { fInkDensity = inkDensity; }
PaperSource getPaperSource() const { return fPaperSource; }
void setPaperSource(PaperSource paper_source) { fPaperSource = paper_source; };
@ -298,11 +310,9 @@ public:
Color getColor() const { return fColor ? kColor : kMonochrome; }
void setColor(Color color) { fColor = color == kColor; }
/*
protected:
JobData(const JobData &job_data);
JobData &operator = (const JobData &job_data);
*/
Halftone::DitherType getDitherType() const { return fDitherType; }
void setDitherType(Halftone::DitherType dither_type) { fDitherType = dither_type; }
};
#endif /* __JOBDATA_H */

44
src/add-ons/print/drivers/shared/libprint/JobData.cpp
View File

@ -15,13 +15,14 @@ const char *kJDCopies = "copies";
const char *kJDOrientation = "orientation";
const char *kJDScaling = "scaling";
const char *kJDPaperRect = "paper_rect";
const char *kJDPrintableRect = "printable_rect";
const char *kJDFirstPage = "first_page";
const char *kJDLastPage = "last_page";
const char *kJDPrintableRect = "printable_rect";
const char *kJDPaper = "JJJJ_paper";
const char *kJDNup = "JJJJ_nup";
const char *kJDGamma = "JJJJ_gamma";
const char *kJDInkDensity = "JJJJ_ink_density";
const char *kJDPaperSource = "JJJJ_paper_source";
const char *kJDCollate = "JJJJ_collate";
const char *kJDReverse = "JJJJ_reverse";
@ -29,10 +30,11 @@ const char *kJDPrintStyle = "JJJJ_print_style";
const char *kJDBindingLocation = "JJJJ_binding_location";
const char *kJDPageOrder = "JJJJ_page_order";
const char *kJDColor = "JJJJ_color";
const char *kJDDitherType = "JJJJ_dither_type";
JobData::JobData(BMessage *msg, const PrinterCap *cap)
JobData::JobData(BMessage *msg, const PrinterCap *cap, Settings settings)
{
load(msg, cap);
load(msg, cap, settings);
}
JobData::~JobData()
@ -52,6 +54,7 @@ JobData::JobData(const JobData &job_data)
fFirstPage = job_data.fFirstPage;
fLastPage = job_data.fLastPage;
fGamma = job_data.fGamma;
fInkDensity = job_data.fInkDensity;
fPaperSource = job_data.fPaperSource;
fCopies = job_data.fCopies;
fCollate = job_data.fCollate;
@ -59,8 +62,10 @@ JobData::JobData(const JobData &job_data)
fPrintStyle = job_data.fPrintStyle;
fBindingLocation = job_data.fBindingLocation;
fPageOrder = job_data.fPageOrder;
fSettings = job_data.fSettings;
fMsg = job_data.fMsg;
fColor = job_data.fColor;
fDitherType = job_data.fDitherType;
}
JobData &JobData::operator = (const JobData &job_data)
@ -76,6 +81,7 @@ JobData &JobData::operator = (const JobData &job_data)
fFirstPage = job_data.fFirstPage;
fLastPage = job_data.fLastPage;
fGamma = job_data.fGamma;
fInkDensity = job_data.fInkDensity;
fPaperSource = job_data.fPaperSource;
fCopies = job_data.fCopies;
fCollate = job_data.fCollate;
@ -83,14 +89,17 @@ JobData &JobData::operator = (const JobData &job_data)
fPrintStyle = job_data.fPrintStyle;
fBindingLocation = job_data.fBindingLocation;
fPageOrder = job_data.fPageOrder;
fSettings = job_data.fSettings;
fMsg = job_data.fMsg;
fColor = job_data.fColor;
fDitherType = job_data.fDitherType;
return *this;
}
void JobData::load(BMessage *msg, const PrinterCap *cap)
void JobData::load(BMessage *msg, const PrinterCap *cap, Settings settings)
{
fMsg = msg;
fSettings = settings;
if (msg->HasInt32(kJDPaper))
fPaper = (Paper)msg->FindInt32(kJDPaper);
@ -157,7 +166,12 @@ void JobData::load(BMessage *msg, const PrinterCap *cap)
if (msg->HasFloat(kJDGamma))
fGamma = fMsg->FindFloat(kJDGamma);
else
fGamma = 1.4f;
fGamma = 0.25f;
if (msg->HasFloat(kJDInkDensity))
fInkDensity = fMsg->FindFloat(kJDInkDensity);
else
fInkDensity = 0.0f;
if (msg->HasInt32(kJDPaperSource))
fPaperSource = (PaperSource)fMsg->FindInt32(kJDPaperSource);
@ -204,6 +218,11 @@ void JobData::load(BMessage *msg, const PrinterCap *cap)
fColor = msg->FindBool(kJDColor);
else
fColor = false;
if (msg->HasInt32(kJDDitherType))
fDitherType = (Halftone::DitherType)msg->FindInt32(kJDDitherType);
else
fDitherType = Halftone::kTypeFloydSteinberg;
}
void JobData::save(BMessage *msg)
@ -212,6 +231,7 @@ void JobData::save(BMessage *msg)
msg = fMsg;
}
// page settings
if (msg->HasInt32(kJDPaper))
msg->ReplaceInt32(kJDPaper, fPaper);
else
@ -247,6 +267,10 @@ void JobData::save(BMessage *msg)
else
msg->AddRect(kJDPrintableRect, fPrintableRect);
// page settings end here; don't store job settings in message
if (fSettings == kPageSettings) return;
// job settings
if (msg->HasInt32(kJDNup))
msg->ReplaceInt32(kJDNup, fNup);
else
@ -267,6 +291,11 @@ void JobData::save(BMessage *msg)
else
msg->AddFloat(kJDGamma, fGamma);
if (msg->HasFloat(kJDInkDensity))
msg->ReplaceFloat(kJDInkDensity, fInkDensity);
else
msg->AddFloat(kJDInkDensity, fInkDensity);
if (msg->HasInt32(kJDPaperSource))
msg->ReplaceInt32(kJDPaperSource, fPaperSource);
else
@ -306,4 +335,9 @@ void JobData::save(BMessage *msg)
msg->ReplaceBool(kJDColor, fColor);
else
msg->AddBool(kJDColor, fColor);
if (msg->HasInt32(kJDDitherType))
msg->ReplaceInt32(kJDDitherType, fDitherType);
else
msg->AddInt32(kJDDitherType, fDitherType);
}