electron-rare/leocad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Array cleanup.

Browse Source
This commit is contained in:
Leonardo Zide
2020-04-18 19:38:29 -07:00
parent cde5db25fe
commit a5c2e617d5
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/lc_lxf.cpp
+6 -6
View File
@@ -78,7 +78,7 @@ static bool lcLoadLDrawXML(std::map<int, int>& MaterialTable, std::map<int, std:
return true;
}
bool lcImportLXFMLFile(const QString& FileData, lcArray<lcPiece*>& Pieces, lcArray<lcArray<lcPiece*>>& Groups)
bool lcImportLXFMLFile(const QString& FileData, std::vector<lcPiece*>& Pieces, std::vector<std::vector<lcPiece*>>& Groups)
{
std::map<int, int> MaterialTable;
std::map<int, std::string> BrickTable;
@@ -187,16 +187,16 @@ bool lcImportLXFMLFile(const QString& FileData, lcArray<lcPiece*>& Pieces, lcArr
Piece->SetPieceInfo(Info, QString(), false);
Piece->Initialize(lcMatrix44LDrawToLeoCAD(WorldMatrix), 1);
Piece->SetColorCode(ColorCode);
Pieces.Add(Piece);
Pieces.push_back(Piece);
NumBrickPieces++;
}
if (NumBrickPieces > 1)
{
lcArray<lcPiece*> Group;
for (int PieceIdx = Pieces.GetSize() - NumBrickPieces; PieceIdx < Pieces.GetSize(); PieceIdx++)
Group.Add(Pieces[PieceIdx]);
Groups.Add(Group);
std::vector<lcPiece*> Group;
for (size_t PieceIdx = Pieces.size() - NumBrickPieces; PieceIdx < Pieces.size(); PieceIdx++)
Group.push_back(Pieces[PieceIdx]);
Groups.push_back(Group);
}
}
}
common/lc_lxf.h
+1 -3
View File
@@ -1,6 +1,4 @@
#pragma once
#include "lc_array.h"
bool lcImportLXFMLFile(const QString& FileData, lcArray<lcPiece*>& Pieces, lcArray<lcArray<lcPiece*>>& Groups);
bool lcImportLXFMLFile(const QString& FileData, std::vector<lcPiece*>& Pieces, std::vector<std::vector<lcPiece*>>& Groups);
common/lc_model.cpp
+3 -3
View File
@@ -980,8 +980,8 @@ bool lcModel::LoadBinary(lcFile* file)
bool lcModel::LoadLDD(const QString& FileData)
{
lcArray<lcPiece*> Pieces;
lcArray<lcArray<lcPiece*>> Groups;
std::vector<lcPiece*> Pieces;
std::vector<std::vector<lcPiece*>> Groups;
if (!lcImportLXFMLFile(FileData, Pieces, Groups))
return false;
@@ -989,7 +989,7 @@ bool lcModel::LoadLDD(const QString& FileData)
for (lcPiece* Piece : Pieces)
AddPiece(Piece);
for (const lcArray<lcPiece*>& Group : Groups)
for (const std::vector<lcPiece*>& Group : Groups)
{
lcGroup* NewGroup = AddGroup(tr("Group #"), nullptr);
for (lcPiece* Piece : Group)