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

Ensure that title bar correctly displays active molecule file #440

Merged
merged 1 commit into from Dec 5, 2023

Conversation

Makiah
Copy link
Contributor

@Makiah Makiah commented Dec 3, 2023

Noticed while using this software that my active cjson file did not seem to appear in the title bar (Ubuntu 22.04, for reference). Tracked this down to the fact that Variant will not be instantiated correctly with a String m_type when a char array is passed and initialized via setValue, and the AVO_UNUSED path is called instead. To fix this, we can just set the fileName attribute as an std::string directly via toStdString rather than toLocal8Bit().data().

Before:
image

After:
image

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.

Copy link

welcome bot commented Dec 3, 2023

Thanks for opening this pull request! Please check out our contributing guidelines and check for the automated tests.

@ghutchis
Copy link
Member

ghutchis commented Dec 4, 2023

Thanks - this is great. I'll add it also to the "Variant class needs more conversions" list. (I found recently it didn't do conversions for a few matrix / vector classes too.)

For contributions, we do request signing your commits with your full name, e.g:
https://github.com/OpenChemistry/avogadroapp/pull/440/checks?check_run_id=19266593742

@Makiah
Copy link
Contributor Author

Makiah commented Dec 4, 2023

Ah thanks! Missed that earlier, I'll follow the signing convention from here on out.

@ghutchis
Copy link
Member

ghutchis commented Dec 4, 2023

Let's go with something like this:

  m_fileReadMolecule->setData("fileName", qPrintable(fileName));
  // etc. for other cases

This should force const char* which should work.

@ghutchis
Copy link
Member

ghutchis commented Dec 4, 2023

Don't worry about the two build errors - I need to update the GitHub actions here to match avogadrolibs

Signed-off-by: Makiah Bennett <makiahtbennett@gmail.com>
@Makiah
Copy link
Contributor Author

Makiah commented Dec 5, 2023

Nice - tested out qPrintable and it works as well, thanks! Updated in latest revision.

@avo-bot
Copy link

avo-bot commented Dec 5, 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

@ghutchis ghutchis merged commit ba539c5 into OpenChemistry:master Dec 5, 2023
26 of 30 checks passed
Copy link

welcome bot commented Dec 5, 2023

Congrats on merging your first pull request! 🎉 Thanks for making Avogadro better for everyone!

@ghutchis
Copy link
Member

ghutchis commented Dec 5, 2023

Thanks! Much appreciated

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.

None yet

3 participants