Commit 4444c571 authored by Nicolas Vuaille's avatar Nicolas Vuaille Committed by Kitware Robot

Merge topic 'FixMoleculeRepWarning'

d10b68c3 Fix warnings in vtkSMPVMoleculeRepresentationProxy
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Cory Quammen's avatarCory Quammen <cory.quammen@kitware.com>
Merge-request: !2940
parents 2540df21 d10b68c3
Pipeline #126101 failed with stage
in 0 seconds
......@@ -116,14 +116,14 @@ const char* vtkSMPVMoleculeRepresentationProxy::GetPresetDisplayName(int preset)
int vtkSMPVMoleculeRepresentationProxy::GetCurrentPreset()
{
MapperParametersPreset p;
p.RenderAtoms = vtkSMUncheckedPropertyHelper(this, "RenderAtoms").GetAsInt();
p.RenderBonds = vtkSMUncheckedPropertyHelper(this, "RenderBonds").GetAsInt();
p.RenderAtoms = vtkSMUncheckedPropertyHelper(this, "RenderAtoms").GetAsInt() == 1;
p.RenderBonds = vtkSMUncheckedPropertyHelper(this, "RenderBonds").GetAsInt() == 1;
p.AtomicRadiusType = vtkSMUncheckedPropertyHelper(this, "AtomicRadiusType").GetAsDouble();
p.AtomicRadiusFactor = vtkSMUncheckedPropertyHelper(this, "AtomicRadiusFactor").GetAsDouble();
p.UseMultiCylindersForBonds =
vtkSMUncheckedPropertyHelper(this, "MultiCylindersForBonds").GetAsInt();
vtkSMUncheckedPropertyHelper(this, "MultiCylindersForBonds").GetAsInt() == 1;
p.BondRadius = vtkSMUncheckedPropertyHelper(this, "BondRadius").GetAsDouble();
p.UseAtomColorForBonds = vtkSMUncheckedPropertyHelper(this, "BondColorMode").GetAsInt();
p.UseAtomColorForBonds = vtkSMUncheckedPropertyHelper(this, "BondColorMode").GetAsInt() == 1;
for (const auto& preset : this->Presets)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment