Compare commits
No commits in common. "main" and "0.3.0" have entirely different histories.
85
.travis.yml
85
.travis.yml
@ -1,85 +0,0 @@
|
|||||||
language: cpp
|
|
||||||
|
|
||||||
sudo: required
|
|
||||||
dist: trusty
|
|
||||||
|
|
||||||
branches:
|
|
||||||
only:
|
|
||||||
- master
|
|
||||||
- dev
|
|
||||||
|
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
sources:
|
|
||||||
- ubuntu-toolchain-r-test
|
|
||||||
packages:
|
|
||||||
- g++-4.9
|
|
||||||
- expect
|
|
||||||
- binutils-mingw-w64-x86-64 # 64bit MinGW
|
|
||||||
- gcc-mingw-w64-x86-64
|
|
||||||
- g++-mingw-w64-x86-64
|
|
||||||
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- os: linux
|
|
||||||
env: CONF=release BUILDER=gcc TARGET=Linux TAG=Linux COMPILATOR_OPTION="--compilator-version=4.9" GCOV=--gcov
|
|
||||||
compiler: gcc
|
|
||||||
- os: linux
|
|
||||||
env: CONF=debug BUILDER=clang TARGET=Linux
|
|
||||||
compiler: clang
|
|
||||||
- os: linux
|
|
||||||
env: CONF=release BUILDER=gcc TARGET=Windows TAG=Mingw
|
|
||||||
compiler: x86_64-w64-mingw32-gcc
|
|
||||||
- os: linux
|
|
||||||
env: CONF=release BUILDER=gcc TARGET=Android TAG=Android DISABLE_PACKAGE=-p
|
|
||||||
compiler: gcc
|
|
||||||
- os: osx
|
|
||||||
env: CONF=release BUILDER=clang TARGET=MacOs TAG=MacOs
|
|
||||||
compiler: clang
|
|
||||||
- os: osx
|
|
||||||
env: CONF=release BUILDER=clang TARGET=IOs TAG=IOs
|
|
||||||
compiler: clang
|
|
||||||
|
|
||||||
install:
|
|
||||||
- cd ..
|
|
||||||
- pip install --user lutin
|
|
||||||
- if [ "$TAG" == "Android" ]; then
|
|
||||||
git clone --depth 1 --branch master https://github.com/HeeroYui/android-download-tool;
|
|
||||||
./android-download-tool/dl-android.sh;
|
|
||||||
fi
|
|
||||||
- git clone --depth 1 --branch master https://github.com/atria-soft/ci.git
|
|
||||||
- cd -
|
|
||||||
|
|
||||||
before_script:
|
|
||||||
- cd ..
|
|
||||||
- git clone https://github.com/atria-soft/elog.git -b $TRAVIS_BRANCH
|
|
||||||
- git clone https://github.com/atria-soft/etk.git -b $TRAVIS_BRANCH
|
|
||||||
- git clone https://github.com/atria-soft/ememory.git -b $TRAVIS_BRANCH
|
|
||||||
- git clone https://github.com/generic-library/gtest-lutin.git --recursive
|
|
||||||
- git clone https://github.com/generic-library/z-lutin.git --recursive
|
|
||||||
- pwd
|
|
||||||
- ls -l
|
|
||||||
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
|
|
||||||
export PATH=$PATH:/Users/travis/Library/Python/2.7/bin/;
|
|
||||||
fi
|
|
||||||
- ./ci/build_send.py --tag=$TAG --status=START;
|
|
||||||
|
|
||||||
script:
|
|
||||||
- lutin -w -j4 -C -P -t $TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF $GCOV $DISABLE_PACKAGE eproperty-*; STATUS=$?
|
|
||||||
- ./ci/build_send.py --tag=$TAG --status="$STATUS";
|
|
||||||
|
|
||||||
after_script:
|
|
||||||
- if [ "$GCOV" != "" ]; then
|
|
||||||
./ci/warning_send.py --find-path ./out/Linux_x86_64/$CONF/build/$BUILDER/eproperty/;
|
|
||||||
fi
|
|
||||||
- lutin -w -j4 -C -P -t$TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF $GCOV $DISABLE_PACKAGE eproperty-test?run:--elog-level=3 | tee out_test.txt
|
|
||||||
- if [ "$GCOV" != "" ]; then
|
|
||||||
./ci/test_send.py --file=out_test.txt;
|
|
||||||
lutin -C -P -t $TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF -p eproperty?gcov;
|
|
||||||
./ci/coverage_send.py --json=out/Linux_x86_64/$CONF/build/$BUILDER/eproperty/eproperty.json;
|
|
||||||
fi
|
|
||||||
|
|
||||||
notifications:
|
|
||||||
email:
|
|
||||||
- yui.heero@gmail.com
|
|
||||||
|
|
||||||
574
LICENSE
574
LICENSE
@ -1,373 +1,201 @@
|
|||||||
Mozilla Public License Version 2.0
|
Apache License
|
||||||
==================================
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
1. Definitions
|
|
||||||
--------------
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
1.1. "Contributor"
|
1. Definitions.
|
||||||
means each individual or legal entity that creates, contributes to
|
|
||||||
the creation of, or owns Covered Software.
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
1.2. "Contributor Version"
|
|
||||||
means the combination of the Contributions of others (if any) used
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
by a Contributor and that particular Contributor's Contribution.
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
1.3. "Contribution"
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
means Covered Software of a particular Contributor.
|
other entities that control, are controlled by, or are under common
|
||||||
|
control with that entity. For the purposes of this definition,
|
||||||
1.4. "Covered Software"
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
means Source Code Form to which the initial Contributor has attached
|
direction or management of such entity, whether by contract or
|
||||||
the notice in Exhibit A, the Executable Form of such Source Code
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
Form, and Modifications of such Source Code Form, in each case
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
including portions thereof.
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
1.5. "Incompatible With Secondary Licenses"
|
exercising permissions granted by this License.
|
||||||
means
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
(a) that the initial Contributor has attached the notice described
|
including but not limited to software source code, documentation
|
||||||
in Exhibit B to the Covered Software; or
|
source, and configuration files.
|
||||||
|
|
||||||
(b) that the Covered Software was made available under the terms of
|
"Object" form shall mean any form resulting from mechanical
|
||||||
version 1.1 or earlier of the License, but not also under the
|
transformation or translation of a Source form, including but
|
||||||
terms of a Secondary License.
|
not limited to compiled object code, generated documentation,
|
||||||
|
and conversions to other media types.
|
||||||
1.6. "Executable Form"
|
|
||||||
means any form of the work other than Source Code Form.
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
1.7. "Larger Work"
|
copyright notice that is included in or attached to the work
|
||||||
means a work that combines Covered Software with other material, in
|
(an example is provided in the Appendix below).
|
||||||
a separate file or files, that is not Covered Software.
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
1.8. "License"
|
form, that is based on (or derived from) the Work and for which the
|
||||||
means this document.
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
1.9. "Licensable"
|
of this License, Derivative Works shall not include works that remain
|
||||||
means having the right to grant, to the maximum extent possible,
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
whether at the time of the initial grant or subsequently, any and
|
the Work and Derivative Works thereof.
|
||||||
all of the rights conveyed by this License.
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
1.10. "Modifications"
|
the original version of the Work and any modifications or additions
|
||||||
means any of the following:
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
(a) any file in Source Code Form that results from an addition to,
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
deletion from, or modification of the contents of Covered
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
Software; or
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
(b) any new file in Source Code Form that contains any Covered
|
communication on electronic mailing lists, source code control systems,
|
||||||
Software.
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
1.11. "Patent Claims" of a Contributor
|
excluding communication that is conspicuously marked or otherwise
|
||||||
means any patent claim(s), including without limitation, method,
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
process, and apparatus claims, in any patent Licensable by such
|
|
||||||
Contributor that would be infringed, but for the grant of the
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
License, by the making, using, selling, offering for sale, having
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
made, import, or transfer of either its Contributions or its
|
subsequently incorporated within the Work.
|
||||||
Contributor Version.
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
1.12. "Secondary License"
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
means either the GNU General Public License, Version 2.0, the GNU
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
Lesser General Public License, Version 2.1, the GNU Affero General
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
Public License, Version 3.0, or any later versions of those
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
licenses.
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
1.13. "Source Code Form"
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
means the form of the work preferred for making modifications.
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
1.14. "You" (or "Your")
|
(except as stated in this section) patent license to make, have made,
|
||||||
means an individual or a legal entity exercising rights under this
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
License. For legal entities, "You" includes any entity that
|
where such license applies only to those patent claims licensable
|
||||||
controls, is controlled by, or is under common control with You. For
|
by such Contributor that are necessarily infringed by their
|
||||||
purposes of this definition, "control" means (a) the power, direct
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
or indirect, to cause the direction or management of such entity,
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
whether by contract or otherwise, or (b) ownership of more than
|
institute patent litigation against any entity (including a
|
||||||
fifty percent (50%) of the outstanding shares or beneficial
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
ownership of such entity.
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
2. License Grants and Conditions
|
granted to You under this License for that Work shall terminate
|
||||||
--------------------------------
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
2.1. Grants
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
Each Contributor hereby grants You a world-wide, royalty-free,
|
modifications, and in Source or Object form, provided that You
|
||||||
non-exclusive license:
|
meet the following conditions:
|
||||||
|
|
||||||
(a) under intellectual property rights (other than patent or trademark)
|
(a) You must give any other recipients of the Work or
|
||||||
Licensable by such Contributor to use, reproduce, make available,
|
Derivative Works a copy of this License; and
|
||||||
modify, display, perform, distribute, and otherwise exploit its
|
|
||||||
Contributions, either on an unmodified basis, with Modifications, or
|
(b) You must cause any modified files to carry prominent notices
|
||||||
as part of a Larger Work; and
|
stating that You changed the files; and
|
||||||
|
|
||||||
(b) under Patent Claims of such Contributor to make, use, sell, offer
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
for sale, have made, import, and otherwise transfer either its
|
that You distribute, all copyright, patent, trademark, and
|
||||||
Contributions or its Contributor Version.
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
2.2. Effective Date
|
the Derivative Works; and
|
||||||
|
|
||||||
The licenses granted in Section 2.1 with respect to any Contribution
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
become effective for each Contribution on the date the Contributor first
|
distribution, then any Derivative Works that You distribute must
|
||||||
distributes such Contribution.
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
2.3. Limitations on Grant Scope
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
The licenses granted in this Section 2 are the only rights granted under
|
as part of the Derivative Works; within the Source form or
|
||||||
this License. No additional rights or licenses will be implied from the
|
documentation, if provided along with the Derivative Works; or,
|
||||||
distribution or licensing of Covered Software under this License.
|
within a display generated by the Derivative Works, if and
|
||||||
Notwithstanding Section 2.1(b) above, no patent license is granted by a
|
wherever such third-party notices normally appear. The contents
|
||||||
Contributor:
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
(a) for any code that a Contributor has removed from Covered Software;
|
notices within Derivative Works that You distribute, alongside
|
||||||
or
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
(b) for infringements caused by: (i) Your and any other third party's
|
as modifying the License.
|
||||||
modifications of Covered Software, or (ii) the combination of its
|
|
||||||
Contributions with other software (except as part of its Contributor
|
You may add Your own copyright statement to Your modifications and
|
||||||
Version); or
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
(c) under Patent Claims infringed by Covered Software in the absence of
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
its Contributions.
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
This License does not grant any rights in the trademarks, service marks,
|
|
||||||
or logos of any Contributor (except as may be necessary to comply with
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
the notice requirements in Section 3.4).
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
2.4. Subsequent Licenses
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
No Contributor makes additional grants as a result of Your choice to
|
the terms of any separate license agreement you may have executed
|
||||||
distribute the Covered Software under a subsequent version of this
|
with Licensor regarding such Contributions.
|
||||||
License (see Section 10.2) or under the terms of a Secondary License (if
|
|
||||||
permitted under the terms of Section 3.3).
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
2.5. Representation
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
Each Contributor represents that the Contributor believes its
|
|
||||||
Contributions are its original creation(s) or it has sufficient rights
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
to grant the rights to its Contributions conveyed by this License.
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
2.6. Fair Use
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
This License is not intended to limit any rights You have under
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
applicable copyright doctrines of fair use, fair dealing, or other
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
equivalents.
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
2.7. Conditions
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
in Section 2.1.
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
3. Responsibilities
|
liable to You for damages, including any direct, indirect, special,
|
||||||
-------------------
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
3.1. Distribution of Source Form
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
All distribution of Covered Software in Source Code Form, including any
|
other commercial damages or losses), even if such Contributor
|
||||||
Modifications that You create or to which You contribute, must be under
|
has been advised of the possibility of such damages.
|
||||||
the terms of this License. You must inform recipients that the Source
|
|
||||||
Code Form of the Covered Software is governed by the terms of this
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
License, and how they can obtain a copy of this License. You may not
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
attempt to alter or restrict the recipients' rights in the Source Code
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
Form.
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
3.2. Distribution of Executable Form
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
If You distribute Covered Software in Executable Form then:
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
(a) such Covered Software must also be made available in Source Code
|
of your accepting any such warranty or additional liability.
|
||||||
Form, as described in Section 3.1, and You must inform recipients of
|
|
||||||
the Executable Form how they can obtain a copy of such Source Code
|
END OF TERMS AND CONDITIONS
|
||||||
Form by reasonable means in a timely manner, at a charge no more
|
|
||||||
than the cost of distribution to the recipient; and
|
APPENDIX: How to apply the Apache License to your work.
|
||||||
|
|
||||||
(b) You may distribute such Executable Form under the terms of this
|
To apply the Apache License to your work, attach the following
|
||||||
License, or sublicense it under different terms, provided that the
|
boilerplate notice, with the fields enclosed by brackets "{}"
|
||||||
license for the Executable Form does not attempt to limit or alter
|
replaced with your own identifying information. (Don't include
|
||||||
the recipients' rights in the Source Code Form under this License.
|
the brackets!) The text should be enclosed in the appropriate
|
||||||
|
comment syntax for the file format. We also recommend that a
|
||||||
3.3. Distribution of a Larger Work
|
file or class name and description of purpose be included on the
|
||||||
|
same "printed page" as the copyright notice for easier
|
||||||
You may create and distribute a Larger Work under terms of Your choice,
|
identification within third-party archives.
|
||||||
provided that You also comply with the requirements of this License for
|
|
||||||
the Covered Software. If the Larger Work is a combination of Covered
|
Copyright {yyyy} {name of copyright owner}
|
||||||
Software with a work governed by one or more Secondary Licenses, and the
|
|
||||||
Covered Software is not Incompatible With Secondary Licenses, this
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
License permits You to additionally distribute such Covered Software
|
you may not use this file except in compliance with the License.
|
||||||
under the terms of such Secondary License(s), so that the recipient of
|
You may obtain a copy of the License at
|
||||||
the Larger Work may, at their option, further distribute the Covered
|
|
||||||
Software under the terms of either this License or such Secondary
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
License(s).
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
3.4. Notices
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
You may not remove or alter the substance of any license notices
|
See the License for the specific language governing permissions and
|
||||||
(including copyright notices, patent notices, disclaimers of warranty,
|
limitations under the License.
|
||||||
or limitations of liability) contained within the Source Code Form of
|
|
||||||
the Covered Software, except that You may alter any license notices to
|
|
||||||
the extent required to remedy known factual inaccuracies.
|
|
||||||
|
|
||||||
3.5. Application of Additional Terms
|
|
||||||
|
|
||||||
You may choose to offer, and to charge a fee for, warranty, support,
|
|
||||||
indemnity or liability obligations to one or more recipients of Covered
|
|
||||||
Software. However, You may do so only on Your own behalf, and not on
|
|
||||||
behalf of any Contributor. You must make it absolutely clear that any
|
|
||||||
such warranty, support, indemnity, or liability obligation is offered by
|
|
||||||
You alone, and You hereby agree to indemnify every Contributor for any
|
|
||||||
liability incurred by such Contributor as a result of warranty, support,
|
|
||||||
indemnity or liability terms You offer. You may include additional
|
|
||||||
disclaimers of warranty and limitations of liability specific to any
|
|
||||||
jurisdiction.
|
|
||||||
|
|
||||||
4. Inability to Comply Due to Statute or Regulation
|
|
||||||
---------------------------------------------------
|
|
||||||
|
|
||||||
If it is impossible for You to comply with any of the terms of this
|
|
||||||
License with respect to some or all of the Covered Software due to
|
|
||||||
statute, judicial order, or regulation then You must: (a) comply with
|
|
||||||
the terms of this License to the maximum extent possible; and (b)
|
|
||||||
describe the limitations and the code they affect. Such description must
|
|
||||||
be placed in a text file included with all distributions of the Covered
|
|
||||||
Software under this License. Except to the extent prohibited by statute
|
|
||||||
or regulation, such description must be sufficiently detailed for a
|
|
||||||
recipient of ordinary skill to be able to understand it.
|
|
||||||
|
|
||||||
5. Termination
|
|
||||||
--------------
|
|
||||||
|
|
||||||
5.1. The rights granted under this License will terminate automatically
|
|
||||||
if You fail to comply with any of its terms. However, if You become
|
|
||||||
compliant, then the rights granted under this License from a particular
|
|
||||||
Contributor are reinstated (a) provisionally, unless and until such
|
|
||||||
Contributor explicitly and finally terminates Your grants, and (b) on an
|
|
||||||
ongoing basis, if such Contributor fails to notify You of the
|
|
||||||
non-compliance by some reasonable means prior to 60 days after You have
|
|
||||||
come back into compliance. Moreover, Your grants from a particular
|
|
||||||
Contributor are reinstated on an ongoing basis if such Contributor
|
|
||||||
notifies You of the non-compliance by some reasonable means, this is the
|
|
||||||
first time You have received notice of non-compliance with this License
|
|
||||||
from such Contributor, and You become compliant prior to 30 days after
|
|
||||||
Your receipt of the notice.
|
|
||||||
|
|
||||||
5.2. If You initiate litigation against any entity by asserting a patent
|
|
||||||
infringement claim (excluding declaratory judgment actions,
|
|
||||||
counter-claims, and cross-claims) alleging that a Contributor Version
|
|
||||||
directly or indirectly infringes any patent, then the rights granted to
|
|
||||||
You by any and all Contributors for the Covered Software under Section
|
|
||||||
2.1 of this License shall terminate.
|
|
||||||
|
|
||||||
5.3. In the event of termination under Sections 5.1 or 5.2 above, all
|
|
||||||
end user license agreements (excluding distributors and resellers) which
|
|
||||||
have been validly granted by You or Your distributors under this License
|
|
||||||
prior to termination shall survive termination.
|
|
||||||
|
|
||||||
************************************************************************
|
|
||||||
* *
|
|
||||||
* 6. Disclaimer of Warranty *
|
|
||||||
* ------------------------- *
|
|
||||||
* *
|
|
||||||
* Covered Software is provided under this License on an "as is" *
|
|
||||||
* basis, without warranty of any kind, either expressed, implied, or *
|
|
||||||
* statutory, including, without limitation, warranties that the *
|
|
||||||
* Covered Software is free of defects, merchantable, fit for a *
|
|
||||||
* particular purpose or non-infringing. The entire risk as to the *
|
|
||||||
* quality and performance of the Covered Software is with You. *
|
|
||||||
* Should any Covered Software prove defective in any respect, You *
|
|
||||||
* (not any Contributor) assume the cost of any necessary servicing, *
|
|
||||||
* repair, or correction. This disclaimer of warranty constitutes an *
|
|
||||||
* essential part of this License. No use of any Covered Software is *
|
|
||||||
* authorized under this License except under this disclaimer. *
|
|
||||||
* *
|
|
||||||
************************************************************************
|
|
||||||
|
|
||||||
************************************************************************
|
|
||||||
* *
|
|
||||||
* 7. Limitation of Liability *
|
|
||||||
* -------------------------- *
|
|
||||||
* *
|
|
||||||
* Under no circumstances and under no legal theory, whether tort *
|
|
||||||
* (including negligence), contract, or otherwise, shall any *
|
|
||||||
* Contributor, or anyone who distributes Covered Software as *
|
|
||||||
* permitted above, be liable to You for any direct, indirect, *
|
|
||||||
* special, incidental, or consequential damages of any character *
|
|
||||||
* including, without limitation, damages for lost profits, loss of *
|
|
||||||
* goodwill, work stoppage, computer failure or malfunction, or any *
|
|
||||||
* and all other commercial damages or losses, even if such party *
|
|
||||||
* shall have been informed of the possibility of such damages. This *
|
|
||||||
* limitation of liability shall not apply to liability for death or *
|
|
||||||
* personal injury resulting from such party's negligence to the *
|
|
||||||
* extent applicable law prohibits such limitation. Some *
|
|
||||||
* jurisdictions do not allow the exclusion or limitation of *
|
|
||||||
* incidental or consequential damages, so this exclusion and *
|
|
||||||
* limitation may not apply to You. *
|
|
||||||
* *
|
|
||||||
************************************************************************
|
|
||||||
|
|
||||||
8. Litigation
|
|
||||||
-------------
|
|
||||||
|
|
||||||
Any litigation relating to this License may be brought only in the
|
|
||||||
courts of a jurisdiction where the defendant maintains its principal
|
|
||||||
place of business and such litigation shall be governed by laws of that
|
|
||||||
jurisdiction, without reference to its conflict-of-law provisions.
|
|
||||||
Nothing in this Section shall prevent a party's ability to bring
|
|
||||||
cross-claims or counter-claims.
|
|
||||||
|
|
||||||
9. Miscellaneous
|
|
||||||
----------------
|
|
||||||
|
|
||||||
This License represents the complete agreement concerning the subject
|
|
||||||
matter hereof. If any provision of this License is held to be
|
|
||||||
unenforceable, such provision shall be reformed only to the extent
|
|
||||||
necessary to make it enforceable. Any law or regulation which provides
|
|
||||||
that the language of a contract shall be construed against the drafter
|
|
||||||
shall not be used to construe this License against a Contributor.
|
|
||||||
|
|
||||||
10. Versions of the License
|
|
||||||
---------------------------
|
|
||||||
|
|
||||||
10.1. New Versions
|
|
||||||
|
|
||||||
Mozilla Foundation is the license steward. Except as provided in Section
|
|
||||||
10.3, no one other than the license steward has the right to modify or
|
|
||||||
publish new versions of this License. Each version will be given a
|
|
||||||
distinguishing version number.
|
|
||||||
|
|
||||||
10.2. Effect of New Versions
|
|
||||||
|
|
||||||
You may distribute the Covered Software under the terms of the version
|
|
||||||
of the License under which You originally received the Covered Software,
|
|
||||||
or under the terms of any subsequent version published by the license
|
|
||||||
steward.
|
|
||||||
|
|
||||||
10.3. Modified Versions
|
|
||||||
|
|
||||||
If you create software not governed by this License, and you want to
|
|
||||||
create a new license for such software, you may create and use a
|
|
||||||
modified version of this License if you rename the license and remove
|
|
||||||
any references to the name of the license steward (except to note that
|
|
||||||
such modified license differs from this License).
|
|
||||||
|
|
||||||
10.4. Distributing Source Code Form that is Incompatible With Secondary
|
|
||||||
Licenses
|
|
||||||
|
|
||||||
If You choose to distribute Source Code Form that is Incompatible With
|
|
||||||
Secondary Licenses under the terms of this version of the License, the
|
|
||||||
notice described in Exhibit B of this License must be attached.
|
|
||||||
|
|
||||||
Exhibit A - Source Code Form License Notice
|
|
||||||
-------------------------------------------
|
|
||||||
|
|
||||||
This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
|
|
||||||
If it is not possible or desirable to put the notice in a particular
|
|
||||||
file, then You may include the notice in a location (such as a LICENSE
|
|
||||||
file in a relevant directory) where a recipient would be likely to look
|
|
||||||
for such a notice.
|
|
||||||
|
|
||||||
You may add additional accurate notices of copyright ownership.
|
|
||||||
|
|
||||||
Exhibit B - "Incompatible With Secondary Licenses" Notice
|
|
||||||
---------------------------------------------------------
|
|
||||||
|
|
||||||
This Source Code Form is "Incompatible With Secondary Licenses", as
|
|
||||||
defined by the Mozilla Public License, v. 2.0.
|
|
||||||
|
|||||||
82
README.md
82
README.md
@ -1,80 +1,2 @@
|
|||||||
e-property
|
# eproperty
|
||||||
==========
|
(APACHE v2.0) class property depending on etk only
|
||||||
|
|
||||||
`eproperty` is c++ simple class property handling that permit to change parameter through XML file.
|
|
||||||
|
|
||||||
Release (master)
|
|
||||||
----------------
|
|
||||||
|
|
||||||
[](https://travis-ci.org/atria-soft/eproperty)
|
|
||||||
[](http://atria-soft.com/ci/atria-soft/eproperty)
|
|
||||||
[](http://atria-soft.com/ci/atria-soft/eproperty)
|
|
||||||
[](http://atria-soft.com/ci/atria-soft/eproperty)
|
|
||||||
|
|
||||||
[](http://atria-soft.com/ci/atria-soft/eproperty)
|
|
||||||
[](http://atria-soft.com/ci/atria-soft/eproperty)
|
|
||||||
[](http://atria-soft.com/ci/atria-soft/eproperty)
|
|
||||||
|
|
||||||
[](http://atria-soft.com/ci/atria-soft/eproperty)
|
|
||||||
[](http://atria-soft.com/ci/atria-soft/eproperty)
|
|
||||||
|
|
||||||
Developement (dev)
|
|
||||||
------------------
|
|
||||||
|
|
||||||
[](https://travis-ci.org/atria-soft/eproperty)
|
|
||||||
[](http://atria-soft.com/ci/atria-soft/eproperty)
|
|
||||||
[](http://atria-soft.com/ci/atria-soft/eproperty)
|
|
||||||
[](http://atria-soft.com/ci/atria-soft/eproperty)
|
|
||||||
|
|
||||||
[](http://atria-soft.com/ci/atria-soft/eproperty)
|
|
||||||
[](http://atria-soft.com/ci/atria-soft/eproperty)
|
|
||||||
[](http://atria-soft.com/ci/atria-soft/eproperty)
|
|
||||||
|
|
||||||
[](http://atria-soft.com/ci/atria-soft/eproperty)
|
|
||||||
[](http://atria-soft.com/ci/atria-soft/eproperty)
|
|
||||||
|
|
||||||
|
|
||||||
Instructions
|
|
||||||
============
|
|
||||||
|
|
||||||
download Build system:
|
|
||||||
----------------------
|
|
||||||
|
|
||||||
sudo pip install lutin
|
|
||||||
sudo pip install pillow
|
|
||||||
|
|
||||||
download the software:
|
|
||||||
----------------------
|
|
||||||
|
|
||||||
mkdir WORKING_DIRECTORY
|
|
||||||
cd WORKING_DIRECTORY
|
|
||||||
git clone https://github.com/atria-soft/etk.git
|
|
||||||
git clone https://github.com/atria-soft/elog.git
|
|
||||||
git clone https://github.com/atria-soft/ememory.git
|
|
||||||
git clone https://github.com/atria-soft/eproperty.git
|
|
||||||
git clone https://github.com/generic-library/gtest-lutin.git --recursive
|
|
||||||
git clone https://github.com/generic-library/z-lutin.git --recursive
|
|
||||||
|
|
||||||
Compile software:
|
|
||||||
-----------------
|
|
||||||
|
|
||||||
cd WORKING_DIRECTORY
|
|
||||||
lutin -C -P eproperty-test eproperty-sample
|
|
||||||
|
|
||||||
|
|
||||||
License (MPL v2.0)
|
|
||||||
=====================
|
|
||||||
Copyright eproperty Edouard DUPIN
|
|
||||||
|
|
||||||
Licensed under the Mozilla Public License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
https://www.mozilla.org/MPL/2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
|
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
MR Edouard DUPIN <yui.heero@gmail.com>
|
MR Edouard DUPIN <yui.heero@gmail.com>
|
||||||
|
|||||||
@ -26,16 +26,16 @@ Are there any licensing restrictions? {#eproperty_mainpage_license_re
|
|||||||
EPROPERTY is **FREE software** and _all sub-library are FREE and staticly linkable !!!_
|
EPROPERTY is **FREE software** and _all sub-library are FREE and staticly linkable !!!_
|
||||||
|
|
||||||
|
|
||||||
License (MPL v2.0) {#eproperty_mainpage_license}
|
License (APACHE-2.0) {#eproperty_mainpage_license}
|
||||||
==================
|
====================
|
||||||
|
|
||||||
Copyright EPROPERTY Edouard DUPIN
|
Copyright EPROPERTY Edouard DUPIN
|
||||||
|
|
||||||
Licensed under the Mozilla Public License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
You may obtain a copy of the License at
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
<https://www.mozilla.org/MPL/2.0>
|
<http://www.apache.org/licenses/LICENSE-2.0>
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
Unless required by applicable law or agreed to in writing, software
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
|||||||
@ -6,7 +6,7 @@ import doxy.tools as tools
|
|||||||
|
|
||||||
def create(target, module_name):
|
def create(target, module_name):
|
||||||
my_module = module.Module(__file__, module_name)
|
my_module = module.Module(__file__, module_name)
|
||||||
my_module.set_version([0,1,"dev"])
|
my_module.set_version("version.txt")
|
||||||
my_module.set_title("eproperty: Ewol property interface")
|
my_module.set_title("eproperty: Ewol property interface")
|
||||||
my_module.set_website("http://atria-soft.github.io/" + module_name)
|
my_module.set_website("http://atria-soft.github.io/" + module_name)
|
||||||
my_module.set_website_sources("http://github.com/atria-soft/" + module_name)
|
my_module.set_website_sources("http://github.com/atria-soft/" + module_name)
|
||||||
@ -24,10 +24,10 @@ def create(target, module_name):
|
|||||||
'*operator<<*',
|
'*operator<<*',
|
||||||
])
|
])
|
||||||
my_module.add_exclude_file([
|
my_module.add_exclude_file([
|
||||||
'debug.hpp',
|
'debug.h',
|
||||||
])
|
])
|
||||||
my_module.add_file_patterns([
|
my_module.add_file_patterns([
|
||||||
'*.hpp',
|
'*.h',
|
||||||
'*.md',
|
'*.md',
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|||||||
@ -3,13 +3,13 @@
|
|||||||
*
|
*
|
||||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||||
*
|
*
|
||||||
* @license MPL v2.0 (see license file)
|
* @license APACHE v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <etk/Vector.hpp>
|
#include <vector>
|
||||||
#include <etk/Map.hpp>
|
#include <map>
|
||||||
#include <eproperty/InterfaceData.hpp>
|
#include <eproperty/InterfaceData.h>
|
||||||
|
|
||||||
namespace eproperty {
|
namespace eproperty {
|
||||||
/**
|
/**
|
||||||
@ -3,13 +3,13 @@
|
|||||||
*
|
*
|
||||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||||
*
|
*
|
||||||
* @license MPL v2.0 (see license file)
|
* @license APACHE v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <eproperty/debug.hpp>
|
#include <eproperty/debug.h>
|
||||||
#include <eproperty/List.hpp>
|
#include <eproperty/List.h>
|
||||||
#include <eproperty/Property.hpp>
|
#include <eproperty/Property.h>
|
||||||
#include <eproperty/InterfaceData.hpp>
|
#include <eproperty/InterfaceData.h>
|
||||||
|
|
||||||
eproperty::InterfaceData::InterfaceData() {
|
eproperty::InterfaceData::InterfaceData() {
|
||||||
|
|
||||||
@ -21,55 +21,41 @@ eproperty::InterfaceData::~InterfaceData() {
|
|||||||
|
|
||||||
// note this pointer is not allocated and not free at the end of the class
|
// note this pointer is not allocated and not free at the end of the class
|
||||||
void eproperty::InterfaceData::add(eproperty::Property* _pointerOnProperty) {
|
void eproperty::InterfaceData::add(eproperty::Property* _pointerOnProperty) {
|
||||||
if (_pointerOnProperty == null) {
|
if (_pointerOnProperty == nullptr) {
|
||||||
EPROPERTY_ERROR("Try to link a null properties");
|
EPROPERTY_ERROR("Try to link a nullptr properties");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
for (auto &it : m_list) {
|
for (auto &it : m_list) {
|
||||||
if( it != null
|
if( it != nullptr
|
||||||
&& it->getName() == _pointerOnProperty->getName()) {
|
&& it->getName() == _pointerOnProperty->getName()) {
|
||||||
EPROPERTY_CRITICAL("2 property can not have the same name ... ==> generate runtime error");
|
EPROPERTY_CRITICAL("2 property can not have the same name ... ==> generate runtime error");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
m_list.pushBack(_pointerOnProperty);
|
m_list.push_back(_pointerOnProperty);
|
||||||
}
|
}
|
||||||
|
|
||||||
void eproperty::InterfaceData::remove(eproperty::Property* _pointerOnProperty) {
|
|
||||||
if (_pointerOnProperty == null) {
|
|
||||||
EPROPERTY_ERROR("Try to un-link a null properties");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
auto it = m_list.begin();
|
|
||||||
while (it != m_list.end()) {
|
|
||||||
if(*it == _pointerOnProperty) {
|
|
||||||
it = m_list.erase(it);
|
|
||||||
} else {
|
|
||||||
++it;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
void eproperty::InterfaceData::clean() {
|
void eproperty::InterfaceData::clean() {
|
||||||
// remove all pointer on these properties
|
// remove all pointer on these propertys
|
||||||
m_list.clear();
|
m_list.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Note no lock is needed at this level, because the lock is done is the upper elements ...
|
// Note no lock is needed at this level, because the lock is done is the upper elements ...
|
||||||
// the property set might be done with a pool of property, allone, the overhed is bigger ...
|
// the property set might be done with a pool of property, allone, the overhed is bigger ...
|
||||||
bool eproperty::InterfaceData::set(const etk::String& _property, const etk::String& _value) {
|
bool eproperty::InterfaceData::set(const std::string& _property, const std::string& _value) {
|
||||||
for (auto &it : m_list) {
|
for (auto &it : m_list) {
|
||||||
if( it != null
|
if( it != nullptr
|
||||||
&& it->getName() == _property) {
|
&& it->getName() == _property) {
|
||||||
it->setString(_value);
|
it->setString(_value);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// can not find the properties :
|
// can not find the propertys :
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
etk::String eproperty::InterfaceData::get(const etk::String& _property) const {
|
std::string eproperty::InterfaceData::get(const std::string& _property) const {
|
||||||
for (auto &it : m_list) {
|
for (auto &it : m_list) {
|
||||||
if( it != null
|
if( it != nullptr
|
||||||
&& it->getName() == _property) {
|
&& it->getName() == _property) {
|
||||||
return it->getString();
|
return it->getString();
|
||||||
}
|
}
|
||||||
@ -78,31 +64,31 @@ etk::String eproperty::InterfaceData::get(const etk::String& _property) const {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void eproperty::InterfaceData::display(bool _changeOnly) const {
|
void eproperty::InterfaceData::display(bool _changeOnly) const {
|
||||||
EPROPERTY_INFO(" Object properties:");
|
EPROPERTY_INFO(" Object propertys:");
|
||||||
for (auto &it : m_list) {
|
for (auto &it : m_list) {
|
||||||
if(it != null) {
|
if(it != nullptr) {
|
||||||
etk::String paramName = it->getName();
|
std::string paramName = it->getName();
|
||||||
etk::String paramVal = it->getString();
|
std::string paramVal = it->getString();
|
||||||
etk::String paramInfo = it->getInfo();
|
std::string paramInfo = it->getInfo();
|
||||||
if ( _changeOnly == false
|
if ( _changeOnly == false
|
||||||
|| it->isDefault() == false) {
|
|| it->isDefault() == false) {
|
||||||
EPROPERTY_INFO(" | param='" << paramName << "' value=" << paramVal << " (" << paramInfo << ")");
|
EPROPERTY_INFO(" | param='" << paramName << "' value=" << paramVal << " (" << paramInfo << ")");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
EPROPERTY_INFO(" | param=null");
|
EPROPERTY_INFO(" | param=nullptr");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
etk::Map<etk::String, etk::String> eproperty::InterfaceData::getAll(bool _notIfDefault) const {
|
std::map<std::string, std::string> eproperty::InterfaceData::getAll(bool _notIfDefault) const {
|
||||||
etk::Map<etk::String, etk::String> out;
|
std::map<std::string, std::string> out;
|
||||||
for (auto &it : m_list) {
|
for (auto &it : m_list) {
|
||||||
if(it != null) {
|
if(it != nullptr) {
|
||||||
etk::String paramName = it->getName();
|
std::string paramName = it->getName();
|
||||||
etk::String paramVal = it->getString();
|
std::string paramVal = it->getString();
|
||||||
if ( _notIfDefault == false
|
if ( _notIfDefault == false
|
||||||
|| it->isDefault() == false) {
|
|| it->isDefault() == false) {
|
||||||
out.set(paramName, paramVal);
|
out.insert(std::make_pair(paramName, paramVal));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -117,17 +103,17 @@ size_t eproperty::InterfaceData::size() const {
|
|||||||
eproperty::Property* eproperty::InterfaceData::getRaw(const size_t& _id) const {
|
eproperty::Property* eproperty::InterfaceData::getRaw(const size_t& _id) const {
|
||||||
if (_id >= m_list.size()) {
|
if (_id >= m_list.size()) {
|
||||||
EPROPERTY_ERROR("Wrong ID for property list. " << _id << " >= " << m_list.size());
|
EPROPERTY_ERROR("Wrong ID for property list. " << _id << " >= " << m_list.size());
|
||||||
return null;
|
return nullptr;
|
||||||
}
|
}
|
||||||
return m_list[_id];
|
return m_list[_id];
|
||||||
}
|
}
|
||||||
|
|
||||||
eproperty::Property* eproperty::InterfaceData::getRaw(const etk::String _name) const {
|
eproperty::Property* eproperty::InterfaceData::getRaw(const std::string _name) const {
|
||||||
for (auto &it : m_list) {
|
for (auto &it : m_list) {
|
||||||
if(it->getName() == _name) {
|
if(it->getName() == _name) {
|
||||||
return it;
|
return it;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -3,12 +3,12 @@
|
|||||||
*
|
*
|
||||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||||
*
|
*
|
||||||
* @license MPL v2.0 (see license file)
|
* @license APACHE v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <etk/Vector.hpp>
|
#include <vector>
|
||||||
#include <etk/Map.hpp>
|
#include <map>
|
||||||
|
|
||||||
namespace eproperty {
|
namespace eproperty {
|
||||||
class Property;
|
class Property;
|
||||||
@ -18,7 +18,7 @@ namespace eproperty {
|
|||||||
*/
|
*/
|
||||||
class InterfaceData {
|
class InterfaceData {
|
||||||
private:
|
private:
|
||||||
etk::Vector<eproperty::Property*> m_list; //!< list of availlable properties (no need to free)
|
std::vector<eproperty::Property*> m_list; //!< list of availlable Propertys (no need to free)
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* @brief Constructor.
|
* @brief Constructor.
|
||||||
@ -29,16 +29,11 @@ namespace eproperty {
|
|||||||
*/
|
*/
|
||||||
virtual ~InterfaceData();
|
virtual ~InterfaceData();
|
||||||
/**
|
/**
|
||||||
* @brief Register a property class pointer in the List of properties
|
* @brief Register a property class pointer in the List of propertys
|
||||||
* @note This class does not destroy the property pointer!!!
|
* @note This class does not destroy the property pointer!!!
|
||||||
* @param[in] _pointerOnProperty Pointer on the property that might be added.
|
* @param[in] _pointerOnProperty Pointer on the property that might be added.
|
||||||
*/
|
*/
|
||||||
void add(Property* _pointerOnProperty);
|
void add(Property* _pointerOnProperty);
|
||||||
/**
|
|
||||||
* @brief Un-Register a property class pointer in the List of properties
|
|
||||||
* @param[in] _pointerOnProperty Pointer on the property that might be removed.
|
|
||||||
*/
|
|
||||||
void remove(Property* _pointerOnProperty);
|
|
||||||
/**
|
/**
|
||||||
* @brief Remove all the property reference in this class.
|
* @brief Remove all the property reference in this class.
|
||||||
* @note no delete, just clean and inform that a property has not been removed.
|
* @note no delete, just clean and inform that a property has not been removed.
|
||||||
@ -51,13 +46,13 @@ namespace eproperty {
|
|||||||
* @return true Property update.
|
* @return true Property update.
|
||||||
* @return false Property not update.
|
* @return false Property not update.
|
||||||
*/
|
*/
|
||||||
bool set(const etk::String& _property, const etk::String& _value);
|
bool set(const std::string& _property, const std::string& _value);
|
||||||
/**
|
/**
|
||||||
* @brief Get a specific value of the property reference name.
|
* @brief Get a specific value of the property reference name.
|
||||||
* @param[in] _property The property string name.
|
* @param[in] _property The property string name.
|
||||||
* @return The value of the property (string).
|
* @return The value of the property (string).
|
||||||
*/
|
*/
|
||||||
etk::String get(const etk::String& _property) const;
|
std::string get(const std::string& _property) const;
|
||||||
/**
|
/**
|
||||||
* @brief Display all the property value with there name.
|
* @brief Display all the property value with there name.
|
||||||
* @param[in] _changeOnly check at true if the user want to display only property that are not at default value.
|
* @param[in] _changeOnly check at true if the user want to display only property that are not at default value.
|
||||||
@ -66,27 +61,27 @@ namespace eproperty {
|
|||||||
/**
|
/**
|
||||||
* @brief Get All the property configuration:
|
* @brief Get All the property configuration:
|
||||||
* @param[in] _notIfDefault if true the parameter value with default value are not extracted.
|
* @param[in] _notIfDefault if true the parameter value with default value are not extracted.
|
||||||
* @return map on the properties
|
* @return map on the propertys
|
||||||
*/
|
*/
|
||||||
etk::Map<etk::String, etk::String> getAll(bool _notIfDefault=true) const;
|
std::map<std::string, std::string> getAll(bool _notIfDefault=true) const;
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* @brief Get count of properties.
|
* @brief Get count of propertys.
|
||||||
* @return The number of the property.
|
* @return The number of the property.
|
||||||
*/
|
*/
|
||||||
size_t size() const;
|
size_t size() const;
|
||||||
/**
|
/**
|
||||||
* @brief Get name of a properties.
|
* @brief Get name of a propertys.
|
||||||
* @param[in] _id Id of the property.
|
* @param[in] _id Id of the property.
|
||||||
* @return pointer on the property.
|
* @return pointer on the property.
|
||||||
*/
|
*/
|
||||||
eproperty::Property* getRaw(const size_t& _id) const;
|
eproperty::Property* getRaw(const size_t& _id) const;
|
||||||
/**
|
/**
|
||||||
* @brief Get name of a properties.
|
* @brief Get name of a propertys.
|
||||||
* @param[in] _name name of the property.
|
* @param[in] _name name of the property.
|
||||||
* @return pointer on the property.
|
* @return pointer on the property.
|
||||||
*/
|
*/
|
||||||
eproperty::Property* getRaw(const etk::String _name) const;
|
eproperty::Property* getRaw(const std::string _name) const;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3,12 +3,13 @@
|
|||||||
*
|
*
|
||||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||||
*
|
*
|
||||||
* @license MPL v2.0 (see license file)
|
* @license APACHE v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <eproperty/PropertyType.hpp>
|
#include <eproperty/PropertyType.h>
|
||||||
#include <etk/Map.hpp>
|
#include <map>
|
||||||
|
#include <typeinfo>
|
||||||
|
|
||||||
namespace eproperty {
|
namespace eproperty {
|
||||||
/**
|
/**
|
||||||
@ -16,10 +17,10 @@ namespace eproperty {
|
|||||||
*/
|
*/
|
||||||
template<class TYPE> class List : public PropertyType<TYPE> {
|
template<class TYPE> class List : public PropertyType<TYPE> {
|
||||||
private:
|
private:
|
||||||
etk::Map<etk::String, TYPE> m_list; //!< pointer on the list of all elements.
|
std::map<std::string, TYPE> m_list; //!< pointer on the list of all elements.
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* @brief Create a parameter with List of element parameter (null if none).
|
* @brief Create a parameter with List of element parameter (nullptr if none).
|
||||||
* @param[in] _owner reference on the parameter lister.
|
* @param[in] _owner reference on the parameter lister.
|
||||||
* @param[in] _name Static name of the parameter.
|
* @param[in] _name Static name of the parameter.
|
||||||
* @param[in] _defaultValue Default value of the parameter.
|
* @param[in] _defaultValue Default value of the parameter.
|
||||||
@ -28,72 +29,44 @@ namespace eproperty {
|
|||||||
*/
|
*/
|
||||||
template<class CLASS_TYPE>
|
template<class CLASS_TYPE>
|
||||||
List(CLASS_TYPE* _owner,
|
List(CLASS_TYPE* _owner,
|
||||||
const etk::String& _name,
|
const std::string& _name,
|
||||||
const TYPE& _defaultValue,
|
const TYPE& _defaultValue,
|
||||||
const etk::String& _description="",
|
const std::string& _description="",
|
||||||
void (CLASS_TYPE::*_setObs)()=null) :
|
void (CLASS_TYPE::*_setObs)()=nullptr) :
|
||||||
eproperty::PropertyType<TYPE>(_owner, _name, _defaultValue, _description, _setObs) {
|
eproperty::PropertyType<TYPE>(_owner, _name, _defaultValue, _description, _setObs) {
|
||||||
|
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* @brief Create a parameter with List of element parameter (null if none).
|
* @brief Create a parameter with List of element parameter (nullptr if none).
|
||||||
* @param[in] _defaultValue Default value of the parameter.
|
* @param[in] _defaultValue Default value of the parameter.
|
||||||
*/
|
*/
|
||||||
List(const TYPE& _defaultValue) :
|
List(const TYPE& _defaultValue) :
|
||||||
eproperty::PropertyType<TYPE>(_defaultValue) {
|
eproperty::PropertyType<TYPE>(_defaultValue) {
|
||||||
|
|
||||||
};
|
};
|
||||||
/**
|
|
||||||
* @brief Remove copy contructor
|
|
||||||
*/
|
|
||||||
List(List& _obj) = delete;
|
|
||||||
/**
|
|
||||||
* @brief Enable move contructor
|
|
||||||
*/
|
|
||||||
List(List&& _obj) :
|
|
||||||
PropertyType<TYPE>::PropertyType(_obj.m_default) {
|
|
||||||
Property::internalSwap(&_obj);
|
|
||||||
etk::swap(PropertyType<TYPE>::m_default, _obj.m_default);
|
|
||||||
etk::swap(PropertyType<TYPE>::m_value, _obj.m_value);
|
|
||||||
etk::swap(m_list, _obj.m_list);
|
|
||||||
};
|
|
||||||
/**
|
/**
|
||||||
* @brief virtualisation of Destructor.
|
* @brief virtualisation of Destructor.
|
||||||
*/
|
*/
|
||||||
virtual ~List() = default;
|
virtual ~List() = default;
|
||||||
/**
|
|
||||||
* @brief Remove copy operator
|
|
||||||
*/
|
|
||||||
List& operator=(List& _obj) = delete;
|
|
||||||
/**
|
|
||||||
* @brief Enable move operator
|
|
||||||
*/
|
|
||||||
List& operator=(List&& _obj) {
|
|
||||||
Property::internalSwap(&_obj);
|
|
||||||
etk::swap(PropertyType<TYPE>::m_default, _obj.m_default);
|
|
||||||
etk::swap(PropertyType<TYPE>::m_value, _obj.m_value);
|
|
||||||
etk::swap(m_list, _obj.m_list);
|
|
||||||
return *this;
|
|
||||||
};
|
|
||||||
/**
|
/**
|
||||||
* @brief Add a value in the list of parameter
|
* @brief Add a value in the list of parameter
|
||||||
* @param[in] _value Value of the string
|
* @param[in] _value Value of the string
|
||||||
* @param[in] _name String of the value
|
* @param[in] _name String of the value
|
||||||
* @param[in] _description Description of the parameter value
|
* @param[in] _description Description of the parameter value
|
||||||
*/
|
*/
|
||||||
void add(const TYPE& _value, const etk::String& _name, const etk::String& _description = "") {
|
void add(const TYPE& _value, const std::string& _name, const std::string& _description = "") {
|
||||||
auto it = m_list.find(_name);
|
auto it = m_list.find(_name);
|
||||||
if (it != m_list.end()) {
|
if (it != m_list.end()) {
|
||||||
it->second = _value;
|
it->second = _value;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
m_list.add(_name, _value);
|
m_list.insert(std::make_pair(_name, _value));
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* @brief Remove a value of the element availlable
|
* @brief Remove a value of the element availlable
|
||||||
* @param[in] _name Name of the value to remove
|
* @param[in] _name Name of the value to remove
|
||||||
*/
|
*/
|
||||||
void remove(const etk::String& _name) {
|
void remove(const std::string& _name) {
|
||||||
auto it = m_list.find(_name);
|
auto it = m_list.find(_name);
|
||||||
bool firstValue = false;
|
bool firstValue = false;
|
||||||
bool firstDefault = false;
|
bool firstDefault = false;
|
||||||
@ -125,7 +98,7 @@ namespace eproperty {
|
|||||||
* @param[in] _nameOld Old property name to replace
|
* @param[in] _nameOld Old property name to replace
|
||||||
* @param[in] _nameNew New name of the property
|
* @param[in] _nameNew New name of the property
|
||||||
*/
|
*/
|
||||||
void rename(const etk::String& _nameOld, const etk::String& _nameNew) {
|
void rename(const std::string& _nameOld, const std::string& _nameNew) {
|
||||||
//get old value
|
//get old value
|
||||||
TYPE value;
|
TYPE value;
|
||||||
auto it = m_list.find(_nameOld);
|
auto it = m_list.find(_nameOld);
|
||||||
@ -138,10 +111,10 @@ namespace eproperty {
|
|||||||
remove(_nameOld);
|
remove(_nameOld);
|
||||||
add(value, _nameNew);
|
add(value, _nameNew);
|
||||||
}
|
}
|
||||||
etk::String getPropertyType() const override {
|
std::string getPropertyType() const override {
|
||||||
return "eproperty::List";
|
return "eproperty::List";
|
||||||
}
|
}
|
||||||
void setString(const etk::String& _newVal) override {
|
void setString(const std::string& _newVal) override {
|
||||||
auto it = m_list.find(_newVal);
|
auto it = m_list.find(_newVal);
|
||||||
if (it != m_list.end()) {
|
if (it != m_list.end()) {
|
||||||
if (it->second != eproperty::PropertyType<TYPE>::m_value) {
|
if (it->second != eproperty::PropertyType<TYPE>::m_value) {
|
||||||
@ -157,17 +130,17 @@ namespace eproperty {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
etk::String getInfo() const override {
|
std::string getInfo() const override {
|
||||||
etk::String list = "List default=" + getValueSpecific(eproperty::PropertyType<TYPE>::m_default) + " in : [";
|
std::string list = "List default=" + getValueSpecific(eproperty::PropertyType<TYPE>::m_default) + " in : [";
|
||||||
for (auto &it : m_list) {
|
for (auto &it : m_list) {
|
||||||
list += it.first + "/";
|
list += it.first + "/";
|
||||||
}
|
}
|
||||||
return list + "]";
|
return list + "]";
|
||||||
}
|
}
|
||||||
etk::Vector<etk::String> getListValue() const override {
|
std::vector<std::string> getListValue() const override {
|
||||||
etk::Vector<etk::String> out;
|
std::vector<std::string> out;
|
||||||
for (auto &it : m_list) {
|
for (auto &it : m_list) {
|
||||||
out.pushBack(it.first);
|
out.push_back(it.first);
|
||||||
}
|
}
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
@ -206,7 +179,7 @@ namespace eproperty {
|
|||||||
* @param[in] _intValue value that might be converted in string.
|
* @param[in] _intValue value that might be converted in string.
|
||||||
* @return the description string coresponding to this ID.
|
* @return the description string coresponding to this ID.
|
||||||
*/
|
*/
|
||||||
etk::String getValueSpecific(const TYPE& _valueRequested) const override {
|
std::string getValueSpecific(const TYPE& _valueRequested) const override {
|
||||||
for (auto &it : m_list) {
|
for (auto &it : m_list) {
|
||||||
if (it.second == _valueRequested) {
|
if (it.second == _valueRequested) {
|
||||||
return it.first;
|
return it.first;
|
||||||
@ -216,7 +189,7 @@ namespace eproperty {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
//! @not_in_doc
|
//! @not_in_doc
|
||||||
template<typename TYPE> etk::Stream& operator <<(etk::Stream& _os, const eproperty::List<TYPE>& _obj) {
|
template<typename TYPE> std::ostream& operator <<(std::ostream& _os, const eproperty::List<TYPE>& _obj) {
|
||||||
_os << _obj.get();
|
_os << _obj.get();
|
||||||
return _os;
|
return _os;
|
||||||
}
|
}
|
||||||
@ -3,90 +3,41 @@
|
|||||||
*
|
*
|
||||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||||
*
|
*
|
||||||
* @license MPL v2.0 (see license file)
|
* @license APACHE v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <eproperty/debug.hpp>
|
#include <eproperty/debug.h>
|
||||||
#include <eproperty/Interface.hpp>
|
#include <eproperty/Interface.h>
|
||||||
#include <eproperty/Property.hpp>
|
#include <eproperty/Property.h>
|
||||||
|
|
||||||
|
|
||||||
void eproperty::Property::linkInterface() {
|
eproperty::Property::Property(eproperty::Interface* _paramInterfaceLink, const std::string& _name) :
|
||||||
|
m_interfaceLink(_paramInterfaceLink),
|
||||||
|
m_setObserver(),
|
||||||
|
m_name(_name) {
|
||||||
// add a reference on the current Property ...
|
// add a reference on the current Property ...
|
||||||
if (m_interfaceLink != null) {
|
if (m_interfaceLink != nullptr) {
|
||||||
m_interfaceLink->properties.add(this);
|
m_interfaceLink->properties.add(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void eproperty::Property::unLinkInterface() {
|
eproperty::Property::Property() :
|
||||||
if (m_interfaceLink != null) {
|
m_interfaceLink(nullptr),
|
||||||
m_interfaceLink->properties.remove(this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
eproperty::Property::Property(eproperty::Interface* _paramInterfaceLink, const etk::String& _name) :
|
|
||||||
m_interfaceLink(_paramInterfaceLink),
|
|
||||||
m_setObserver(),
|
m_setObserver(),
|
||||||
m_name(_name) {
|
m_name("") {
|
||||||
linkInterface();
|
|
||||||
}
|
|
||||||
|
|
||||||
void eproperty::Property::internalSwap(Property* _obj) {
|
|
||||||
// unplug main class
|
|
||||||
_obj->unLinkInterface();
|
|
||||||
unLinkInterface();
|
|
||||||
// change data
|
|
||||||
etk::swap(m_interfaceLink, _obj->m_interfaceLink);
|
|
||||||
etk::swap(m_setObserver, _obj->m_setObserver);
|
|
||||||
etk::swap(m_name, _obj->m_name);
|
|
||||||
// replug main class
|
|
||||||
linkInterface();
|
|
||||||
_obj->linkInterface();
|
|
||||||
}
|
|
||||||
|
|
||||||
eproperty::Property::Property() {
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
eproperty::Property::Property(Property&& _obj) {
|
|
||||||
// unplug main class
|
|
||||||
_obj.unLinkInterface();
|
|
||||||
// change data
|
|
||||||
etk::swap(m_interfaceLink, _obj.m_interfaceLink);
|
|
||||||
etk::swap(m_setObserver, _obj.m_setObserver);
|
|
||||||
etk::swap(m_name, _obj.m_name);
|
|
||||||
// replug main class
|
|
||||||
linkInterface();
|
|
||||||
}
|
|
||||||
|
|
||||||
eproperty::Property::~Property(){
|
|
||||||
unLinkInterface();
|
|
||||||
}
|
|
||||||
|
|
||||||
eproperty::Property& eproperty::Property::operator=(Property&& _obj) {
|
|
||||||
// unplug main class
|
|
||||||
_obj.unLinkInterface();
|
|
||||||
unLinkInterface();
|
|
||||||
// change data
|
|
||||||
etk::swap(m_interfaceLink, _obj.m_interfaceLink);
|
|
||||||
etk::swap(m_setObserver, _obj.m_setObserver);
|
|
||||||
etk::swap(m_name, _obj.m_name);
|
|
||||||
// replug main class
|
|
||||||
_obj.linkInterface();
|
|
||||||
linkInterface();
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
void eproperty::Property::setObserver(eproperty::Property::Observer _setObs) {
|
void eproperty::Property::setObserver(eproperty::Property::Observer _setObs) {
|
||||||
m_setObserver = _setObs;
|
m_setObserver = _setObs;
|
||||||
}
|
}
|
||||||
|
|
||||||
etk::String eproperty::Property::getName() const {
|
std::string eproperty::Property::getName() const {
|
||||||
return m_name;
|
return m_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
void eproperty::Property::notifyChange() const {
|
void eproperty::Property::notifyChange() const {
|
||||||
if (m_setObserver != null) {
|
if (m_setObserver != nullptr) {
|
||||||
m_setObserver();
|
m_setObserver();
|
||||||
}
|
}
|
||||||
//m_interfaceLink.onPropertyChangeValue();
|
//m_interfaceLink.onPropertyChangeValue();
|
||||||
|
|||||||
@ -3,14 +3,14 @@
|
|||||||
*
|
*
|
||||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||||
*
|
*
|
||||||
* @license MPL v2.0 (see license file)
|
* @license APACHE v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <eproperty/Interface.hpp>
|
#include <eproperty/Interface.h>
|
||||||
#include <etk/String.hpp>
|
#include <string>
|
||||||
#include <etk/typeTrait.hpp>
|
#include <typeinfo>
|
||||||
#include <etk/Function.hpp>
|
#include <functional>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief eproperty global interface for all property implementation
|
* @brief eproperty global interface for all property implementation
|
||||||
@ -19,66 +19,36 @@ namespace eproperty {
|
|||||||
class Ref;
|
class Ref;
|
||||||
/**
|
/**
|
||||||
* @brief Base of the property With all generic element needed
|
* @brief Base of the property With all generic element needed
|
||||||
* @note A property is movable but not comiable ==> the atachement of an interface is a critical thngs
|
|
||||||
*/
|
*/
|
||||||
class Property {
|
class Property {
|
||||||
public:
|
public:
|
||||||
using Observer = etk::Function<void()>; //!< Local main object observer of changing value of the property
|
using Observer = std::function<void()>; //!< Local main object observer of changing value of the property
|
||||||
protected:
|
private:
|
||||||
eproperty::Interface* m_interfaceLink = null; //!< Base interface class to group all the property
|
eproperty::Interface* m_interfaceLink; //!< Base interface class to group all the property
|
||||||
Observer m_setObserver; //!< Observer of the changing value
|
Observer m_setObserver; //!< Observer of the changing value
|
||||||
etk::String m_name; //!< Name of the property
|
std::string m_name; //!< Name of the property
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* @brief Basic property elements
|
* @brief Basic property elements
|
||||||
* @param[in] _paramInterfaceLink Link on the esignal::Interface class to register parameter (can be null)
|
* @param[in] _paramInterfaceLink Link on the esignal::Interface class to register parameter (can be nullptr)
|
||||||
* @param[in] _name Name of the parameter (must be unique if _paramInterfaceLink is define)
|
* @param[in] _name Name of the parameter (must be unique if _paramInterfaceLink is define)
|
||||||
*/
|
*/
|
||||||
Property(eproperty::Interface* _paramInterfaceLink, const etk::String& _name);
|
Property(eproperty::Interface* _paramInterfaceLink, const std::string& _name);
|
||||||
/**
|
/**
|
||||||
* @brief Basic property elements
|
* @brief Basic property elements
|
||||||
*/
|
*/
|
||||||
Property();
|
Property();
|
||||||
/**
|
|
||||||
* @brief Remove copy contructor
|
|
||||||
*/
|
|
||||||
Property(const Property& _obj) = delete;
|
|
||||||
/**
|
|
||||||
* @brief Enable move contructor
|
|
||||||
*/
|
|
||||||
Property(Property&& _obj);
|
|
||||||
/**
|
/**
|
||||||
* @brief Virtualize the destructor
|
* @brief Virtualize the destructor
|
||||||
* @internal
|
* @internal
|
||||||
*/
|
*/
|
||||||
virtual ~Property();
|
virtual ~Property() = default;
|
||||||
/**
|
|
||||||
* @brief Remove copy operator
|
|
||||||
*/
|
|
||||||
Property& operator=(const Property& _obj) = delete;
|
|
||||||
/**
|
|
||||||
* @brief Enable move operator
|
|
||||||
*/
|
|
||||||
Property& operator=(Property&& _obj);
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* @brief Set the change observer of the property
|
* @brief Set the change observer of the property
|
||||||
* @param[in] _setObs New observer of the property
|
* @param[in] _setObs New observer of the property
|
||||||
*/
|
*/
|
||||||
void setObserver(eproperty::Property::Observer _setObs);
|
void setObserver(eproperty::Property::Observer _setObs);
|
||||||
/**
|
|
||||||
* @brief Link with the interface reference.
|
|
||||||
*/
|
|
||||||
void linkInterface();
|
|
||||||
/**
|
|
||||||
* @brief Un-link with the interface reference.
|
|
||||||
*/
|
|
||||||
void unLinkInterface();
|
|
||||||
/**
|
|
||||||
* @brief swap local data class.
|
|
||||||
* @note Must be Nullptr.
|
|
||||||
*/
|
|
||||||
void internalSwap(Property* _obj);
|
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* @brief call main class that PropertyChange
|
* @brief call main class that PropertyChange
|
||||||
@ -88,37 +58,37 @@ namespace eproperty {
|
|||||||
* @brief Get the name of the Property.
|
* @brief Get the name of the Property.
|
||||||
* @return The name of the Property
|
* @return The name of the Property
|
||||||
*/
|
*/
|
||||||
virtual etk::String getName() const;
|
virtual std::string getName() const;
|
||||||
/**
|
/**
|
||||||
* @brief Description of the Propertys.
|
* @brief Description of the Propertys.
|
||||||
* @return Descriptive information of the Property (for remote UI).
|
* @return Descriptive information of the Property (for remote UI).
|
||||||
*/
|
*/
|
||||||
virtual etk::String getInfo() const = 0;
|
virtual std::string getInfo() const = 0;
|
||||||
/**
|
/**
|
||||||
* @brief Get the Property type of the class in string mode.
|
* @brief Get the Property type of the class in string mode.
|
||||||
* @return The string type of the Property.
|
* @return The string type of the Property.
|
||||||
*/
|
*/
|
||||||
virtual etk::String getPropertyType() const = 0;
|
virtual std::string getPropertyType() const = 0;
|
||||||
/**
|
/**
|
||||||
* @brief Get the type of the Property in string mode.
|
* @brief Get the type of the Property in string mode.
|
||||||
* @return The string type of the Property.
|
* @return The string type of the Property.
|
||||||
*/
|
*/
|
||||||
virtual etk::String getType() const = 0;
|
virtual std::string getType() const = 0;
|
||||||
/**
|
/**
|
||||||
* @brief Get the string of the current value of the Property.
|
* @brief Get the string of the current value of the Property.
|
||||||
* @return The string description of the value.
|
* @return The string description of the value.
|
||||||
*/
|
*/
|
||||||
virtual etk::String getString() const = 0;
|
virtual std::string getString() const = 0;
|
||||||
/**
|
/**
|
||||||
* @brief Get the string of the default value of the Property.
|
* @brief Get the string of the default value of the Property.
|
||||||
* @return the string decription of the default value.
|
* @return the string decription of the default value.
|
||||||
*/
|
*/
|
||||||
virtual etk::String getDefault() const = 0;
|
virtual std::string getDefault() const = 0;
|
||||||
/**
|
/**
|
||||||
* @brief Set a new value of the Property (with string interface).
|
* @brief Set a new value of the Property (with string interface).
|
||||||
* @param[in] _newVal New value of the Propertys.
|
* @param[in] _newVal New value of the Propertys.
|
||||||
*/
|
*/
|
||||||
virtual void setString(const etk::String& _newVal) = 0;
|
virtual void setString(const std::string& _newVal) = 0;
|
||||||
/**
|
/**
|
||||||
* @brief Check if the value is the default
|
* @brief Check if the value is the default
|
||||||
* @return true : the vakue is the default one, false otherwise.
|
* @return true : the vakue is the default one, false otherwise.
|
||||||
@ -132,8 +102,8 @@ namespace eproperty {
|
|||||||
* @brief Specific for eproperty::List to get all the possible values
|
* @brief Specific for eproperty::List to get all the possible values
|
||||||
* @return Descriptive information of the Property (for remote UI).
|
* @return Descriptive information of the Property (for remote UI).
|
||||||
*/
|
*/
|
||||||
virtual etk::Vector<etk::String> getListValue() const {
|
virtual std::vector<std::string> getListValue() const {
|
||||||
return etk::Vector<etk::String>();
|
return std::vector<std::string>();
|
||||||
}
|
}
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
@ -3,14 +3,13 @@
|
|||||||
*
|
*
|
||||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||||
*
|
*
|
||||||
* @license MPL v2.0 (see license file)
|
* @license APACHE v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <eproperty/Interface.hpp>
|
#include <eproperty/Interface.h>
|
||||||
#include <eproperty/Property.hpp>
|
#include <eproperty/Property.h>
|
||||||
#include <eproperty/debug.hpp>
|
#include <eproperty/debug.h>
|
||||||
#include <etk/typeInfo.hpp>
|
|
||||||
|
|
||||||
namespace eproperty {
|
namespace eproperty {
|
||||||
/**
|
/**
|
||||||
@ -23,7 +22,7 @@ namespace eproperty {
|
|||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* @brief Create a parameter with a specific type.
|
* @brief Create a parameter with a specific type.
|
||||||
* @param[in] _owner Owner of the parameter (null if none).
|
* @param[in] _owner Owner of the parameter (nullptr if none).
|
||||||
* @param[in] _name Static name of the parameter.
|
* @param[in] _name Static name of the parameter.
|
||||||
* @param[in] _defaultValue Default value of the parameter.
|
* @param[in] _defaultValue Default value of the parameter.
|
||||||
* @param[in] _description description of the parameter.
|
* @param[in] _description description of the parameter.
|
||||||
@ -31,14 +30,14 @@ namespace eproperty {
|
|||||||
*/
|
*/
|
||||||
template<class CLASS_TYPE>
|
template<class CLASS_TYPE>
|
||||||
PropertyType(CLASS_TYPE* _owner,
|
PropertyType(CLASS_TYPE* _owner,
|
||||||
const etk::String& _name,
|
const std::string& _name,
|
||||||
const TYPE& _defaultValue,
|
const TYPE& _defaultValue,
|
||||||
const etk::String& _description = "",
|
const std::string& _description = "",
|
||||||
void (CLASS_TYPE::*_setObs)()=null) :
|
void (CLASS_TYPE::*_setObs)()=nullptr) :
|
||||||
Property(_owner, _name),
|
Property(_owner, _name),
|
||||||
m_value(_defaultValue),
|
m_value(_defaultValue),
|
||||||
m_default(_defaultValue) {
|
m_default(_defaultValue) {
|
||||||
if (_setObs != null) {
|
if (_setObs != nullptr) {
|
||||||
setObserver([=](){(*_owner.*_setObs)();});
|
setObserver([=](){(*_owner.*_setObs)();});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -51,49 +50,23 @@ namespace eproperty {
|
|||||||
m_default(_defaultValue) {
|
m_default(_defaultValue) {
|
||||||
|
|
||||||
}
|
}
|
||||||
/**
|
|
||||||
* @brief Remove copy contructor
|
|
||||||
*/
|
|
||||||
PropertyType(PropertyType& _obj) = delete;
|
|
||||||
/**
|
|
||||||
* @brief Enable move contructor
|
|
||||||
*/
|
|
||||||
PropertyType(PropertyType&& _obj) {
|
|
||||||
Property::internalSwap(&_obj);
|
|
||||||
etk::swap(m_default, _obj.m_default);
|
|
||||||
etk::swap(m_value, _obj.m_value);
|
|
||||||
}
|
|
||||||
/**
|
/**
|
||||||
* @brief Destructor.
|
* @brief Destructor.
|
||||||
*/
|
*/
|
||||||
virtual ~PropertyType() = default;
|
virtual ~PropertyType() = default;
|
||||||
/**
|
std::string getPropertyType() const override {
|
||||||
* @brief Remove copy operator
|
|
||||||
*/
|
|
||||||
PropertyType& operator=(PropertyType& _obj) = delete;
|
|
||||||
/**
|
|
||||||
* @brief Enable move operator
|
|
||||||
*/
|
|
||||||
PropertyType& operator=(PropertyType&& _obj) {
|
|
||||||
Property::internalSwap(&_obj);
|
|
||||||
etk::swap(m_default, _obj.m_default);
|
|
||||||
etk::swap(m_value, _obj.m_value);
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
etk::String getPropertyType() const override {
|
|
||||||
return "eproperty::Value";
|
return "eproperty::Value";
|
||||||
}
|
}
|
||||||
etk::String getType() const override {
|
std::string getType() const override {
|
||||||
//return typeid(TYPE).name(); // With generic STL & RTTI ...
|
return typeid(TYPE).name();
|
||||||
return ETK_GET_TYPE_NAME(TYPE);
|
|
||||||
}
|
}
|
||||||
etk::String getString() const override {
|
std::string getString() const override {
|
||||||
return getValueSpecific(m_value);
|
return getValueSpecific(m_value);
|
||||||
}
|
}
|
||||||
etk::String getDefault() const override {
|
std::string getDefault() const override {
|
||||||
return getValueSpecific(m_default);
|
return getValueSpecific(m_default);
|
||||||
}
|
}
|
||||||
etk::String getInfo() const override {
|
std::string getInfo() const override {
|
||||||
return getType() + " default=" + getDefault();
|
return getType() + " default=" + getDefault();
|
||||||
}
|
}
|
||||||
bool isDefault() const override {
|
bool isDefault() const override {
|
||||||
@ -161,7 +134,7 @@ namespace eproperty {
|
|||||||
* @param[in] _valueRequested Value to convert in string
|
* @param[in] _valueRequested Value to convert in string
|
||||||
* @return convertion of the value in string.
|
* @return convertion of the value in string.
|
||||||
*/
|
*/
|
||||||
virtual etk::String getValueSpecific(const TYPE& _valueRequested) const = 0;
|
virtual std::string getValueSpecific(const TYPE& _valueRequested) const = 0;
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* @brief Const cast the property in the Type of the data
|
* @brief Const cast the property in the Type of the data
|
||||||
@ -192,7 +165,7 @@ namespace eproperty {
|
|||||||
PropertyType<TYPE>& operator= (const TYPE& _newVal) = delete;
|
PropertyType<TYPE>& operator= (const TYPE& _newVal) = delete;
|
||||||
};
|
};
|
||||||
//! @not_in_doc
|
//! @not_in_doc
|
||||||
template<typename TYPE> etk::Stream& operator <<(etk::Stream& _os, const eproperty::PropertyType<TYPE>& _obj) {
|
template<typename TYPE> std::ostream& operator <<(std::ostream& _os, const eproperty::PropertyType<TYPE>& _obj) {
|
||||||
_os << _obj.get();
|
_os << _obj.get();
|
||||||
return _os;
|
return _os;
|
||||||
}
|
}
|
||||||
@ -3,12 +3,13 @@
|
|||||||
*
|
*
|
||||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||||
*
|
*
|
||||||
* @license MPL v2.0 (see license file)
|
* @license APACHE v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <eproperty/Interface.hpp>
|
#include <eproperty/Interface.h>
|
||||||
#include <eproperty/Value.hpp>
|
#include <eproperty/Value.h>
|
||||||
|
#include <typeinfo>
|
||||||
|
|
||||||
namespace eproperty {
|
namespace eproperty {
|
||||||
/**
|
/**
|
||||||
@ -22,7 +23,7 @@ namespace eproperty {
|
|||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* @brief Create a parameter with a specific type.
|
* @brief Create a parameter with a specific type.
|
||||||
* @param[in] _owner reference on the parameter lister (null if none).
|
* @param[in] _owner reference on the parameter lister (nullptr if none).
|
||||||
* @param[in] _name Static name of the parameter.
|
* @param[in] _name Static name of the parameter.
|
||||||
* @param[in] _defaultValue Default value of the parameter.
|
* @param[in] _defaultValue Default value of the parameter.
|
||||||
* @param[in] _min Minumum value.
|
* @param[in] _min Minumum value.
|
||||||
@ -32,12 +33,12 @@ namespace eproperty {
|
|||||||
*/
|
*/
|
||||||
template<class CLASS_TYPE>
|
template<class CLASS_TYPE>
|
||||||
Range(CLASS_TYPE* _owner,
|
Range(CLASS_TYPE* _owner,
|
||||||
const etk::String& _name,
|
const std::string& _name,
|
||||||
const TYPE& _defaultValue,
|
const TYPE& _defaultValue,
|
||||||
const TYPE& _min,
|
const TYPE& _min,
|
||||||
const TYPE& _max,
|
const TYPE& _max,
|
||||||
const etk::String& _description = "",
|
const std::string& _description = "",
|
||||||
void (CLASS_TYPE::*_setObs)()=null) :
|
void (CLASS_TYPE::*_setObs)()=nullptr) :
|
||||||
eproperty::Value<TYPE>(_owner, _name, _defaultValue, _description, _setObs),
|
eproperty::Value<TYPE>(_owner, _name, _defaultValue, _description, _setObs),
|
||||||
m_min(_min),
|
m_min(_min),
|
||||||
m_max(_max) {
|
m_max(_max) {
|
||||||
@ -54,49 +55,19 @@ namespace eproperty {
|
|||||||
Range(const TYPE& _defaultValue,
|
Range(const TYPE& _defaultValue,
|
||||||
const TYPE& _min,
|
const TYPE& _min,
|
||||||
const TYPE& _max);
|
const TYPE& _max);
|
||||||
/**
|
|
||||||
* @brief Remove copy contructor
|
|
||||||
*/
|
|
||||||
Range(Range& _obj) = delete;
|
|
||||||
/**
|
|
||||||
* @brief Enable move contructor
|
|
||||||
*/
|
|
||||||
Range(Range&& _obj) :
|
|
||||||
Value<TYPE>::Value(_obj.m_default) {
|
|
||||||
Property::internalSwap(&_obj);
|
|
||||||
etk::swap(PropertyType<TYPE>::m_default, _obj.m_default);
|
|
||||||
etk::swap(PropertyType<TYPE>::m_value, _obj.m_value);
|
|
||||||
etk::swap(m_min, _obj.m_min);
|
|
||||||
etk::swap(m_max, _obj.m_max);
|
|
||||||
};
|
|
||||||
/**
|
/**
|
||||||
* @brief Destructor.
|
* @brief Destructor.
|
||||||
*/
|
*/
|
||||||
virtual ~Range() = default;
|
virtual ~Range() = default;
|
||||||
/**
|
std::string getPropertyType() const override;
|
||||||
* @brief Remove copy operator
|
void setString(const std::string& _newVal) override;
|
||||||
*/
|
std::string getInfo() const override;
|
||||||
Range& operator=(Range& _obj) = delete;
|
|
||||||
/**
|
|
||||||
* @brief Enable move operator
|
|
||||||
*/
|
|
||||||
Range& operator=(Range&& _obj) {
|
|
||||||
Property::internalSwap(&_obj);
|
|
||||||
etk::swap(PropertyType<TYPE>::m_default, _obj.m_default);
|
|
||||||
etk::swap(PropertyType<TYPE>::m_value, _obj.m_value);
|
|
||||||
etk::swap(m_min, _obj.m_min);
|
|
||||||
etk::swap(m_max, _obj.m_max);
|
|
||||||
return *this;
|
|
||||||
};
|
|
||||||
etk::String getPropertyType() const override;
|
|
||||||
void setString(const etk::String& _newVal) override;
|
|
||||||
etk::String getInfo() const override;
|
|
||||||
public:
|
public:
|
||||||
void set(const TYPE& _newVal) override;
|
void set(const TYPE& _newVal) override;
|
||||||
void setDirectCheck(const TYPE& _newVal) override;
|
void setDirectCheck(const TYPE& _newVal) override;
|
||||||
};
|
};
|
||||||
//! @not_in_doc
|
//! @not_in_doc
|
||||||
template<typename TYPE> etk::Stream& operator <<(etk::Stream& _os, const eproperty::Range<TYPE>& _obj) {
|
template<typename TYPE> std::ostream& operator <<(std::ostream& _os, const eproperty::Range<TYPE>& _obj) {
|
||||||
_os << _obj.get();
|
_os << _obj.get();
|
||||||
return _os;
|
return _os;
|
||||||
}
|
}
|
||||||
54
eproperty/Value.h
Normal file
54
eproperty/Value.h
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
/** @file
|
||||||
|
* @author Edouard DUPIN
|
||||||
|
*
|
||||||
|
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||||
|
*
|
||||||
|
* @license APACHE v2.0 (see license file)
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <eproperty/PropertyType.h>
|
||||||
|
#include <etk/types.h>
|
||||||
|
#include <etk/math/Vector2D.h>
|
||||||
|
#include <etk/math/Vector3D.h>
|
||||||
|
#include <etk/Color.h>
|
||||||
|
|
||||||
|
namespace eproperty {
|
||||||
|
/**
|
||||||
|
* @brief Simple Value of the property (need to implement fuction etk::from_string<TYPE> to use it)
|
||||||
|
*/
|
||||||
|
template<class TYPE> class Value : public PropertyType<TYPE> {
|
||||||
|
public:
|
||||||
|
/**
|
||||||
|
* @brief Create a parameter with a specific type.
|
||||||
|
* @param[in] _owner Owner of the parameter (nullptr if none).
|
||||||
|
* @param[in] _name Static name of the parameter.
|
||||||
|
* @param[in] _defaultValue Default value of the parameter.
|
||||||
|
* @param[in] _description description of the parameter.
|
||||||
|
* @param[in] _setObs function of the class that opserve the change of the value
|
||||||
|
*/
|
||||||
|
template<class CLASS_TYPE>
|
||||||
|
Value(CLASS_TYPE* _owner,
|
||||||
|
const std::string& _name,
|
||||||
|
const TYPE& _defaultValue,
|
||||||
|
const std::string& _description = "",
|
||||||
|
void (CLASS_TYPE::*_setObs)()=nullptr) :
|
||||||
|
eproperty::PropertyType<TYPE>(_owner, _name, _defaultValue, _description, _setObs) {
|
||||||
|
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* @brief Create a parameter with a specific type.
|
||||||
|
* @param[in] _defaultValue Default value of the parameter.
|
||||||
|
*/
|
||||||
|
Value(const TYPE& _defaultValue);
|
||||||
|
public:
|
||||||
|
std::string getValueSpecific(const TYPE& _valueRequested) const override;
|
||||||
|
void setString(const std::string& _newVal) override;
|
||||||
|
};
|
||||||
|
//! @not_in_doc
|
||||||
|
template<typename TYPE> std::ostream& operator <<(std::ostream& _os, const eproperty::Value<TYPE>& _obj) {
|
||||||
|
_os << _obj.get();
|
||||||
|
return _os;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@ -1,84 +0,0 @@
|
|||||||
/** @file
|
|
||||||
* @author Edouard DUPIN
|
|
||||||
*
|
|
||||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
|
||||||
*
|
|
||||||
* @license MPL v2.0 (see license file)
|
|
||||||
*/
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <eproperty/PropertyType.hpp>
|
|
||||||
#include <etk/types.hpp>
|
|
||||||
#include <etk/math/Vector2D.hpp>
|
|
||||||
#include <etk/math/Vector3D.hpp>
|
|
||||||
#include <etk/Color.hpp>
|
|
||||||
|
|
||||||
namespace eproperty {
|
|
||||||
/**
|
|
||||||
* @brief Simple Value of the property (need to implement fuction etk::from_string<TYPE> to use it)
|
|
||||||
*/
|
|
||||||
template<class TYPE> class Value : public PropertyType<TYPE> {
|
|
||||||
public:
|
|
||||||
/**
|
|
||||||
* @brief Create a parameter with a specific type.
|
|
||||||
* @param[in] _owner Owner of the parameter (null if none).
|
|
||||||
* @param[in] _name Static name of the parameter.
|
|
||||||
* @param[in] _defaultValue Default value of the parameter.
|
|
||||||
* @param[in] _description description of the parameter.
|
|
||||||
* @param[in] _setObs function of the class that opserve the change of the value
|
|
||||||
*/
|
|
||||||
template<class CLASS_TYPE>
|
|
||||||
Value(CLASS_TYPE* _owner,
|
|
||||||
const etk::String& _name,
|
|
||||||
const TYPE& _defaultValue,
|
|
||||||
const etk::String& _description = "",
|
|
||||||
void (CLASS_TYPE::*_setObs)()=null) :
|
|
||||||
eproperty::PropertyType<TYPE>(_owner, _name, _defaultValue, _description, _setObs) {
|
|
||||||
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* @brief Create a parameter with a specific type.
|
|
||||||
* @param[in] _defaultValue Default value of the parameter.
|
|
||||||
*/
|
|
||||||
Value(const TYPE& _defaultValue);
|
|
||||||
/**
|
|
||||||
* @brief Remove copy contructor
|
|
||||||
*/
|
|
||||||
Value(Value& _obj) = delete;
|
|
||||||
/**
|
|
||||||
* @brief Enable move contructor
|
|
||||||
*/
|
|
||||||
Value(Value&& _obj) :
|
|
||||||
PropertyType<TYPE>::PropertyType(_obj.m_default) {
|
|
||||||
Property::internalSwap(&_obj);
|
|
||||||
etk::swap(PropertyType<TYPE>::m_default, _obj.m_default);
|
|
||||||
etk::swap(PropertyType<TYPE>::m_value, _obj.m_value);
|
|
||||||
};
|
|
||||||
/**
|
|
||||||
* @brief default destructor
|
|
||||||
*/
|
|
||||||
virtual ~Value() = default;
|
|
||||||
/**
|
|
||||||
* @brief Remove copy operator
|
|
||||||
*/
|
|
||||||
Value& operator=(Value& _obj) = delete;
|
|
||||||
/**
|
|
||||||
* @brief Enable move operator
|
|
||||||
*/
|
|
||||||
Value& operator=(Value&& _obj) {
|
|
||||||
Property::internalSwap(&_obj);
|
|
||||||
etk::swap(PropertyType<TYPE>::m_default, _obj.m_default);
|
|
||||||
etk::swap(PropertyType<TYPE>::m_value, _obj.m_value);
|
|
||||||
return *this;
|
|
||||||
};
|
|
||||||
public:
|
|
||||||
etk::String getValueSpecific(const TYPE& _valueRequested) const override;
|
|
||||||
void setString(const etk::String& _newVal) override;
|
|
||||||
};
|
|
||||||
//! @not_in_doc
|
|
||||||
template<typename TYPE> etk::Stream& operator <<(etk::Stream& _os, const eproperty::Value<TYPE>& _obj) {
|
|
||||||
_os << _obj.get();
|
|
||||||
return _os;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -3,10 +3,10 @@
|
|||||||
*
|
*
|
||||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||||
*
|
*
|
||||||
* @license MPL v2.0 (see license file)
|
* @license APACHE v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <eproperty/debug.hpp>
|
#include <eproperty/debug.h>
|
||||||
|
|
||||||
int32_t eproperty::getLogId() {
|
int32_t eproperty::getLogId() {
|
||||||
static int32_t g_val = elog::registerInstance("eproperty");
|
static int32_t g_val = elog::registerInstance("eproperty");
|
||||||
|
|||||||
@ -3,11 +3,11 @@
|
|||||||
*
|
*
|
||||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||||
*
|
*
|
||||||
* @license MPL v2.0 (see license file)
|
* @license APACHE v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <elog/log.hpp>
|
#include <elog/log.h>
|
||||||
|
|
||||||
namespace eproperty {
|
namespace eproperty {
|
||||||
int32_t getLogId();
|
int32_t getLogId();
|
||||||
@ -3,13 +3,13 @@
|
|||||||
*
|
*
|
||||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||||
*
|
*
|
||||||
* @license MPL v2.0 (see license file)
|
* @license APACHE v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
#include <eproperty/details/Range.hxx>
|
#include <eproperty/details/Range.hxx>
|
||||||
#include <etk/types.hpp>
|
#include <etk/types.h>
|
||||||
#include <etk/math/Vector2D.hpp>
|
#include <etk/math/Vector2D.h>
|
||||||
#include <etk/math/Vector3D.hpp>
|
#include <etk/math/Vector3D.h>
|
||||||
#include <etk/Color.hpp>
|
#include <etk/Color.h>
|
||||||
|
|
||||||
// void generic properties
|
// void generic properties
|
||||||
template class eproperty::Range<int64_t>;
|
template class eproperty::Range<int64_t>;
|
||||||
|
|||||||
@ -3,11 +3,11 @@
|
|||||||
*
|
*
|
||||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||||
*
|
*
|
||||||
* @license MPL v2.0 (see license file)
|
* @license APACHE v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <eproperty/Range.hpp>
|
#include <eproperty/Range.h>
|
||||||
|
|
||||||
|
|
||||||
template<class TYPE>
|
template<class TYPE>
|
||||||
@ -23,20 +23,20 @@ eproperty::Range<TYPE>::Range(const TYPE& _defaultValue,
|
|||||||
}
|
}
|
||||||
|
|
||||||
template<class TYPE>
|
template<class TYPE>
|
||||||
etk::String eproperty::Range<TYPE>::getPropertyType() const {
|
std::string eproperty::Range<TYPE>::getPropertyType() const {
|
||||||
return "eproperty::Range";
|
return "eproperty::Range";
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class TYPE>
|
template<class TYPE>
|
||||||
void eproperty::Range<TYPE>::setString(const etk::String& _newVal) {
|
void eproperty::Range<TYPE>::setString(const std::string& _newVal) {
|
||||||
TYPE val;
|
TYPE val;
|
||||||
// when you want to set an element in parameter you will implement the function template etk::from_string
|
// when you want to set an element in parameter you will implement the function template std::from_string
|
||||||
etk::from_string(val, _newVal);
|
etk::from_string(val, _newVal);
|
||||||
set(val);
|
set(val);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class TYPE>
|
template<class TYPE>
|
||||||
etk::String eproperty::Range<TYPE>::getInfo() const {
|
std::string eproperty::Range<TYPE>::getInfo() const {
|
||||||
return eproperty::Value<TYPE>::getType() + " default=" + eproperty::Value<TYPE>::getDefault();
|
return eproperty::Value<TYPE>::getType() + " default=" + eproperty::Value<TYPE>::getDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -48,7 +48,7 @@ void eproperty::Range<TYPE>::set(const TYPE& _newVal) {
|
|||||||
eproperty::Value<TYPE>::notifyChange();
|
eproperty::Value<TYPE>::notifyChange();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
TYPE newVal = etk::avg(m_min, _newVal, m_max);
|
TYPE newVal = std::avg(m_min, _newVal, m_max);
|
||||||
if (newVal != eproperty::Value<TYPE>::m_value) {
|
if (newVal != eproperty::Value<TYPE>::m_value) {
|
||||||
eproperty::Value<TYPE>::m_value = newVal;
|
eproperty::Value<TYPE>::m_value = newVal;
|
||||||
eproperty::Value<TYPE>::notifyChange();
|
eproperty::Value<TYPE>::notifyChange();
|
||||||
@ -63,7 +63,7 @@ void eproperty::Range<TYPE>::setDirectCheck(const TYPE& _newVal) {
|
|||||||
eproperty::Value<TYPE>::m_value = _newVal;
|
eproperty::Value<TYPE>::m_value = _newVal;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
TYPE newVal = etk::avg(m_min, _newVal, m_max);
|
TYPE newVal = std::avg(m_min, _newVal, m_max);
|
||||||
if (newVal != eproperty::Value<TYPE>::m_value) {
|
if (newVal != eproperty::Value<TYPE>::m_value) {
|
||||||
eproperty::Value<TYPE>::m_value = newVal;
|
eproperty::Value<TYPE>::m_value = newVal;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,22 +3,20 @@
|
|||||||
*
|
*
|
||||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||||
*
|
*
|
||||||
* @license MPL v2.0 (see license file)
|
* @license APACHE v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
#include <eproperty/details/Value.hxx>
|
#include <eproperty/details/Value.hxx>
|
||||||
|
|
||||||
#include <etk/types.hpp>
|
#include <etk/types.h>
|
||||||
#include <etk/math/Vector2D.hpp>
|
#include <etk/math/Vector2D.h>
|
||||||
#include <etk/math/Vector3D.hpp>
|
#include <etk/math/Vector3D.h>
|
||||||
#include <etk/Color.hpp>
|
#include <etk/Color.h>
|
||||||
#include <etk/path/Path.hpp>
|
|
||||||
#include <etk/uri/Uri.hpp>
|
|
||||||
|
|
||||||
// void generic properties
|
// void generic properties
|
||||||
template class eproperty::Value<bool>;
|
template class eproperty::Value<bool>;
|
||||||
template class eproperty::Value<etk::String>;
|
template class eproperty::Value<std::string>;
|
||||||
#if __CPP_VERSION__ >= 2011
|
#if __CPP_VERSION__ >= 2011
|
||||||
template class eproperty::Value<etk::UString>;
|
template class eproperty::Value<std::u32string>;
|
||||||
#endif
|
#endif
|
||||||
template class eproperty::Value<int64_t>;
|
template class eproperty::Value<int64_t>;
|
||||||
template class eproperty::Value<int32_t>;
|
template class eproperty::Value<int32_t>;
|
||||||
@ -48,6 +46,3 @@ template class eproperty::Value<etk::Color<unsigned char,4>>;
|
|||||||
template class eproperty::Value<etk::Color<unsigned char,3>>;
|
template class eproperty::Value<etk::Color<unsigned char,3>>;
|
||||||
template class eproperty::Value<etk::Color<float,4>>;
|
template class eproperty::Value<etk::Color<float,4>>;
|
||||||
template class eproperty::Value<etk::Color<float,3>>;
|
template class eproperty::Value<etk::Color<float,3>>;
|
||||||
|
|
||||||
template class eproperty::Value<etk::Path>;
|
|
||||||
template class eproperty::Value<etk::Uri>;
|
|
||||||
@ -3,11 +3,11 @@
|
|||||||
*
|
*
|
||||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||||
*
|
*
|
||||||
* @license MPL v2.0 (see license file)
|
* @license APACHE v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <eproperty/Value.hpp>
|
#include <eproperty/Value.h>
|
||||||
|
|
||||||
|
|
||||||
template<class TYPE>
|
template<class TYPE>
|
||||||
@ -17,13 +17,13 @@ eproperty::Value<TYPE>::Value(const TYPE& _defaultValue) :
|
|||||||
}
|
}
|
||||||
|
|
||||||
template<class TYPE>
|
template<class TYPE>
|
||||||
etk::String eproperty::Value<TYPE>::getValueSpecific(const TYPE& _valueRequested) const {
|
std::string eproperty::Value<TYPE>::getValueSpecific(const TYPE& _valueRequested) const {
|
||||||
return etk::toString(_valueRequested);
|
return etk::to_string(_valueRequested);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class TYPE>
|
template<class TYPE>
|
||||||
void eproperty::Value<TYPE>::setString(const etk::String& _newVal) {
|
void eproperty::Value<TYPE>::setString(const std::string& _newVal) {
|
||||||
// when you want to set an element in parameter you will implement the function template etk::from_string
|
// when you want to set an element in parameter you will implement the function template std::from_string
|
||||||
etk::from_string(eproperty::PropertyType<TYPE>::m_value, _newVal);
|
etk::from_string(eproperty::PropertyType<TYPE>::m_value, _newVal);
|
||||||
// TODO : Do it better ...
|
// TODO : Do it better ...
|
||||||
eproperty::PropertyType<TYPE>::notifyChange();
|
eproperty::PropertyType<TYPE>::notifyChange();
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/python
|
#!/usr/bin/python
|
||||||
import realog.debug as debug
|
import lutin.module as module
|
||||||
import lutin.tools as tools
|
import lutin.tools as tools
|
||||||
|
import datetime
|
||||||
|
|
||||||
def get_type():
|
def get_type():
|
||||||
return "BINARY"
|
return "BINARY"
|
||||||
@ -12,7 +13,7 @@ def get_desc():
|
|||||||
return "e-property sample 1"
|
return "e-property sample 1"
|
||||||
|
|
||||||
def get_licence():
|
def get_licence():
|
||||||
return "MPL-2"
|
return "APACHE-2"
|
||||||
|
|
||||||
def get_compagny_type():
|
def get_compagny_type():
|
||||||
return "com"
|
return "com"
|
||||||
@ -23,13 +24,11 @@ def get_compagny_name():
|
|||||||
def get_maintainer():
|
def get_maintainer():
|
||||||
return "authors.txt"
|
return "authors.txt"
|
||||||
|
|
||||||
def configure(target, my_module):
|
def create(target, module_name):
|
||||||
|
my_module = module.Module(__file__, module_name, get_type())
|
||||||
my_module.add_src_file([
|
my_module.add_src_file([
|
||||||
'sample/sampleAll.cpp'
|
'sample/sampleAll.cpp'
|
||||||
])
|
])
|
||||||
my_module.add_depend([
|
my_module.add_depend(['eproperty', 'test-debug'])
|
||||||
'eproperty',
|
return my_module
|
||||||
'test-debug'
|
|
||||||
])
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/python
|
#!/usr/bin/python
|
||||||
import realog.debug as debug
|
import lutin.module as module
|
||||||
import lutin.tools as tools
|
import lutin.tools as tools
|
||||||
|
import datetime
|
||||||
|
|
||||||
|
|
||||||
def get_type():
|
def get_type():
|
||||||
@ -13,7 +14,7 @@ def get_desc():
|
|||||||
return "e-property test software"
|
return "e-property test software"
|
||||||
|
|
||||||
def get_licence():
|
def get_licence():
|
||||||
return "MPL-2"
|
return "APACHE-2"
|
||||||
|
|
||||||
def get_compagny_type():
|
def get_compagny_type():
|
||||||
return "com"
|
return "com"
|
||||||
@ -24,18 +25,15 @@ def get_compagny_name():
|
|||||||
def get_maintainer():
|
def get_maintainer():
|
||||||
return "authors.txt"
|
return "authors.txt"
|
||||||
|
|
||||||
def configure(target, my_module):
|
def create(target, module_name):
|
||||||
|
my_module = module.Module(__file__, module_name, get_type())
|
||||||
my_module.add_src_file([
|
my_module.add_src_file([
|
||||||
'test/main.cpp',
|
'test/main.cpp',
|
||||||
'test/declareProperties.cpp',
|
'test/declareProperties.cpp',
|
||||||
'test/test_list.cpp',
|
'test/test_list.cpp',
|
||||||
'test/test_range.cpp',
|
'test/test_range.cpp',
|
||||||
'test/test_value.cpp'
|
'test/test_value.cpp'
|
||||||
])
|
])
|
||||||
my_module.add_depend([
|
my_module.add_depend(['eproperty', 'gtest', 'test-debug'])
|
||||||
'eproperty',
|
return my_module
|
||||||
'etest',
|
|
||||||
'test-debug'
|
|
||||||
])
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/python
|
#!/usr/bin/python
|
||||||
|
import lutin.module as module
|
||||||
import lutin.tools as tools
|
import lutin.tools as tools
|
||||||
import realog.debug as debug
|
import lutin.debug as debug
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
|
||||||
@ -11,7 +12,7 @@ def get_desc():
|
|||||||
return "eproperty is a property interface for basic class"
|
return "eproperty is a property interface for basic class"
|
||||||
|
|
||||||
def get_licence():
|
def get_licence():
|
||||||
return "MPL-2"
|
return "APACHE-2"
|
||||||
|
|
||||||
def get_compagny_type():
|
def get_compagny_type():
|
||||||
return "com"
|
return "com"
|
||||||
@ -25,33 +26,32 @@ def get_maintainer():
|
|||||||
def get_version():
|
def get_version():
|
||||||
return "version.txt"
|
return "version.txt"
|
||||||
|
|
||||||
def configure(target, my_module):
|
def create(target, module_name):
|
||||||
|
my_module = module.Module(__file__, module_name, get_type())
|
||||||
my_module.add_extra_flags()
|
my_module.add_extra_flags()
|
||||||
my_module.add_src_file([
|
my_module.add_src_file([
|
||||||
'eproperty/debug.cpp',
|
'eproperty/debug.cpp',
|
||||||
'eproperty/Property.cpp',
|
'eproperty/Property.cpp',
|
||||||
'eproperty/InterfaceData.cpp',
|
'eproperty/InterfaceData.cpp',
|
||||||
'eproperty/details/Range.cpp',
|
'eproperty/details/Range.cpp',
|
||||||
'eproperty/details/Value.cpp',
|
'eproperty/details/Value.cpp',
|
||||||
])
|
])
|
||||||
my_module.add_header_file([
|
my_module.add_header_file([
|
||||||
'eproperty/debug.hpp',
|
'eproperty/debug.h',
|
||||||
'eproperty/Value.hpp',
|
'eproperty/Value.h',
|
||||||
'eproperty/Interface.hpp',
|
'eproperty/Interface.h',
|
||||||
'eproperty/InterfaceData.hpp',
|
'eproperty/InterfaceData.h',
|
||||||
'eproperty/Property.hpp',
|
'eproperty/Property.h',
|
||||||
'eproperty/PropertyType.hpp',
|
'eproperty/PropertyType.h',
|
||||||
'eproperty/Range.hpp',
|
'eproperty/Range.h',
|
||||||
'eproperty/List.hpp',
|
'eproperty/List.h',
|
||||||
'eproperty/details/Range.hxx',
|
'eproperty/details/Range.hxx',
|
||||||
'eproperty/details/Value.hxx',
|
'eproperty/details/Value.hxx',
|
||||||
])
|
])
|
||||||
my_module.add_depend([
|
my_module.add_depend(['etk'])
|
||||||
'etk'
|
my_module.add_path(tools.get_current_path(__file__))
|
||||||
])
|
|
||||||
my_module.add_path(".")
|
|
||||||
my_module.add_flag('c++', [
|
my_module.add_flag('c++', [
|
||||||
"-DEPROPERTY_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\""
|
"-DEPROPERTY_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\""
|
||||||
])
|
])
|
||||||
return True
|
return my_module
|
||||||
|
|
||||||
|
|||||||
19
monk_eproperty.py
Normal file
19
monk_eproperty.py
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
#!/usr/bin/python
|
||||||
|
import monkModule
|
||||||
|
import monkTools as tools
|
||||||
|
import os
|
||||||
|
|
||||||
|
def get_desc():
|
||||||
|
return "E-property simple property interface"
|
||||||
|
|
||||||
|
def create():
|
||||||
|
# module name is 'ewol' and type binary.
|
||||||
|
myModule = monkModule.Module(__file__, 'eproperty', 'LIBRARY')
|
||||||
|
# enable doculentation :
|
||||||
|
myModule.set_website("http://atria-soft.github.io/eproperty/")
|
||||||
|
myModule.set_website_sources("http://github.com/atria-soft/eproperty/")
|
||||||
|
myModule.set_path(os.path.join(tools.get_current_path(__file__), "eproperty"))
|
||||||
|
myModule.set_path_general_doc(os.path.join(tools.get_current_path(__file__), "doc"))
|
||||||
|
# add the currrent module at the
|
||||||
|
return myModule
|
||||||
|
|
||||||
@ -3,24 +3,24 @@
|
|||||||
*
|
*
|
||||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||||
*
|
*
|
||||||
* @license MPL v2.0 (see license file)
|
* @license APACHE v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
#include <etk/etk.hpp>
|
#include <etk/etk.h>
|
||||||
#include <test-debug/debug.hpp>
|
#include <test-debug/debug.h>
|
||||||
|
|
||||||
//! [eproperty_sample_all]
|
//! [eproperty_sample_all]
|
||||||
|
|
||||||
//! [eproperty_sample_declare_interface]
|
//! [eproperty_sample_declare_interface]
|
||||||
#include <eproperty/Interface.hpp>
|
#include <eproperty/Interface.h>
|
||||||
//! [eproperty_sample_declare_interface]
|
//! [eproperty_sample_declare_interface]
|
||||||
//! [eproperty_sample_declare_value]
|
//! [eproperty_sample_declare_value]
|
||||||
#include <eproperty/Value.hpp>
|
#include <eproperty/Value.h>
|
||||||
//! [eproperty_sample_declare_value]
|
//! [eproperty_sample_declare_value]
|
||||||
//! [eproperty_sample_declare_list]
|
//! [eproperty_sample_declare_list]
|
||||||
#include <eproperty/List.hpp>
|
#include <eproperty/List.h>
|
||||||
//! [eproperty_sample_declare_list]
|
//! [eproperty_sample_declare_list]
|
||||||
//! [eproperty_sample_declare_range]
|
//! [eproperty_sample_declare_range]
|
||||||
#include <eproperty/Range.hpp>
|
#include <eproperty/Range.h>
|
||||||
//! [eproperty_sample_declare_range]
|
//! [eproperty_sample_declare_range]
|
||||||
|
|
||||||
//! [eproperty_sample_declare_an_enum]
|
//! [eproperty_sample_declare_an_enum]
|
||||||
@ -30,9 +30,6 @@ enum simpleEnum {
|
|||||||
simpleEnum_enum3,
|
simpleEnum_enum3,
|
||||||
simpleEnum_enum4,
|
simpleEnum_enum4,
|
||||||
};
|
};
|
||||||
// Declare type in CPP only
|
|
||||||
#include <etk/typeInfo.hpp>
|
|
||||||
ETK_DECLARE_TYPE(enum simpleEnum);
|
|
||||||
//! [eproperty_sample_declare_an_enum]
|
//! [eproperty_sample_declare_an_enum]
|
||||||
|
|
||||||
//! [eproperty_sample_class_with_interface]
|
//! [eproperty_sample_class_with_interface]
|
||||||
@ -41,7 +38,7 @@ class sampleClassGroup : public eproperty::Interface {
|
|||||||
//! [eproperty_sample_declare_class_with_interface]
|
//! [eproperty_sample_declare_class_with_interface]
|
||||||
public:
|
public:
|
||||||
//! [eproperty_sample_declare_class_property_value]
|
//! [eproperty_sample_declare_class_property_value]
|
||||||
eproperty::Value<etk::String> propertyValue; //!< Simple property Value with type string
|
eproperty::Value<std::string> propertyValue; //!< Simple property Value with type string
|
||||||
//! [eproperty_sample_declare_class_property_value]
|
//! [eproperty_sample_declare_class_property_value]
|
||||||
//! [eproperty_sample_declare_class_property_list]
|
//! [eproperty_sample_declare_class_property_list]
|
||||||
eproperty::List<enum simpleEnum> propertyList; //!< Simple property List with type enumeration
|
eproperty::List<enum simpleEnum> propertyList; //!< Simple property List with type enumeration
|
||||||
@ -104,7 +101,7 @@ class sampleClassGroup : public eproperty::Interface {
|
|||||||
//! [eproperty_sample_class_without_interface]
|
//! [eproperty_sample_class_without_interface]
|
||||||
class sampleClassSolo {
|
class sampleClassSolo {
|
||||||
public:
|
public:
|
||||||
eproperty::Value<etk::String> propertyValue;
|
eproperty::Value<std::string> propertyValue;
|
||||||
eproperty::List<enum simpleEnum> propertyList;
|
eproperty::List<enum simpleEnum> propertyList;
|
||||||
eproperty::Range<int32_t> propertyRange;
|
eproperty::Range<int32_t> propertyRange;
|
||||||
sampleClassSolo():
|
sampleClassSolo():
|
||||||
|
|||||||
@ -3,19 +3,20 @@
|
|||||||
*
|
*
|
||||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||||
*
|
*
|
||||||
* @license MPL v2.0 (see license file)
|
* @license APACHE v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
#define NAME "Empty"
|
#define NAME "Empty"
|
||||||
|
|
||||||
#include <etk/types.hpp>
|
#include <etk/types.h>
|
||||||
#include <etk/etk.hpp>
|
#include <etk/etk.h>
|
||||||
#include <test-debug/debug.hpp>
|
#include <test-debug/debug.h>
|
||||||
#include <etest/etest.hpp>
|
#include <gtest/gtest.h>
|
||||||
|
|
||||||
int main(int _argc, const char *_argv[]) {
|
int main(int _argc, const char *_argv[]) {
|
||||||
etest::init(_argc, _argv);
|
::testing::InitGoogleTest(&_argc, const_cast<char **>(_argv));
|
||||||
|
etk::init(_argc, _argv);
|
||||||
for (int32_t iii=0; iii<_argc ; ++iii) {
|
for (int32_t iii=0; iii<_argc ; ++iii) {
|
||||||
etk::String data = _argv[iii];
|
std::string data = _argv[iii];
|
||||||
if ( data == "-h"
|
if ( data == "-h"
|
||||||
|| data == "--help") {
|
|| data == "--help") {
|
||||||
TEST_PRINT("eproperty-test - help : ");
|
TEST_PRINT("eproperty-test - help : ");
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
1.0.0
|
0.3.0
|
||||||
Loading…
x
Reference in New Issue
Block a user