#1224 Different indent after loading reaction from file and after lay…

…out it (#1227) Co-authored-by: Aliaksandr Dziarkach <[email protected]>
epam · Aug 17, 2023 · 5fb2726 · 5fb2726
1 parent 35f60e3
commit 5fb2726
Show file tree

Hide file tree

Showing 11 changed files with 694 additions and 699 deletions.
diff --git a/api/c/indigo/src/indigo_internal.h b/api/c/indigo/src/indigo_internal.h
@@ -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"
@@ -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;
 

diff --git a/api/c/indigo/src/indigo_layout.cpp b/api/c/indigo/src/indigo_layout.cpp
@@ -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);
@@ -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