SOF-7354: show labels with atomic symbols when present

Exabyte-io · May 6, 2024 · d738651 · d738651
1 parent fac1ab5
commit d738651
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/mixins/atoms.js b/src/mixins/atoms.js
@@ -88,13 +88,15 @@ export const AtomsMixin = (superclass) =>
         createAtomsGroup(basis, atomRadiiScale) {
             const atomsGroup = new THREE.Group();
             atomsGroup.name = ATOM_GROUP_NAME;
+            const { elementsWithLabelsArray } = basis;
             basis.coordinates.forEach((atomicCoordinate, atomicIndex) => {
                 const element = basis.getElementByIndex(atomicIndex);
                 const sphereMesh = this.getSphereMeshObject({
                     ...this._getDefaultSettingsForElement(element, atomRadiiScale),
                     coordinate: atomicCoordinate.value,
                 });
                 sphereMesh.name = `${element}-${atomicIndex}`;
+                sphereMesh.nameWithLabel = `${elementsWithLabelsArray[atomicIndex]}`;
                 atomsGroup.add(sphereMesh);
             });
             return atomsGroup;

diff --git a/src/mixins/labels.js b/src/mixins/labels.js
@@ -111,7 +111,7 @@ export const LabelsMixin = (superclass) =>
 
                 group.children.forEach((atom) => {
                     if (atom instanceof THREE.Mesh) {
-                        const text = atom.name.split("-")[0];
+                        const text = atom.nameWithLabel;
                         const position = new THREE.Vector3().setFromMatrixPosition(
                             atom.matrixWorld,
                         );