DefDAP 1.1.2__tar.gz → 1.2.2__tar.gz

{defdap-1.1.2 → defdap-1.2.2}/DefDAP.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DefDAP
-Version: 1.1.2
+Version: 1.2.2
 Summary: A python library for correlating EBSD and HRDIC data.
 Author: Rhys Thomas, João Quinta da Fonseca
 Author-email: "Michael D. Atkinson" <michael.atkinson@ukaea.uk>

{defdap-1.1.2 → defdap-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DefDAP
-Version: 1.1.2
+Version: 1.2.2
 Summary: A python library for correlating EBSD and HRDIC data.
 Author: Rhys Thomas, João Quinta da Fonseca
 Author-email: "Michael D. Atkinson" <michael.atkinson@ukaea.uk>

defdap-1.2.2/defdap/_version.py

@@ -0,0 +1 @@
+__version__ = '1.2.2'

{defdap-1.1.2 → defdap-1.2.2}/defdap/base.py

@@ -44,7 +44,7 @@ class Map(ABC):
 
     """
     def __init__(self, file_name, data_type=None, experiment=None,
-                 increment=None, frame=None, map_name=None):
+                 increment=None, frame=None, map_name=None, **kwargs):
         """
 
         Parameters
@@ -83,8 +83,12 @@ class Map(ABC):
         self.grain_plot = None
         self.profile_plot = None
 
-        self.file_name = Path(file_name)
-        self.load_data(self.file_name, data_type=data_type)
+        self.file_name = None
+        if isinstance(file_name, str):
+            file_name = Path(file_name)
+        if isinstance(file_name, (str, Path)):
+            self.file_name = file_name
+        self.load_data(file_name, data_type=data_type, **kwargs)
 
         self.data.add_generator(
             'proxigram', self.calc_proxigram, unit='', type='map', order=0,

{defdap-1.1.2 → defdap-1.2.2}/defdap/ebsd.py

@@ -148,7 +148,7 @@ class Map(base.Map):
         )
 
     @report_progress("loading EBSD data")
-    def load_data(self, file_name, data_type=None):
+    def load_data(self, file_name, data_type=None, **kwargs):
         """Load in EBSD data from file.
 
         Parameters
@@ -160,7 +160,7 @@ class Map(base.Map):
 
         """
         data_loader = EBSDDataLoader.get_loader(data_type, file_name)
-        data_loader.load(file_name)
+        data_loader.load(file_name, **kwargs)
 
         metadata_dict = data_loader.loaded_metadata
         self.shape = metadata_dict['shape']

{defdap-1.1.2 → defdap-1.2.2}/defdap/file_readers.py

@@ -289,6 +289,8 @@ class EdaxAngLoader(EBSDDataLoader):
         self.check_metadata()
 
         # Construct fixed data format
+        # .ang format seems to take all sorts of forms, only columns that seem
+        # to be agreed on by most files are loaded
         self.data_format = np.dtype([
             ('ph1', 'float32'),
             ('phi', 'float32'),
@@ -298,10 +300,8 @@ class EdaxAngLoader(EBSDDataLoader):
             ('IQ', 'float32'),
             ('CI', 'float32'),
             ('phase', 'uint8'),
-            # ('SE_signal', 'float32'),
-            ('FF', 'float32'),
         ])
-        load_cols = (0, 1, 2, 5, 6, 7, 8, 9)
+        load_cols = (0, 1, 2, 5, 6, 7)
 
         # now read the data from file
         data = np.loadtxt(
@@ -325,15 +325,8 @@ class EdaxAngLoader(EBSDDataLoader):
                 'clabel': 'Confidence index',
             }
         )
-        self.loaded_data.add(
-            'fit_factor', data['FF'].reshape(shape),
-            unit='', type='map', order=0,
-            plot_params={
-                'plot_colour_bar': True,
-                'clabel': 'Fit factor',
-            }
-        )
-        self.loaded_data.phase = data['phase'].reshape(shape) + 1
+        add_phase = 1 if data['phase'].min() == 0 else 0
+        self.loaded_data.phase = data['phase'].reshape(shape) + add_phase
         self.loaded_data['phase', 'plot_params']['vmax'] = len(self.loaded_metadata['phases'])
 
         # flatten the structured dtype
@@ -647,7 +640,8 @@ class DICDataLoader(ABC):
                 'openpiv': OpenPivTextLoader,    #Backwards compatability
                 'openpivtext': OpenPivTextLoader,
                 'openpivbinary': OpenPivBinaryLoader,
