Skip to content
Snippets Groups Projects
Commit 033a506e authored by Oscar Gustafsson's avatar Oscar Gustafsson :bicyclist:
Browse files

Do not wrap operations

parent 3f0ec5b9
No related branches found
No related tags found
No related merge requests found
Pipeline #95963 passed
......@@ -672,9 +672,8 @@ class ScheduleMainWindow(QMainWindow, Ui_MainWindow):
row = self.info_table.findItems("Operator", Qt.MatchFlag.MatchExactly)
if row:
row = row[0].row()
if row > 2:
for _ in range(3):
self.info_table.removeRow(1)
for _ in range(1, row):
self.info_table.removeRow(1)
else:
log.error("'Operator' not found in info table. It may have been renamed.")
......
......@@ -198,8 +198,13 @@ class SchedulerEvent: # PyQt5
pos_x += self._schedule.schedule_time
redraw = True
if pos_x > self._schedule.schedule_time:
pos_x = pos_x % self._schedule.schedule_time
redraw = True
# If zero execution time, keep operation at the edge
if (
pos_x > self._schedule.schedule_time + 1
or item.operation.execution_time
):
pos_x = pos_x % self._schedule.schedule_time
redraw = True
pos_y = self._schedule.get_y_location(item.operation.graph_id)
# Check move in y-direction
if pos_y != self._old_op_position:
......
......@@ -96,7 +96,6 @@ class SchedulerItem(SchedulerEvent, QGraphicsItemGroup): # PySide2 / PyQt5
pos : float
The x-position to check.
"""
# TODO: implement
if self.schedule is None:
raise ValueError("No schedule installed.")
new_start_time = floor(pos) - floor(self._x_axis_indent)
......@@ -109,9 +108,9 @@ class SchedulerItem(SchedulerEvent, QGraphicsItemGroup): # PySide2 / PyQt5
if new_start_time < -1:
# Moving one position before left edge => wrap
return False
if new_start_time > self.schedule.schedule_time + 1:
# Moving one position after schedule_time => wrap
return False
# if new_start_time > self.schedule.schedule_time + 1:
# Moving one position after schedule_time => wrap
# return False
else:
if pos < 0:
return False
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment