Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#1224 Different indent after loading reaction from file and after layout it #1227

Merged
merged 2 commits into from
Aug 17, 2023
Merged

#1224 Different indent after loading reaction from file and after layout it #1227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fdc779
Fix reaction layout indent
Aug 11, 2023
2531fb6
#1224 Different indent after loading reaction from file and after la…
AliaksandrDziarkach Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion api/c/indigo/src/indigo_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
#include "base_cpp/exception.h"
#include "base_cpp/io_base.h"

#include "layout/reaction_layout.h"

#include "molecule/molecule_fingerprint.h"
#include "molecule/molecule_gross_formula.h"
#include "molecule/molecule_ionize.h"
Expand Down Expand Up @@ -329,7 +331,7 @@ class DLLEXPORT Indigo

int layout_max_iterations; // default is zero -- no limit
bool smart_layout = false;
float layout_horintervalfactor = 1.4f;
float layout_horintervalfactor = ReactionLayout::DEFAULT_HOR_INTERVAL_FACTOR;

int layout_orientation = 0;

Expand Down
4 changes: 2 additions & 2 deletions api/c/indigo/src/indigo_layout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ CEXPORT int indigoLayout(int object)
}

ml.max_iterations = self.layout_max_iterations;
ml.bond_length = 1.6f;
ml.bond_length = MoleculeLayout::DEFAULT_BOND_LENGTH;
ml.layout_orientation = (layout_orientation_value)self.layout_orientation;

TimeoutCancellationHandler cancellation(self.cancellation_timeout);
Expand Down Expand Up @@ -105,7 +105,7 @@ CEXPORT int indigoLayout(int object)
ReactionLayout rl(rxn, self.smart_layout);
rl.max_iterations = self.layout_max_iterations;
rl.layout_orientation = (layout_orientation_value)self.layout_orientation;
rl.bond_length = 1.6f;
rl.bond_length = MoleculeLayout::DEFAULT_BOND_LENGTH;
rl.horizontal_interval_factor = self.layout_horintervalfactor;
rl.make();
try
Expand Down
Loading
Loading