palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-06-29 07:38:11 +02:00
Code Issues Projects Releases Wiki Activity

Merged in ValentinaZhuravska/valentina/feature (pull request #118)

Browse source 
Fixed tests in Windows.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-06-01 22:02:43 +03:00
parent 080da6d3e1 096976b682
commit 37d025dda8
6 changed files with 99 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/libs/vlayout/vposter.cpp
View file

@ -55,14 +55,14 @@ QVector<QImage> VPoster::Generate(const QImage &image, int page, int sheets) con
}
const int rows = CountRows(image.rect().height());
const int colomns = CountColomns(image.rect().width());
const int columns = CountColumns(image.rect().width());
for (int i=0; i < rows; i++)
{
for (int j=0; j< colomns; j++)
for (int j=0; j< columns; j++)
{
QImage img = Cut(i, j, image);
img = Borders(rows, colomns, i, j, img, page, sheets);
img = Borders(rows, columns, i, j, img, page, sheets);
poster.append(img);
}
}
@ -120,7 +120,7 @@ int VPoster::CountRows(int height) const
}
//---------------------------------------------------------------------------------------------------------------------
int VPoster::CountColomns(int width) const
int VPoster::CountColumns(int width) const
{
const qreal imgLength = width;
const qreal pageLength = PageRect().width();
@ -182,7 +182,7 @@ QImage VPoster::Cut(int i, int j, const QImage &image) const
}
//---------------------------------------------------------------------------------------------------------------------
QImage VPoster::Borders(int rows, int colomns, int i, int j, QImage &image, int page, int sheets) const
QImage VPoster::Borders(int rows, int columns, int i, int j, QImage &image, int page, int sheets) const
{
QPainter painter(&image);
@ -198,7 +198,7 @@ QImage VPoster::Borders(int rows, int colomns, int i, int j, QImage &image, int
QImage("://scissors_vertical.png"));
}
if (j != colomns-1)
if (j != columns-1)
{// Right border
painter.drawLine(QLine(rec.width()-static_cast<int>(allowence), 0,
rec.width()-static_cast<int>(allowence), rec.height()));
@ -211,7 +211,7 @@ QImage VPoster::Borders(int rows, int colomns, int i, int j, QImage &image, int
QImage("://scissors_horizontal.png"));
}
if (rows*colomns > 1)
if (rows*columns > 1)
{ // Don't show bottom border if only one page need
// Bottom border (mandatory)
painter.drawLine(QLine(0, rec.height()-static_cast<int>(allowence),
@ -230,7 +230,7 @@ QImage VPoster::Borders(int rows, int colomns, int i, int j, QImage &image, int
QRect labels(layoutX, rec.height()-static_cast<int>(allowence)+layoutY,
rec.width()-(static_cast<int>(allowence)+layoutX), static_cast<int>(allowence)-layoutY);
painter.drawText(labels, Qt::AlignLeft, tr("Grid ( %1 , %2 )").arg(i+1).arg(j+1));
painter.drawText(labels, Qt::AlignHCenter, tr("Page %1 of %2").arg(i*(colomns)+j+1).arg(rows*colomns));
painter.drawText(labels, Qt::AlignHCenter, tr("Page %1 of %2").arg(i*(columns)+j+1).arg(rows*columns));
if (sheets > 1)
{
painter.drawText(labels, Qt::AlignRight, tr("Sheet %1 of %2").arg(page).arg(sheets));

4
src/libs/vlayout/vposter.h
View file

@ -47,10 +47,10 @@ private:
quint32 allowence;
int CountRows(int height) const;
int CountColomns(int width) const;
int CountColumns(int width) const;
QImage Cut(int i, int j, const QImage &image) const;
QImage Borders(int rows, int colomns, int i, int j, QImage &image, int page, int sheets) const;
QImage Borders(int rows, int columns, int i, int j, QImage &image, int page, int sheets) const;
QRect PageRect() const;

52
src/test/ValentinaTest/tst_misc.cpp
View file

@ -92,6 +92,57 @@ void TST_Misc::TestAbsoluteFilePath_data()
QTest::addColumn<QString>("relativeMPath");
QTest::addColumn<QString>("output");
#ifdef Q_OS_WIN
QTest::newRow("Measurements one level above")
<< QApplication::applicationDirPath() + QStringLiteral("/home/user/patterns/pattern.val")
<< "../measurements/m.vit"
<< QApplication::applicationDirPath() + QStringLiteral("/home/user/measurements/m.vit");
QTest::newRow("Measurements one level above")
<< QApplication::applicationDirPath() + QStringLiteral("/home/user/patterns/pattern.val")
<< "../measurements/m.vit"
<< QApplication::applicationDirPath() + QStringLiteral("/home/user/measurements/m.vit");
QTest::newRow("Measurements one level under")
<< QApplication::applicationDirPath() + QStringLiteral("/home/user/patterns/pattern.val")
<< "measurements/m.vit"
<< QApplication::applicationDirPath() + QStringLiteral("/home/user/patterns/measurements/m.vit");
QTest::newRow("Measurements in the same folder")
<< QApplication::applicationDirPath() + QStringLiteral("/home/user/patterns/pattern.val")
<< "m.vit"
<< QApplication::applicationDirPath() + QStringLiteral("/home/user/patterns/m.vit");
QTest::newRow("Path to measurements is empty")
<< QApplication::applicationDirPath() + QStringLiteral("/home/user/patterns/pattern.val")
<< "" << "";
QTest::newRow("Path to a pattern file is empty. Ablosute measurements path.")
<< ""
<< QApplication::applicationDirPath() + QStringLiteral("/home/user/patterns/m.vit")
<< QApplication::applicationDirPath() + QStringLiteral("/home/user/patterns/m.vit");
QTest::newRow("Path to a pattern file is empty. Relative measurements path.")
<< ""
<< "measurements/m.vit"
<< "measurements/m.vit";
QTest::newRow("Relative measurements path.")
<< QApplication::applicationDirPath() + QStringLiteral("/home/user/patterns/pattern.val")
<< "../measurements/m.vit"
<< QApplication::applicationDirPath() + QStringLiteral("/home/user/measurements/m.vit");
QTest::newRow("Both paths are empty") << "" << "" << "";
QTest::newRow("Path to measurements is relative")
<< QApplication::applicationDirPath() + QStringLiteral("/home/user/patterns/pattern.val")
<< "m.vit"
<< QApplication::applicationDirPath() + QStringLiteral("/home/user/patterns/m.vit");
QTest::newRow("Absolute pattern path.")
<< QApplication::applicationDirPath() + QStringLiteral("/home/user/patterns")
<< "m.vit"
<< QApplication::applicationDirPath() + QStringLiteral("/home/user/m.vit");
#else
QTest::newRow("Measurements one level above")
<< "/home/user/patterns/pattern.val" << "../measurements/m.vit" << "/home/user/measurements/m.vit";
@ -119,6 +170,7 @@ void TST_Misc::TestAbsoluteFilePath_data()
<< "/home/user/patterns/pattern.val" << "m.vit" << "/home/user/patterns/m.vit";
QTest::newRow("Absolute pattern path.") << "/home/user/patterns" << "m.vit" << "/home/user/m.vit";
#endif
}
//---------------------------------------------------------------------------------------------------------------------

7
src/test/ValentinaTest/tst_valentinacommandline.cpp
View file

@ -258,6 +258,9 @@ void TST_ValentinaCommandLine::TestOpenCollection_data() const
const QString keyTest = QStringLiteral("--test");
QTest::newRow("bra") << "bra.val" << keyTest << true << V_EX_OK;
#ifdef Q_OS_WIN
Q_UNUSED(testGOST)
#else
QTest::newRow("jacketМ1_52-176") << "jacketМ1_52-176.val" << testGOST << true << V_EX_OK;
QTest::newRow("jacketМ2_40-146") << "jacketМ2_40-146.val" << testGOST << true << V_EX_OK;
QTest::newRow("jacketМ3_40-146") << "jacketМ3_40-146.val" << testGOST << true << V_EX_OK;
@ -267,8 +270,10 @@ void TST_ValentinaCommandLine::TestOpenCollection_data() const
QTest::newRow("pantsМ1_52-176") << "pantsМ1_52-176.val" << testGOST << true << V_EX_OK;
QTest::newRow("pantsМ2_40-146") << "pantsМ2_40-146.val" << testGOST << true << V_EX_OK;
QTest::newRow("pantsМ7") << "pantsМ7.val" << testGOST << true << V_EX_OK;
#endif
QTest::newRow("TShirt_test") << "TShirt_test.val" << keyTest << true << V_EX_OK;
QTest::newRow("TestDart") << "TestDart.val" << keyTest << true << V_EX_OK;
#ifndef Q_OS_WIN
QTest::newRow("patrón_blusa") << "patrón_blusa.val" << keyTest << true << V_EX_OK;
QTest::newRow("PajamaTopWrap2") << "PajamaTopWrap2.val" << keyTest << true << V_EX_OK;
QTest::newRow("Keiko_skirt") << "Keiko_skirt.val" << keyTest << true << V_EX_OK;
@ -277,6 +282,8 @@ void TST_ValentinaCommandLine::TestOpenCollection_data() const
QTest::newRow("IMK_Zhaketa") << "IMK_Zhaketa_poluprilegayuschego_silueta.val" << keyTest << true << V_EX_OK;
QTest::newRow("Moulage_0.5_armhole_neckline") << "Moulage_0.5_armhole_neckline.val" << keyTest << true << V_EX_OK;
QTest::newRow("0.7_Armhole_adjustment_0.10") << "0.7_Armhole_adjustment_0.10.val" << keyTest << true << V_EX_OK;
#endif
// We have a problem with encoding in Windows when we try to open some files in terminal
}
//---------------------------------------------------------------------------------------------------------------------

35
src/test/ValentinaTest/tst_vmeasurements.cpp
View file

@ -57,10 +57,17 @@ void TST_VMeasurements::CreateEmptyStandardFile()
QSharedPointer<VMeasurements>(new VMeasurements(mUnit, size, height, data.data()));
QTemporaryFile file;
QString fileName;
// In Windows we have problems when we try to open QSaveFile when QTemporaryFile with the same name is already open.
if (file.open())
{
// So, before we try to open file in m->SaveDocument function we need to close it and remove.
// Just closing - is not enough, if we just close QTemporaryFile we get "access denied" in Windows.
fileName = file.fileName();
file.close();
file.remove();
QString error;
const bool result = m->SaveDocument(file.fileName(), error);
const bool result = m->SaveDocument(fileName, error);
QVERIFY2(result, error.toUtf8().constData());
}
@ -71,7 +78,7 @@ void TST_VMeasurements::CreateEmptyStandardFile()
try
{
VDomDocument::ValidateXML(VVSTConverter::CurrentSchema, file.fileName());
VDomDocument::ValidateXML(VVSTConverter::CurrentSchema, fileName);
}
catch (VException &e)
{
@ -93,10 +100,14 @@ void TST_VMeasurements::CreateEmptyIndividualFile()
QSharedPointer<VMeasurements>(new VMeasurements(mUnit, data.data()));
QTemporaryFile file;
QString fileName;
if (file.open())
{
fileName = file.fileName();
file.close();
file.remove();
QString error;
const bool result = m->SaveDocument(file.fileName(), error);
const bool result = m->SaveDocument(fileName, error);
QVERIFY2(result, error.toUtf8().constData());
}
@ -107,7 +118,7 @@ void TST_VMeasurements::CreateEmptyIndividualFile()
try
{
VDomDocument::ValidateXML(VVITConverter::CurrentSchema, file.fileName());
VDomDocument::ValidateXML(VVITConverter::CurrentSchema, fileName);
}
catch (VException &e)
{
@ -141,10 +152,14 @@ void TST_VMeasurements::ValidPMCodesStandardFile()
m->SetPMSystem(code);
QTemporaryFile file;
QString fileName;
if (file.open())
{
fileName = file.fileName();
file.close();
file.remove();
QString error;
const bool result = m->SaveDocument(file.fileName(), error);
const bool result = m->SaveDocument(fileName, error);
const QString message = QString("Error: %1 for code=%2").arg(error).arg(listSystems.at(i));
QVERIFY2(result, qUtf8Printable(message));
@ -156,7 +171,7 @@ void TST_VMeasurements::ValidPMCodesStandardFile()
try
{
VDomDocument::ValidateXML(VVSTConverter::CurrentSchema, file.fileName());
VDomDocument::ValidateXML(VVSTConverter::CurrentSchema, fileName);
}
catch (VException &e)
{
@ -188,10 +203,14 @@ void TST_VMeasurements::ValidPMCodesIndividualFile()
m->SetPMSystem(code);
QTemporaryFile file;
QString fileName;
if (file.open())
{
fileName = file.fileName();
file.close();
file.remove();
QString error;
const bool result = m->SaveDocument(file.fileName(), error);
const bool result = m->SaveDocument(fileName, error);
const QString message = QString("Error: %1 for code=%2").arg(error).arg(listSystems.at(i));
QVERIFY2(result, qUtf8Printable(message));
@ -203,7 +222,7 @@ void TST_VMeasurements::ValidPMCodesIndividualFile()
try
{
VDomDocument::ValidateXML(VVITConverter::CurrentSchema, file.fileName());
VDomDocument::ValidateXML(VVITConverter::CurrentSchema, fileName);
}
catch (VException &e)
{

4
src/test/ValentinaTest/tst_vposter.cpp
View file

@ -46,12 +46,14 @@ void TST_VPoster::BigPoster()
QPrinter printer;
printer.setResolution(96);// By default
printer.setPaperSize(QPrinter::A4);
printer.setFullPage(true);
// We need to set full page because otherwise QPrinter->pageRect returns different values in Windows and Linux
const QImage image(2622, 3178, QImage::Format_RGB32); // Little bit bigger than A1
VPoster posterazor(&printer);
const QVector<QImage> poster = posterazor.Generate(image, 1, 1);
QCOMPARE(poster.size(), 16);
QCOMPARE(poster.size(), 12);
for (int i=0; i < poster.size(); i++)
{