Skip to content

Smart pack filter update to keep component selection (#1251) #2123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edriouk merged 1 commit into from
Jun 27, 2025
Merged

Smart pack filter update to keep component selection (#1251) #2123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions tools/projmgr/src/ProjMgrRpcServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ class RpcHandler : public RpcMethods {
ContextItem m_globalContext;
bool m_packsLoaded = false;
bool m_solutionLoaded = false;
bool m_bUseAllPacks = false;

void StoreSelectedComponents(RteTarget* rteTarget, map<RteComponent*, int>& selectedComponents);
void UpdateFilter(const string& context, RteTarget* rteTarget, bool bAll); // returns true if changed
const ContextItem& GetContext(const string& context) const;
RteTarget* GetActiveTarget(const string& context) const;
RteComponentAggregate* GetComponentAggregate(const string& context, const string& id) const;
Expand Down Expand Up @@ -276,11 +280,8 @@ RpcArgs::PacksInfo RpcHandler::GetPacksInfo(const string& context) {
return packsInfo;
}

RpcArgs::CtRoot RpcHandler::GetComponentsTree(const string& context, const bool& all) {
RpcArgs::CtRoot ctRoot;
RteTarget* rteTarget = GetActiveTarget(context);
// store selected components, not aggregates: they will be destroyed
map<RteComponent*, int> selectedComponents;
void RpcHandler::StoreSelectedComponents(RteTarget* rteTarget, map<RteComponent*, int>& selectedComponents)
{
auto& selectedAggregates = rteTarget->CollectSelectedComponentAggregates();
for(auto [aggregate, count] : selectedAggregates) {
RteComponent* c = aggregate->GetComponent();
Expand All @@ -289,6 +290,17 @@ RpcArgs::CtRoot RpcHandler::GetComponentsTree(const string& context, const bool&
selectedComponents[c] = count;
}
}
}

void RpcHandler::UpdateFilter(const string& context, RteTarget* rteTarget, bool all) {
if(m_bUseAllPacks == all) {
return;
}
m_bUseAllPacks = all;
// store selected components, not aggregates: they will be destroyed
map<RteComponent*, int> selectedComponents;
StoreSelectedComponents(rteTarget, selectedComponents);

RtePackageFilter packFilter;
if(!all) {
// construct and apply filter
Expand All @@ -300,7 +312,13 @@ RpcArgs::CtRoot RpcHandler::GetComponentsTree(const string& context, const bool&
packIds.insert(id);
}
}
// add new packs from current selection otherwise we will loose the selection
for(auto [c, _count] : selectedComponents) {
auto id = c->GetPackageID();
packIds.insert(id);
}
packFilter.SetSelectedPackages(packIds);
packFilter.SetUseAllPacks(false);
}
// only update filter if differs from current state
if(!packFilter.IsEqual(rteTarget->GetPackageFilter())) {
Expand All @@ -313,8 +331,14 @@ RpcArgs::CtRoot RpcHandler::GetComponentsTree(const string& context, const bool&
}
rteTarget->EvaluateComponentDependencies();
}
}

RpcArgs::CtRoot RpcHandler::GetComponentsTree(const string& context, const bool& all) {
RteTarget* rteTarget = GetActiveTarget(context);
UpdateFilter(context, rteTarget, all);

RpcDataCollector dc(rteTarget);
RpcArgs::CtRoot ctRoot;
dc.CollectCtClasses(ctRoot);
return ctRoot;
}
Expand Down
Loading