Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 11837 → Rev 11838

/branches/Version133x/Scribus/scribus/plugins/psimport/importps.cpp
109,7 → 109,8
FarNam = FarNam.remove(FarNam.length()-1,1);
QRegExp badchars("[\\s\\/\\{\\[\\]\\}\\<\\>\\(\\)\\%]");
FarNam = FarNam.simplifyWhiteSpace().replace( badchars, "_" );
cc = ScColor(static_cast<int>(255 * c), static_cast<int>(255 * m), static_cast<int>(255 * y), static_cast<int>(255 * k));
cc = ScColor(qRound(255 * c), qRound(255 * m), qRound(255 * y), qRound(255 * k));
// cc = ScColor(static_cast<int>(255 * c), static_cast<int>(255 * m), static_cast<int>(255 * y), static_cast<int>(255 * k));
cc.setSpotColor(true);
CustColors.insert(FarNam, cc);
while (!ts.atEnd())
126,7 → 127,8
FarNam = FarNam.remove(FarNam.length()-1,1);
QRegExp badchars("[\\s\\/\\{\\[\\]\\}\\<\\>\\(\\)\\%]");
FarNam = FarNam.simplifyWhiteSpace().replace( badchars, "_" );
cc = ScColor(static_cast<int>(255 * c), static_cast<int>(255 * m), static_cast<int>(255 * y), static_cast<int>(255 * k));
cc = ScColor(qRound(255 * c), qRound(255 * m), qRound(255 * y), qRound(255 * k));
// cc = ScColor(static_cast<int>(255 * c), static_cast<int>(255 * m), static_cast<int>(255 * y), static_cast<int>(255 * k));
cc.setSpotColor(true);
CustColors.insert(FarNam, cc);
}
766,9 → 768,12
Code >> g;
Code >> b;
Code >> Opacity;
int Rc = static_cast<int>(r * 255 + 0.5);
/* int Rc = static_cast<int>(r * 255 + 0.5);
int Gc = static_cast<int>(g * 255 + 0.5);
int Bc = static_cast<int>(b * 255 + 0.5);
int Bc = static_cast<int>(b * 255 + 0.5); */
int Rc = qRound(r * 255);
int Gc = qRound(g * 255);
int Bc = qRound(b * 255);
int hR, hG, hB;
tmp.setColorRGB(Rc, Gc, Bc);
for (it = Doku->PageColors.begin(); it != Doku->PageColors.end(); ++it)
791,10 → 796,14
Code >> y;
Code >> k;
Code >> Opacity;
int Cc = static_cast<int>(c * 255 + 0.5);
/* int Cc = static_cast<int>(c * 255 + 0.5);
int Mc = static_cast<int>(m * 255 + 0.5);
int Yc = static_cast<int>(y * 255 + 0.5);
int Kc = static_cast<int>(k * 255 + 0.5);
int Kc = static_cast<int>(k * 255 + 0.5); */
int Cc = qRound(c * 255);
int Mc = qRound(m * 255);
int Yc = qRound(y * 255);
int Kc = qRound(k * 255);
int hC, hM, hY, hK;
tmp.setColor(Cc, Mc, Yc, Kc);
for (it = Doku->PageColors.begin(); it != Doku->PageColors.end(); ++it)