Skip to content

Linear view mscolab bug #1021

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
ReimarBauer merged 2 commits into from
Jun 9, 2021
Merged

Linear view mscolab bug #1021

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
fde1fa5
fixed tableview not opening bug; added test
aravindm711 Jun 9, 2021
23681fd
added raising of mscolab window after closing view
aravindm711 Jun 9, 2021
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 mslib/msui/_tests/test_mscolab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ def test_view_open(self):
QtTest.QTest.mouseClick(self.window.topview, QtCore.Qt.LeftButton)
QtTest.QTest.mouseClick(self.window.sideview, QtCore.Qt.LeftButton)
QtTest.QTest.mouseClick(self.window.tableview, QtCore.Qt.LeftButton)
QtTest.QTest.mouseClick(self.window.linearview, QtCore.Qt.LeftButton)
QtWidgets.QApplication.processEvents()
assert len(self.window.active_windows) == 0
# test after activating project
Expand All @@ -118,6 +119,9 @@ def test_view_open(self):
QtTest.QTest.mouseClick(self.window.sideview, QtCore.Qt.LeftButton)
QtWidgets.QApplication.processEvents()
assert len(self.window.active_windows) == 3
QtTest.QTest.mouseClick(self.window.linearview, QtCore.Qt.LeftButton)
QtWidgets.QApplication.processEvents()
assert len(self.window.active_windows) == 4

@mock.patch("PyQt5.QtWidgets.QFileDialog.getSaveFileName",
return_value=(fs.path.join(mscolab_settings.MSCOLAB_DATA_DIR, 'test_export.ftml'), None))
Expand Down
3 changes: 2 additions & 1 deletion mslib/msui/mscolab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@ def create_view_window(self, _type):
view_window = linearview.MSSLinearViewWindow(model=self.waypoints_model,
parent=self.listProjects,
_id=self.id_count)
view_window.view_type = "tableview"
view_window.view_type = "linearview"
if self.access_level == "viewer":
self.disable_navbar_action_buttons(_type, view_window)

Expand Down Expand Up @@ -1271,6 +1271,7 @@ def handle_view_close(self, value):
for index, window in enumerate(self.active_windows):
if window._id == value:
del self.active_windows[index]
self.raise_()

def setIdentifier(self, identifier):
self.identifier = identifier
Expand Down