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

Layer system #709

Merged
merged 12 commits into from
Aug 10, 2021
Merged

Layer system #709

merged 12 commits into from
Aug 10, 2021

Conversation

serk12
Copy link
Collaborator

@serk12 serk12 commented Jul 30, 2021

Signed-off-by: Marc Prat Masó marc.prat.maso@estudiantat.upc.edu

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.

Some examples:

Signed-off-by: Marc Prat Masó <marc.prat.maso@estudiantat.upc.edu>
@github-actions
Copy link
Contributor

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

Copy link
Member

@ghutchis ghutchis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally looks good - definitely needs some doc comments in headers. Also seems like a .png crept in.

Somewhere we need to document the source of the icons (e.g., README)

avogadro/core/connectedgroup.cpp Outdated Show resolved Hide resolved
avogadro/core/connectedgroup.cpp Outdated Show resolved Hide resolved
avogadro/core/layer.h Show resolved Hide resolved
avogadro/core/layer.cpp Show resolved Hide resolved
avogadro/core/layer.cpp Outdated Show resolved Hide resolved
avogadro/qtgui/layermanager.h Outdated Show resolved Hide resolved
avogadro/qtgui/layermodel.cpp Outdated Show resolved Hide resolved
Signed-off-by: Marc Prat Masó <marc.prat.maso@estudiantat.upc.edu>
Signed-off-by: Marc Prat Masó <marc.prat.maso@estudiantat.upc.edu>
@github-actions
Copy link
Contributor

github-actions bot commented Aug 6, 2021

Here are the build results
Ubuntu-2004.tar.gz
Artifacts will only be retained for 90 days.

@ghutchis ghutchis added enhancement feature changes / API changes rendering labels Aug 8, 2021
avogadro/core/layermanager.h Outdated Show resolved Hide resolved
Signed-off-by: Marc Prat Masó <marc.prat.maso@estudiantat.upc.edu>
@github-actions
Copy link
Contributor

github-actions bot commented Aug 9, 2021

Here are the build results
Ubuntu-2004.tar.gz
Artifacts will only be retained for 90 days.

/** save custom data, base save should never be called */
virtual std::string serialize()
{
assert(true);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we drop the assert if it's always true?

@ghutchis
Copy link
Member

The Mac build failure needs #include <string> in layermanager.h

#include <cassert>
#include <map>
#include <memory>
#include <vector>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#include <string>

@github-actions
Copy link
Contributor

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

Signed-off-by: Marc Prat Masó <marc.prat.maso@estudiantat.upc.edu>
San4ito and others added 5 commits August 10, 2021 12:33
Currently translated at 27.0% (323 of 1194 strings)

Translation: Avogadro/avogadrolibs
Translate-URL: https://hosted.weblate.org/projects/avogadro/avogadrolibs/ru/
Currently translated at 100.0% (1188 of 1188 strings)

Translation: Avogadro/avogadrolibs
Translate-URL: https://hosted.weblate.org/projects/avogadro/avogadrolibs/eo/
* complex cartoons, and coloring, area select

Signed-off-by: Marc Prat Masó <marc.prat.maso@estudiantat.upc.edu>
Signed-off-by: Marc Prat Masó <marc.prat.maso@estudiantat.upc.edu>
…yer_system

Signed-off-by: Marc Prat Masó <marc.prat.maso@estudiantat.upc.edu>
@github-actions
Copy link
Contributor

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

@ghutchis ghutchis merged commit b30e202 into OpenChemistry:master Aug 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement feature changes / API changes rendering
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants