fix bounding box and UT

AliaksandrDziarkach · AliaksandrDziarkach · commit d0e173dfd438 · 2024-11-15T23:06:36.000+03:00
diff --git a/api/tests/integration/tests/layout/ref/acs_issue_2458.ket b/api/tests/integration/tests/layout/ref/acs_issue_2458.ket
@@ -42,12 +42,12 @@
                     "mode": "open-angle",
                     "pos": [
                         {
-                            "x": 9.904167,
+                            "x": 10.008333,
                             "y": 0.0,
                             "z": 0.0
                         },
                         {
-                            "x": 20.945833,
+                            "x": 21.674999,
                             "y": 0.0,
                             "z": 0.0
                         }
@@ -286,8 +286,8 @@
             {
                 "label": "P",
                 "location": [
-                    10.546529,
-                    1.368056,
+                    10.668056,
+                    1.402778,
                     0.0
                 ]
             }
@@ -300,8 +300,8 @@
             {
                 "label": "P",
                 "location": [
-                    12.317363,
-                    1.368056,
+                    12.543056,
+                    1.402778,
                     0.0
                 ]
             }
@@ -314,7 +314,7 @@
             {
                 "label": "O",
                 "location": [
-                    9.261806,
+                    9.348611,
                     0.0,
                     0.0
                 ]
@@ -328,8 +328,8 @@
             {
                 "label": "O",
                 "location": [
-                    14.990974,
-                    1.368056,
+                    15.390278,
+                    1.402778,
                     0.0
                 ]
             }
@@ -342,8 +342,8 @@
             {
                 "label": "O",
                 "location": [
-                    16.761808,
-                    1.368056,
+                    17.265278,
+                    1.402778,
                     0.0
                 ]
             }
@@ -356,87 +356,87 @@
             {
                 "label": "N",
                 "location": [
-                    22.039583,
+                    22.820831,
                     1.309017,
                     0.0
                 ]
             },
             {
                 "label": "C",
                 "location": [
-                    22.990639,
+                    23.771889,
                     1.0,
                     0.0
                 ]
             },
             {
                 "label": "C",
                 "location": [
-                    21.451797,
+                    22.233047,
                     0.5,
                     0.0
                 ]
             },
             {
                 "label": "C",
                 "location": [
-                    22.990639,
+                    23.771889,
                     -0.0,
                     0.0
                 ]
             },
             {
                 "label": "N",
                 "location": [
-                    23.856665,
+                    24.637915,
                     1.5,
                     0.0
                 ]
             },
             {
                 "label": "N",
                 "location": [
-                    22.039583,
+                    22.820833,
                     -0.309017,
                     0.0
                 ]
             },
             {
                 "label": "C",
                 "location": [
-                    23.856665,
+                    24.637915,
                     -0.5,
                     0.0
                 ]
             },
             {
                 "label": "C",
                 "location": [
-                    24.722691,
+                    25.503941,
                     1.0,
                     0.0
                 ]
             },
             {
                 "label": "N",
                 "location": [
-                    24.722691,
+                    25.503941,
                     0.0,
                     0.0
                 ]
             },
             {
                 "label": "O",
                 "location": [
-                    23.856665,
+                    24.637915,
                     -1.5,
                     0.0
                 ]
             },
             {
                 "label": "N",
                 "location": [
-                    25.588715,
+                    26.369965,
                     1.5,
                     0.0
                 ]
@@ -535,8 +535,8 @@
             {
                 "label": "P",
                 "location": [
-                    17.629864,
-                    1.368056,
+                    18.168055,
+                    1.402778,
                     0.0
                 ]
             }
@@ -549,8 +549,8 @@
             {
                 "label": "O",
                 "location": [
-                    20.303473,
-                    1.368056,
+                    21.015278,
+                    1.402778,
                     0.0
                 ]
             }
diff --git a/core/indigo-core/molecule/src/base_molecule.cpp b/core/indigo-core/molecule/src/base_molecule.cpp
@@ -4535,7 +4535,7 @@ void BaseMolecule::getAtomBoundingBox(int atom_idx, float font_size, LABEL_MODE
     if (font_size <= EPSILON)
         return;
 
-    float symbol_size = font_size * 0.65f;
+    float symbol_size = font_size * 0.7f;
 
     if (isPseudoAtom(atom_idx) || isTemplateAtom(atom_idx))
     {

Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,12 @@`
`42`	`42`	`"mode": "open-angle",`
`43`	`43`	`"pos": [`
`44`	`44`	`{`
`45`		`- "x": 9.904167,`
	`45`	`+ "x": 10.008333,`
`46`	`46`	`"y": 0.0,`
`47`	`47`	`"z": 0.0`
`48`	`48`	`},`
`49`	`49`	`{`
`50`		`- "x": 20.945833,`
	`50`	`+ "x": 21.674999,`
`51`	`51`	`"y": 0.0,`
`52`	`52`	`"z": 0.0`
`53`	`53`	`}`
`@@ -286,8 +286,8 @@`
`286`	`286`	`{`
`287`	`287`	`"label": "P",`
`288`	`288`	`"location": [`
`289`		`- 10.546529,`
`290`		`- 1.368056,`
	`289`	`+ 10.668056,`
	`290`	`+ 1.402778,`
`291`	`291`	`0.0`
`292`	`292`	`]`
`293`	`293`	`}`
`@@ -300,8 +300,8 @@`
`300`	`300`	`{`
`301`	`301`	`"label": "P",`
`302`	`302`	`"location": [`
`303`		`- 12.317363,`
`304`		`- 1.368056,`
	`303`	`+ 12.543056,`
	`304`	`+ 1.402778,`
`305`	`305`	`0.0`
`306`	`306`	`]`
`307`	`307`	`}`
`@@ -314,7 +314,7 @@`
`314`	`314`	`{`
`315`	`315`	`"label": "O",`
`316`	`316`	`"location": [`
`317`		`- 9.261806,`
	`317`	`+ 9.348611,`
`318`	`318`	`0.0,`
`319`	`319`	`0.0`
`320`	`320`	`]`
`@@ -328,8 +328,8 @@`
`328`	`328`	`{`
`329`	`329`	`"label": "O",`
`330`	`330`	`"location": [`
`331`		`- 14.990974,`
`332`		`- 1.368056,`
	`331`	`+ 15.390278,`
	`332`	`+ 1.402778,`
`333`	`333`	`0.0`
`334`	`334`	`]`
`335`	`335`	`}`
`@@ -342,8 +342,8 @@`
`342`	`342`	`{`
`343`	`343`	`"label": "O",`
`344`	`344`	`"location": [`
`345`		`- 16.761808,`
`346`		`- 1.368056,`
	`345`	`+ 17.265278,`
	`346`	`+ 1.402778,`
`347`	`347`	`0.0`
`348`	`348`	`]`
`349`	`349`	`}`
`@@ -356,87 +356,87 @@`
`356`	`356`	`{`
`357`	`357`	`"label": "N",`
`358`	`358`	`"location": [`
`359`		`- 22.039583,`
	`359`	`+ 22.820831,`
`360`	`360`	`1.309017,`
`361`	`361`	`0.0`
`362`	`362`	`]`
`363`	`363`	`},`
`364`	`364`	`{`
`365`	`365`	`"label": "C",`
`366`	`366`	`"location": [`
`367`		`- 22.990639,`
	`367`	`+ 23.771889,`
`368`	`368`	`1.0,`
`369`	`369`	`0.0`
`370`	`370`	`]`
`371`	`371`	`},`
`372`	`372`	`{`
`373`	`373`	`"label": "C",`
`374`	`374`	`"location": [`
`375`		`- 21.451797,`
	`375`	`+ 22.233047,`
`376`	`376`	`0.5,`
`377`	`377`	`0.0`
`378`	`378`	`]`
`379`	`379`	`},`
`380`	`380`	`{`
`381`	`381`	`"label": "C",`
`382`	`382`	`"location": [`
`383`		`- 22.990639,`
	`383`	`+ 23.771889,`
`384`	`384`	`-0.0,`
`385`	`385`	`0.0`
`386`	`386`	`]`
`387`	`387`	`},`
`388`	`388`	`{`
`389`	`389`	`"label": "N",`
`390`	`390`	`"location": [`
`391`		`- 23.856665,`
	`391`	`+ 24.637915,`
`392`	`392`	`1.5,`
`393`	`393`	`0.0`
`394`	`394`	`]`
`395`	`395`	`},`
`396`	`396`	`{`
`397`	`397`	`"label": "N",`
`398`	`398`	`"location": [`
`399`		`- 22.039583,`
	`399`	`+ 22.820833,`
`400`	`400`	`-0.309017,`
`401`	`401`	`0.0`
`402`	`402`	`]`
`403`	`403`	`},`
`404`	`404`	`{`
`405`	`405`	`"label": "C",`
`406`	`406`	`"location": [`
`407`		`- 23.856665,`
	`407`	`+ 24.637915,`
`408`	`408`	`-0.5,`
`409`	`409`	`0.0`
`410`	`410`	`]`
`411`	`411`	`},`
`412`	`412`	`{`
`413`	`413`	`"label": "C",`
`414`	`414`	`"location": [`
`415`		`- 24.722691,`
	`415`	`+ 25.503941,`
`416`	`416`	`1.0,`
`417`	`417`	`0.0`
`418`	`418`	`]`
`419`	`419`	`},`
`420`	`420`	`{`
`421`	`421`	`"label": "N",`
`422`	`422`	`"location": [`
`423`		`- 24.722691,`
	`423`	`+ 25.503941,`
`424`	`424`	`0.0,`
`425`	`425`	`0.0`
`426`	`426`	`]`
`427`	`427`	`},`
`428`	`428`	`{`
`429`	`429`	`"label": "O",`
`430`	`430`	`"location": [`
`431`		`- 23.856665,`
	`431`	`+ 24.637915,`
`432`	`432`	`-1.5,`
`433`	`433`	`0.0`
`434`	`434`	`]`
`435`	`435`	`},`
`436`	`436`	`{`
`437`	`437`	`"label": "N",`
`438`	`438`	`"location": [`
`439`		`- 25.588715,`
	`439`	`+ 26.369965,`
`440`	`440`	`1.5,`
`441`	`441`	`0.0`
`442`	`442`	`]`
`@@ -535,8 +535,8 @@`
`535`	`535`	`{`
`536`	`536`	`"label": "P",`
`537`	`537`	`"location": [`
`538`		`- 17.629864,`
`539`		`- 1.368056,`
	`538`	`+ 18.168055,`
	`539`	`+ 1.402778,`
`540`	`540`	`0.0`
`541`	`541`	`]`
`542`	`542`	`}`
`@@ -549,8 +549,8 @@`
`549`	`549`	`{`
`550`	`550`	`"label": "O",`
`551`	`551`	`"location": [`
`552`		`- 20.303473,`
`553`		`- 1.368056,`
	`552`	`+ 21.015278,`
	`553`	`+ 1.402778,`
`554`	`554`	`0.0`
`555`	`555`	`]`
`556`	`556`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4535,7 +4535,7 @@ void BaseMolecule::getAtomBoundingBox(int atom_idx, float font_size, LABEL_MODE`
`4535`	`4535`	`if (font_size <= EPSILON)`
`4536`	`4536`	`return;`
`4537`	`4537`
`4538`		`- float symbol_size = font_size * 0.65f;`
	`4538`	`+ float symbol_size = font_size * 0.7f;`
`4539`	`4539`
`4540`	`4540`	`if (isPseudoAtom(atom_idx) \|\| isTemplateAtom(atom_idx))`
`4541`	`4541`	`{`