3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-02 08:18:25 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:alicevision/meshroom into dev/nodesAndTaskManager

Browse source 
Conflicts:
	meshroom/core/graph.py
	meshroom/ui/qml/main.qml
This commit is contained in:
Fabien Castan 2020-12-01 20:02:43 +01:00
commit 1102ce84e0
61 changed files with 1241 additions and 345 deletions
Download patch file Download diff file Expand all files Collapse all files

34
meshroom/ui/qml/main.qml
View file

@ -413,19 +413,24 @@ ApplicationWindow {
onTriggered: ensureSaved(function() { _reconstruction.new("photogrammetry") })
}
Action {
text: "HDRI"
onTriggered: ensureSaved(function() { _reconstruction.new("hdri") })
text: "Panorama HDR"
onTriggered: ensureSaved(function() { _reconstruction.new("panoramahdr") })
}
Action {
text: "HDRI Fisheye"
onTriggered: ensureSaved(function() { _reconstruction.new("hdriFisheye") })
text: "Panorama Fisheye HDR"
onTriggered: ensureSaved(function() { _reconstruction.new("panoramafisheyehdr") })
}
}
Action {
id: openActionItem
text: "Open"
shortcut: "Ctrl+O"
onTriggered: ensureSaved(function() { openFileDialog.open() })
onTriggered: ensureSaved(function() {
if(_reconstruction.graph && _reconstruction.graph.filepath) {
openFileDialog.folder = Filepath.stringToUrl(Filepath.dirname(_reconstruction.graph.filepath))
}
openFileDialog.open()
})
}
Menu {
id: openRecentMenu
@ -477,14 +482,27 @@ ApplicationWindow {
id: saveAction
text: "Save"
shortcut: "Ctrl+S"
enabled: _reconstruction.graph && (!_reconstruction.graph.filepath || !_reconstruction.undoStack.clean)
onTriggered: _reconstruction.graph.filepath ? _reconstruction.save() : saveFileDialog.open()
enabled: (_reconstruction.graph && !_reconstruction.graph.filepath) || !_reconstruction.undoStack.clean
onTriggered: {
if(_reconstruction.graph.filepath) {
_reconstruction.save()
}
else
{
saveFileDialog.open()
}
}
}
Action {
id: saveAsAction
text: "Save As..."
shortcut: "Ctrl+Shift+S"
onTriggered: saveFileDialog.open()
onTriggered: {
if(_reconstruction.graph && _reconstruction.graph.filepath) {
saveFileDialog.folder = Filepath.stringToUrl(Filepath.dirname(_reconstruction.graph.filepath))
}
saveFileDialog.open()
}
}
MenuSeparator { }
Action {