Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Molstar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Michal Malý
Molstar
Commits
2fdd7773
Unverified
Commit
2fdd7773
authored
2 years ago
by
Alexander Rose
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #499 from molstar/immediate-isolevel
enable immediateUpdate for iso level
parents
31c98ef1
ceeec2c1
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
src/mol-model/volume/volume.ts
+3
-3
3 additions, 3 deletions
src/mol-model/volume/volume.ts
src/mol-plugin-ui/custom/volume.tsx
+1
-1
1 addition, 1 deletion
src/mol-plugin-ui/custom/volume.tsx
with
5 additions
and
4 deletions
CHANGELOG.md
+
1
−
0
View file @
2fdd7773
...
...
@@ -10,6 +10,7 @@ Note that since we don't clearly distinguish between a public and private interf
-
Improve handling principal axes of points in a plane
-
Add 'material' annotation support for textures
-
More effort to avoid using
``flat``
qualifier in shaders: add
``dVaryingGroup``
-
Enable
``immediateUpdate``
for iso level in isosurface and volume streaming controls
## [v3.12.1] - 2022-07-20
...
...
This diff is collapsed.
Click to expand it.
src/mol-model/volume/volume.ts
+
3
−
3
View file @
2fdd7773
/**
* Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
* Copyright (c) 2020
-2022
mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
*/
...
...
@@ -126,12 +126,12 @@ export namespace Volume {
'
absolute
'
:
PD
.
Converted
(
(
v
:
Volume
.
IsoValue
)
=>
Volume
.
IsoValue
.
toAbsolute
(
v
,
Grid
.
One
.
stats
).
absoluteValue
,
(
v
:
number
)
=>
Volume
.
IsoValue
.
absolute
(
v
),
PD
.
Numeric
(
mean
,
{
min
,
max
,
step
:
toPrecision
(
sigma
/
100
,
2
)
})
PD
.
Numeric
(
mean
,
{
min
,
max
,
step
:
toPrecision
(
sigma
/
100
,
2
)
},
{
immediateUpdate
:
true
})
),
'
relative
'
:
PD
.
Converted
(
(
v
:
Volume
.
IsoValue
)
=>
Volume
.
IsoValue
.
toRelative
(
v
,
Grid
.
One
.
stats
).
relativeValue
,
(
v
:
number
)
=>
Volume
.
IsoValue
.
relative
(
v
),
PD
.
Numeric
(
Math
.
min
(
1
,
relMax
),
{
min
:
relMin
,
max
:
relMax
,
step
:
toPrecision
(
Math
.
round
(((
max
-
min
)
/
sigma
))
/
100
,
2
)
})
PD
.
Numeric
(
Math
.
min
(
1
,
relMax
),
{
min
:
relMin
,
max
:
relMax
,
step
:
toPrecision
(
Math
.
round
(((
max
-
min
)
/
sigma
))
/
100
,
2
)
},
{
immediateUpdate
:
true
})
)
},
(
v
:
Volume
.
IsoValue
)
=>
v
.
kind
===
'
absolute
'
?
'
absolute
'
:
'
relative
'
,
...
...
This diff is collapsed.
Click to expand it.
src/mol-plugin-ui/custom/volume.tsx
+
1
−
1
View file @
2fdd7773
...
...
@@ -104,7 +104,7 @@ class Channel extends PluginUIComponent<{
colorStripe
=
{
channel
.
color
}
pivot
=
{
<
div
className
=
'msp-volume-channel-inline-controls'
>
<
Slider
value
=
{
value
}
min
=
{
ctrlMin
}
max
=
{
ctrlMax
}
step
=
{
step
}
onChange
=
{
v
=>
props
.
changeIso
(
props
.
name
,
v
,
isRelative
)
}
disabled
=
{
props
.
params
.
isDisabled
}
onEnter
=
{
props
.
params
.
events
.
onEnter
}
/>
onChange
=
{
v
=>
props
.
changeIso
(
props
.
name
,
v
,
isRelative
)
}
onChangeImmediate
=
{
v
=>
props
.
changeIso
(
props
.
name
,
v
,
isRelative
)
}
disabled
=
{
props
.
params
.
isDisabled
}
onEnter
=
{
props
.
params
.
events
.
onEnter
}
/>
<
IconButton
svg
=
{
this
.
getVisible
()
?
VisibilityOutlinedSvg
:
VisibilityOffOutlinedSvg
}
onClick
=
{
this
.
toggleVisible
}
toggleState
=
{
false
}
disabled
=
{
props
.
params
.
isDisabled
}
/>
</
div
>
}
controls
=
{
<
ParameterControls
onChange
=
{
({
name
,
value
})
=>
props
.
changeParams
(
props
.
name
,
name
,
value
)
}
params
=
{
ChannelParams
}
values
=
{
channel
}
onEnter
=
{
props
.
params
.
events
.
onEnter
}
isDisabled
=
{
props
.
params
.
isDisabled
}
/>
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment