react-cheminfo 0.138.0 → 0.140.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/credits/core/credits.d.ts +12 -0
- package/lib/credits/core/credits.d.ts.map +1 -1
- package/lib/credits/core/credits.js +16 -0
- package/lib/credits/core/credits.js.map +1 -1
- package/lib/crystal3d/ui/CrystalCanvas3D.d.ts +1 -1
- package/lib/crystal3d/ui/CrystalCanvas3D.d.ts.map +1 -1
- package/lib/crystal3d/ui/CrystalViewer3D.d.ts +1 -1
- package/lib/crystal3d/ui/CrystalViewer3D.d.ts.map +1 -1
- package/lib/crystal3d/ui/crystalStructureViewerProps.d.ts +1 -1
- package/lib/crystal3d/ui/crystalStructureViewerProps.d.ts.map +1 -1
- package/lib/download/ui/FigureDownloadPanel.d.ts +17 -3
- package/lib/download/ui/FigureDownloadPanel.d.ts.map +1 -1
- package/lib/download/ui/FigureDownloadPanel.js +1 -1
- package/lib/download/ui/FigureDownloadPanel.js.map +1 -1
- package/lib/download/ui/FigureQuickActions.d.ts +10 -4
- package/lib/download/ui/FigureQuickActions.d.ts.map +1 -1
- package/lib/download/ui/FigureQuickActions.js +12 -6
- package/lib/download/ui/FigureQuickActions.js.map +1 -1
- package/lib/drawing/ui/ZoomControl.d.ts +20 -1
- package/lib/drawing/ui/ZoomControl.d.ts.map +1 -1
- package/lib/drawing/ui/ZoomControl.js +9 -5
- package/lib/drawing/ui/ZoomControl.js.map +1 -1
- package/lib/ecosystem/core/home.d.ts +19 -0
- package/lib/ecosystem/core/home.d.ts.map +1 -0
- package/lib/ecosystem/core/home.js +23 -0
- package/lib/ecosystem/core/home.js.map +1 -0
- package/lib/ecosystem/core/index.d.ts +3 -0
- package/lib/ecosystem/core/index.d.ts.map +1 -1
- package/lib/ecosystem/core/index.js +2 -0
- package/lib/ecosystem/core/index.js.map +1 -1
- package/lib/ecosystem/core/searchSites.d.ts +39 -0
- package/lib/ecosystem/core/searchSites.d.ts.map +1 -0
- package/lib/ecosystem/core/searchSites.js +77 -0
- package/lib/ecosystem/core/searchSites.js.map +1 -0
- package/lib/ecosystem/core/types.d.ts +1 -1
- package/lib/ecosystem/core/types.d.ts.map +1 -1
- package/lib/ecosystem/core/unlistedSites.d.ts.map +1 -1
- package/lib/ecosystem/core/unlistedSites.js +14 -0
- package/lib/ecosystem/core/unlistedSites.js.map +1 -1
- package/lib/ecosystem/ui/EcosystemButton.d.ts +6 -0
- package/lib/ecosystem/ui/EcosystemButton.d.ts.map +1 -1
- package/lib/ecosystem/ui/EcosystemButton.js +2 -2
- package/lib/ecosystem/ui/EcosystemButton.js.map +1 -1
- package/lib/ecosystem/ui/EcosystemMenu.d.ts +13 -4
- package/lib/ecosystem/ui/EcosystemMenu.d.ts.map +1 -1
- package/lib/ecosystem/ui/EcosystemMenu.js +56 -6
- package/lib/ecosystem/ui/EcosystemMenu.js.map +1 -1
- package/lib/ecosystem/ui/SiteGroupGrid.d.ts +12 -0
- package/lib/ecosystem/ui/SiteGroupGrid.d.ts.map +1 -1
- package/lib/ecosystem/ui/SiteGroupGrid.js +15 -2
- package/lib/ecosystem/ui/SiteGroupGrid.js.map +1 -1
- package/lib/ecosystem/ui/glyphs.d.ts.map +1 -1
- package/lib/ecosystem/ui/glyphs.js +4 -0
- package/lib/ecosystem/ui/glyphs.js.map +1 -1
- package/lib/i18n/core/chromeCatalog.d.ts +1 -1
- package/lib/i18n/core/chromeCatalog.d.ts.map +1 -1
- package/lib/locales/de.json +10 -0
- package/lib/locales/en.json +10 -0
- package/lib/locales/es.json +10 -0
- package/lib/locales/fr.json +10 -0
- package/lib/locales/it.json +10 -0
- package/lib/molecule3d/core/bondNeighbours.d.ts +30 -0
- package/lib/molecule3d/core/bondNeighbours.d.ts.map +1 -0
- package/lib/molecule3d/core/bondNeighbours.js +108 -0
- package/lib/molecule3d/core/bondNeighbours.js.map +1 -0
- package/lib/molecule3d/core/file.d.ts +15 -4
- package/lib/molecule3d/core/file.d.ts.map +1 -1
- package/lib/molecule3d/core/file.js +10 -1
- package/lib/molecule3d/core/file.js.map +1 -1
- package/lib/molecule3d/core/index.d.ts +11 -2
- package/lib/molecule3d/core/index.d.ts.map +1 -1
- package/lib/molecule3d/core/index.js +6 -1
- package/lib/molecule3d/core/index.js.map +1 -1
- package/lib/molecule3d/core/partialBondMode.d.ts +34 -0
- package/lib/molecule3d/core/partialBondMode.d.ts.map +1 -0
- package/lib/molecule3d/core/partialBondMode.js +39 -0
- package/lib/molecule3d/core/partialBondMode.js.map +1 -0
- package/lib/molecule3d/core/partialBondRanges.d.ts +61 -0
- package/lib/molecule3d/core/partialBondRanges.d.ts.map +1 -0
- package/lib/molecule3d/core/partialBondRanges.js +89 -0
- package/lib/molecule3d/core/partialBondRanges.js.map +1 -0
- package/lib/molecule3d/core/partialBonds.d.ts +61 -0
- package/lib/molecule3d/core/partialBonds.d.ts.map +1 -0
- package/lib/molecule3d/core/partialBonds.js +115 -0
- package/lib/molecule3d/core/partialBonds.js.map +1 -0
- package/lib/molecule3d/core/settings.d.ts +13 -35
- package/lib/molecule3d/core/settings.d.ts.map +1 -1
- package/lib/molecule3d/core/settings.js +17 -25
- package/lib/molecule3d/core/settings.js.map +1 -1
- package/lib/molecule3d/core/tools.d.ts +36 -0
- package/lib/molecule3d/core/tools.d.ts.map +1 -0
- package/lib/molecule3d/core/tools.js +24 -0
- package/lib/molecule3d/core/tools.js.map +1 -0
- package/lib/molecule3d/ui/Molecule3DExport.d.ts.map +1 -1
- package/lib/molecule3d/ui/Molecule3DExport.js +19 -2
- package/lib/molecule3d/ui/Molecule3DExport.js.map +1 -1
- package/lib/molecule3d/ui/Molecule3DOptions.d.ts +5 -2
- package/lib/molecule3d/ui/Molecule3DOptions.d.ts.map +1 -1
- package/lib/molecule3d/ui/Molecule3DOptions.js +6 -4
- package/lib/molecule3d/ui/Molecule3DOptions.js.map +1 -1
- package/lib/molecule3d/ui/Molecule3DPartialBonds.d.ts +22 -0
- package/lib/molecule3d/ui/Molecule3DPartialBonds.d.ts.map +1 -0
- package/lib/molecule3d/ui/Molecule3DPartialBonds.js +53 -0
- package/lib/molecule3d/ui/Molecule3DPartialBonds.js.map +1 -0
- package/lib/molecule3d/ui/Molecule3DToolbar.d.ts +1 -1
- package/lib/molecule3d/ui/Molecule3DToolbar.d.ts.map +1 -1
- package/lib/molecule3d/ui/Molecule3DToolbar.js +1 -1
- package/lib/molecule3d/ui/Molecule3DToolbar.js.map +1 -1
- package/lib/molecule3d/ui/MoleculeCanvas3D.d.ts.map +1 -1
- package/lib/molecule3d/ui/MoleculeCanvas3D.js +3 -2
- package/lib/molecule3d/ui/MoleculeCanvas3D.js.map +1 -1
- package/lib/molecule3d/ui/drawScene.d.ts +4 -3
- package/lib/molecule3d/ui/drawScene.d.ts.map +1 -1
- package/lib/molecule3d/ui/drawScene.js +12 -2
- package/lib/molecule3d/ui/drawScene.js.map +1 -1
- package/lib/molecule3d/ui/moleculeFileFormats.d.ts +3 -2
- package/lib/molecule3d/ui/moleculeFileFormats.d.ts.map +1 -1
- package/lib/molecule3d/ui/moleculeFileFormats.js +5 -3
- package/lib/molecule3d/ui/moleculeFileFormats.js.map +1 -1
- package/lib/molecule3d/ui/moleculeViewer3DProps.d.ts +2 -1
- package/lib/molecule3d/ui/moleculeViewer3DProps.d.ts.map +1 -1
- package/lib/molecule3d/ui/partialBondShapes.d.ts +117 -0
- package/lib/molecule3d/ui/partialBondShapes.d.ts.map +1 -0
- package/lib/molecule3d/ui/partialBondShapes.js +164 -0
- package/lib/molecule3d/ui/partialBondShapes.js.map +1 -0
- package/lib/molecule3d/ui/renderMolecule.d.ts +9 -0
- package/lib/molecule3d/ui/renderMolecule.d.ts.map +1 -1
- package/lib/molecule3d/ui/renderMolecule.js +17 -0
- package/lib/molecule3d/ui/renderMolecule.js.map +1 -1
- package/lib/molecule3d/ui/renderPartialBonds.d.ts +19 -0
- package/lib/molecule3d/ui/renderPartialBonds.d.ts.map +1 -0
- package/lib/molecule3d/ui/renderPartialBonds.js +90 -0
- package/lib/molecule3d/ui/renderPartialBonds.js.map +1 -0
- package/lib/molecule3d/ui/structureGeometry.d.ts +22 -0
- package/lib/molecule3d/ui/structureGeometry.d.ts.map +1 -0
- package/lib/molecule3d/ui/structureGeometry.js +63 -0
- package/lib/molecule3d/ui/structureGeometry.js.map +1 -0
- package/lib/molecule3d/ui/usePolarSurfaceArea.d.ts +2 -2
- package/lib/molecule3d/ui/usePolarSurfaceArea.d.ts.map +1 -1
- package/lib/molecule3d/ui/usePolarSurfaceArea.js +5 -4
- package/lib/molecule3d/ui/usePolarSurfaceArea.js.map +1 -1
- package/lib/molecule3d/ui/viewer.d.ts +8 -1
- package/lib/molecule3d/ui/viewer.d.ts.map +1 -1
- package/lib/molecule3d/ui/viewer.js +10 -0
- package/lib/molecule3d/ui/viewer.js.map +1 -1
- package/lib/molecule3d/ui/viewerTypes.d.ts +18 -0
- package/lib/molecule3d/ui/viewerTypes.d.ts.map +1 -1
- package/lib/panel/ui/FilterInput.d.ts +11 -0
- package/lib/panel/ui/FilterInput.d.ts.map +1 -1
- package/lib/panel/ui/FilterInput.js +10 -1
- package/lib/panel/ui/FilterInput.js.map +1 -1
- package/lib/shell/ui/ShellFrame.d.ts.map +1 -1
- package/lib/shell/ui/ShellFrame.js +3 -2
- package/lib/shell/ui/ShellFrame.js.map +1 -1
- package/package.json +1 -1
- package/src/credits/core/credits.ts +16 -0
- package/src/crystal3d/ui/CrystalCanvas3D.tsx +1 -1
- package/src/crystal3d/ui/CrystalViewer3D.tsx +1 -1
- package/src/crystal3d/ui/crystalStructureViewerProps.ts +1 -1
- package/src/download/ui/FigureDownloadPanel.tsx +20 -4
- package/src/download/ui/FigureQuickActions.tsx +18 -6
- package/src/drawing/ui/ZoomControl.tsx +33 -8
- package/src/ecosystem/core/home.ts +27 -0
- package/src/ecosystem/core/index.ts +7 -0
- package/src/ecosystem/core/searchSites.ts +102 -0
- package/src/ecosystem/core/types.ts +1 -0
- package/src/ecosystem/core/unlistedSites.ts +15 -0
- package/src/ecosystem/ui/EcosystemButton.tsx +8 -2
- package/src/ecosystem/ui/EcosystemMenu.tsx +103 -7
- package/src/ecosystem/ui/SiteGroupGrid.tsx +28 -3
- package/src/ecosystem/ui/glyphs.tsx +14 -0
- package/src/locales/de.json +10 -0
- package/src/locales/en.json +10 -0
- package/src/locales/es.json +10 -0
- package/src/locales/fr.json +10 -0
- package/src/locales/it.json +10 -0
- package/src/molecule3d/core/bondNeighbours.ts +108 -0
- package/src/molecule3d/core/file.ts +18 -4
- package/src/molecule3d/core/index.ts +17 -3
- package/src/molecule3d/core/partialBondMode.ts +48 -0
- package/src/molecule3d/core/partialBondRanges.ts +120 -0
- package/src/molecule3d/core/partialBonds.ts +180 -0
- package/src/molecule3d/core/settings.ts +29 -52
- package/src/molecule3d/core/tools.ts +51 -0
- package/src/molecule3d/ui/Molecule3DExport.tsx +17 -2
- package/src/molecule3d/ui/Molecule3DOptions.tsx +16 -3
- package/src/molecule3d/ui/Molecule3DPartialBonds.tsx +100 -0
- package/src/molecule3d/ui/Molecule3DToolbar.tsx +2 -2
- package/src/molecule3d/ui/MoleculeCanvas3D.tsx +3 -4
- package/src/molecule3d/ui/drawScene.ts +15 -2
- package/src/molecule3d/ui/moleculeFileFormats.ts +5 -3
- package/src/molecule3d/ui/moleculeViewer3DProps.ts +2 -1
- package/src/molecule3d/ui/partialBondShapes.ts +246 -0
- package/src/molecule3d/ui/renderMolecule.ts +20 -0
- package/src/molecule3d/ui/renderPartialBonds.ts +122 -0
- package/src/molecule3d/ui/structureGeometry.ts +73 -0
- package/src/molecule3d/ui/usePolarSurfaceArea.ts +5 -4
- package/src/molecule3d/ui/viewer.ts +12 -0
- package/src/molecule3d/ui/viewerTypes.ts +19 -0
- package/src/panel/ui/FilterInput.tsx +24 -0
- package/src/shell/ui/ShellFrame.tsx +7 -1
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* The display settings of the 3D molecule viewer
|
|
3
|
-
*
|
|
2
|
+
* The display settings of the 3D molecule viewer, free of React and molstar so
|
|
3
|
+
* a site can persist and validate them.
|
|
4
4
|
*/
|
|
5
|
+
import { isPartialBondMode } from "./partialBondMode.js";
|
|
5
6
|
/** Ways the model can be drawn, in the order the picker offers them. */
|
|
6
7
|
export const REPRESENTATIONS = [
|
|
7
8
|
'ball-and-stick',
|
|
@@ -42,6 +43,8 @@ export const DEFAULT_MOLECULE_3D_SETTINGS = {
|
|
|
42
43
|
surfaceColoring: 'uniform',
|
|
43
44
|
// A scene colour: WebGL cannot read a CSS custom property.
|
|
44
45
|
surfaceColor: '#94a3b8', // tokens-ok
|
|
46
|
+
partialBonds: 'auto',
|
|
47
|
+
partialBondLengths: true,
|
|
45
48
|
};
|
|
46
49
|
/** The span, and the slider step, of every numeric setting. */
|
|
47
50
|
export const MOLECULE_3D_RANGES = {
|
|
@@ -49,17 +52,6 @@ export const MOLECULE_3D_RANGES = {
|
|
|
49
52
|
surfaceAlpha: { minimum: 0.1, maximum: 1, step: 0.05 },
|
|
50
53
|
probeRadius: { minimum: 1, maximum: 3, step: 0.1 },
|
|
51
54
|
};
|
|
52
|
-
/** Every tool on. */
|
|
53
|
-
export const DEFAULT_MOLECULE_3D_TOOLS = {
|
|
54
|
-
measure: true,
|
|
55
|
-
options: true,
|
|
56
|
-
spin: true,
|
|
57
|
-
surface: true,
|
|
58
|
-
reset: true,
|
|
59
|
-
export: true,
|
|
60
|
-
fullscreen: true,
|
|
61
|
-
help: true,
|
|
62
|
-
};
|
|
63
55
|
/**
|
|
64
56
|
* Narrow an arbitrary string — a stored preference, a picker's value — to a
|
|
65
57
|
* representation.
|
|
@@ -88,14 +80,14 @@ export function isSurfaceColoringId(value) {
|
|
|
88
80
|
/**
|
|
89
81
|
* Complete and repair settings from any source: missing fields take their
|
|
90
82
|
* default, numbers are clamped into {@link MOLECULE_3D_RANGES}, an unknown
|
|
91
|
-
* representation or
|
|
92
|
-
* is not `#rrggbb` to its default.
|
|
83
|
+
* representation, colouring or partial bond mode falls back to the default
|
|
84
|
+
* one, and a colour that is not `#rrggbb` to its default.
|
|
93
85
|
* @param settings - Whatever a site has, possibly read back from storage.
|
|
94
86
|
* @returns Settings the viewer can draw.
|
|
95
87
|
*/
|
|
96
88
|
export function normalizeMolecule3DSettings(settings = {}) {
|
|
97
89
|
const defaults = DEFAULT_MOLECULE_3D_SETTINGS;
|
|
98
|
-
const { representation, sizeFactor, showSurface, surfaceAlpha, probeRadius, surfaceColoring, surfaceColor, } = settings;
|
|
90
|
+
const { representation, sizeFactor, showSurface, surfaceAlpha, probeRadius, surfaceColoring, surfaceColor, partialBonds, partialBondLengths, } = settings;
|
|
99
91
|
return {
|
|
100
92
|
representation: typeof representation === 'string' && isRepresentationId(representation)
|
|
101
93
|
? representation
|
|
@@ -109,6 +101,12 @@ export function normalizeMolecule3DSettings(settings = {}) {
|
|
|
109
101
|
? surfaceColoring
|
|
110
102
|
: defaults.surfaceColoring,
|
|
111
103
|
surfaceColor: hexColor(surfaceColor, defaults.surfaceColor),
|
|
104
|
+
partialBonds: isPartialBondMode(partialBonds)
|
|
105
|
+
? partialBonds
|
|
106
|
+
: defaults.partialBonds,
|
|
107
|
+
partialBondLengths: typeof partialBondLengths === 'boolean'
|
|
108
|
+
? partialBondLengths
|
|
109
|
+
: defaults.partialBondLengths,
|
|
112
110
|
};
|
|
113
111
|
}
|
|
114
112
|
/**
|
|
@@ -134,15 +132,9 @@ export function sameMolecule3DSettings(first, second) {
|
|
|
134
132
|
first.surfaceAlpha === second.surfaceAlpha &&
|
|
135
133
|
first.probeRadius === second.probeRadius &&
|
|
136
134
|
first.surfaceColoring === second.surfaceColoring &&
|
|
137
|
-
first.surfaceColor === second.surfaceColor
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
* Complete a partial tool selection.
|
|
141
|
-
* @param tools - The tools a site switched on or off.
|
|
142
|
-
* @returns Every tool, those not named left on.
|
|
143
|
-
*/
|
|
144
|
-
export function resolveMolecule3DTools(tools = {}) {
|
|
145
|
-
return { ...DEFAULT_MOLECULE_3D_TOOLS, ...tools };
|
|
135
|
+
first.surfaceColor === second.surfaceColor &&
|
|
136
|
+
first.partialBonds === second.partialBonds &&
|
|
137
|
+
first.partialBondLengths === second.partialBondLengths);
|
|
146
138
|
}
|
|
147
139
|
function hexColor(value, fallback) {
|
|
148
140
|
return typeof value === 'string' && /^#[\da-f]{6}$/i.test(value)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../src/molecule3d/core/settings.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../src/molecule3d/core/settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Which buttons the toolbar over the 3D molecule canvas shows, free of React
|
|
3
|
+
* and molstar so a site can persist them.
|
|
4
|
+
*/
|
|
5
|
+
/** Which buttons the toolbar over the canvas shows. */
|
|
6
|
+
export interface Molecule3DTools {
|
|
7
|
+
/** Distance, angle and dihedral tools, and a button removing them all. */
|
|
8
|
+
measure: boolean;
|
|
9
|
+
/** A popover with the representation, the size and the surface sliders. */
|
|
10
|
+
options: boolean;
|
|
11
|
+
/** A toggle turning the model on its own. */
|
|
12
|
+
spin: boolean;
|
|
13
|
+
/** A toggle drawing the molecular surface. */
|
|
14
|
+
surface: boolean;
|
|
15
|
+
/** A button framing the model again. */
|
|
16
|
+
reset: boolean;
|
|
17
|
+
/** A popover saving the picture as a PNG or an SVG. */
|
|
18
|
+
export: boolean;
|
|
19
|
+
/**
|
|
20
|
+
* A toggle filling the screen with the canvas and its toolbars. It is left
|
|
21
|
+
* out where the browser cannot fill the screen, as on an iPhone or in a
|
|
22
|
+
* frame not allowed to.
|
|
23
|
+
*/
|
|
24
|
+
fullscreen: boolean;
|
|
25
|
+
/** A popover listing what the mouse and the keyboard do on the canvas. */
|
|
26
|
+
help: boolean;
|
|
27
|
+
}
|
|
28
|
+
/** Every tool on. */
|
|
29
|
+
export declare const DEFAULT_MOLECULE_3D_TOOLS: Molecule3DTools;
|
|
30
|
+
/**
|
|
31
|
+
* Complete a partial tool selection.
|
|
32
|
+
* @param tools - The tools a site switched on or off.
|
|
33
|
+
* @returns Every tool, those not named left on.
|
|
34
|
+
*/
|
|
35
|
+
export declare function resolveMolecule3DTools(tools?: Partial<Molecule3DTools>): Molecule3DTools;
|
|
36
|
+
//# sourceMappingURL=tools.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../../src/molecule3d/core/tools.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,uDAAuD;AACvD,MAAM,WAAW,eAAe;IAC9B,0EAA0E;IAC1E,OAAO,EAAE,OAAO,CAAC;IACjB,2EAA2E;IAC3E,OAAO,EAAE,OAAO,CAAC;IACjB,6CAA6C;IAC7C,IAAI,EAAE,OAAO,CAAC;IACd,8CAA8C;IAC9C,OAAO,EAAE,OAAO,CAAC;IACjB,wCAAwC;IACxC,KAAK,EAAE,OAAO,CAAC;IACf,uDAAuD;IACvD,MAAM,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,UAAU,EAAE,OAAO,CAAC;IACpB,0EAA0E;IAC1E,IAAI,EAAE,OAAO,CAAC;CACf;AAED,qBAAqB;AACrB,eAAO,MAAM,yBAAyB,EAAE,eASvC,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,GAAE,OAAO,CAAC,eAAe,CAAM,GACnC,eAAe,CAEjB"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Which buttons the toolbar over the 3D molecule canvas shows, free of React
|
|
3
|
+
* and molstar so a site can persist them.
|
|
4
|
+
*/
|
|
5
|
+
/** Every tool on. */
|
|
6
|
+
export const DEFAULT_MOLECULE_3D_TOOLS = {
|
|
7
|
+
measure: true,
|
|
8
|
+
options: true,
|
|
9
|
+
spin: true,
|
|
10
|
+
surface: true,
|
|
11
|
+
reset: true,
|
|
12
|
+
export: true,
|
|
13
|
+
fullscreen: true,
|
|
14
|
+
help: true,
|
|
15
|
+
};
|
|
16
|
+
/**
|
|
17
|
+
* Complete a partial tool selection.
|
|
18
|
+
* @param tools - The tools a site switched on or off.
|
|
19
|
+
* @returns Every tool, those not named left on.
|
|
20
|
+
*/
|
|
21
|
+
export function resolveMolecule3DTools(tools = {}) {
|
|
22
|
+
return { ...DEFAULT_MOLECULE_3D_TOOLS, ...tools };
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=tools.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../src/molecule3d/core/tools.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA0BH,qBAAqB;AACrB,MAAM,CAAC,MAAM,yBAAyB,GAAoB;IACxD,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,IAAI;IACV,OAAO,EAAE,IAAI;IACb,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,IAAI;IAChB,IAAI,EAAE,IAAI;CACX,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CACpC,QAAkC,EAAE;IAEpC,OAAO,EAAE,GAAG,yBAAyB,EAAE,GAAG,KAAK,EAAE,CAAC;AACpD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Molecule3DExport.d.ts","sourceRoot":"","sources":["../../../src/molecule3d/ui/Molecule3DExport.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Molecule3DExport.d.ts","sourceRoot":"","sources":["../../../src/molecule3d/ui/Molecule3DExport.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAI1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAM1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAQvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAUtD,yCAAyC;AACzC,MAAM,WAAW,qBAAqB;IACpC,sEAAsE;IACtE,OAAO,EAAE,MAAM,YAAY,GAAG,IAAI,CAAC;IACnC;;OAEG;IACH,QAAQ,EAAE,CACR,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,OAAO,KACd,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,2EAA2E;IAC3E,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IACjD;;;;OAIG;IACH,SAAS,CAAC,EAAE,CACV,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,OAAO,KACd,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IAChC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,YAAY,CA8H3E"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { useCallback, useState } from 'react';
|
|
3
|
+
import { writeToClipboard } from "../../clipboard/core/writeToClipboard.js";
|
|
3
4
|
import { DEFAULT_FIGURE_DPI, FIGURE_DPIS, dpiScale, } from "../../download/core/figureDpi.js";
|
|
4
5
|
import { FigureDownloadPanel } from "../../download/ui/FigureDownloadPanel.js";
|
|
5
6
|
import { useFigureSend } from "../../download/ui/useFigureSend.js";
|
|
@@ -30,11 +31,18 @@ export function Molecule3DExport(props) {
|
|
|
30
31
|
const atoms = moleculeFileAtoms(molfile, frameCount);
|
|
31
32
|
const versions = moleculeFileChoices(atoms, t);
|
|
32
33
|
const writtenVersion = versions[0]?.disabled ? 'molfileV3000' : version;
|
|
33
|
-
// Written once picked
|
|
34
|
+
// Written once picked rather than on the press: Safari only allows a
|
|
35
|
+
// clipboard write the click itself started, and Save has it at hand too.
|
|
34
36
|
const written = useAsync(useCallback(() => file !== null && molfile
|
|
35
37
|
? moleculeFileText(molfile, writtenVersion)
|
|
36
38
|
: Promise.resolve(null), [file, molfile, writtenVersion]));
|
|
37
39
|
const text = written.pending ? null : written.data;
|
|
40
|
+
const versionLabel = writtenVersion === 'molfileV3000' ? 'V3000' : 'V2000';
|
|
41
|
+
async function copyMolfile(molfileText) {
|
|
42
|
+
if (await writeToClipboard(molfileText))
|
|
43
|
+
return 'copied';
|
|
44
|
+
throw new Error(t('clipboard.failed'));
|
|
45
|
+
}
|
|
38
46
|
// What the last copy came to only describes the choices it was made with.
|
|
39
47
|
function changed(apply) {
|
|
40
48
|
return (value) => {
|
|
@@ -50,6 +58,12 @@ export function Molecule3DExport(props) {
|
|
|
50
58
|
value: file,
|
|
51
59
|
onChange: changed(setFile),
|
|
52
60
|
hint: t('molecule3d.molfileHint', { count: atoms }),
|
|
61
|
+
copy: {
|
|
62
|
+
ready: t('molecule3d.copyMolfile', { version: versionLabel }),
|
|
63
|
+
copied: t('molecule3d.copiedMolfile', {
|
|
64
|
+
version: versionLabel,
|
|
65
|
+
}),
|
|
66
|
+
},
|
|
53
67
|
}
|
|
54
68
|
: undefined, scale: scale, scales: DPI_SCALES, unit: "dpi", size: size, failure: failure ?? written.failure?.message ?? null, notice: notice, saving: busy || (file !== null && text === null), rasterSvg: true, onFormatChange: changed(setFormat), onScaleChange: changed(setScale), onSave: () => {
|
|
55
69
|
if (file === null) {
|
|
@@ -59,7 +73,10 @@ export function Molecule3DExport(props) {
|
|
|
59
73
|
saveMoleculeFile(text, writtenVersion, fileName);
|
|
60
74
|
}
|
|
61
75
|
}, onCopy: () => {
|
|
62
|
-
|
|
76
|
+
if (file === null)
|
|
77
|
+
run(onCopy(scale));
|
|
78
|
+
else if (text)
|
|
79
|
+
run(copyMolfile(text));
|
|
63
80
|
}, onSend: writeFile === undefined
|
|
64
81
|
? undefined
|
|
65
82
|
: () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Molecule3DExport.js","sourceRoot":"","sources":["../../../src/molecule3d/ui/Molecule3DExport.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Molecule3DExport.js","sourceRoot":"","sources":["../../../src/molecule3d/ui/Molecule3DExport.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The display options of the molecule viewer, shown in the toolbar's popover:
|
|
3
|
-
* the representation, the size, and the surface's opacity,
|
|
4
|
-
* colours, with a button returning them all to the defaults.
|
|
3
|
+
* the representation, the size, the partial bonds, and the surface's opacity,
|
|
4
|
+
* solvent probe and colours, with a button returning them all to the defaults.
|
|
5
5
|
*/
|
|
6
6
|
import type { ReactElement } from 'react';
|
|
7
|
+
import type { Molecule3DFile } from '../core/file.ts';
|
|
7
8
|
import type { Molecule3DSettings } from '../core/settings.ts';
|
|
8
9
|
/** Props of {@link Molecule3DOptions}. */
|
|
9
10
|
export interface Molecule3DOptionsProps {
|
|
@@ -13,6 +14,8 @@ export interface Molecule3DOptionsProps {
|
|
|
13
14
|
polarSurfaceArea: number | null;
|
|
14
15
|
/** What the reset button returns to; `showSurface` is left as it is. */
|
|
15
16
|
defaults: Molecule3DSettings;
|
|
17
|
+
/** The format of the file on screen, which decides the partial bonds' `auto`. */
|
|
18
|
+
format: Molecule3DFile['format'];
|
|
16
19
|
}
|
|
17
20
|
/**
|
|
18
21
|
* The options panel.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Molecule3DOptions.d.ts","sourceRoot":"","sources":["../../../src/molecule3d/ui/Molecule3DOptions.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,OAAO,CAAC;AAIzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"Molecule3DOptions.d.ts","sourceRoot":"","sources":["../../../src/molecule3d/ui/Molecule3DOptions.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,OAAO,CAAC;AAIzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAa9D,0CAA0C;AAC1C,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,QAAQ,EAAE,CAAC,QAAQ,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACjD,oEAAoE;IACpE,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,wEAAwE;IACxE,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,iFAAiF;IACjF,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;CAClC;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,YAAY,CAyG7E"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
2
|
/**
|
|
3
3
|
* The display options of the molecule viewer, shown in the toolbar's popover:
|
|
4
|
-
* the representation, the size, and the surface's opacity,
|
|
5
|
-
* colours, with a button returning them all to the defaults.
|
|
4
|
+
* the representation, the size, the partial bonds, and the surface's opacity,
|
|
5
|
+
* solvent probe and colours, with a button returning them all to the defaults.
|
|
6
6
|
*/
|
|
7
7
|
import { Button, SegmentedControl, Slider } from '@blueprintjs/core';
|
|
8
8
|
import { formatDecimal } from "../../format/core/numbers.js";
|
|
9
9
|
import { useChromeT } from "../../i18n/ui/useT.js";
|
|
10
10
|
import { MOLECULE_3D_RANGES, REPRESENTATIONS, REPRESENTATION_LABELS, isRepresentationId, resetMolecule3DSettings, sameMolecule3DSettings, } from "../core/settings.js";
|
|
11
|
+
import { Molecule3DPartialBonds } from "./Molecule3DPartialBonds.js";
|
|
11
12
|
import { Molecule3DSurfaceColors } from "./Molecule3DSurfaceColors.js";
|
|
12
13
|
/**
|
|
13
14
|
* The options panel.
|
|
@@ -15,7 +16,7 @@ import { Molecule3DSurfaceColors } from "./Molecule3DSurfaceColors.js";
|
|
|
15
16
|
* @returns The panel.
|
|
16
17
|
*/
|
|
17
18
|
export function Molecule3DOptions(props) {
|
|
18
|
-
const { settings, onChange, polarSurfaceArea, defaults } = props;
|
|
19
|
+
const { settings, onChange, polarSurfaceArea, defaults, format } = props;
|
|
19
20
|
const t = useChromeT();
|
|
20
21
|
const reset = resetMolecule3DSettings(settings, defaults);
|
|
21
22
|
const atDefaults = sameMolecule3DSettings(settings, reset);
|
|
@@ -28,7 +29,7 @@ export function Molecule3DOptions(props) {
|
|
|
28
29
|
}
|
|
29
30
|
} }), _jsxs("div", { style: GRID_STYLE, children: [_jsx(SliderRow, { label: t('molecule3d.size'), range: MOLECULE_3D_RANGES.sizeFactor, digits: 1, value: settings.sizeFactor, testId: "molecule3d-size-value", onChange: (sizeFactor) => {
|
|
30
31
|
onChange({ ...settings, sizeFactor });
|
|
31
|
-
} }), settings.showSurface ? null : (_jsxs("span", { style: SURFACE_OFF_STYLE, "data-testid": "molecule3d-surface-off", children: [t('molecule3d.surfaceOff'), _jsx(Button, { variant: "minimal", size: "small", intent: "primary", text: t('molecule3d.showSurface'), onClick: () => {
|
|
32
|
+
} }), _jsx("div", { style: FULL_ROW_STYLE, children: _jsx(Molecule3DPartialBonds, { settings: settings, onChange: onChange, format: format }) }), settings.showSurface ? null : (_jsxs("span", { style: SURFACE_OFF_STYLE, "data-testid": "molecule3d-surface-off", children: [t('molecule3d.surfaceOff'), _jsx(Button, { variant: "minimal", size: "small", intent: "primary", text: t('molecule3d.showSurface'), onClick: () => {
|
|
32
33
|
onChange({ ...settings, showSurface: true });
|
|
33
34
|
} })] })), _jsx(SliderRow, { label: t('molecule3d.surfaceOpacity'), range: MOLECULE_3D_RANGES.surfaceAlpha, digits: 2, value: settings.surfaceAlpha, disabled: !settings.showSurface, testId: "molecule3d-opacity-value", onChange: (surfaceAlpha) => {
|
|
34
35
|
onChange({ ...settings, surfaceAlpha });
|
|
@@ -61,6 +62,7 @@ const GRID_STYLE = {
|
|
|
61
62
|
rowGap: 6,
|
|
62
63
|
};
|
|
63
64
|
const LABEL_STYLE = { fontSize: 12 };
|
|
65
|
+
const FULL_ROW_STYLE = { gridColumn: '1 / -1' };
|
|
64
66
|
/** Spans the grid, between the size and the surface rows it explains. */
|
|
65
67
|
const SURFACE_OFF_STYLE = {
|
|
66
68
|
display: 'flex',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Molecule3DOptions.js","sourceRoot":"","sources":["../../../src/molecule3d/ui/Molecule3DOptions.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAGrE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"Molecule3DOptions.js","sourceRoot":"","sources":["../../../src/molecule3d/ui/Molecule3DOptions.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The partial bond section of the options popover: whether they are drawn,
|
|
3
|
+
* and whether their lengths are written over them.
|
|
4
|
+
*/
|
|
5
|
+
import type { ReactElement } from 'react';
|
|
6
|
+
import type { Molecule3DFile } from '../core/file.ts';
|
|
7
|
+
import type { Molecule3DSettings } from '../core/settings.ts';
|
|
8
|
+
/** Props of {@link Molecule3DPartialBonds}. */
|
|
9
|
+
export interface Molecule3DPartialBondsProps {
|
|
10
|
+
settings: Molecule3DSettings;
|
|
11
|
+
onChange: (settings: Molecule3DSettings) => void;
|
|
12
|
+
/** The format of the file on screen, which `auto` follows. */
|
|
13
|
+
format: Molecule3DFile['format'];
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* The two switches. The first shows what is drawn for the file on screen, and
|
|
17
|
+
* turning it back to what `auto` draws for that file stores `auto` again.
|
|
18
|
+
* @param props - See {@link Molecule3DPartialBondsProps}.
|
|
19
|
+
* @returns The section.
|
|
20
|
+
*/
|
|
21
|
+
export declare function Molecule3DPartialBonds(props: Molecule3DPartialBondsProps): ReactElement;
|
|
22
|
+
//# sourceMappingURL=Molecule3DPartialBonds.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Molecule3DPartialBonds.d.ts","sourceRoot":"","sources":["../../../src/molecule3d/ui/Molecule3DPartialBonds.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,OAAO,CAAC;AAGzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,+CAA+C;AAC/C,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,QAAQ,EAAE,CAAC,QAAQ,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACjD,8DAA8D;IAC9D,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;CAClC;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,2BAA2B,GACjC,YAAY,CAiDd"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
/**
|
|
3
|
+
* The partial bond section of the options popover: whether they are drawn,
|
|
4
|
+
* and whether their lengths are written over them.
|
|
5
|
+
*/
|
|
6
|
+
import { Switch } from '@blueprintjs/core';
|
|
7
|
+
import { useChromeT } from "../../i18n/ui/useT.js";
|
|
8
|
+
import { showsPartialBonds } from "../core/partialBondMode.js";
|
|
9
|
+
import { normalizeMolecule3DSettings } from "../core/settings.js";
|
|
10
|
+
/**
|
|
11
|
+
* The two switches. The first shows what is drawn for the file on screen, and
|
|
12
|
+
* turning it back to what `auto` draws for that file stores `auto` again.
|
|
13
|
+
* @param props - See {@link Molecule3DPartialBondsProps}.
|
|
14
|
+
* @returns The section.
|
|
15
|
+
*/
|
|
16
|
+
export function Molecule3DPartialBonds(props) {
|
|
17
|
+
const { settings, onChange, format } = props;
|
|
18
|
+
const t = useChromeT();
|
|
19
|
+
// A site owning the settings may hand over a record from before they existed.
|
|
20
|
+
const { partialBonds, partialBondLengths } = normalizeMolecule3DSettings(settings);
|
|
21
|
+
const shown = showsPartialBonds(partialBonds, format);
|
|
22
|
+
const byDefault = showsPartialBonds('auto', format);
|
|
23
|
+
// Spacefill draws no bond: a disabled switch fires no hover, so the section
|
|
24
|
+
// carries the why.
|
|
25
|
+
const spacefill = settings.representation === 'spacefill';
|
|
26
|
+
return (_jsxs("div", { style: SECTION_STYLE, title: spacefill ? t('molecule3d.partialBondsSpacefill') : undefined, children: [_jsx(Switch, { alignIndicator: "end", style: SWITCH_STYLE, checked: shown && !spacefill, disabled: spacefill, labelElement: _jsx("span", { title: t('molecule3d.partialBondsHelp'), children: t('molecule3d.partialBonds') }), "data-testid": "molecule3d-partial-bonds", onChange: (event) => {
|
|
27
|
+
const checked = event.currentTarget.checked;
|
|
28
|
+
onChange({ ...settings, partialBonds: modeOf(checked, byDefault) });
|
|
29
|
+
} }), _jsx(Switch, { alignIndicator: "end", style: SWITCH_STYLE, checked: partialBondLengths, disabled: spacefill || !shown, label: t('molecule3d.partialBondLengths'), "data-testid": "molecule3d-partial-bond-lengths", onChange: (event) => {
|
|
30
|
+
onChange({
|
|
31
|
+
...settings,
|
|
32
|
+
partialBondLengths: event.currentTarget.checked,
|
|
33
|
+
});
|
|
34
|
+
} })] }));
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* The mode a switch stores: `auto` when it lands on what `auto` draws.
|
|
38
|
+
* @param checked - Whether the partial bonds are to be drawn.
|
|
39
|
+
* @param byDefault - Whether `auto` draws them for the file on screen.
|
|
40
|
+
* @returns The mode.
|
|
41
|
+
*/
|
|
42
|
+
function modeOf(checked, byDefault) {
|
|
43
|
+
if (checked === byDefault)
|
|
44
|
+
return 'auto';
|
|
45
|
+
return checked ? 'on' : 'off';
|
|
46
|
+
}
|
|
47
|
+
const SECTION_STYLE = {
|
|
48
|
+
display: 'flex',
|
|
49
|
+
flexDirection: 'column',
|
|
50
|
+
gap: 2,
|
|
51
|
+
};
|
|
52
|
+
const SWITCH_STYLE = { marginBottom: 0, fontSize: 12 };
|
|
53
|
+
//# sourceMappingURL=Molecule3DPartialBonds.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Molecule3DPartialBonds.js","sourceRoot":"","sources":["../../../src/molecule3d/ui/Molecule3DPartialBonds.tsx"],"names":[],"mappings":";AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG3C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAUlE;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CACpC,KAAkC;IAElC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAC7C,MAAM,CAAC,GAAG,UAAU,EAAE,CAAC;IACvB,8EAA8E;IAC9E,MAAM,EAAE,YAAY,EAAE,kBAAkB,EAAE,GACxC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,iBAAiB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpD,4EAA4E;IAC5E,mBAAmB;IACnB,MAAM,SAAS,GAAG,QAAQ,CAAC,cAAc,KAAK,WAAW,CAAC;IAE1D,OAAO,CACL,eACE,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC,CAAC,CAAC,SAAS,aAEpE,KAAC,MAAM,IACL,cAAc,EAAC,KAAK,EACpB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,KAAK,IAAI,CAAC,SAAS,EAC5B,QAAQ,EAAE,SAAS,EACnB,YAAY,EACV,eAAM,KAAK,EAAE,CAAC,CAAC,6BAA6B,CAAC,YAC1C,CAAC,CAAC,yBAAyB,CAAC,GACxB,iBAEG,0BAA0B,EACtC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;oBAClB,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC;oBAC5C,QAAQ,CAAC,EAAE,GAAG,QAAQ,EAAE,YAAY,EAAE,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;gBACtE,CAAC,GACD,EACF,KAAC,MAAM,IACL,cAAc,EAAC,KAAK,EACpB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,kBAAkB,EAC3B,QAAQ,EAAE,SAAS,IAAI,CAAC,KAAK,EAC7B,KAAK,EAAE,CAAC,CAAC,+BAA+B,CAAC,iBAC7B,iCAAiC,EAC7C,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;oBAClB,QAAQ,CAAC;wBACP,GAAG,QAAQ;wBACX,kBAAkB,EAAE,KAAK,CAAC,aAAa,CAAC,OAAO;qBAChD,CAAC,CAAC;gBACL,CAAC,GACD,IACE,CACP,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,MAAM,CAAC,OAAgB,EAAE,SAAkB;IAClD,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC;IACzC,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;AAChC,CAAC;AAED,MAAM,aAAa,GAAkB;IACnC,OAAO,EAAE,MAAM;IACf,aAAa,EAAE,QAAQ;IACvB,GAAG,EAAE,CAAC;CACP,CAAC;AAEF,MAAM,YAAY,GAAkB,EAAE,YAAY,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import type { ReactElement } from 'react';
|
|
8
8
|
import type { MeasurementKind } from '../core/measurement.ts';
|
|
9
|
-
import type { Molecule3DTools } from '../core/
|
|
9
|
+
import type { Molecule3DTools } from '../core/tools.ts';
|
|
10
10
|
/** Whether the canvas fills the screen, and how to change that. */
|
|
11
11
|
export interface Molecule3DFullscreen {
|
|
12
12
|
/** Whether the canvas and its toolbars fill the screen. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Molecule3DToolbar.d.ts","sourceRoot":"","sources":["../../../src/molecule3d/ui/Molecule3DToolbar.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,OAAO,CAAC;AAIzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAM9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"Molecule3DToolbar.d.ts","sourceRoot":"","sources":["../../../src/molecule3d/ui/Molecule3DToolbar.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,OAAO,CAAC;AAIzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAM9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAUxD,mEAAmE;AACnE,MAAM,WAAW,oBAAoB;IACnC,2DAA2D;IAC3D,MAAM,EAAE,OAAO,CAAC;IAChB,oCAAoC;IACpC,MAAM,EAAE,MAAM,IAAI,CAAC;CACpB;AAED,0CAA0C;AAC1C,MAAM,WAAW,sBAAsB;IACrC,6DAA6D;IAC7D,KAAK,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IACjC,WAAW,EAAE,eAAe,GAAG,IAAI,CAAC;IACpC,mBAAmB,EAAE,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,KAAK,IAAI,CAAC;IAC5D,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,IAAI,CAAC;IAChC,QAAQ,EAAE,OAAO,CAAC;IAClB,gBAAgB,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IAC9C,sFAAsF;IACtF,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,mBAAmB,CAAC,EAAE,CAAC,WAAW,EAAE,OAAO,KAAK,IAAI,CAAC;IACrD,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,wEAAwE;IACxE,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,uEAAuE;IACvE,WAAW,CAAC,EAAE,YAAY,CAAC;IAC3B;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,UAAU,CAAC,EAAE,oBAAoB,CAAC;CACnC;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,YAAY,CA6J7E"}
|
|
@@ -9,7 +9,7 @@ import { Card } from '@blueprintjs/core';
|
|
|
9
9
|
import { Toolbar } from 'react-science/ui';
|
|
10
10
|
import { useChromeT } from "../../i18n/ui/useT.js";
|
|
11
11
|
import { MEASUREMENT_ATOM_COUNTS, MEASUREMENT_KINDS, MEASUREMENT_LABELS, } from "../core/measurement.js";
|
|
12
|
-
import { resolveMolecule3DTools } from "../core/
|
|
12
|
+
import { resolveMolecule3DTools } from "../core/tools.js";
|
|
13
13
|
import { Molecule3DHelp } from "./Molecule3DHelp.js";
|
|
14
14
|
import { ClearMeasurementsIcon, MeasureIcon, SurfaceIcon, } from "./molecule3dIcons.js";
|
|
15
15
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Molecule3DToolbar.js","sourceRoot":"","sources":["../../../src/molecule3d/ui/Molecule3DToolbar.tsx"],"names":[],"mappings":";AAAA;;;;;GAKG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EACL,uBAAuB,EACvB,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"Molecule3DToolbar.js","sourceRoot":"","sources":["../../../src/molecule3d/ui/Molecule3DToolbar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MoleculeCanvas3D.d.ts","sourceRoot":"","sources":["../../../src/molecule3d/ui/MoleculeCanvas3D.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"MoleculeCanvas3D.d.ts","sourceRoot":"","sources":["../../../src/molecule3d/ui/MoleculeCanvas3D.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,OAAO,CAAC;AAgBzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAYxE,yCAAyC;AACzC,MAAM,WAAW,qBAAsB,SAAQ,IAAI,CACjD,qBAAqB,EACrB,UAAU,GAAG,mBAAmB,CACjC;IACC,2EAA2E;IAC3E,eAAe,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;CACnD;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,YAAY,CA0J3E"}
|
|
@@ -5,7 +5,8 @@ import { DEFAULT_SPIN_SPEED } from "../../molstar/core/index.js";
|
|
|
5
5
|
import { MolstarToolbar } from "../../molstar/ui/MolstarToolbar.js";
|
|
6
6
|
import { useMolstarTools } from "../../molstar/ui/useMolstarTools.js";
|
|
7
7
|
import { DEFAULT_FRAMES_PER_SECOND } from "../core/animatedPng.js";
|
|
8
|
-
import { normalizeMolecule3DSettings
|
|
8
|
+
import { normalizeMolecule3DSettings } from "../core/settings.js";
|
|
9
|
+
import { resolveMolecule3DTools } from "../core/tools.js";
|
|
9
10
|
import { Molecule3DOptions } from "./Molecule3DOptions.js";
|
|
10
11
|
import { Molecule3DStage } from "./Molecule3DStage.js";
|
|
11
12
|
import { highlightColorOf } from "./highlightColor.js";
|
|
@@ -78,7 +79,7 @@ export function MoleculeCanvas3D(props) {
|
|
|
78
79
|
}, [onCapture, container, capture]);
|
|
79
80
|
return (_jsx(Molecule3DStage, { style: { ...STAGE_STYLE, minHeight }, children: (fullscreen) => (_jsxs(_Fragment, { children: [_jsx("div", { ref: setContainer, style: CANVAS_STYLE, "data-testid": "molecule3d" }), molfile !== null && (_jsx(MolstarToolbar, { controls: controls, tools: tools, fullscreen: fullscreen, measurementCount: measurements.length, onClearMeasurements: clearMeasurements, showSurface: settings.showSurface, onShowSurfaceChange: (showSurface) => {
|
|
80
81
|
setSettings({ ...settings, showSurface });
|
|
81
|
-
}, onResetView: resetView, options: _jsx(Molecule3DOptions, { settings: settings, onChange: setSettings, polarSurfaceArea: polarSurfaceArea, defaults: initialSettings }), exportLabel: moleculeFileAtoms(molfile, frameCount) > 0
|
|
82
|
+
}, onResetView: resetView, options: _jsx(Molecule3DOptions, { settings: settings, onChange: setSettings, polarSurfaceArea: polarSurfaceArea, defaults: initialSettings, format: molfile.format }), exportLabel: moleculeFileAtoms(molfile, frameCount) > 0
|
|
82
83
|
? t('molecule3d.exportImageOrMolfile')
|
|
83
84
|
: undefined, imageExport: imageExport, frameCount: frameCount, molfile: molfile, fileName: fileName }))] })) }));
|
|
84
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MoleculeCanvas3D.js","sourceRoot":"","sources":["../../../src/molecule3d/ui/MoleculeCanvas3D.tsx"],"names":[],"mappings":";AASA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE5C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAqC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAEnE,OAAO,
|
|
1
|
+
{"version":3,"file":"MoleculeCanvas3D.js","sourceRoot":"","sources":["../../../src/molecule3d/ui/MoleculeCanvas3D.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,11 @@ import type { Measurement } from '../core/measurement.ts';
|
|
|
3
3
|
import type { Molecule3DSettings } from '../core/settings.ts';
|
|
4
4
|
import type { Molecule3DViewer } from './viewer.ts';
|
|
5
5
|
/** The operations of the viewer a scene is drawn with. */
|
|
6
|
-
export type SceneViewer = Pick<Molecule3DViewer, 'showMolecule' | 'hideMolecule' | 'showSurface' | 'showMeasurements' | 'resetCamera' | 'setCamera'>;
|
|
6
|
+
export type SceneViewer = Pick<Molecule3DViewer, 'showMolecule' | 'hideMolecule' | 'showPartialBonds' | 'showSurface' | 'showMeasurements' | 'resetCamera' | 'setCamera'>;
|
|
7
7
|
/**
|
|
8
|
-
* Draw the whole scene. `showMolecule` empties it, so the
|
|
9
|
-
* measurements are added after the model, and the camera is
|
|
8
|
+
* Draw the whole scene. `showMolecule` empties it, so the partial bonds, the
|
|
9
|
+
* surface and the measurements are added after the model, and the camera is
|
|
10
|
+
* framed last. Spacefill draws no bonds, and so no partial ones either.
|
|
10
11
|
* @param viewer - The viewer holding the canvas.
|
|
11
12
|
* @param molfile - What to draw, or `null` to empty the scene.
|
|
12
13
|
* @param settings - How to draw it.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drawScene.d.ts","sourceRoot":"","sources":["../../../src/molecule3d/ui/drawScene.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"drawScene.d.ts","sourceRoot":"","sources":["../../../src/molecule3d/ui/drawScene.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,0DAA0D;AAC1D,MAAM,MAAM,WAAW,GAAG,IAAI,CAC5B,gBAAgB,EACd,cAAc,GACd,cAAc,GACd,kBAAkB,GAClB,aAAa,GACb,kBAAkB,GAClB,aAAa,GACb,WAAW,CACd,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,wBAAsB,SAAS,CAC7B,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,cAAc,GAAG,IAAI,EAC9B,QAAQ,EAAE,kBAAkB,EAC5B,YAAY,EAAE,SAAS,WAAW,EAAE,EACpC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GACrC,OAAO,CAAC,IAAI,CAAC,CA+Bf"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { showsPartialBonds } from "../core/partialBondMode.js";
|
|
1
2
|
import { normalizeMolecule3DSettings } from "../core/settings.js";
|
|
2
3
|
/**
|
|
3
|
-
* Draw the whole scene. `showMolecule` empties it, so the
|
|
4
|
-
* measurements are added after the model, and the camera is
|
|
4
|
+
* Draw the whole scene. `showMolecule` empties it, so the partial bonds, the
|
|
5
|
+
* surface and the measurements are added after the model, and the camera is
|
|
6
|
+
* framed last. Spacefill draws no bonds, and so no partial ones either.
|
|
5
7
|
* @param viewer - The viewer holding the canvas.
|
|
6
8
|
* @param molfile - What to draw, or `null` to empty the scene.
|
|
7
9
|
* @param settings - How to draw it.
|
|
@@ -21,6 +23,14 @@ export async function drawScene(viewer, molfile, settings, measurements, frameCa
|
|
|
21
23
|
representation: safe.representation,
|
|
22
24
|
sizeFactor: safe.sizeFactor,
|
|
23
25
|
});
|
|
26
|
+
if (safe.representation !== 'spacefill' &&
|
|
27
|
+
showsPartialBonds(safe.partialBonds, molfile.format)) {
|
|
28
|
+
await viewer.showPartialBonds({
|
|
29
|
+
representation: safe.representation,
|
|
30
|
+
sizeFactor: safe.sizeFactor,
|
|
31
|
+
lengths: safe.partialBondLengths,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
24
34
|
if (safe.showSurface) {
|
|
25
35
|
await viewer.showSurface({
|
|
26
36
|
alpha: safe.surfaceAlpha,
|