-                'pyvale': PyValeLoader
+                'pyvale': PyValeLoader,
+                'matflow': MatflowLoader,
             }[data_type]
         except KeyError:
             raise ValueError(f"No loader for DIC data of type {data_type}.")
@@ -797,6 +791,7 @@ class OpenPivTextLoader(DICDataLoader):
 
         self.check_data()
 
+
 class OpenPivBinaryLoader(DICDataLoader):
     def load(self, file_name: pathlib.Path) -> None:
         """ Load from Open PIV .npz file.
@@ -905,6 +900,53 @@ class PyValeLoader(DICDataLoader):
 
         self.loaded_data.coordinate = coord_dense
         self.loaded_data.displacement = disp_dense
+        self.loaded_data.add(
+            'cost', data['cost'].reshape(shape),
+            unit='', type='map', order=0,
+            plot_params={
+                'plot_colour_bar': True,
+                'clabel': 'Cost',
+            }
+        )
+
+        self.check_data()
+
+
+class MatflowLoader(DICDataLoader):
+    def load(self, data_dict: Dict[str, Any], step_index: int = 0) -> None:
+        """ Load from matflow workflow element output.
+
+        Parameters
+        ----------
+        data_dict
+            Dictionary with keys:
+                'ss_x'
+                'ss_y'
+                'u'
+                'v'
+
+        """
+        # Software name and version
+        self.loaded_metadata['format'] = 'PyVale'
+        self.loaded_metadata['version'] = 'n/a'
+
+        # Sub-window width in pixels
+        binning_x = np.diff(data_dict['ss_x'], axis=1)
+        binning = int(binning_x[0, 0])
+        assert np.all(binning_x == binning)
+        binning_y = np.diff(data_dict['ss_y'], axis=0)
+        assert np.all(binning_y == binning)
+        self.loaded_metadata['binning'] = binning
+        self.loaded_metadata['shape'] = data_dict['ss_x'].shape
+
+        self.checkMetadata()
+
+        self.loaded_data.coordinate = np.stack(
+            (data_dict['ss_x'], data_dict['ss_y'])
+        )
+        self.loaded_data.displacement = np.stack(
+            (data_dict['u'][step_index], data_dict['v'][step_index])
+        )
 
         self.check_data()
 

{defdap-1.1.2 → defdap-1.2.2}/defdap/hrdic.py

@@ -185,7 +185,7 @@ class Map(base.Map):
         return self.ebsd_map.crystal_sym
 
     @report_progress("loading HRDIC data")
-    def load_data(self, file_name, data_type=None):
+    def load_data(self, file_name, data_type=None, **kwargs):
         """Load DIC data from file.
 
         Parameters
@@ -197,7 +197,7 @@ class Map(base.Map):
 
         """
         data_loader = DICDataLoader.get_loader(data_type)
-        data_loader.load(file_name)
+        data_loader.load(file_name, **kwargs)
 
         metadata_dict = data_loader.loaded_metadata
         self.format = metadata_dict['format']      # Software name

{defdap-1.1.2 → defdap-1.2.2}/defdap/inspector.py

@@ -331,7 +331,7 @@ class GrainInspector:
         # Draw slip bands
         bands = [elem[1] for elem in self.selected_dic_grain.groups_list]
         if self.selected_dic_grain.groups_list != None:
-            slipPlot.add_slip_bands(top_only=True, angles=list(np.deg2rad(bands)))
+            slipPlot.add_traces(list(np.deg2rad(bands)), ["black"], top_only=True)
 
     def run_rdr_group(self,
                       event: int,

{defdap-1.1.2 → defdap-1.2.2}/defdap/plotting.py

@@ -309,7 +309,7 @@ class Plot(object):
         """Draw plot
 
         """
-        self.fig.canvas.draw()
+        self.fig.canvas.draw_idle()
 
 
 class MapPlot(Plot):

{defdap-1.1.2 → defdap-1.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "DefDAP"
-version = "1.1.2"
+version = "1.2.2"
 authors = [
   {name = "Michael D. Atkinson", email = "michael.atkinson@ukaea.uk"},
   {name = "Rhys Thomas"},
@@ -75,7 +75,7 @@ defdap = ["slip_systems/*.txt"]
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "1.1.2"
+version = "1.2.2"
 tag_format = "v$version"
 version_files = [
     "pyproject.toml:version",

defdap-1.1.2/defdap/_version.py

@@ -1 +0,0 @@
-__version__ = '1.1.2'