#3469 fix bond path and attachmentpoint direction

epam · Nov 8, 2023 · 15a9265 · 15a9265
1 parent 7df38b1
commit 15a9265
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/packages/ketcher-core/src/application/render/renderers/PolymerBondRenderer.ts b/packages/ketcher-core/src/application/render/renderers/PolymerBondRenderer.ts
@@ -165,8 +165,26 @@ export class PolymerBondRenderer extends BaseRenderer {
     );
   }
 
-  private updateSnakeBondPath(startPosition, endPosition) {
+  private updateSnakeBondPath(
+    startPosition: Vec2,
+    endPosition: Vec2,
+    reCheckAttachmentpoint = true,
+  ) {
+    const isR1TheCurrentAttachmentpointOfFirstMonomer =
+      this.polymerBond.firstMonomer.getAttachmentPointByBond(
+        this.polymerBond,
+      ) === 'R1' ||
+      this.polymerBond.firstMonomer.getPotentialAttachmentPointByBond(
+        this.polymerBond,
+      ) === 'R1';
     if (this.isSecondMonomerBottomRight(startPosition, endPosition)) {
+      if (
+        isR1TheCurrentAttachmentpointOfFirstMonomer &&
+        reCheckAttachmentpoint
+      ) {
+        this.updateSnakeBondPath(endPosition, startPosition, false);
+        return;
+      }
       this.addLine(
         LINE_DIRECTION.Horizontal,
         LINE_FROM_MONOMER_LENGTH + this.getMonomerWidth() / 2,
@@ -210,6 +228,13 @@ export class PolymerBondRenderer extends BaseRenderer {
           this.getMonomerWidth() / 2,
       );
     } else if (this.isSecondMonomerBottomLeft(startPosition, endPosition)) {
+      if (
+        isR1TheCurrentAttachmentpointOfFirstMonomer &&
+        reCheckAttachmentpoint
+      ) {
+        this.updateSnakeBondPath(endPosition, startPosition, false);
+        return;
+      }
       this.addLine(
         LINE_DIRECTION.Horizontal,
         LINE_FROM_MONOMER_LENGTH + this.getMonomerWidth() / 2,
@@ -241,6 +266,13 @@ export class PolymerBondRenderer extends BaseRenderer {
         LINE_FROM_MONOMER_LENGTH + this.getMonomerWidth() / 2,
       );
     } else if (this.isSecondMonomerTopLeft(startPosition, endPosition)) {
+      if (
+        isR1TheCurrentAttachmentpointOfFirstMonomer &&
+        reCheckAttachmentpoint
+      ) {
+        this.updateSnakeBondPath(endPosition, startPosition, false);
+        return;
+      }
       this.addLine(
         LINE_DIRECTION.Horizontal,
         LINE_FROM_MONOMER_LENGTH + this.getMonomerWidth() / 2,

diff --git a/packages/ketcher-core/src/domain/AttachmentPoint.ts b/packages/ketcher-core/src/domain/AttachmentPoint.ts
@@ -131,7 +131,7 @@ export class AttachmentPoint {
       this.monomer.id ===
       this.monomer.attachmentPointsToBonds[this.attachmentPointName]
         ?.firstMonomer?.id;
-
+    const isAttachmentpointR1 = this.attachmentPointName === 'R1';
     if (!this.isUsed) {
       angleDegrees = this.initialAngle;
     } else if (
@@ -140,7 +140,7 @@ export class AttachmentPoint {
         this.attachmentPointName
       ]?.renderer.isMonomersOnSameHorizontalLine()
     ) {
-      angleRadians = flip ? Math.PI : 0;
+      angleRadians = isAttachmentpointR1 ? 0 : Math.PI;
       angleDegrees = Vec2.radiansToDegrees(angleRadians);
     } else {
       const angleRadians = this.rotateToAngle(