Skip to content

Commit

Permalink
Merge pull request #34 from EIT-ALIVE/033_new_eitprocessing_structure…
Browse files Browse the repository at this point in the history
…_wbaccinelli

033 new eitprocessing structure wbaccinelli
  • Loading branch information
wbaccinelli authored Mar 25, 2024
2 parents ff705fa + 644691b commit fdfcad5
Show file tree
Hide file tree
Showing 2 changed files with 1,877 additions and 1,883 deletions.
18 changes: 6 additions & 12 deletions eit_dash/callbacks/load_callbacks.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
import plotly.graph_objects as go
from dash import ALL, Input, Output, State, callback, ctx, html
from dash.exceptions import PreventUpdate
from eitprocessing.continuous_data import ContinuousData
from eitprocessing.data_collection import DataCollection
from eitprocessing.eit_data import EITData
from eitprocessing.sequence import Sequence
from eitprocessing.datahandling.continuousdata import ContinuousData
from eitprocessing.datahandling.datacollection import DataCollection
from eitprocessing.datahandling.eitdata import EITData
from eitprocessing.datahandling.loading import load_eit_data
from eitprocessing.datahandling.sequence import Sequence

import eit_dash.definitions.element_ids as ids
from eit_dash.app import data_object
Expand Down Expand Up @@ -134,16 +135,9 @@ def open_data_selector(data, cancel_load, file_type):
return True, [], figure

path = Path(data)
eit_data, continuous_data, sparse_data = EITData.from_path(
file_data = load_eit_data(
path,
vendor=InputFiletypes(int(file_type)).name.lower(),
return_non_eit_data=True,
)

file_data = Sequence(
eit_data=eit_data,
continuous_data=continuous_data,
sparse_data=sparse_data,
label="selected data",
)

Expand Down
Loading

0 comments on commit fdfcad5

Please sign in to comment.