From 9082633d86004a37ad328a7210614fe1ef2a2b58 Mon Sep 17 00:00:00 2001
From: Aliaksandr Dziarkach
 <18146690+AliaksandrDziarkach@users.noreply.github.com>
Date: Wed, 2 Oct 2024 17:51:57 +0300
Subject: [PATCH] Backmerge: #2070 - Settings for the "attachment point tool"
 don't update with changed pixel settings

backmerge to master
---
 .../ref/rendering/render_rgroups.py.out       | 176 +++++++++---------
 .../ref/linux/rgroups/issue_2070.png          | Bin 0 -> 9455 bytes
 .../rendering/ref/mac/rgroups/issue_2070.png  | Bin 0 -> 9455 bytes
 .../rendering/ref/win/rgroups/issue_2070.png  | Bin 0 -> 9455 bytes
 .../tests/rendering/render_rgroups.py         |  17 +-
 core/render2d/src/render_context.cpp          |   2 +-
 6 files changed, 105 insertions(+), 90 deletions(-)
 create mode 100644 api/tests/integration/tests/rendering/ref/linux/rgroups/issue_2070.png
 create mode 100644 api/tests/integration/tests/rendering/ref/mac/rgroups/issue_2070.png
 create mode 100644 api/tests/integration/tests/rendering/ref/win/rgroups/issue_2070.png

diff --git a/api/tests/integration/ref/rendering/render_rgroups.py.out b/api/tests/integration/ref/rendering/render_rgroups.py.out
index 311fcc63bc..bd9f585225 100644
--- a/api/tests/integration/ref/rendering/render_rgroups.py.out
+++ b/api/tests/integration/ref/rendering/render_rgroups.py.out
@@ -1,87 +1,89 @@
-rgroups/rgroup-mol-rec1.png rendering status: OK
-rgroups/rgroup-qmol-rec1.png rendering status: OK
-rgroups/noap-mol-rec1.png rendering status: OK
-rgroups/noap-qmol-rec1.png rendering status: OK
-rgroups/norgroup-mol-rec1.png rendering status: OK
-rgroups/norgroup-qmol-rec1.png rendering status: OK
-rec1 OK
-rgroups/rgroup-mol-occur.png rendering status: OK
-rgroups/rgroup-qmol-occur.png rendering status: OK
-rgroups/noap-mol-occur.png rendering status: OK
-rgroups/noap-qmol-occur.png rendering status: OK
-rgroups/norgroup-mol-occur.png rendering status: OK
-rgroups/norgroup-qmol-occur.png rendering status: OK
-occur OK
-rgroups/rgroup-mol-resth.png rendering status: OK
-rgroups/rgroup-qmol-resth.png rendering status: OK
-rgroups/noap-mol-resth.png rendering status: OK
-rgroups/noap-qmol-resth.png rendering status: OK
-rgroups/norgroup-mol-resth.png rendering status: OK
-rgroups/norgroup-qmol-resth.png rendering status: OK
-resth OK
-rgroups/rgroup-mol-2ap.png rendering status: OK
-rgroups/rgroup-qmol-2ap.png rendering status: OK
-rgroups/noap-mol-2ap.png rendering status: OK
-rgroups/noap-qmol-2ap.png rendering status: OK
-rgroups/norgroup-mol-2ap.png rendering status: OK
-rgroups/norgroup-qmol-2ap.png rendering status: OK
-2ap OK
-
-
-
-
-
-
-rec1 OK
-
-
-
-
-
-
-occur OK
-
-
-
-
-
-
-resth OK
-
-
-
-
-
-
-2ap OK
-*** R-groups and attachment points ***
-0:
-rgroups/deco_set1_1_hi.png rendering status: OK
-rgroups/deco_set1_1.png rendering status: OK
-
-
-1:
-rgroups/deco_set1_2_hi.png rendering status: OK
-rgroups/deco_set1_2.png rendering status: OK
-
-
-2:
-rgroups/deco_set1_3_hi.png rendering status: OK
-rgroups/deco_set1_3.png rendering status: OK
-
-
-3:
-rgroups/deco_set1_4_hi.png rendering status: OK
-rgroups/deco_set1_4.png rendering status: OK
-
-
-4:
-rgroups/deco_set1_5_hi.png rendering status: OK
-rgroups/deco_set1_5.png rendering status: OK
-
-
-5:
-rgroups/deco_set1_6_hi.png rendering status: OK
-rgroups/deco_set1_6.png rendering status: OK
-
-
+rgroups/rgroup-mol-rec1.png rendering status: OK
+rgroups/rgroup-qmol-rec1.png rendering status: OK
+rgroups/noap-mol-rec1.png rendering status: OK
+rgroups/noap-qmol-rec1.png rendering status: OK
+rgroups/norgroup-mol-rec1.png rendering status: OK
+rgroups/norgroup-qmol-rec1.png rendering status: OK
+rec1 OK
+rgroups/rgroup-mol-occur.png rendering status: OK
+rgroups/rgroup-qmol-occur.png rendering status: OK
+rgroups/noap-mol-occur.png rendering status: OK
+rgroups/noap-qmol-occur.png rendering status: OK
+rgroups/norgroup-mol-occur.png rendering status: OK
+rgroups/norgroup-qmol-occur.png rendering status: OK
+occur OK
+rgroups/rgroup-mol-resth.png rendering status: OK
+rgroups/rgroup-qmol-resth.png rendering status: OK
+rgroups/noap-mol-resth.png rendering status: OK
+rgroups/noap-qmol-resth.png rendering status: OK
+rgroups/norgroup-mol-resth.png rendering status: OK
+rgroups/norgroup-qmol-resth.png rendering status: OK
+resth OK
+rgroups/rgroup-mol-2ap.png rendering status: OK
+rgroups/rgroup-qmol-2ap.png rendering status: OK
+rgroups/noap-mol-2ap.png rendering status: OK
+rgroups/noap-qmol-2ap.png rendering status: OK
+rgroups/norgroup-mol-2ap.png rendering status: OK
+rgroups/norgroup-qmol-2ap.png rendering status: OK
+2ap OK
+
+
+
+
+
+
+rec1 OK
+
+
+
+
+
+
+occur OK
+
+
+
+
+
+
+resth OK
+
+
+
+
+
+
+2ap OK
+*** R-groups and attachment points ***
+0:
+rgroups/deco_set1_1_hi.png rendering status: OK
+rgroups/deco_set1_1.png rendering status: OK
+
+
+1:
+rgroups/deco_set1_2_hi.png rendering status: OK
+rgroups/deco_set1_2.png rendering status: OK
+
+
+2:
+rgroups/deco_set1_3_hi.png rendering status: OK
+rgroups/deco_set1_3.png rendering status: OK
+
+
+3:
+rgroups/deco_set1_4_hi.png rendering status: OK
+rgroups/deco_set1_4.png rendering status: OK
+
+
+4:
+rgroups/deco_set1_5_hi.png rendering status: OK
+rgroups/deco_set1_5.png rendering status: OK
+
+
+5:
+rgroups/deco_set1_6_hi.png rendering status: OK
+rgroups/deco_set1_6.png rendering status: OK
+
+
+Test issue 2070 attachment point width
+rgroups/issue_2070.png rendering status: OK
diff --git a/api/tests/integration/tests/rendering/ref/linux/rgroups/issue_2070.png b/api/tests/integration/tests/rendering/ref/linux/rgroups/issue_2070.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbd28ec27c7fa56293dfee3a6622804f8256faa2
GIT binary patch
literal 9455
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

