Browse Source

Merge pull request #285 from MadCatX/tweak-measurement-order-labels

Tweak measurement order labels
David Sehnal 3 years ago
parent
commit
ffee2bf1c4

+ 1 - 1
src/mol-geo/geometry/text/text.ts

@@ -245,7 +245,7 @@ export namespace Text {
             ...BaseGeometry.createValues(props, counts),
             uSizeFactor: ValueCell.create(props.sizeFactor),
 
-            uBorderWidth: ValueCell.create(clamp(props.borderWidth / 2, 0, 0.5)),
+            uBorderWidth: ValueCell.create(clamp(props.borderWidth, 0, 0.5)),
             uBorderColor: ValueCell.create(Color.toArrayNormalized(props.borderColor, Vec3.zero(), 0)),
             uOffsetX: ValueCell.create(props.offsetX),
             uOffsetY: ValueCell.create(props.offsetY),

+ 2 - 1
src/mol-plugin-state/manager/structure/measurement.ts

@@ -308,8 +308,9 @@ class StructureMeasurementManager extends StatefulPluginComponent<StructureMeasu
                 .apply(StateTransforms.Representation.StructureSelectionsLabel3D, {
                     textColor: Color.fromRgb(255, 255, 255),
                     borderColor: Color.fromRgb(0, 0, 0),
-                    borderWidth: 0.5,
                     textSize: 0.33,
+                    borderWidth: 0.3,
+                    offsetZ: 0.75,
                     customText: `${order++}`
                 }, { tags: MeasurementOrderLabelTag });
         }