molstar 4.0.1 → 4.2.0

package/lib/mol-plugin-state/transforms/volume.js

@@ -1,11 +1,12 @@
 /**
- * Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
+ * @author Yakov Pechersky <ffxen158@gmail.com>
  */
 import { CIF } from '../../mol-io/reader/cif';
-import { Vec3 } from '../../mol-math/linear-algebra';
+import { Mat4, Vec3 } from '../../mol-math/linear-algebra';
 import { volumeFromCcp4 } from '../../mol-model-formats/volume/ccp4';
 import { volumeFromDensityServerData } from '../../mol-model-formats/volume/density-server';
 import { volumeFromDsn6 } from '../../mol-model-formats/volume/dsn6';
@@ -14,6 +15,7 @@ import { ParamDefinition as PD } from '../../mol-util/param-definition';
 import { PluginStateObject as SO, PluginStateTransform } from '../objects';
 import { volumeFromCube } from '../../mol-model-formats/volume/cube';
 import { volumeFromDx } from '../../mol-model-formats/volume/dx';
+import { Grid } from '../../mol-model/volume';
 import { StateSelection } from '../../mol-state';
 import { volumeFromSegmentationData } from '../../mol-model-formats/volume/segmentation';
 export { VolumeFromCcp4 };
@@ -217,3 +219,50 @@ const AssignColorVolume = PluginStateTransform.BuiltIn({
         });
     }
 });
+export const VolumeTransform = PluginStateTransform.BuiltIn({
+    name: 'volume-transform',
+    display: { name: 'Transform Volume' },
+    isDecorator: true,
+    from: SO.Volume.Data,
+    to: SO.Volume.Data,
+    params: {
+        transform: PD.MappedStatic('matrix', 
+        // TODO: support "components" based rotation
+        {
+            matrix: PD.Group({
+                data: PD.Mat4(Mat4.identity()),
+                transpose: PD.Boolean(false),
+            }, { isFlat: true }),
+        }, { label: 'Kind' }),
+    },
+})({
+    canAutoUpdate({ newParams }) {
+        return newParams.transform.name !== 'matrix';
+    },
+    apply({ a, params }) {
+        // similar to StateTransforms.Model.TransformStructureConformation;
+        const transform = Mat4();
+        let gridTransform = { ...a.data.grid.transform };
+        Mat4.copy(transform, params.transform.params.data);
+        if (params.transform.params.transpose)
+            Mat4.transpose(transform, transform);
+        const origMat = a.data.grid.transform.kind === 'matrix'
+            ? a.data.grid.transform.matrix
+            : Grid.getGridToCartesianTransform(a.data.grid);
+        gridTransform = {
+            kind: 'matrix',
+            matrix: Mat4.mul(Mat4(), transform, origMat),
+        };
+        const v = {
+            ...a.data,
+            grid: {
+                ...a.data.grid,
+                transform: gridTransform,
+            },
+        };
+        return new SO.Volume.Data(v, {
+            label: a.label,
+            description: `${a.description} [Transformed]`,
+        });
+    },
+});

package/lib/mol-plugin-ui/skin/base/base.scss

@@ -1,38 +1,38 @@
-
-@mixin user-select($select) {
-  -webkit-user-select: $select;
-     -moz-user-select: $select;
-      -ms-user-select: $select; // IE10+
-          user-select: $select;
-}
-
-.msp-plugin {
-    font-family: "Helvetica Neue", "Segoe UI", Helvetica, "Source Sans Pro", Arial, sans-serif;
-    font-size: 14px;
-    line-height: 1.42857143;
-
-    position: absolute;
-    left: 0;
-    top: 0;
-    right: 0;
-    bottom: 0;
-
-    @import 'variables';
-
-    @import "normalize";
-
-    @import 'layout';
-    @import 'ui';
-    @import 'logo';
-
-    .msp-plugin-content {
-        color: $font-color;
-    }
-
-    .msp-plugin-init-error {
-        white-space: pre;
-        margin: $control-spacing;
-    }
-
-    background: $default-background;
+
+@mixin user-select($select) {
+  -webkit-user-select: $select;
+     -moz-user-select: $select;
+      -ms-user-select: $select; // IE10+
+          user-select: $select;
+}
+
+.msp-plugin {
+    font-family: "Helvetica Neue", "Segoe UI", Helvetica, "Source Sans Pro", Arial, sans-serif;
+    font-size: 14px;
+    line-height: 1.42857143;
+
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+
+    @import 'variables';
+
+    @import "normalize";
+
+    @import 'layout';
+    @import 'ui';
+    @import 'logo';
+
+    .msp-plugin-content {
+        color: $font-color;
+    }
+
+    .msp-plugin-init-error {
+        white-space: pre;
+        margin: $control-spacing;
+    }
+
+    background: $default-background;
 }