Michel2/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad.git synced 2026-07-28 04:07:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update all views during piece insert. Fixes #942.

Browse Source
This commit is contained in:
Leonardo Zide
2026-05-06 20:59:46 -07:00
parent 64b829b074
commit b6f7f92e7e
7 changed files with 98 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/lc_model.cpp
+43 -7
View File
@@ -189,6 +189,16 @@ lcModel::lcModel(const QString& FileName, Project* Project, bool Preview)
lcModel::~lcModel()
{
if (!mPreviewInsertPieceInfo.empty())
{
lcPiecesLibrary* Library = lcGetPiecesLibrary();
for (lcInsertPieceInfo& PreviewPieceInfoTransform : mPreviewInsertPieceInfo)
Library->ReleasePieceInfo(PreviewPieceInfoTransform.Info);
mPreviewInsertPieceInfo.clear();
}
if (mPieceInfo)
{
if (!mIsPreview && gMainWindow && gMainWindow->GetCurrentPieceInfo() == mPieceInfo)
@@ -2878,6 +2888,21 @@ void lcModel::UpdateSelectedPiecesTrainTrackConnections()
}
}
void lcModel::SetPreviewInsertPieceInfo(std::vector<lcInsertPieceInfo>&& PreviewInsertPieceInfo)
{
lcPiecesLibrary* Library = lcGetPiecesLibrary();
for (lcInsertPieceInfo& InfoTransform : PreviewInsertPieceInfo)
Library->LoadPieceInfo(InfoTransform.Info, true, true);
for (lcInsertPieceInfo& PreviewPieceInfoTransform : mPreviewInsertPieceInfo)
Library->ReleasePieceInfo(PreviewPieceInfoTransform.Info);
mPreviewInsertPieceInfo = std::move(PreviewInsertPieceInfo);
UpdateAllViews();
}
void lcModel::DeleteSelectedObjects()
{
if (mIsPreview)
@@ -4940,27 +4965,36 @@ void lcModel::EndMouseTool(lcTool Tool, lcView* View, bool Accept)
}
}
void lcModel::InsertPieceToolClicked(const std::vector<lcInsertPieceInfo>& PieceInfoTransforms)
bool lcModel::InsertPieceToolClicked(std::optional<lcMatrix44> Transform)
{
if (PieceInfoTransforms.empty())
return;
if (mPreviewInsertPieceInfo.empty())
return false;
BeginHistorySequence();
BeginEditHistory(lcModelHistoryEditMerge::None);
lcPiece* Piece = nullptr;
for (const lcInsertPieceInfo& PieceInfoTransform : PieceInfoTransforms)
for (const lcInsertPieceInfo& InsertPieceInfo : mPreviewInsertPieceInfo)
{
Piece = new lcPiece(PieceInfoTransform.Info);
Piece = new lcPiece(InsertPieceInfo.Info);
Piece->Initialize(PieceInfoTransform.Transform, mCurrentStep);
Piece->SetColorIndex(PieceInfoTransform.ColorIndex);
lcMatrix44 PieceTransform;
if (Transform.has_value())
PieceTransform = lcMul(InsertPieceInfo.Transform, Transform.value());
else
PieceTransform = InsertPieceInfo.Transform;
Piece->Initialize(PieceTransform, mCurrentStep);
Piece->SetColorIndex(InsertPieceInfo.ColorIndex);
Piece->UpdatePosition(mCurrentStep);
AddPiece(Piece);
}
SetPreviewInsertPieceInfo(std::vector<lcInsertPieceInfo>());
EndEditHistory();
SetSelectionAndFocus(std::vector<lcObject*>(), Piece, LC_PIECE_SECTION_POSITION, lcSelectionMode::Single);
@@ -4971,6 +5005,8 @@ void lcModel::InsertPieceToolClicked(const std::vector<lcInsertPieceInfo>& Piece
gMainWindow->UpdateInUseCategory();
UpdateTrainTrackConnections(Piece, false);
return true;
}
void lcModel::InsertCameraToolClicked(const lcVector3& Position)