literal 0
HcmV?d00001

diff --git a/api/tests/integration/tests/rendering/ref/mac/rgroups/issue_2070.png b/api/tests/integration/tests/rendering/ref/mac/rgroups/issue_2070.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbd28ec27c7fa56293dfee3a6622804f8256faa2
GIT binary patch
literal 9455
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

literal 0
HcmV?d00001

diff --git a/api/tests/integration/tests/rendering/ref/win/rgroups/issue_2070.png b/api/tests/integration/tests/rendering/ref/win/rgroups/issue_2070.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbd28ec27c7fa56293dfee3a6622804f8256faa2
GIT binary patch
literal 9455
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

literal 0
HcmV?d00001

diff --git a/api/tests/integration/tests/rendering/render_rgroups.py b/api/tests/integration/tests/rendering/render_rgroups.py
index 465c8de10f..20ea94199d 100644
--- a/api/tests/integration/tests/rendering/render_rgroups.py
+++ b/api/tests/integration/tests/rendering/render_rgroups.py
@@ -7,8 +7,8 @@
         os.path.join(os.path.abspath(__file__), "..", "..", "..", "common")
     )
 )
-from env_indigo import *  # noqa
-from rendering import *
+from env_indigo import Indigo, IndigoRenderer, isIronPython, joinPathPy
+from rendering import checkImageSimilarity
 
 indigo = Indigo()
 renderer = IndigoRenderer(indigo)
@@ -216,6 +216,19 @@ def render_molobj(mol_):
 """
 )
 
+print("Test issue 2070 attachment point width")
+
+indigo.resetOptions()
+indigo.setOption("render-output-format", "png")
+indigo.setOption("render-bond-thickness", 5)
+fname = joinPathPy("molecules/r1-2ap-aal.mol", __file__)
+mol = indigo.loadMoleculeFromFile(fname)
+qmol = indigo.loadQueryMoleculeFromFile(fname)
+png_file = "rgroups/issue_2070.png"
+renderer.renderToFile(mol, joinPathPy("out/" + png_file, __file__))
+print(checkImageSimilarity(png_file))
+
+
 if isIronPython():
     renderer.Dispose()
     indigo.Dispose()
diff --git a/core/render2d/src/render_context.cpp b/core/render2d/src/render_context.cpp
index ee5d13d3d3..89652247b2 100644
--- a/core/render2d/src/render_context.cpp
+++ b/core/render2d/src/render_context.cpp
@@ -859,7 +859,7 @@ void RenderContext::drawAttachmentPoint(RenderItemAttachmentPoint& ri, bool idle
     setSingleSource(ri.color);
     if (ri.highlighted && opt.highlightColorEnable)
         setSingleSource(opt.highlightColor);
-    setLineWidth(_settings.unit);
+    setLineWidth(_settings.bondLineWidth);
     moveTo(ri.p0);
     lineTo(ri.p1);
     checkPathNonEmpty();