Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-17 18:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Replaced HTML parts list table with image.

Browse source
This commit is contained in:
Leonardo Zide 2017-07-02 16:10:30 -07:00
parent 0784cbc857
commit bb5a703f51
3 changed files with 144 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
common/project.cpp
View file

@ -1041,7 +1041,7 @@ void Project::ExportCSV()
} }
} }
void Project::CreatePartsListImage(lcModel* Model, lcStep Step, QPainter& Painter) QImage Project::CreatePartsListImage(lcModel* Model, lcStep Step)
{ {
lcPartsList PartsList; lcPartsList PartsList;
if (Step == 0) if (Step == 0)
@ -1050,7 +1050,7 @@ void Project::CreatePartsListImage(lcModel* Model, lcStep Step, QPainter& Painte
Model->GetPartsListForStep(Step, gDefaultColor, PartsList); Model->GetPartsListForStep(Step, gDefaultColor, PartsList);
if (PartsList.empty()) if (PartsList.empty())
return; return QImage();
struct lcPartsListImage struct lcPartsListImage
{ {
@ -1059,6 +1059,7 @@ void Project::CreatePartsListImage(lcModel* Model, lcStep Step, QPainter& Painte
int ColorIndex; int ColorIndex;
int Count; int Count;
QRect Bounds; QRect Bounds;
QPoint Position;
}; };
std::vector<lcPartsListImage> Images; std::vector<lcPartsListImage> Images;
@ -1094,11 +1095,11 @@ void Project::CreatePartsListImage(lcModel* Model, lcStep Step, QPainter& Painte
if (!Context->BeginRenderToTexture(ThumbnailWidth, ThumbnailHeight)) if (!Context->BeginRenderToTexture(ThumbnailWidth, ThumbnailHeight))
{ {
QMessageBox::warning(gMainWindow, tr("LeoCAD"), tr("Error creating images.")); QMessageBox::warning(gMainWindow, tr("LeoCAD"), tr("Error creating images."));
return; return QImage();
} }
float Aspect = (float)ThumbnailWidth / (float)ThumbnailHeight; float Aspect = (float)ThumbnailWidth / (float)ThumbnailHeight;
float OrthoHeight = 100.0f; float OrthoHeight = 200.0f;
float OrthoWidth = OrthoHeight * Aspect; float OrthoWidth = OrthoHeight * Aspect;
lcMatrix44 ProjectionMatrix = lcMatrix44Ortho(-OrthoWidth, OrthoWidth, -OrthoHeight, OrthoHeight, 1.0f, 50000.0f); lcMatrix44 ProjectionMatrix = lcMatrix44Ortho(-OrthoWidth, OrthoWidth, -OrthoHeight, OrthoHeight, 1.0f, 50000.0f);
@ -1158,36 +1159,75 @@ void Project::CreatePartsListImage(lcModel* Model, lcStep Step, QPainter& Painte
QtConcurrent::blockingMap(Images, CalculateImageBounds); QtConcurrent::blockingMap(Images, CalculateImageBounds);
QFont Font("helvetica", 24, QFont::Bold); QImage DummyImage(16, 16, QImage::Format_ARGB32);
Painter.setFont(Font); QPainter DummyPainter(&DummyImage);
QFontMetrics FontMetrics = Painter.fontMetrics();
int CurrentX = 0; QFont Font("helvetica", 20, QFont::Bold);
int CurrentY = 0; DummyPainter.setFont(Font);
int ColumnWidth = 0; QFontMetrics FontMetrics = DummyPainter.fontMetrics();
int Ascent = FontMetrics.ascent(); int Ascent = FontMetrics.ascent();
int Spacing = 20;
int CurrentHeight = 0;
int MaxWidth = 1024;
for (lcPartsListImage& Image : Images) for (lcPartsListImage& Image : Images)
{ {
if (CurrentY + Image.Bounds.height() + Ascent > Painter.device()->height()) CurrentHeight = qMax(Image.Bounds.height() + Ascent, CurrentHeight);
MaxWidth = qMax(MaxWidth, Image.Bounds.height());
}
for (;;)
{
int CurrentWidth = 0;
int CurrentX = 0;
int CurrentY = 0;
int ColumnWidth = 0;
int Spacing = 20;
int NextHeightIncrease = INT_MAX;
for (lcPartsListImage& Image : Images)
{ {
CurrentY = 0; if (CurrentY + Image.Bounds.height() + Ascent > CurrentHeight)
CurrentX += ColumnWidth + Spacing; {
ColumnWidth = 0; int NeededSpace = Image.Bounds.height() + Ascent - (CurrentHeight - CurrentY);
NextHeightIncrease = qMin(NeededSpace, NextHeightIncrease);
CurrentY = 0;
CurrentX += ColumnWidth + Spacing;
ColumnWidth = 0;
}
Image.Position = QPoint(CurrentX, CurrentY);
CurrentY += Image.Bounds.height() + Ascent + Spacing;
CurrentWidth = qMax(CurrentWidth, CurrentX + Image.Bounds.width());
ColumnWidth = qMax(ColumnWidth, Image.Bounds.width());
} }
Painter.drawImage(QPoint(CurrentX, CurrentY), Image.Thumbnail, Image.Bounds); if (CurrentWidth < MaxWidth)
CurrentY += Image.Bounds.height(); {
MaxWidth = CurrentWidth;
break;
}
CurrentY += Ascent; CurrentHeight += NextHeightIncrease;
Painter.drawText(QPoint(CurrentX, CurrentY), QString::number(Image.Count) + 'x'); }
ColumnWidth = qMax(ColumnWidth, Image.Bounds.width()); QImage Image(MaxWidth + 40, CurrentHeight + 40, QImage::Format_ARGB32);
CurrentY += Spacing; Image.fill(QColor(255, 255, 255, 0));
QPainter Painter(&Image);
Painter.setFont(Font);
for (lcPartsListImage& Image : Images)
{
QPoint Position = Image.Position + QPoint(20, 20);
Painter.drawImage(Position, Image.Thumbnail, Image.Bounds);
Painter.drawText(QPoint(Position.x(), Position.y() + Image.Bounds.height() + Ascent), QString::number(Image.Count) + 'x');
} }
Painter.end(); Painter.end();
return Image;
} }
void Project::CreateHTMLPieceList(QTextStream& Stream, lcModel* Model, lcStep Step, bool Images) void Project::CreateHTMLPieceList(QTextStream& Stream, lcModel* Model, lcStep Step, bool Images)
@ -1324,6 +1364,21 @@ void Project::ExportHTML()
QString ProjectTitle = GetTitle(); QString ProjectTitle = GetTitle();
auto AddPartsListImage = [this, &ProjectTitle, &Dir](QTextStream& Stream, lcModel* Model, lcStep Step)
{
QImage Image = CreatePartsListImage(Model, Step);
if (!Image.isNull())
{
QString BaseName = ProjectTitle.left(ProjectTitle.length() - QFileInfo(ProjectTitle).suffix().length() - 1);
QString FileName = QFileInfo(Dir, BaseName + QLatin1String("-parts.png")).absoluteFilePath();
Image.save(FileName);
Stream << QString::fromLatin1("<IMG SRC=\"%1\" />\r\n").arg(FileName);
}
};
for (int ModelIdx = 0; ModelIdx < Models.GetSize(); ModelIdx++) for (int ModelIdx = 0; ModelIdx < Models.GetSize(); ModelIdx++)
{ {
lcModel* Model = mModels[ModelIdx]; lcModel* Model = mModels[ModelIdx];
@ -1365,7 +1420,7 @@ void Project::ExportHTML()
} }
if (Options.PartsListEnd) if (Options.PartsListEnd)
CreateHTMLPieceList(Stream, Model, 0, Options.PartsListImages); AddPartsListImage(Stream, Model, 0);
Stream << QLatin1String("</CENTER>\n<BR><HR><BR><B><I>Created by <A HREF=\"http://www.leocad.org\">LeoCAD</A></B></I><BR></HTML>\r\n"); Stream << QLatin1String("</CENTER>\n<BR><HR><BR><B><I>Created by <A HREF=\"http://www.leocad.org\">LeoCAD</A></B></I><BR></HTML>\r\n");
} }
@ -1445,7 +1500,7 @@ void Project::ExportHTML()
Stream << QString::fromLatin1("<HTML>\r\n<HEAD>\r\n<TITLE>Pieces used by %1</TITLE>\r\n</HEAD>\r\n<BR>\r\n<CENTER>\n").arg(PageTitle); Stream << QString::fromLatin1("<HTML>\r\n<HEAD>\r\n<TITLE>Pieces used by %1</TITLE>\r\n</HEAD>\r\n<BR>\r\n<CENTER>\n").arg(PageTitle);
CreateHTMLPieceList(Stream, Model, 0, Options.PartsListImages); AddPartsListImage(Stream, Model, 0);
Stream << QLatin1String("</CENTER>\n<BR><HR><BR>"); Stream << QLatin1String("</CENTER>\n<BR><HR><BR>");
Stream << QString::fromLatin1("<A HREF=\"%1-%2.html\">Previous</A> ").arg(BaseName, QString("%1").arg(LastStep, 2, 10, QLatin1Char('0'))); Stream << QString::fromLatin1("<A HREF=\"%1-%2.html\">Previous</A> ").arg(BaseName, QString("%1").arg(LastStep, 2, 10, QLatin1Char('0')));
@ -1546,17 +1601,6 @@ void Project::ExportHTML()
Stream << QLatin1String("</CENTER>\n<BR><HR><BR><B><I>Created by <A HREF=\"http://www.leocad.org\">LeoCAD</A></B></I><BR></HTML>\r\n"); Stream << QLatin1String("</CENTER>\n<BR><HR><BR><B><I>Created by <A HREF=\"http://www.leocad.org\">LeoCAD</A></B></I><BR></HTML>\r\n");
} }
QImage Image(2048, 2048, QImage::Format_ARGB32);
Image.fill(QColor(255, 255, 255, 0));
QPainter Painter(&Image);
CreatePartsListImage(Models[0], 0, Painter);
QString BaseName = ProjectTitle.left(ProjectTitle.length() - QFileInfo(ProjectTitle).suffix().length() - 1);
QString FileName = QFileInfo(Dir, BaseName + QLatin1String("-parts.png")).absoluteFilePath();
Image.save(FileName);
} }
struct lcColorName struct lcColorName

