Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
39 changes: 30 additions & 9 deletions src/app/widget_gui_document.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
#include <QtWidgets/QWidgetAction>
#include <Standard_Version.hxx>

#include <algorithm>
#include <vector>

namespace Mayo {

namespace {
Expand Down Expand Up @@ -70,6 +73,18 @@ class MenuIconSizeStyle : public QProxyStyle {
// Default margin to be used in widgets
const int Internal_widgetMargin = 4;

std::vector<TreeNodeId> getSelectedNodeIds(const GuiDocument* guiDoc)
{
std::vector<TreeNodeId> nodeIds;
const GuiApplication* guiApp = guiDoc->guiApplication();
for (const ApplicationItem& appItem : guiApp->selectionModel()->selectedItems()) {
if (appItem.isDocumentTreeNode() && appItem.document() == guiDoc->document())
nodeIds.push_back(appItem.documentTreeNode().id());
}

return nodeIds;
}

} // namespace

WidgetGuiDocument::WidgetGuiDocument(GuiDocument* guiDoc, QWidget* parent)
Expand Down Expand Up @@ -139,6 +154,20 @@ WidgetGuiDocument::WidgetGuiDocument(GuiDocument* guiDoc, QWidget* parent)
auto mode = on ? GraphicsScene::SelectionMode::Multi : GraphicsScene::SelectionMode::Single;
gfxScene->setSelectionMode(mode);
});
m_controller->signalToggleSelectionVisibilityRequested.connectSlot([=]{
const auto vecSelectedNodeId = getSelectedNodeIds(m_guiDoc);
if (vecSelectedNodeId.empty())
return;

const bool allSelectedItemVisible = std::all_of(
vecSelectedNodeId.cbegin(), vecSelectedNodeId.cend(),
[=](TreeNodeId nodeId) { return m_guiDoc->nodeVisibleState(nodeId) == CheckState::On; }
);
for (TreeNodeId nodeId : vecSelectedNodeId)
m_guiDoc->setNodeVisible(nodeId, !allSelectedItemVisible);

m_guiDoc->graphicsScene()->redraw();
});

m_guiDoc->viewCameraAnimation()->setBackend(std::make_unique<QtAnimationBackend>(QEasingCurve::OutExpo));
m_guiDoc->viewCameraAnimation()->setRenderFunction([=](const OccHandle<V3d_View>& view){
Expand Down Expand Up @@ -399,15 +428,7 @@ void WidgetGuiDocument::createMenuItemVisibility(QWidget* container)

const DocumentPtr doc = m_guiDoc->document();
// Helper function to get the selected tree nodes(ids) in the document
auto fnGetDocSelectedNodeIds = [=]() -> std::vector<TreeNodeId> {
std::vector<TreeNodeId> nodeIds;
const GuiApplication* guiApp = m_guiDoc->guiApplication();
for (const ApplicationItem& appItem : guiApp->selectionModel()->selectedItems()) {
if (appItem.isDocumentTreeNode() && appItem.document() == m_guiDoc->document())
nodeIds.push_back(appItem.documentTreeNode().id());
}
return nodeIds;
};
auto fnGetDocSelectedNodeIds = [=] { return getSelectedNodeIds(m_guiDoc); };

// "Show all" action
QObject::connect(actionShowAll, &QAction::triggered, this, [=]{
Expand Down
3 changes: 3 additions & 0 deletions src/app/widget_occ_view_controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,9 @@ void WidgetOccViewController::handleKeyPress(const QKeyEvent* event)
return;

m_inputSequence.push(event->key());
if (m_inputSequence.equal({ Qt::Key_H }))
this->signalToggleSelectionVisibilityRequested.send();

if (m_inputSequence.equal({ Qt::Key_Space }))
this->startInstantZoom(toPosition(m_occView->widget()->mapFromGlobal(QCursor::pos())));

Expand Down
1 change: 1 addition & 0 deletions src/gui/v3d_view_controller.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class V3dViewController {
Signal<int, int> signalMouseMoved; // x,y: mouse position in view
Signal<Aspect_VKeyMouse> signalMouseButtonClicked;
Signal<bool> signalMultiSelectionToggled;
Signal<> signalToggleSelectionVisibilityRequested;

protected:
struct Position { int x; int y; };
Expand Down