list what a belt is carrying, and clear it by name
The belt card's only content was a button reading "Clear stuck items", which assumed a state the items need not be in. It now reads "Clear items", and above it the card lists what the selected tiles hold -- one item chip per type, the same chip the buffer sections and the HQ's block stock draw -- so a line's contents can be read before they are removed, and can be read at all: items on a moving belt are too small and too transient to count by eye, and items inside a tunnel are drawn nowhere. BeltSystem gains countItems(tiles), a query of the same kind as forEachVisualItem: a method rather than exposed tile containers, so the per-tile representation stays swappable. It walks the same five containers as clearTiles, in the same order, so the list and the button cannot drift apart. The tunnel's two ends are now told apart. Items in transit are counted on the exit they are travelling toward, and a clear removes exactly what the panel listed for the tile it acts on: the exit discards them, the entry leaves them travelling. BeltSystemTest's tunnel case splits in two accordingly. Splitters now aggregate with belts and tunnel ends. Their output filters are per-object configuration, which an aggregate simply does not show -- a splitter selected alone still gets them. Both cards share one BeltItemList widget, and both derive their tiles from collectBeltTiles, so nothing is stated twice. The mixed count summary loses the clear action it carried: a button acting on part of a selection is worse than no button, and the tiles can be selected by themselves. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Ne3mejABZoLWKLh8fgpM3x
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
#include <QVBoxLayout>
|
||||
|
||||
#include "BeltItemList.h"
|
||||
#include "BuildingTarget.h"
|
||||
#include "ClearBeltControl.h"
|
||||
#include "SelectionNames.h"
|
||||
@@ -17,6 +18,10 @@ BeltContent::BeltContent(const SelectionContext& context,
|
||||
parent)
|
||||
, m_ids(request.buildings)
|
||||
{
|
||||
// What is there, then the button that removes it (REQ-UI-BELT-ITEMS,
|
||||
// REQ-UI-BELT-CLEAR).
|
||||
m_itemList = new BeltItemList(context, m_ids, this);
|
||||
getRuntimeLayout()->addWidget(m_itemList);
|
||||
getRuntimeLayout()->addWidget(new ClearBeltControl(context, m_ids, this));
|
||||
}
|
||||
|
||||
@@ -28,11 +33,17 @@ void BeltContent::refreshConfiguration()
|
||||
return;
|
||||
}
|
||||
|
||||
// An aggregated selection may mix belts with tunnel ends, so it is named after the
|
||||
// first tile; the count says how many are held (REQ-UI-SELECTION-AGGREGATE).
|
||||
// An aggregated selection may mix belts with tunnel ends and splitters, so it is
|
||||
// named after the first tile; the count says how many are held
|
||||
// (REQ-UI-SELECTION-AGGREGATE).
|
||||
setBuildingIdentity(target.type, getBuildingTypeName(target.type));
|
||||
if (m_ids.size() > 1)
|
||||
{
|
||||
setCountSlot(static_cast<int>(m_ids.size()));
|
||||
}
|
||||
}
|
||||
|
||||
void BeltContent::refreshRuntime()
|
||||
{
|
||||
m_itemList->refresh();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user