Skip to content

Feature/gui pin functions #621

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
joern274 merged 6 commits into from
Sep 2, 2025
Merged

Feature/gui pin functions #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bef929f
1.Updating pin index upon d&d 2.Allow to drop pin on pin 3.Add toggle…
joern274 Aug 31, 2025
d50954c
GUI feature change pin group type
joern274 Sep 1, 2025
a997e41
Send pin group rename event when generating temporary name
joern274 Sep 1, 2025
7537422
Removal of debug statements and include files not needed
joern274 Sep 1, 2025
5d2fd20
Implement Drop PinGroup on Pin
joern274 Sep 2, 2025
c3f6526
master merged
joern274 Sep 2, 2025
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
2 changes: 1 addition & 1 deletion plugins/gui/include/gui/selection_details_widget/module_details_widget/port_tree_model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ namespace hal
void updateGroupIndex(PortTreeItem* groupItem);

// helper functions for dnd for more clarity
void dndGroupOnGroup(BaseTreeItem* droppedGroup, BaseTreeItem* onDroppedGroup);
void dndGroupOnGroup(BaseTreeItem* droppedGroup, BaseTreeItem* onDroppedGroup, int row=-1);
void dndGroupBetweenGroup(PortTreeItem* droppedGroup, int row);
void dndPinOnGroup(PortTreeItem* droppedPin, BaseTreeItem* onDroppedGroup);
void dndPinBetweenPin(PortTreeItem* droppedPin, BaseTreeItem* onDroppedParent, int row);
Expand Down
1 change: 1 addition & 0 deletions plugins/gui/src/selection_details_widget/module_details_widget/module_ports_tree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ namespace hal
if (!m)
return;

mPortModel->clear();
mPortModel->setModule(m);
mModuleID = moduleID;
}
Expand Down
35 changes: 21 additions & 14 deletions plugins/gui/src/selection_details_widget/module_details_widget/port_tree_model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ namespace hal

auto droppedItem = (type == "group") ? static_cast<PortTreeItem*>(mIdToGroupItem.value(id)) : static_cast<PortTreeItem*>(mIdToPinItem.value(id));
//auto droppedParentItem = droppedItem->getParent();
auto parentItem = getItemFromIndex(parent);
auto dropPositionItem = getItemFromIndex(parent);

// perhaps helper functions?
// 1. group on group (between group)
Expand All @@ -180,42 +180,51 @@ namespace hal

if(type == "group")
{
if(!parentItem)
if(!dropPositionItem)
{
// debug pingroup qDebug() << "group was dropped between groups... with row: " << row; //check in canDropMine if its not an adjacent row?
dndGroupBetweenGroup(droppedItem, row);
}
else
{
// debug pingroup qDebug() << "group was dropped on a group?";
dndGroupOnGroup(droppedItem, parentItem);
PortTreeItem* pitem = dynamic_cast<PortTreeItem*>(dropPositionItem);
if (pitem && pitem->itemType() == PortTreeItem::Pin)
{
// debug pingroup qDebug() << "group was dropped on a pin...";
PortTreeItem* parentGroupItem = static_cast<PortTreeItem*>(pitem->getParent());
row = getIndexFromItem(pitem).row();
dndGroupOnGroup(droppedItem, parentGroupItem, row);
}
else
// debug pingroup qDebug() << "group was dropped on a group?";
dndGroupOnGroup(droppedItem, dropPositionItem);
}
}
else
{
if(!parentItem)
if(!dropPositionItem)
{
// debug pingroup qDebug() << "pin was dropped between groups on row " << row;
dndPinBetweenGroup(droppedItem, row);
}
else if(row != -1)
{
// debug pingroup qDebug() << "pin was dropped between pins";
dndPinBetweenPin(droppedItem, parentItem, row);
dndPinBetweenPin(droppedItem, dropPositionItem, row);
}
else
{
PortTreeItem* pitem = dynamic_cast<PortTreeItem*>(parentItem);
PortTreeItem* pitem = dynamic_cast<PortTreeItem*>(dropPositionItem);
if (pitem && pitem->itemType() == PortTreeItem::Pin)
{
// debug pingroup qDebug() << "pin was dropped on a pin...";
PortTreeItem* ppitem = static_cast<PortTreeItem*>(pitem->getParent());
PortTreeItem* parentGroupItem = static_cast<PortTreeItem*>(pitem->getParent());
row = getIndexFromItem(pitem).row();
dndPinBetweenPin(droppedItem, ppitem, row);
dndPinBetweenPin(droppedItem, parentGroupItem, row);
}
else
// debug pingroup qDebug() << "pin was dropped on a group...";
dndPinOnGroup(droppedItem, parentItem);
dndPinOnGroup(droppedItem, dropPositionItem);
}
}

Expand Down Expand Up @@ -288,7 +297,6 @@ namespace hal

void ModulePinsTreeModel::setModule(Module* m)
{
clear();
mModule = m;
beginResetModel();

Expand Down Expand Up @@ -576,7 +584,7 @@ namespace hal
}
}

void ModulePinsTreeModel::dndGroupOnGroup(BaseTreeItem *droppedGroup, BaseTreeItem *onDroppedGroup)
void ModulePinsTreeModel::dndGroupOnGroup(BaseTreeItem *droppedGroup, BaseTreeItem *onDroppedGroup, int row)
{
// SPECIFY: 1) create completely new group, all pins in that, delete old 2 groups
// 2) just add all pins from dropped group to "ondroppedgroup", then rename?
Expand All @@ -590,8 +598,7 @@ namespace hal

auto tgtgroup = mModule->get_pin_group_by_id(static_cast<PortTreeItem*>(onDroppedGroup)->id());

ActionPingroup* act = ActionPingroup::addPinsToExistingGroup(mModule,tgtgroup->get_id(),pins);
act->setObject(UserActionObject(mModule->get_id(),UserActionObjectType::Module));
ActionPingroup* act = ActionPingroup::addPinsToExistingGroup(mModule,tgtgroup->get_id(),pins,row);
if (act) act->exec();

// too keep the order, ActionAddItemsToObject cannot be executed with all pins, but a ComAction must be created
Expand Down
Loading