Skip to content

Commit

Permalink
Refs #42. Fixed an error if pole figure contour is init to nan.
Browse files Browse the repository at this point in the history
pyrs/core/mantid_fit_peak.py:249:        # TODO - 20181101 - Need to
expand this method such that all fitted parameters will be added to
output
pyrs/interface/ui/diffdataviews.py:113:        # TODO - 20181101 -
Enable after auto_scale is fixed: self.auto_rescale()
pyrs/interface/ui/mplgraphicsview1d.py:287:        # TODO FIXME -
20181101 - This is a broken method.  Fix it!
pyrs/core/strain_stress_calculator.py:497:    # TODO FIXME - 20181001 -
Temporarily disabled in order to clean up for the new workflow
pyrs/core/strain_stress_calculator.py:1417:        # TODO - 20181010 -
check whether all the raw files (e11/e22/e33) are ready for next!
pyrs/interface/strainstresscalwindow.py:388:        # TODO - 20181010 -
Refactor!
pyrs/interface/strainstresscalwindow.py:872:            # TODO -
20181011 - Implement (from cleaning old codes)
pyrs/interface/strainstresscalwindow.py:873:            # TODO - ASAP -
20181011 - Continue from here!
pyrs/interface/strainstresscalwindow.py:1056:        # # TODO - 20181010
- Consider how to integrate method plot_peak_parameter()
pyrs/interface/manualreductionwindow.py:140:        # TODO - 20181009 -
Need to refine
pyrs/interface/manualreductionwindow.py:207:        # TODO - 20181006 -
Implement ASAP
pyrs/interface/manualreductionwindow.py:297:        # TODO - 20181008 -
ASAP
tests/unittest/straincalculationtest.py:75:    # TODO FIXME - 20181001 -
Make an individual method for ....  ---> New workflow!
tests/unittest/straincalculationtest.py:77:        # TODO FIXME -
20181001 - This is a new suite of methods to analyze the sample grids
  • Loading branch information
wdzhou committed Nov 5, 2018
1 parent daf7f5e commit 6d671c7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 2 additions & 1 deletion pyrs/interface/ui/diffdataviews.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ def plot_pole_figure(self, vec_alpha, vec_beta, vec_intensity):
# else:
# plot contour
# TODO - make the grid of r converted from linear grid on alpha
init_value = np.nan # np.nan
self._myCanvas.plot_contour(vec_theta=vec_beta, vec_r=vec_r, vec_values=vec_intensity, max_r=90.,
r_resolution=5., theta_resolution=5., init_value=np.nan)
r_resolution=5., theta_resolution=5., init_value=init_value)

# TODO - convert (vec_r, vec_beta) to X, Y and do a scattering in another

Expand Down
5 changes: 4 additions & 1 deletion pyrs/interface/ui/mplgraphicsviewpolar.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,10 @@ def plot_contour(self, vec_theta, vec_r, vec_values, max_r, r_resolution, theta_
# END-IF-ELSE

# set value
mesh_values[index_theta, index_r] += value_i
if np.isnan(mesh_values[index_theta, index_r]):
mesh_values[index_theta, index_r] = value_i
else:
mesh_values[index_theta, index_r] += value_i
# END-FOR

# plot
Expand Down

0 comments on commit 6d671c7

Please sign in to comment.