From de4984da903d35cb9e9ae70675905e8cd457cd46 Mon Sep 17 00:00:00 2001 From: StephenNneji <34302892+StephenNneji@users.noreply.github.com> Date: Fri, 10 Feb 2023 13:21:11 +0000 Subject: [PATCH] Adds DOI and updates version to 2.1.0 (#107) * Adds DOI and updates version to 2.1.0 * bugfix for no vector render --- README.md | 6 +++--- sscanss/__version.py | 4 ++-- sscanss/app/dialogs/misc.py | 6 +++--- sscanss/core/scene/node.py | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 6ec153d2..939d0eb0 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![release](https://img.shields.io/github/release/ISISNeutronMuon/SScanSS-2.svg)](https://github.com/ISISNeutronMuon/SScanSS-2/releases) [![Actions Status](https://github.com/ISISNeutronMuon/SScanSS-2/workflows/Build/badge.svg)](https://github.com/ISISNeutronMuon/SScanSS-2/actions) [![Actions Status](https://github.com/ISISNeutronMuon/SScanSS-2/workflows/Docs/badge.svg)](https://github.com/ISISNeutronMuon/SScanSS-2/actions) -[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.6516966.svg)](https://doi.org/10.5281/zenodo.6516966) +[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7625691.svg)](https://doi.org/10.5281/zenodo.7625691) SScanSS 2 ========= @@ -24,5 +24,5 @@ Citing SScanSS 2 1. J. A. James, J. R. Santisteban, L. Edwards and M. R. Daymond, “A virtual laboratory for neutron and synchrotron strain scanning,” Physica B: Condensed Matter, vol. 350, no. 1-3, p. 743–746, 2004. -2. Nneji Stephen, & Cooper Joshaniel FK. (2022). SScanSS 2—a redesigned strain scanning simulation software (Version 2.0.0). -[http://doi.org/10.5281/zenodo.6516966](http://doi.org/10.5281/zenodo.6516966). +2. Nneji Stephen, Sharp Paul, Farooq Rabiya, Zavileiskii Timofei, & Cooper Joshaniel FK. (2022). SScanSS 2—a redesigned +strain scanning simulation software (Version 2.1.0). [http://doi.org/10.5281/zenodo.7625691](http://doi.org/10.5281/zenodo.7625691). diff --git a/sscanss/__version.py b/sscanss/__version.py index 9acbcadb..bebc18a8 100644 --- a/sscanss/__version.py +++ b/sscanss/__version.py @@ -64,5 +64,5 @@ def __repr__(self): return f'Version({self.major}, {self.minor}, {self.patch}, {self.pre_release}, {self.build})' -__version__ = Version(2, 0, 0) -__editor_version__ = Version(2, 0, 0) +__version__ = Version(2, 1, 0) +__editor_version__ = Version(2, 1, 0) diff --git a/sscanss/app/dialogs/misc.py b/sscanss/app/dialogs/misc.py index 264a85aa..8bc42a4e 100644 --- a/sscanss/app/dialogs/misc.py +++ b/sscanss/app/dialogs/misc.py @@ -52,9 +52,9 @@ def __init__(self, parent): '
  1. J. A. James, J. R. Santisteban, L. Edwards and M. R. Daymond, “A virtual laboratory for ' 'neutron and synchrotron strain scanning,” Physica B: Condensed Matter, vol. 350, no. 1-3, ' 'p. 743–746, 2004.
    2. ' - '
  2. Nneji Stephen, & Cooper Joshaniel FK. (2022). SScanSS 2—a redesigned strain scanning simulation ' - 'software (Version 2.0.0). ' - 'http://doi.org/10.5281/zenodo.6516966.
    3. ' + '
  3. Nneji Stephen, Sharp Paul, Farooq Rabiya, Zavileiskii Timofei, & Cooper Joshaniel FK. (2022). ' + 'SScanSS 2—a redesigned strain scanning simulation software (Version 2.1.0). ' + 'http://doi.org/10.5281/zenodo.7625691.
    4. ' '
' '

Credit

' '' diff --git a/sscanss/core/scene/node.py b/sscanss/core/scene/node.py index d0d93a02..272de972 100644 --- a/sscanss/core/scene/node.py +++ b/sscanss/core/scene/node.py @@ -258,7 +258,7 @@ def draw(self, renderer): :param renderer: OpenGl renderer instance :type renderer: OpenGLRenderer """ - if not self.visible or self.buffer is None: + if not self.visible: return GL.glPushMatrix()