Skip to content

[FIX] owcsvimport: Make the progress update a direct connection #4109

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
janezd merged 1 commit into from
Oct 18, 2019
Merged

[FIX] owcsvimport: Make the progress update a direct connection #4109

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions Orange/widgets/data/owcsvimport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,8 +831,8 @@ def commit(self):
task = state = TaskState()
state.future = ...
state.watcher = qconcurrent.FutureWatcher()
state.progressChanged.connect(self.__set_read_progress,
Qt.QueuedConnection)
state.progressChanged.connect(
self.__set_read_progress, Qt.DirectConnection)

def progress_(i, j):
task.emitProgressChangedOrCancel(i, j)
Expand Down Expand Up @@ -1298,9 +1298,16 @@ class UserCancelException(BaseException):
#: progress state, second value is the total progress to complete
#: (-1 if unknown)
progressChanged = Signal('qint64', 'qint64')
__progressChanged = Signal('qint64', 'qint64')
#: Was cancel requested.
cancel = False

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
# route the signal via this object's queue
self.__progressChanged.connect(
self.progressChanged, Qt.QueuedConnection)

def emitProgressChangedOrCancel(self, current, total):
# type: (int, int) -> None
"""
Expand All @@ -1309,7 +1316,7 @@ def emitProgressChangedOrCancel(self, current, total):
if self.cancel:
raise TaskState.UserCancelException()
else:
self.progressChanged.emit(current, total)
self.__progressChanged.emit(current, total)


class TextReadWrapper(io.TextIOWrapper):
Expand Down