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
4 changes: 4 additions & 0 deletions meshroom/core/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -1878,6 +1878,9 @@ def _isCompatibilityNode(self):
def _isInputNode(self):
return isinstance(self.nodeDesc, desc.InputNode)

def _isInitNode(self):
return isinstance(self.nodeDesc, desc.InitNode)

def _isBackdropNode(self) -> bool:
return False

Expand Down Expand Up @@ -2173,6 +2176,7 @@ def _hasDisplayableShape(self):
notify=globalStatusChanged)
isCompatibilityNode = Property(bool, lambda self: self._isCompatibilityNode(), constant=True)
isInputNode = Property(bool, lambda self: self._isInputNode(), constant=True)
isInitNode = Property(bool, lambda self: self._isInitNode(), constant=True)
isBackdropNode = Property(bool, lambda self: self._isBackdropNode(), constant=True)

globalExecMode = Property(str, globalExecMode.fget, notify=globalStatusChanged)
Expand Down
59 changes: 59 additions & 0 deletions meshroom/ui/qml/GraphEditor/GraphEditor.qml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,20 @@ Item {
return undefined
}

/// Get the InitNode delegate at the given position in 'draggable' coordinates, or null
function initNodeDelegateAt(draggableX, draggableY) {
for (var i = 0; i < nodeRepeater.count; ++i) {
var delegate = nodeRepeater.getItemAt(i)
if (delegate && delegate.node && delegate.node.isInitNode && !delegate.readOnly) {
if (draggableX >= delegate.x && draggableX <= delegate.x + delegate.width &&
draggableY >= delegate.y && draggableY <= delegate.y + delegate.height) {
return delegate
}
}
}
return null
}

/// Duplicate a node and optionally all the following ones
function duplicateNode(duplicateFollowingNodes) {
var nodes
Expand Down Expand Up @@ -1238,6 +1252,10 @@ Item {
id: dropArea
anchors.fill: parent
keys: ["text/uri-list"]

/// The InitNode delegate currently being hovered during a file drag, if any
property var hoveredInitNodeDelegate: null

onEntered: function(drag) {
nbMeshroomScenes = 0
nbDraggedFiles = drag.urls.length
Expand All @@ -1247,9 +1265,50 @@ Item {
nbMeshroomScenes++
}
})

// Check if the drag enters directly over an InitNode
var draggablePos = mapToItem(draggable, drag.x, drag.y)
hoveredInitNodeDelegate = initNodeDelegateAt(draggablePos.x, draggablePos.y)
if (hoveredInitNodeDelegate) {
hoveredInitNodeDelegate.initNodeDragHover = true
}
}

onPositionChanged: function(drag) {
// Update which InitNode (if any) the drag is currently over
var draggablePos = mapToItem(draggable, drag.x, drag.y)
var newDelegate = initNodeDelegateAt(draggablePos.x, draggablePos.y)
if (newDelegate !== hoveredInitNodeDelegate) {
if (hoveredInitNodeDelegate) {
hoveredInitNodeDelegate.initNodeDragHover = false
}
hoveredInitNodeDelegate = newDelegate
if (hoveredInitNodeDelegate) {
hoveredInitNodeDelegate.initNodeDragHover = true
}
}
}

onExited: {
if (hoveredInitNodeDelegate) {
hoveredInitNodeDelegate.initNodeDragHover = false
hoveredInitNodeDelegate = null
}
}

onDropped: function(drop) {
// Clear visual feedback
if (hoveredInitNodeDelegate) {
hoveredInitNodeDelegate.initNodeDragHover = false
}

// If dropped on an InitNode, forward the files to its initialize() method
if (hoveredInitNodeDelegate) {
_currentScene.initializeNode(hoveredInitNodeDelegate.node, drop.urls)
hoveredInitNodeDelegate = null
return
}

if (nbMeshroomScenes == nbDraggedFiles || nbMeshroomScenes == 0) {
// Retrieve mouse position and convert coordinate system
// from pixel values to graph reference system
Expand Down
12 changes: 12 additions & 0 deletions meshroom/ui/qml/GraphEditor/Node.qml
Original file line number Diff line number Diff line change
Expand Up @@ -877,4 +877,16 @@ Item {
}
}
}

/// Set to true by the GraphEditor's DropArea when files are dragged over this InitNode
property bool initNodeDragHover: false

// Highlight overlay shown when files are dragged over this InitNode
Rectangle {
anchors.fill: mouseArea
visible: root.node && root.node.isInitNode && root.initNodeDragHover
color: Colors.sysPalette.highlight
opacity: 0.35
radius: background.radius
}
}
18 changes: 18 additions & 0 deletions meshroom/ui/scene.py
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,24 @@ def getFilesByTypeFromDrop(self, urls):
"meshroomScenes": filesByType.meshroomScenes,
"other": filesByType.other}

@Slot(QObject, "QList<QUrl>")
def initializeNode(self, node, urls):
"""
Initialize an InitNode with the provided list of dropped files/URLs.

Converts the list of QUrls to local file paths and calls the node descriptor's
initialize() method with those paths as inputs.

Args:
node (Node): the InitNode to initialize
urls (list of QUrl): the list of dropped file/directory URLs
"""
if not isinstance(node.nodeDesc, meshroom.core.desc.InitNode):
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if not isinstance(node.nodeDesc, meshroom.core.desc.InitNode):
if not node.isInitNode:

logging.warning(f"initializeNode called on non-InitNode '{node.name}' — ignoring.")
return
inputs = [localFile for url in urls if (localFile := url.toLocalFile())]
node.nodeDesc.initialize(node, inputs, [])

def importImagesFromFolder(self, path, recursive=False):
"""

Expand Down
Loading