#1990: Functional group does not connect with another functional group on click&drag #2208
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…th-another-functional-group-on-clickdrag
…up on click&drag
…oup-does-not-connect-with-another-functional-group-on-clickdrag
St-Permiakov
force-pushed
the
#1990-functional-group-does-not-connect-with-another-functional-group-on-clickdrag
branch
from
941319b to
5d7b2a3
Compare
St-Permiakov
force-pushed
the
#1990-functional-group-does-not-connect-with-another-functional-group-on-clickdrag
branch
from
8211e49 to
3bed375
Compare
St-Permiakov
changed the title
added 2 commits
February 16, 2023 15:36
…th-another-functional-group-on-clickdrag
Nitvex
reviewed
Feb 21, 2023
| @@ -403,7 +354,7 @@ class TemplateTool { | |||
| let action | |||
| let pasteItems = null | |||
|
|
|||
| if (SGroup.isSaltOrSolvent(this.template.molecule.name)) { | |||
| if (this.isSaltOrSolvant) { | |||
There was a problem hiding this comment.
Suggested change
| if (this.isSaltOrSolvant) { | |
| if (this.isSaltOrSolvent) { |
| xy0?: Vec2 | ||
| angle0?: number | ||
| } | ||
| function prepareTemplateFromSingleGroup(molecule: Struct): Template | null { |
There was a problem hiding this comment.
May be we need to add some comment that this function calculates the position of FG and its rotation angle?
|
|
||
| constructor(editor, struct) { | ||
| this.editor = editor | ||
| this.editor.selection(null) | ||
| this.struct = struct | ||
|
|
||
| this.isSingleContractedGroup = | ||
| struct.isSingleGroup() && !struct.functionalGroups.get(0).isExpanded |
There was a problem hiding this comment.
Hmm, are you sure we can rely on 0 ?
I guess, in this case we need to get first FG by something like struct.functionaGroups.values().next()
There was a problem hiding this comment.
I am sure.
If id is something else than 0, it should be treated as a bug and fixed.
This "struct" is considered to be a brand-new structure with ids different from actual canvas.
And if first (and only, as we verify beforehand) group has non-0 id, it's a clear marker of a bug.
added 2 commits
February 21, 2023 15:45
…th-another-functional-group-on-clickdrag
Nitvex
approved these changes
Feb 21, 2023
St-Permiakov
deleted the
#1990-functional-group-does-not-connect-with-another-functional-group-on-clickdrag
branch
ansivgit
pushed a commit
that referenced
this pull request
Feb 22, 2023
…p on click&drag (#2208) * #1990 - Detect if group is attached to smth + get attachment atom * #1990 - template tool mousedown() refactor * #1990 - Functional group does not connect with another functional group on click&drag * #1990 - #2195 merge fixes * #1990 - cleanup * #1990 - hotfix * #1990 - fixes and clarifications after review --------- Co-authored-by: Stanislav Permiakov <Stanislav.Permiakov@primark.onmicrosoft.com> Co-authored-by: Stanislav Permiakov <stanislav_permiakov@epam.com>
yuleicul
restored the
#1990-functional-group-does-not-connect-with-another-functional-group-on-clickdrag
branch
yuleicul
deleted the
#1990-functional-group-does-not-connect-with-another-functional-group-on-clickdrag
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed
Added
Refactored
getGroupsIdsFromBondId— since bond can belong to more than one group, it should return array and not single number. Previously added `getGroupIdFromBondId" left for compatibility purposes and should be removed laterfindClosestFGextended with possibility to skip items, but for now not used (replaced with easier solution). Potentially required to get target group for hover when pasting/inserting another group (to avoid editor picking the same group you're pasting as "closest")