Skip to content

Commit

Permalink
batch widget fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
danielhrisca committed Nov 6, 2023
1 parent 601c4c5 commit 9590bea
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/asammdf/blocks/mdf_v4.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
from canmatrix.canmatrix import CanMatrix
from lz4.frame import compress as lz_compress
from lz4.frame import decompress as lz_decompress
import numpy as np
from numpy import (
arange,
argwhere,
Expand Down Expand Up @@ -66,6 +65,7 @@
where,
zeros,
)
import numpy as np
from numpy.core.defchararray import decode, encode
from numpy.core.records import fromarrays, fromstring
from numpy.typing import NDArray
Expand Down
2 changes: 1 addition & 1 deletion src/asammdf/blocks/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ def detect(text: bytes) -> DetectDict:

from canmatrix.canmatrix import CanMatrix, matrix_class
import canmatrix.formats
import numpy as np
from numpy import arange, bool_, dtype, interp, where
import numpy as np
from numpy.typing import NDArray
from pandas import Series

Expand Down
2 changes: 1 addition & 1 deletion src/asammdf/gui/widgets/bar.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import os
import re

import numpy as np
from numpy import searchsorted
import numpy as np
from PySide6 import QtCore, QtGui, QtWidgets

from ..dialogs.messagebox import MessageBox
Expand Down
13 changes: 13 additions & 0 deletions src/asammdf/gui/widgets/batch.py
Original file line number Diff line number Diff line change
Expand Up @@ -1543,6 +1543,19 @@ def apply_processing_thread(self, progress):
return

else:
if output_folder is not None:
if root is None:
file_name = output_folder / Path(mdf_file.original_name).name
else:
file_name = output_folder / Path(mdf_file.name).relative_to(root)

if not file_name.parent.exists():
os.makedirs(file_name.parent, exist_ok=True)
else:
file_name = Path(mdf_file.original_name)

file_name = file_name.with_suffix(suffix)

icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap(":/export.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
progress.signals.setWindowIcon.emit(icon)
Expand Down
2 changes: 1 addition & 1 deletion src/asammdf/gui/widgets/numeric.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
from traceback import format_exc

from natsort import natsorted
import numpy as np
from numpy import searchsorted
import numpy as np
import pyqtgraph.functions as fn
from PySide6 import QtCore, QtGui, QtWidgets

Expand Down
2 changes: 1 addition & 1 deletion src/asammdf/version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
""" asammdf version module """

__version__ = "7.3.19.dev1"
__version__ = "7.3.19.dev2"

0 comments on commit 9590bea

Please sign in to comment.