Skip to content

Commit

Permalink
Merge pull request #1099 from alicevision/dev/saveAsFolder
Browse files Browse the repository at this point in the history
[ui] init saveAs folder
  • Loading branch information
fabiencastan authored Oct 15, 2020
2 parents 42913c2 + 9476019 commit e83bbb9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
7 changes: 7 additions & 0 deletions meshroom/ui/qml/ImageGallery/ImageGallery.qml
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ Panel {
footerContent: RowLayout {
// Images count
MaterialToolLabel {
Layout.minimumWidth: childrenRect.width
ToolTip.text: grid.model.count + " Input Images"
iconText: MaterialIcons.image
label: grid.model.count.toString()
Expand All @@ -353,6 +354,7 @@ Panel {
}
// cameras count
MaterialToolLabel {
Layout.minimumWidth: childrenRect.width
ToolTip.text: label + " Estimated Cameras"
iconText: MaterialIcons.videocam
label: _reconstruction ? _reconstruction.nbCameras.toString() : "0"
Expand All @@ -364,6 +366,7 @@ Panel {

MaterialToolLabelButton {
id: displayHDR
Layout.minimumWidth: childrenRect.width
property var activeNode: _reconstruction.activeNodes.get("LdrToHdrMerge").node
ToolTip.text: "Visualize HDR images: " + (activeNode ? activeNode.label : "No Node")
iconText: MaterialIcons.filter
Expand Down Expand Up @@ -405,6 +408,8 @@ Panel {

MaterialToolButton {
id: imageProcessing
Layout.minimumWidth: childrenRect.width

property var activeNode: _reconstruction.activeNodes.get("ImageProcessing").node
font.pointSize: 15
padding: 0
Expand Down Expand Up @@ -449,6 +454,8 @@ Panel {

// Thumbnail size icon and slider
MaterialToolButton {
Layout.minimumWidth: childrenRect.width

text: MaterialIcons.photo_size_select_large
ToolTip.text: "Thumbnails Scale"
padding: 0
Expand Down
7 changes: 6 additions & 1 deletion meshroom/ui/qml/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,12 @@ ApplicationWindow {
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 {
Expand Down

0 comments on commit e83bbb9

Please sign in to comment.