8000 If any bond is hidden in the ring, it should not be filled. by johnmay · Pull Request #1181 · cdk/cdk · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

If any bond is hidden in the ring, it should not be filled. #1181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 1, 2025
Merged

If any bond is hidden in the ring, it should not be filled. #1181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 13 additions & 26 deletions ...sic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,35 +295,22 @@

Color highlight = null;


if (false) {
Map<Color, Integer> colorCount = new HashMap<>();
for (IAtom atom : ring.atoms()) {
Color color = getHighlightColor(atom, parameters);
if (color != null) {
Integer count = colorCount.computeIfAbsent(color, k -> 0);
colorCount.put(color, count + 1);
}
}

for (Map.Entry<Color, Integer> e : colorCount.entrySet()) {
if (e.getValue() >= (ring.getAtomCount() / 2))
highlight = e.getKey();
}
} else {
for (IBond bond : ring.bonds()) {
Color color = getHighlightColor(bond, parameters);
if (color == null)
continue;
if (highlight == null) {
highlight = color;
} else if (!highlight.equals(color)) {
highlight = null;
break;
}
for (IBond bond : ring.bonds()) {
Color color = getHighlightColor(bond, parameters);

Check warning on line 299 in display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardGenerator.java

View check run for this annotation

Codecov / codecov/patch

display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardGenerator.java#L299 

Added line #L299 was not covered by tests
if (color == null)
continue;

Check warning on line 301 in display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardGenerator.java

View check run for this annotation

Codecov / codecov/patch

display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardGenerator.java#L301 

Added line #L301 was not covered by tests
if (isHidden(bond)) {
highlight = null;
break;

Check warning on line 304 in display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardGenerator.java

View check run for this annotation

Codecov / codecov/patch

display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardGenerator.java#L303-L304 

Added lines #L303 - L304 were not covered by tests
} else if (highlight == null) {
highlight = color;

Check warning on line 306 in display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardGenerator.java

View check run for this annotation

Codecov / codecov/patch

display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardGenerator.java#L306 

Added line #L306 was not covered by tests
} else if (!highlight.equals(color)) {
highlight = null;
break;

Check warning on line 309 in display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardGenerator.java

View check run for this annotation

Codecov / codecov/patch

display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardGenerator.java#L308-L309 

Added lines #L308 - L309 were not covered by tests
}
}


if (highlight == null)
continue;

Expand Down
0