2
common/project.h
View file

@ -80,7 +80,7 @@ public:
protected: protected:
QString GetExportFileName(const QString& FileName, const QString& DefaultExtension, const QString& DialogTitle, const QString& DialogFilter) const; QString GetExportFileName(const QString& FileName, const QString& DefaultExtension, const QString& DialogTitle, const QString& DialogFilter) const;
void GetModelParts(lcArray<lcModelPartsEntry>& ModelParts); void GetModelParts(lcArray<lcModelPartsEntry>& ModelParts);
void CreatePartsListImage(lcModel* Model, lcStep Step, QPainter& Painter); QImage CreatePartsListImage(lcModel* Model, lcStep Step);
void CreateHTMLPieceList(QTextStream& Stream, lcModel* Model, lcStep Step, bool Images); void CreateHTMLPieceList(QTextStream& Stream, lcModel* Model, lcStep Step, bool Images);
bool mModified; bool mModified;

130
qt/lc_qhtmldialog.ui
View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>400</width>
<height>617</height> <height>629</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -179,61 +179,7 @@
<string>Parts List</string> <string>Parts List</string>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<item row="4" column="1"> <item row="5" column="0">
<widget class="QLineEdit" name="partImagesWidth">
<property name="maximumSize">
<size>
<width>75</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLineEdit" name="partImagesHeight">
<property name="maximumSize">
<size>
<width>75</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="partsAtTheEnd">
<property name="text">
<string>At the end</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="partsAfterEachStep">
<property name="text">
<string>After each step</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Width:</string>
</property>
<property name="buddy">
<cstring>partImagesWidth</cstring>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Height:</string>
</property>
<property name="buddy">
<cstring>partImagesHeight</cstring>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>Color:</string> <string>Color:</string>
@ -243,14 +189,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="5" column="1">
<widget class="QCheckBox" name="partImages">
<property name="text">
<string>Create images</string>
</property>
</widget>
</item>
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="lcQColorPicker" name="partColor"> <widget class="lcQColorPicker" name="partColor">
@ -274,6 +213,67 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="6" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Width:</string>
</property>
<property name="buddy">
<cstring>partImagesWidth</cstring>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLineEdit" name="partImagesWidth">
<property name="maximumSize">
<size>
<width>75</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Height:</string>
</property>
<property name="buddy">
<cstring>partImagesHeight</cstring>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLineEdit" name="partImagesHeight">
<property name="maximumSize">
<size>
<width>75</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="partsAfterEachStep">
<property name="text">
<string>After each step</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="partImages">
<property name="text">
<string>Create images</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="partsAtTheEnd">
<property name="text">
<string>At the end</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -319,8 +319,8 @@
<tabstop>stepWidth</tabstop> <tabstop>stepWidth</tabstop>
<tabstop>stepHeight</tabstop> <tabstop>stepHeight</tabstop>
<tabstop>highlightNewParts</tabstop> <tabstop>highlightNewParts</tabstop>
<tabstop>partsAfterEachStep</tabstop>
<tabstop>partsAtTheEnd</tabstop> <tabstop>partsAtTheEnd</tabstop>
<tabstop>partsAfterEachStep</tabstop>
<tabstop>partImages</tabstop> <tabstop>partImages</tabstop>
<tabstop>partColor</tabstop> <tabstop>partColor</tabstop>
<tabstop>partImagesWidth</tabstop> <tabstop>partImagesWidth</tabstop>