Merge branch 'main' into reindex_reference_cell_fix

jbeilstenedmands · Jan 11, 2024 · 91d5025 · 91d5025
2 parents 2727744 + 07bee6b
commit 91d5025
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 26 deletions.
diff --git a/.conda-envs/linux.txt b/.conda-envs/linux.txt
@@ -9,7 +9,7 @@ conda-forge::dials-data>=2.4.72
 conda-forge::docutils
 conda-forge::eigen
 conda-forge::future
-conda-forge::gemmi>=0.6.3
+conda-forge::gemmi=0.6.3
 conda-forge::h5py>=3.1.0
 conda-forge::hdf5<1.13
 conda-forge::hdf5plugin

diff --git a/.conda-envs/macos.txt b/.conda-envs/macos.txt
@@ -9,7 +9,7 @@ conda-forge::dials-data>=2.4.72
 conda-forge::docutils
 conda-forge::eigen
 conda-forge::future
-conda-forge::gemmi>=0.6.3
+conda-forge::gemmi=0.6.3
 conda-forge::h5py>=3.1.0
 conda-forge::hdf5<1.13
 conda-forge::hdf5plugin

diff --git a/.conda-envs/windows.txt b/.conda-envs/windows.txt
@@ -9,7 +9,7 @@ conda-forge::dials-data>=2.4.72
 conda-forge::docutils
 conda-forge::eigen
 conda-forge::future
-conda-forge::gemmi>=0.6.3
+conda-forge::gemmi=0.6.3
 conda-forge::h5py>=3.1.0
 conda-forge::hdf5<1.13
 conda-forge::hdf5plugin

diff --git a/doc/sphinx/documentation/programs/dials_reciprocal_lattice_viewer.rst b/doc/sphinx/documentation/programs/dials_reciprocal_lattice_viewer.rst
diff --git a/doc/sphinx/documentation/programs/index.rst b/doc/sphinx/documentation/programs/index.rst
@@ -28,7 +28,6 @@ Utilities:
 
    dials_show
    dials_image_viewer
-   dials_reciprocal_lattice_viewer
    dials_generate_mask
    dials_check_indexing_symmetry
    dials_search_beam_position

diff --git a/newsfragments/2572.bugfix b/newsfragments/2572.bugfix
@@ -0,0 +1 @@
+``dials.reciprocal_lattice_viewer``: ensure the correct panel for the beam centre is recorded when loading models.
diff --git a/newsfragments/2578.misc b/newsfragments/2578.misc
@@ -0,0 +1 @@
+Pin Gemmi dependency to 0.6.3 due to windows issues.
diff --git a/src/dials/util/reciprocal_lattice/viewer.py b/src/dials/util/reciprocal_lattice/viewer.py
@@ -90,6 +90,9 @@ def __init__(self, parent, id, title, size, settings=None, *args, **kwds):
     def load_models(self, experiments, reflections):
         Render3d.load_models(self, experiments, reflections)
         if self.settings.beam_centre is not None:
+            self.settings_panel.beam_panel_ctrl.SetValue(
+                self.settings.beam_centre_panel
+            )
             self.settings_panel.beam_fast_ctrl.SetValue(self.settings.beam_centre[0])
             self.settings_panel.beam_slow_ctrl.SetValue(self.settings.beam_centre[1])
         else:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		``dials.reciprocal_lattice_viewer``: ensure the correct panel for the beam centre is recorded when loading models.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Pin Gemmi dependency to 0.6.3 due to windows issues.