Skip to content
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.

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

Adding support for bond label in base classes and CJSON #1495

Merged
merged 3 commits into from
Dec 23, 2023

Conversation

ghutchis
Copy link
Member

@ghutchis ghutchis commented Dec 4, 2023

Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.

Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or

(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or

(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.

(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.

@ghutchis
Copy link
Member Author

ghutchis commented Dec 4, 2023

This is so weird .. the diff even indicates the code is correct. Checking the PR on another computer shows it's correct...

@avo-bot
Copy link

avo-bot commented Dec 23, 2023

This pull request has been mentioned on Avogadro Discussion. There might be relevant details there:

https://discuss.avogadro.cc/t/december-2023-live-updates/5051/1

{
auto* comm = new ModifySelectionCommand(*this, atomId, selected);
comm->setText(undoText);
comm->setCanMerge(true);
m_undoStack.push(comm);
// m_molecule.setAtomSelected(atomId, selected);
// m_molecule.setAtomSelected(atomId, selected);

Check notice

Code scanning / CodeQL

Commented-out code Note

This comment appears to contain commented-out code.
Copy link
Contributor

Here are the build results
Avogadro2.AppImage
macOS.dmg
Win64.exe
Artifacts will only be retained for 90 days.

@ghutchis ghutchis merged commit 762a0cb into OpenChemistry:master Dec 23, 2023
17 of 18 checks passed
@ghutchis ghutchis deleted the add-bond-labels branch December 23, 2023 23:17
Copy link
Contributor

Here are the build results
Avogadro2.AppImage
macOS.dmg
Win64.exe
Artifacts will only be retained for 90 days.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants