Skip to content

[ui] Work around PySide2 bug affecting property decorators #1723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabiencastan merged 2 commits into from
Jul 28, 2022
Merged

[ui] Work around PySide2 bug affecting property decorators #1723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e725f59
[ui] Work around PySide2 bug affecting property decorators
p12tic Jul 7, 2022
25cb8f8
Merge branch 'develop' into fix-pyside2-decorator-bug
fabiencastan Jul 28, 2022
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
9 changes: 5 additions & 4 deletions meshroom/ui/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,17 +296,17 @@ def markdownToHtml(self, md):
return md
return markdown(md)

@Property(QJsonValue, constant=True)
def systemInfo(self):
def _systemInfo(self):
import platform
import sys
return {
'platform': '{} {}'.format(platform.system(), platform.release()),
'python': 'Python {}'.format(sys.version.split(" ")[0])
}

@Property("QVariantList", constant=True)
def licensesModel(self):
systemInfo = Property(QJsonValue, _systemInfo, constant=True)

def _licensesModel(self):
"""
Get info about open-source licenses for the application.
Model provides:
Expand All @@ -328,6 +328,7 @@ def licensesModel(self):
}
]

licensesModel = Property("QVariantList", _licensesModel, constant=True)
pipelineTemplateFilesChanged = Signal()
recentProjectFilesChanged = Signal()
pipelineTemplateFiles = Property("QVariantList", _pipelineTemplateFiles, notify=pipelineTemplateFilesChanged)
Expand Down
6 changes: 2 additions & 4 deletions meshroom/ui/reconstruction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,10 +249,8 @@ def _updateDenseSceneParams(self):
self._undistortedImagePath = os.path.join(self._activeNode_PrepareDenseScene.node.output.value, filename)
self.denseSceneParamsChanged.emit()

@Property(type=QObject, constant=True)
def attribute(self):
""" Get the underlying Viewpoint attribute wrapped by this Viewpoint. """
return self._viewpoint
# Get the underlying Viewpoint attribute wrapped by this Viewpoint.
attribute = Property(QObject, lambda self: self._viewpoint, constant=True)

@Property(type="QVariant", notify=initialParamsChanged)
def initialIntrinsics(self):
Expand Down