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

Removed deprecated selection modes.

Browse Source
This commit is contained in:
Leonardo Zide
2026-01-31 13:44:20 -08:00
parent ce206cffe8
commit 966c7abf55
3 changed files with 7 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/lc_model.cpp
+5 -41
View File
@@ -1736,8 +1736,7 @@ void lcModel::SubModelAddBoundingBoxPoints(const lcMatrix44& WorldMatrix, std::v
void lcModel::RecordSelectionAction(lcModelActionSelectionMode ModelActionSelectionMode, const std::vector<lcObject*>& Objects, lcObject* FocusObject, uint32_t FocusSection, lcSelectionMode SelectionMode) void lcModel::RecordSelectionAction(lcModelActionSelectionMode ModelActionSelectionMode, const std::vector<lcObject*>& Objects, lcObject* FocusObject, uint32_t FocusSection, lcSelectionMode SelectionMode)
{ {
std::unique_ptr<lcModelActionSelection> ModelActionSelection = std::make_unique<lcModelActionSelection>(ModelActionSelectionMode); std::unique_ptr<lcModelActionSelection> ModelActionSelection = std::make_unique<lcModelActionSelection>();
bool ForceAdd = false;
ModelActionSelection->SaveStartState(this); ModelActionSelection->SaveStartState(this);
@@ -1776,17 +1775,11 @@ void lcModel::RecordSelectionAction(lcModelActionSelectionMode ModelActionSelect
case lcModelActionSelectionMode::RemoveFromSelection: case lcModelActionSelectionMode::RemoveFromSelection:
SetObjectsSelected(Objects, false); SetObjectsSelected(Objects, false);
break; break;
case lcModelActionSelectionMode::Set:
case lcModelActionSelectionMode::Save:
case lcModelActionSelectionMode::Restore:
ForceAdd = true;
break;
} }
ModelActionSelection->SaveEndState(this); ModelActionSelection->SaveEndState(this);
if (ForceAdd || ModelActionSelection->StateChanged()) if (ModelActionSelection->StateChanged())
mActionSequence.emplace_back(std::move(ModelActionSelection)); mActionSequence.emplace_back(std::move(ModelActionSelection));
} }
@@ -1795,35 +1788,10 @@ void lcModel::RunSelectionAction(const lcModelActionSelection* ModelActionSelect
if (!ModelActionSelection) if (!ModelActionSelection)
return; return;
switch (ModelActionSelection->GetMode()) if (Apply)
{ ModelActionSelection->LoadEndState(this);
case lcModelActionSelectionMode::ClearSelection: else
case lcModelActionSelectionMode::SetSelectionAndFocus:
case lcModelActionSelectionMode::SetFocus:
case lcModelActionSelectionMode::SelectAllPieces:
case lcModelActionSelectionMode::InvertPieceSelection:
case lcModelActionSelectionMode::AddToSelection:
case lcModelActionSelectionMode::RemoveFromSelection:
if (Apply)
ModelActionSelection->LoadEndState(this);
else
ModelActionSelection->LoadStartState(this);
break;
case lcModelActionSelectionMode::Set:
ModelActionSelection->LoadStartState(this); ModelActionSelection->LoadStartState(this);
break;
case lcModelActionSelectionMode::Save:
if (!Apply)
ModelActionSelection->LoadStartState(this);
break;
case lcModelActionSelectionMode::Restore:
if (Apply)
ModelActionSelection->LoadStartState(this);
break;
}
} }
void lcModel::BeginObjectEditAction(lcModelActionObjectEditMode ModelActionObjectEditMode, const lcCamera* Camera) void lcModel::BeginObjectEditAction(lcModelActionObjectEditMode ModelActionObjectEditMode, const lcCamera* Camera)
@@ -2272,9 +2240,7 @@ void lcModel::GroupSelection()
BeginActionSequence(); BeginActionSequence();
RecordSelectionAction(lcModelActionSelectionMode::Restore, std::vector<lcObject*>(), nullptr, 0, lcSelectionMode::Single);
RecordGroupPiecesAction(lcModelActionGroupPiecesMode::Group, Dialog.mName); RecordGroupPiecesAction(lcModelActionGroupPiecesMode::Group, Dialog.mName);
RecordSelectionAction(lcModelActionSelectionMode::Save, std::vector<lcObject*>(), nullptr, 0, lcSelectionMode::Single);
EndActionSequence(tr("Group")); EndActionSequence(tr("Group"));
} }
@@ -2306,9 +2272,7 @@ void lcModel::UngroupSelection()
BeginActionSequence(); BeginActionSequence();
RecordSelectionAction(lcModelActionSelectionMode::Restore, std::vector<lcObject*>(), nullptr, 0, lcSelectionMode::Single);
RecordGroupPiecesAction(lcModelActionGroupPiecesMode::Ungroup, QString()); RecordGroupPiecesAction(lcModelActionGroupPiecesMode::Ungroup, QString());
RecordSelectionAction(lcModelActionSelectionMode::Save, std::vector<lcObject*>(), nullptr, 0, lcSelectionMode::Single);
EndActionSequence(tr("Ungroup")); EndActionSequence(tr("Ungroup"));
} }
common/lc_modelaction.cpp
-5
View File
@@ -182,11 +182,6 @@ bool lcModelAction::LoadHistoryBuffer(const QByteArray& Buffer, lcModel* Model,
return true; return true;
} }
lcModelActionSelection::lcModelActionSelection(lcModelActionSelectionMode Mode)
: mMode(Mode)
{
}
void lcModelActionSelection::SaveStartState(const lcModel* Model) void lcModelActionSelection::SaveStartState(const lcModel* Model)
{ {
SaveState(mStartState, Model); SaveState(mStartState, Model);
common/lc_modelaction.h
+2 -11
View File
@@ -27,10 +27,7 @@ enum class lcModelActionSelectionMode
SelectAllPieces, SelectAllPieces,
InvertPieceSelection, InvertPieceSelection,
AddToSelection, AddToSelection,
RemoveFromSelection, RemoveFromSelection
Set,
Save,
Restore
}; };
struct lcModelActionSelectionState struct lcModelActionSelectionState
@@ -52,13 +49,8 @@ struct lcModelActionSelectionState
class lcModelActionSelection : public lcModelAction class lcModelActionSelection : public lcModelAction
{ {
public: public:
lcModelActionSelection(lcModelActionSelectionMode Mode); lcModelActionSelection() = default;
virtual ~lcModelActionSelection() = default; virtual ~lcModelActionSelection() = default;
lcModelActionSelectionMode GetMode() const
{
return mMode;
}
void SaveStartState(const lcModel* Model); void SaveStartState(const lcModel* Model);
void SaveEndState(const lcModel* Model); void SaveEndState(const lcModel* Model);
@@ -73,7 +65,6 @@ protected:
lcModelActionSelectionState mStartState; lcModelActionSelectionState mStartState;
lcModelActionSelectionState mEndState; lcModelActionSelectionState mEndState;
lcModelActionSelectionMode mMode;
}; };
enum class lcModelActionObjectEditMode enum class lcModelActionObjectEditMode