Skip to content

Commit 6956205

Browse files
committed
refactor: remove src nesting + mypy checks working
1 parent d9986cf commit 6956205

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+242
-233
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.

geos-trame/src/geos_trame/app/core.py renamed to geos-trame/geos_trame/app/core.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from geos_trame.app.ui.plotting import DeckPlotting
2020
from geos_trame.app.ui.timeline import TimelineEditor
2121
from geos_trame.app.ui.viewer.viewer import DeckViewer
22-
from geos_trame.app.ui.alertHandler import AlertHandler
22+
from geos_trame.app.components.alertHandler import AlertHandler
2323

2424
import sys
2525

@@ -29,12 +29,12 @@ class GeosTrame:
2929

3030
def __init__( self, server, file_name: str ):
3131

32-
self.alertHandler = None
33-
self.deckPlotting = None
34-
self.deckViewer = None
35-
self.deckEditor = None
36-
self.timelineEditor = None
37-
self.deckInspector = None
32+
self.alertHandler: AlertHandler | None = None
33+
self.deckPlotting: DeckPlotting | None = None
34+
self.deckViewer: DeckViewer | None = None
35+
self.deckEditor: DeckEditor | None = None
36+
self.timelineEditor: TimelineEditor | None = None
37+
self.deckInspector: DeckInspector | None = None
3838
self.server = server
3939
server.enable_module( module )
4040

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from enum import Enum
2+
3+
4+
class FieldStatus( Enum ):
5+
UNCHECKED = 0
6+
VALID = 1
7+
INVALID = 2

geos-trame/src/geos_trame/app/types/renderable.py renamed to geos-trame/geos_trame/app/data_types/renderable.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ class Renderable( Enum ):
99
INTERNALMESH = "InternalMesh"
1010
INTERNALWELL = "InternalWell"
1111
PERFORATION = "Perforation"
12-
VTKWELL = "VTKWell"
12+
VTKWELL = "VTKWell"

geos-trame/src/geos_trame/app/types/tree_node.py renamed to geos-trame/geos_trame/app/data_types/tree_node.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@
33
# SPDX-FileContributor: Kitware
44
from dataclasses import dataclass
55

6+
from geos_trame.app.data_types.field_status import FieldStatus
7+
68

79
@dataclass
810
class TreeNode:
11+
"""
12+
Single element of the tree, used by `DeckTree`.
13+
"""
914
id: str
1015
title: str
1116
children: list
@@ -34,4 +39,4 @@ def json( self ) -> dict:
3439
valid=self.valid,
3540
children=None,
3641
hidden_children=[],
37-
)
42+
)

0 commit comments

Comments
 (0)