DefDAP 1.0.0__tar.gz → 1.0.1__tar.gz

{defdap-1.0.0 → defdap-1.0.1}/CHANGELOG.md

@@ -4,11 +4,15 @@
 
 ### Added
 
-
 ### Changed
 
+### Fixed
+
+
+## 1.0.1 (03-12-2025)
 
 ### Fixed
+- Plotting slip traces for ebsd grain with colours from phase
 
 
 ## 1.0.0 (05-11-2025)

{defdap-1.0.0 → defdap-1.0.1}/DefDAP.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DefDAP
-Version: 1.0.0
+Version: 1.0.1
 Summary: A python library for correlating EBSD and HRDIC data.
 Author: Michael D. Atkinson, Rhys Thomas, João Quinta da Fonseca
 Author-email: michael.atkinson@manchester.ac.uk

{defdap-1.0.0 → defdap-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DefDAP
-Version: 1.0.0
+Version: 1.0.1
 Summary: A python library for correlating EBSD and HRDIC data.
 Author: Michael D. Atkinson, Rhys Thomas, João Quinta da Fonseca
 Author-email: michael.atkinson@manchester.ac.uk

defdap-1.0.1/defdap/_version.py

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

{defdap-1.0.0 → defdap-1.0.1}/defdap/ebsd.py

@@ -1190,6 +1190,9 @@ class Grain(base.Grain):
         self.ref_ori = None                      # (quat) average ori of grain
         self.average_mis_ori = None               # average mis_ori of grain
 
+        self.phase_id = None
+        self.phase = None
+
         self.average_schmid_factors = None        # list of list Schmid factors (grouped by slip plane)
         self.slip_trace_angles = None             # list of slip trace angles
         self.slip_trace_inclinations = None
@@ -1362,7 +1365,7 @@ class Grain(base.Grain):
             All other arguments are passed to :func:`defdap.quat.Quat.plot_unit_cell`.
 
         """
-        crystal_structure = self.ebsd_map.phases[self.phase_id].crystal_structure
+        crystal_structure = self.phase.crystal_structure
         plot = Quat.plot_unit_cell(self.ref_ori, fig=fig, ax=ax, plot=plot,
                                    crystal_structure=crystal_structure, **kwargs)
 

{defdap-1.0.0 → defdap-1.0.1}/defdap/hrdic.py

@@ -780,6 +780,17 @@ class Grain(base.Grain):
 
         """
         return self.ebsd_grain.ref_ori
+    
+    @property
+    def phase(self):
+        """Returns the phase of the linked ebsd grain.
+
+        Returns
+        -------
+        defdap.crystal.Phase
+
+        """
+        return self.ebsd_grain.phase
 
     @property
     def slip_traces(self):

{defdap-1.0.0 → defdap-1.0.1}/defdap/plotting.py

@@ -846,61 +846,52 @@ class GrainPlot(Plot):
             )
             self.draw()
 
-    def add_slip_traces(self, top_only=False, colours=None, pos=None, **kwargs):
+    def add_slip_traces(self, colours=None, **kwargs):
         """Add slip traces to plot, based on the calling grain's slip systems.
 
         Parameters
         ----------
         colours : list
-            Colours to plot.
+            Colours of each trace.
         top_only : bool, optional
             If true, plot only a semicircle instead of a circle.
-        pos : tuple
-            Position of slip traces.
         kwargs
-            Other arguments are passed to :func:`matplotlib.pyplot.quiver`
+            Other arguments are passed to :func:`defdap.plotting.GrainPlot.add_traces`
 
         """
-
         if colours is None:
-            colours = self.calling_grain.ebsd_grain.phase.slip_trace_colours
+            colours = self.calling_grain.phase.slip_trace_colours
         slip_trace_angles = self.calling_grain.slip_traces
 
-        self.add_traces(slip_trace_angles, colours, top_only, pos=pos, **kwargs)
+        self.add_traces(slip_trace_angles, colours, **kwargs)
 
-    def add_slip_bands(self, top_only=False, grain_map_data=None, angles=None, pos=None,
-                       thres=None, min_dist=None, **kwargs):
+    def add_slip_bands(self, grain_map_data, colour=None, thres=None, 
+                       min_dist=None, **kwargs):
         """Add lines representing slip bands detected by Radon transform
         in :func:`~defdap.hrdic.grain.calc_slip_bands`.
 
         Parameters
         ----------
-        top_only : bool, optional
-            If true, plot only a semicircle instead of a circle.
         grain_map_data :
             Map data to pass to :func:`~defdap.hrdic.Grain.calc_slip_bands`.
-        angles : list(float), optional
-            List of angles to plot, otherwise, use angles
-            detected in :func:`~defdap.hrdic.Grain.calc_slip_bands`.
-        pos : tuple
-            Position in which to plot slip traces.
+        colour : str
+            Colour of traces.
         thres : float
             Threshold to use in :func:`~defdap.hrdic.Grain.calc_slip_bands`.
         min_dist :
             Minimum angle between bands in :func:`~defdap.hrdic.Grain.calc_slip_bands`.
         kwargs
-            Other arguments are passed to :func:`matplotlib.pyplot.quiver`.
+            Other arguments are passed to :func:`defdap.plotting.GrainPlot.add_traces`.
 
         """
-
-        if angles is None:
-            slip_band_angles = self.calling_grain.calc_slip_bands(grain_map_data,
-                                                                  thres=thres,
-                                                                  min_dist=min_dist)
-        else:
-            slip_band_angles = angles
-
-        self.add_traces(slip_band_angles, ["black"], top_only, pos=pos, **kwargs)
+        if colour is None:
+            colour = "black"
+        slip_band_angles = self.calling_grain.calc_slip_bands(
+            grain_map_data,
+            thres=thres,
+            min_dist=min_dist
+        )
+        self.add_traces(slip_band_angles, [colour], **kwargs)
 
     @classmethod
     def create(
@@ -972,7 +963,7 @@ class GrainPlot(Plot):
             plot.add_slip_traces()
 
         if plot_slip_bands:
-            plot.add_slip_bands(grain_map_data=map_data)
+            plot.add_slip_bands(map_data)
 
         return plot
 

defdap-1.0.0/defdap/_version.py

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