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

Check for Open Babel CJSON support: use it if available #937

Merged
merged 1 commit into from
Jun 10, 2022

Conversation

ghutchis
Copy link
Member

Signed-off-by: Geoff Hutchison geoff.hutchison@gmail.com

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.

Signed-off-by: Geoff Hutchison <geoff.hutchison@gmail.com>
@ghutchis
Copy link
Member Author

Open Babel has an initial CJSON implementation in HEAD - use it if available.

return;
}

m_progress->setLabelText(tr("Starting %1…", "arg is an executable file.")
.arg(m_process->obabelExecutable()));

// Run obabel
m_process->optimizeGeometry(QByteArray(mol.c_str()), options);
m_process->optimizeGeometry(QByteArray(mol.c_str()), options, m_defaultFormat);

Check notice

Code scanning

MISRA 17.7 rule

MISRA 17.7 rule
@ghutchis ghutchis added the enhancement feature changes / API changes label Jun 10, 2022
@github-actions
Copy link
Contributor

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

@ghutchis ghutchis merged commit d092955 into OpenChemistry:master Jun 10, 2022
@ghutchis ghutchis deleted the use-cjson-openbabel branch June 10, 2022 03:53
@avo-bot
Copy link

avo-bot commented Jun 23, 2022

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

https://discuss.avogadro.cc/t/june-2022-development-update/3879/1

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

Successfully merging this pull request may close these issues.

2 participants