Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
pedohorse committed Sep 14, 2024
1 parent b35a308 commit e09646e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/lifeblood_viewer/graphics_scene.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from lifeblood.config import get_config
from .graphics_items.graphics_scene_container import GraphicsSceneWithNodesAndTasks
from .long_op import LongOperation, LongOperationData, LongOperationProcessor
from .undo_stack import UndoStack, UndoableOperation, OperationCompletionDetails
from .undo_stack import UndoStack, UndoableOperation
from PySide2.QtCore import Slot

from typing import Callable, Dict, Generator, List, Optional, Tuple
Expand Down
13 changes: 4 additions & 9 deletions src/lifeblood_viewer/graphics_scene_with_data_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import grandalf.layouts

from types import MappingProxyType
from .graphics_items import Task, Node, NodeConnection, GraphicsSceneWithNodesAndTasks
from .graphics_items import Task, Node, NodeConnection
from .graphics_items.qextended_graphics_item import QGraphicsItemExtended
from .db_misc import sql_init_script_nodes
from .long_op import LongOperation, LongOperationData
Expand All @@ -22,9 +22,9 @@
AddConnectionOp, RemoveConnectionOp,
ParameterChangeOp)

from lifeblood.misc import timeit, performance_measurer
from lifeblood.misc import timeit
from lifeblood.uidata import NodeUi, Parameter
from lifeblood.ui_protocol_data import UiData, TaskBatchData, NodeGraphStructureData, TaskDelta, DataNotSet, IncompleteInvocationLogData, InvocationLogData
from lifeblood.ui_protocol_data import TaskBatchData, NodeGraphStructureData, TaskDelta, DataNotSet, IncompleteInvocationLogData, InvocationLogData
from lifeblood.enums import TaskState, TaskGroupArchivedState
from lifeblood import logging
from lifeblood.node_type_metadata import NodeTypeMetadata
Expand All @@ -33,13 +33,12 @@
from lifeblood.snippets import NodeSnippetData, NodeSnippetDataPlaceholder
from lifeblood.environment_resolver import EnvironmentResolverArguments
from lifeblood.ui_events import TaskEvent, TasksRemoved, TasksUpdated, TasksChanged, TaskFullState
from lifeblood.config import get_config

from PySide2.QtWidgets import *
from PySide2.QtCore import Slot, Signal, QThread, QRectF, QPointF
from PySide2.QtGui import QKeyEvent

from typing import Callable, Generator, Optional, List, Mapping, Tuple, Dict, Set, Iterable, Union, Any, Sequence
from typing import Callable, Optional, List, Tuple, Dict, Set, Iterable, Union, Any, Sequence

logger = logging.get_logger('viewer')

Expand Down Expand Up @@ -653,10 +652,6 @@ def graph_full_update(self, graph_data: NodeGraphStructureData):
if nodes_to_layout:
self.layout_nodes(nodes_to_layout)

print('+++')
print(self.items())
print(self.nodes())

@timeit(0.05)
@Slot(object, bool)
def tasks_process_events(self, events: List[TaskEvent], first_time_getting_events: bool):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ def draw_scene_foreground(self, painter: QPainter, rect: QRectF):
self.__buttons = {}

for i, (inv_id, node_id, log_meta) in enumerate(reversed(task.invocation_logs())):
bbox = self.__scene.get_node(node_id).boundingRect()
if node_id not in already_visited_nodes:
already_visited_nodes.add(node_id)
pos = self.__scene.get_node(node_id).scenePos()
bbox = self.__scene.get_node(node_id).boundingRect()
target_pos = pos + bbox.bottomLeft() + self.__node_offset
if not rect.contains(target_pos) and not rect.contains(path.currentPosition()):
path.moveTo(bbox.topLeft() + pos + self.__node_offset)
Expand Down

0 comments on commit e09646e

Please sign in to comment.