Compare commits

...

29 Commits
0.1.0 ... main

Author SHA1 Message Date
6bdaf52efa [RELEASE] Release v1.0.0 2021-02-16 21:46:56 +01:00
2cfa6e06ed [DEBUG] update new API of lutin log 2019-05-03 10:18:22 +02:00
5f8e9461a2 [DEV] update for build URI 2018-09-29 21:58:39 +02:00
f03ab09337 [DEV] update etk null 2018-06-19 22:13:48 +02:00
a4b2688bda [DEV] set the property really movable and not copyable 2017-12-27 14:35:22 +01:00
4fee3e094f [DEBUG] build back sample 2017-11-07 10:19:27 +01:00
6727f58881 [DEV/DEBUG] No stl start to work (add manual type declaration (NO RTTI)) 2017-09-17 00:12:49 +02:00
0f84790c85 [DEV] continue removing STL 2017-09-14 00:59:21 +02:00
d4b5ae43b1 [DEV] remove STL 2017-09-07 23:38:26 +02:00
5de8451452 [DEBUG] correct build 2017-08-30 22:35:58 +02:00
b02a5b6fdc [DEV] continue removing STL 2017-08-29 01:25:30 +02:00
1ecd94c470 [DEV] continue removing stl 2017-08-28 00:04:57 +02:00
f583c09c56 Change licence APACHE-2 to MPL-2 ==> force source redistribution and permit static link 2017-01-05 21:28:23 +01:00
730ee6a575 [DEV] update dev tag version 2016-10-24 22:23:26 +02:00
e1f47e834e [RELEASE] new version 0.4.0 2016-10-24 22:23:26 +02:00
90f776e168 [CI] add travis CI 2016-10-24 22:23:26 +02:00
bafe1a295b [DEV] Update new lutin 2.2.0 (no legacy support) 2016-10-04 23:41:29 +02:00
390e8a1a1c [DEBUG] correct .hpp port + clean libC include 2016-10-02 23:46:20 +02:00
10dd64890f [DEV/API] change .h in .hpp 2016-09-30 22:28:36 +02:00
05270f2a14 [DEV] update version methode 2016-09-12 23:25:53 +02:00
328f317aaa [DEV] update dev tag version 2016-09-12 21:07:12 +02:00
2669cd6854 [RELEASE] create release 0.3.0 2016-09-12 21:06:37 +02:00
aa8a3333fe [DEV] update to future lutin 2.0 2016-09-12 21:07:12 +02:00
44f5b8ab5f [DEV] update dev tag version 2016-08-30 22:54:08 +02:00
2568c690cf [RELEASE] create release 0.2.0 2016-08-30 22:54:08 +02:00
05e1d7d2d7 [DEV] write basic documantation 2016-04-08 22:56:21 +02:00
dfaa1bd035 [DOC] base documentation and change API of 'properties.xxx' for interface 2016-04-05 21:02:05 +02:00
5907ee7abd [DEV] use doxygen documentation 2016-03-30 21:40:01 +02:00
5346b024ff [DEV] add monk file 2016-03-23 22:33:46 +01:00
35 changed files with 2088 additions and 881 deletions

85
.travis.yml Normal file
View File

@ -0,0 +1,85 @@
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

510
LICENSE
View File

@ -1,201 +1,373 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Mozilla Public License Version 2.0
==================================
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions
--------------
1. Definitions.
1.1. "Contributor"
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
by a Contributor and that particular Contributor's Contribution.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
1.3. "Contribution"
means Covered Software of a particular Contributor.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
1.4. "Covered Software"
means Source Code Form to which the initial Contributor has attached
the notice in Exhibit A, the Executable Form of such Source Code
Form, and Modifications of such Source Code Form, in each case
including portions thereof.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
1.5. "Incompatible With Secondary Licenses"
means
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
(a) that the initial Contributor has attached the notice described
in Exhibit B to the Covered Software; or
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
(b) that the Covered Software was made available under the terms of
version 1.1 or earlier of the License, but not also under the
terms of a Secondary License.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
1.6. "Executable Form"
means any form of the work other than Source Code Form.
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
1.7. "Larger Work"
means a work that combines Covered Software with other material, in
a separate file or files, that is not Covered Software.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
1.8. "License"
means this document.
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
1.9. "Licensable"
means having the right to grant, to the maximum extent possible,
whether at the time of the initial grant or subsequently, any and
all of the rights conveyed by this License.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
1.10. "Modifications"
means any of the following:
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
(a) any file in Source Code Form that results from an addition to,
deletion from, or modification of the contents of Covered
Software; or
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(b) any new file in Source Code Form that contains any Covered
Software.
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
1.11. "Patent Claims" of a Contributor
means any patent claim(s), including without limitation, method,
process, and apparatus claims, in any patent Licensable by such
Contributor that would be infringed, but for the grant of the
License, by the making, using, selling, offering for sale, having
made, import, or transfer of either its Contributions or its
Contributor Version.
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
1.12. "Secondary License"
means either the GNU General Public License, Version 2.0, the GNU
Lesser General Public License, Version 2.1, the GNU Affero General
Public License, Version 3.0, or any later versions of those
licenses.
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
1.13. "Source Code Form"
means the form of the work preferred for making modifications.
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
1.14. "You" (or "Your")
means an individual or a legal entity exercising rights under this
License. For legal entities, "You" includes any entity that
controls, is controlled by, or is under common control with You. For
purposes of this definition, "control" means (a) the power, direct
or indirect, to cause the direction or management of such entity,
whether by contract or otherwise, or (b) ownership of more than
fifty percent (50%) of the outstanding shares or beneficial
ownership of such entity.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
2. License Grants and Conditions
--------------------------------
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
2.1. Grants
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
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 hereby grants You a world-wide, royalty-free,
non-exclusive license:
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
(a) under intellectual property rights (other than patent or trademark)
Licensable by such Contributor to use, reproduce, make available,
modify, display, perform, distribute, and otherwise exploit its
Contributions, either on an unmodified basis, with Modifications, or
as part of a Larger Work; and
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
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
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
(b) under Patent Claims of such Contributor to make, use, sell, offer
for sale, have made, import, and otherwise transfer either its
Contributions or its Contributor Version.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
2.2. Effective Date
END OF TERMS AND CONDITIONS
The licenses granted in Section 2.1 with respect to any Contribution
become effective for each Contribution on the date the Contributor first
distributes such Contribution.
APPENDIX: How to apply the Apache License to your work.
2.3. Limitations on Grant Scope
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
The licenses granted in this Section 2 are the only rights granted under
this License. No additional rights or licenses will be implied from the
distribution or licensing of Covered Software under this License.
Notwithstanding Section 2.1(b) above, no patent license is granted by a
Contributor:
Copyright {yyyy} {name of copyright owner}
(a) for any code that a Contributor has removed from Covered Software;
or
Licensed under the Apache 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
(b) for infringements caused by: (i) Your and any other third party's
modifications of Covered Software, or (ii) the combination of its
Contributions with other software (except as part of its Contributor
Version); or
http://www.apache.org/licenses/LICENSE-2.0
(c) under Patent Claims infringed by Covered Software in the absence of
its Contributions.
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.
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
the notice requirements in Section 3.4).
2.4. Subsequent Licenses
No Contributor makes additional grants as a result of Your choice to
distribute the Covered Software under a subsequent version of this
License (see Section 10.2) or under the terms of a Secondary License (if
permitted under the terms of Section 3.3).
2.5. Representation
Each Contributor represents that the Contributor believes its
Contributions are its original creation(s) or it has sufficient rights
to grant the rights to its Contributions conveyed by this License.
2.6. Fair Use
This License is not intended to limit any rights You have under
applicable copyright doctrines of fair use, fair dealing, or other
equivalents.
2.7. Conditions
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
in Section 2.1.
3. Responsibilities
-------------------
3.1. Distribution of Source Form
All distribution of Covered Software in Source Code Form, including any
Modifications that You create or to which You contribute, must be under
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
License, and how they can obtain a copy of this License. You may not
attempt to alter or restrict the recipients' rights in the Source Code
Form.
3.2. Distribution of Executable Form
If You distribute Covered Software in Executable Form then:
(a) such Covered Software must also be made available in Source Code
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
Form by reasonable means in a timely manner, at a charge no more
than the cost of distribution to the recipient; and
(b) You may distribute such Executable Form under the terms of this
License, or sublicense it under different terms, provided that the
license for the Executable Form does not attempt to limit or alter
the recipients' rights in the Source Code Form under this License.
3.3. Distribution of a Larger Work
You may create and distribute a Larger Work under terms of Your choice,
provided that You also comply with the requirements of this License for
the Covered Software. If the Larger Work is a combination of Covered
Software with a work governed by one or more Secondary Licenses, and the
Covered Software is not Incompatible With Secondary Licenses, this
License permits You to additionally distribute such Covered Software
under the terms of such Secondary License(s), so that the recipient of
the Larger Work may, at their option, further distribute the Covered
Software under the terms of either this License or such Secondary
License(s).
3.4. Notices
You may not remove or alter the substance of any license notices
(including copyright notices, patent notices, disclaimers of warranty,
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.

View File

@ -1,2 +1,80 @@
# eproperty
(APACHE v2.0) class property depending on etk only
e-property
==========
`eproperty` is c++ simple class property handling that permit to change parameter through XML file.
Release (master)
----------------
[![Build Status](https://travis-ci.org/atria-soft/eproperty.svg?branch=master)](https://travis-ci.org/atria-soft/eproperty)
[![Coverage Status](http://atria-soft.com/ci/coverage/atria-soft/eproperty.svg?branch=master)](http://atria-soft.com/ci/atria-soft/eproperty)
[![Test Status](http://atria-soft.com/ci/test/atria-soft/eproperty.svg?branch=master)](http://atria-soft.com/ci/atria-soft/eproperty)
[![Warning Status](http://atria-soft.com/ci/warning/atria-soft/eproperty.svg?branch=master)](http://atria-soft.com/ci/atria-soft/eproperty)
[![Build Status](http://atria-soft.com/ci/build/atria-soft/eproperty.svg?branch=master&tag=Linux)](http://atria-soft.com/ci/atria-soft/eproperty)
[![Build Status](http://atria-soft.com/ci/build/atria-soft/eproperty.svg?branch=master&tag=MacOs)](http://atria-soft.com/ci/atria-soft/eproperty)
[![Build Status](http://atria-soft.com/ci/build/atria-soft/eproperty.svg?branch=master&tag=Mingw)](http://atria-soft.com/ci/atria-soft/eproperty)
[![Build Status](http://atria-soft.com/ci/build/atria-soft/eproperty.svg?branch=master&tag=Android)](http://atria-soft.com/ci/atria-soft/eproperty)
[![Build Status](http://atria-soft.com/ci/build/atria-soft/eproperty.svg?branch=master&tag=IOs)](http://atria-soft.com/ci/atria-soft/eproperty)
Developement (dev)
------------------
[![Build Status](https://travis-ci.org/atria-soft/eproperty.svg?branch=dev)](https://travis-ci.org/atria-soft/eproperty)
[![Coverage Status](http://atria-soft.com/ci/coverage/atria-soft/eproperty.svg?branch=dev)](http://atria-soft.com/ci/atria-soft/eproperty)
[![Test Status](http://atria-soft.com/ci/test/atria-soft/eproperty.svg?branch=dev)](http://atria-soft.com/ci/atria-soft/eproperty)
[![Warning Status](http://atria-soft.com/ci/warning/atria-soft/eproperty.svg?branch=dev)](http://atria-soft.com/ci/atria-soft/eproperty)
[![Build Status](http://atria-soft.com/ci/build/atria-soft/eproperty.svg?branch=dev&tag=Linux)](http://atria-soft.com/ci/atria-soft/eproperty)
[![Build Status](http://atria-soft.com/ci/build/atria-soft/eproperty.svg?branch=dev&tag=MacOs)](http://atria-soft.com/ci/atria-soft/eproperty)
[![Build Status](http://atria-soft.com/ci/build/atria-soft/eproperty.svg?branch=dev&tag=Mingw)](http://atria-soft.com/ci/atria-soft/eproperty)
[![Build Status](http://atria-soft.com/ci/build/atria-soft/eproperty.svg?branch=dev&tag=Android)](http://atria-soft.com/ci/atria-soft/eproperty)
[![Build Status](http://atria-soft.com/ci/build/atria-soft/eproperty.svg?branch=dev&tag=IOs)](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
authors.txt Normal file
View File

@ -0,0 +1 @@
MR Edouard DUPIN <yui.heero@gmail.com>

65
doc/build.md Normal file
View File

@ -0,0 +1,65 @@
Build lib & build sample {#eproperty_build}
========================
@tableofcontents
Download: {#eproperty_build_download}
=========
eproperty use some tools to manage source and build it:
lutin (build-system): {#eproperty_build_download_lutin}
---------------------
```{.sh}
pip install lutin --user
# optionnal dependency of lutin (manage image changing size for application release
pip install pillow --user
```
dependency: {#eproperty_build_download_dependency}
-----------
```{.sh}
mkdir framework
cd framework
git clone https://github.com/atria-soft/elog.git
git clone https://github.com/atria-soft/etk.git
cd ..
```
sources: {#eproperty_build_download_sources}
--------
```{.sh}
cd framework
git clone https://github.com/atria-soft/eproperty.git
cd ..
```
Build: {#eproperty_build_build}
======
library: {#eproperty_build_build_library}
--------
```{.sh}
lutin -mdebug eproperty
```
Sample: {#eproperty_build_build_sample}
-------
```{.sh}
lutin -mdebug eproperty-sample
```
Run sample: {#eproperty_build_run_sample}
===========
```{.sh}
lutin -mdebug eproperty-sample?run
```

54
doc/mainpage.md Normal file
View File

@ -0,0 +1,54 @@
EPROPERTY library {#mainpage}
=================
@tableofcontents
What is EPROPERTY: {#eproperty_mainpage_what}
==================
EPROPERTY, or Ewol property interface is a simple property API to set and get generic APIS
EPROPERTY is designed for
- Expose property on generic class
- Call class when the parameter change
- permit to set value throw string (good for XML configurations)
What languages are supported? {#eproperty_mainpage_language}
=============================
EPROPERTY is written in C++.
Are there any licensing restrictions? {#eproperty_mainpage_license_restriction}
=====================================
EPROPERTY is **FREE software** and _all sub-library are FREE and staticly linkable !!!_
License (MPL v2.0) {#eproperty_mainpage_license}
==================
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.
Other pages {#eproperty_mainpage_sub_page}
===========
- @ref eproperty_build
- @ref eproperty_tutorial
- [**ewol coding style**](http://atria-soft.github.io/ewol/ewol_coding_style.html)

138
doc/tutorial.md Normal file
View File

@ -0,0 +1,138 @@
Tutorial {#eproperty_tutorial}
========
@tableofcontents
What is a property: {#eproperty_tutorial_what}
===================
A property is a generic interface to manage parameter of a class whithout redeclare all the time the setter and getter (that is a little boring)
Calling a property car mermit to be notify when the value change and to control the values range of list ...
A property can use agreator interface eproperty::interface that declare a **"properties"** variablke that permit to acces at all the property declared.
Declare a class that have this interface:
@snippet sampleAll.cpp eproperty_sample_declare_class_with_interface
Declare property: {#eproperty_tutorial_declare}
=================
We have some basic properties:
- eproperty::Value Simple store of a unique Value
- eproperty::Range Store a value inside an authorized range
- eproperty::List Store a value inside a list of values (set in constructor)
Declare a Value property: {#eproperty_tutorial_declare_value}
-------------------------
Do the correct include:
@snippet sampleAll.cpp eproperty_sample_declare_value
Declare your property:
@snippet sampleAll.cpp eproperty_sample_declare_class_property_value
Construct the property with eproperty::Interface:
@snippet sampleAll.cpp eproperty_sample_initialize_class_property_value
Construct the property with **NO** eproperty::Interface:
@snippet sampleAll.cpp eproperty_sample_initialize_class_property_value2
Configure your property:
@snippet sampleAll.cpp eproperty_sample_use_set_value_1
Use your property:
@snippet sampleAll.cpp eproperty_sample_get_value_value
Declare a Range property: {#eproperty_tutorial_declare_range}
-------------------------
Do the correct include:
@snippet sampleAll.cpp eproperty_sample_declare_range
Declare your property:
@snippet sampleAll.cpp eproperty_sample_declare_class_property_range
Construct the property with eproperty::Interface:
@snippet sampleAll.cpp eproperty_sample_initialize_class_property_range
Construct the property with **NO** eproperty::Interface:
@snippet sampleAll.cpp eproperty_sample_initialize_class_property_range2
Configure your property:
@snippet sampleAll.cpp eproperty_sample_use_set_range_1
Use your property:
@snippet sampleAll.cpp eproperty_sample_get_value_range
Declare a List property: {#eproperty_tutorial_declare_list}
------------------------
Do the correct include:
@snippet sampleAll.cpp eproperty_sample_declare_list
Declare your property:
@snippet sampleAll.cpp eproperty_sample_declare_class_property_list
Construct the property with eproperty::Interface:
@snippet sampleAll.cpp eproperty_sample_initialize_class_property_list
Construct the property with **NO** eproperty::Interface:
@snippet sampleAll.cpp eproperty_sample_initialize_class_property_list2
Special case for the List is adding the value with their string assiciated:
@snippet sampleAll.cpp eproperty_sample_initialize_class_property_list_add
Configure your property:
@snippet sampleAll.cpp eproperty_sample_use_set_list_1
Use your property:
@snippet sampleAll.cpp eproperty_sample_get_value_list
Particularity: {#eproperty_tutorial_particularity}
==============
Define a callback: {#eproperty_tutorial_particularity_callback}
------------------
All property can define a callback, it is used to update class property with special settings.
The callback is set in the construction instruction like:
@snippet sampleAll.cpp eproperty_sample_initialize_class_property_value
The fucntion define is like:
@snippet sampleAll.cpp eproperty_sample_initialize_class_property_value_callback
It is called every time the Value change, if the value is identical the callback is not called.
Set value without calling the callback: {#eproperty_tutorial_particularity_direct_set}
---------------------------------------
To set a value in a property without calling the nitifiction function, you might use:
@snippet sampleAll.cpp eproperty_sample_initialize_class_property_set_direct
Please do not use it ouside the internal class that define the peoperty (call me if you have an api to control it at the compilation time)
Heritage and callback: {#eproperty_tutorial_particularity_heritage}
----------------------
When you herit from an other class with theire property you can prefer changing the default value or set an other list of parameter.
To set value without calling the callback (that can be virtual then ==0 in the initialisation state), you need to call:
@snippet sampleAll.cpp eproperty_sample_initialize_class_property_set_direct
For the eproperty::List, you chan rename enumeration or remove values:
@snippet sampleAll.cpp eproperty_sample_initialize_class_property_list_rename
All sample Code: {#eproperty_tutorial_all_code}
================
This Will generate this simple sample code:
@snippet sampleAll.cpp eproperty_sample_all

34
doxy_eproperty.py Normal file
View File

@ -0,0 +1,34 @@
#!/usr/bin/python
import os
import doxy.module as module
import doxy.debug as debug
import doxy.tools as tools
def create(target, module_name):
my_module = module.Module(__file__, module_name)
my_module.set_version([0,1,"dev"])
my_module.set_title("eproperty: Ewol property interface")
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.add_path([
module_name,
"doc"
])
my_module.add_depend([
'etk'
])
my_module.add_sample_path([
'sample'
])
my_module.add_exclude_symbols([
'*operator<<*',
])
my_module.add_exclude_file([
'debug.hpp',
])
my_module.add_file_patterns([
'*.hpp',
'*.md',
])
return my_module

View File

@ -1,120 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
*/
#include <eproperty/debug.h>
#include <eproperty/List.h>
#include <eproperty/Property.h>
#undef __class__
#define __class__ "Interface"
eproperty::Interface::Interface() {
}
eproperty::Interface::~Interface() {
propertyClean();
}
// note this pointer is not allocated and not free at the end of the class
void eproperty::Interface::propertyAdd(eproperty::Property* _pointerOnProperty) {
if (_pointerOnProperty == nullptr) {
EPROPERTY_ERROR("Try to link a nullptr properties");
return;
}
for (auto &it : m_list) {
if( it != nullptr
&& it->getName() == _pointerOnProperty->getName()) {
EPROPERTY_CRITICAL("2 property can not have the same name ... ==> generate runtime error");
}
}
m_list.push_back(_pointerOnProperty);
}
void eproperty::Interface::propertyClean() {
// remove all pointer on these propertys
m_list.clear();
}
// 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 ...
bool eproperty::Interface::propertySet(const std::string& _property, const std::string& _value) {
for (auto &it : m_list) {
if( it != nullptr
&& it->getName() == _property) {
it->setString(_value);
return true;
}
}
// can not find the propertys :
return false;
}
std::string eproperty::Interface::propertyGet(const std::string& _property) const {
for (auto &it : m_list) {
if( it != nullptr
&& it->getName() == _property) {
return it->getString();
}
}
return "???";
}
void eproperty::Interface::propertyDisplay(bool _changeOnly) const {
EPROPERTY_INFO(" Object propertys:");
for (auto &it : m_list) {
if(it != nullptr) {
std::string paramName = it->getName();
std::string paramVal = it->getString();
std::string paramInfo = it->getInfo();
if ( _changeOnly == false
|| it->isDefault() == false) {
EPROPERTY_INFO(" | param='" << paramName << "' value=" << paramVal << " (" << paramInfo << ")");
}
} else {
EPROPERTY_INFO(" | param=nullptr");
}
}
}
std::map<std::string, std::string> eproperty::Interface::propertyGetAll(bool _notIfDefault) const {
std::map<std::string, std::string> out;
for (auto &it : m_list) {
if(it != nullptr) {
std::string paramName = it->getName();
std::string paramVal = it->getString();
if ( _notIfDefault == false
|| it->isDefault() == false) {
out.insert(std::make_pair(paramName, paramVal));
}
}
}
return out;
}
size_t eproperty::Interface::getPropertyCount() const {
return m_list.size();
}
eproperty::Property* eproperty::Interface::getPropertyRaw(const size_t& _id) const {
if (_id >= m_list.size()) {
EPROPERTY_ERROR("Wrong ID for property list. " << _id << " >= " << m_list.size());
return nullptr;
}
return m_list[_id];
}
eproperty::Property* eproperty::Interface::getPropertyRaw(const std::string _name) const {
for (auto &it : m_list) {
if(it->getName() == _name) {
return it;
}
}
return nullptr;
}

View File

@ -1,81 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
*/
#pragma once
#include <vector>
#include <map>
namespace eproperty {
class Property;
class Ref;
class Interface {
friend class eproperty::Property; // to register property in the list.
private:
std::vector<eproperty::Property*> m_list; //!< list of availlable Propertys (no need to free)
public:
/**
* @brief Constructor.
*/
Interface();
/**
* @brief Destructor.
*/
virtual ~Interface();
/**
* @brief Register a property class pointer in the List of propertys
* @note This class does not destroy the property pointer!!!
* @param[in] pointerOnProperty Pointer on the property that might be added.
*/
void propertyAdd(Property* _pointerOnProperty);
/**
* @brief Remove all the property reference in this class.
* @note no delete, just clean and inform that a property has not been removed.
*/
void propertyClean();
/**
* @brief Set a specific value to the property reference name.
* @param[in] property The property string name.
* @param[in] value The new value of the property (string).
* @return true Property update.
* @return false Property not update.
*/
bool propertySet(const std::string& _property, const std::string& _value);
/**
* @brief Get a specific value of the property reference name.
* @param[in] property The property string name.
* @return The value of the property (string).
*/
std::string propertyGet(const std::string& _property) const;
/**
* @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.
*/
void propertyDisplay(bool _changeOnly = false) const;
/**
* @brief Get All the property configuration:
* @return map on the propertys
*/
std::map<std::string, std::string> propertyGetAll(bool _notIfDefault=true) const;
public:
/**
* @brief Get count of propertys.
* @return The number of the property.
*/
size_t getPropertyCount() const;
/**
* @brief Get name of a propertys.
* @param[in] _id Id of the property.
* @param[in] _name name of the property.
* @return pointer on the property.
*/
eproperty::Property* getPropertyRaw(const size_t& _id) const;
//! @previous
eproperty::Property* getPropertyRaw(const std::string _name) const;
};
}

24
eproperty/Interface.hpp Normal file
View File

@ -0,0 +1,24 @@
/** @file
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license MPL v2.0 (see license file)
*/
#pragma once
#include <etk/Vector.hpp>
#include <etk/Map.hpp>
#include <eproperty/InterfaceData.hpp>
namespace eproperty {
/**
* @brief Interface to collect the property list (for abstarction "set" and "get")
* It create a simple "properties" member that permit to access at the properties.
*/
class Interface {
public:
eproperty::InterfaceData properties; //!< Interface to access at all properties...
};
}

133
eproperty/InterfaceData.cpp Normal file
View File

@ -0,0 +1,133 @@
/** @file
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license MPL v2.0 (see license file)
*/
#include <eproperty/debug.hpp>
#include <eproperty/List.hpp>
#include <eproperty/Property.hpp>
#include <eproperty/InterfaceData.hpp>
eproperty::InterfaceData::InterfaceData() {
}
eproperty::InterfaceData::~InterfaceData() {
clean();
}
// note this pointer is not allocated and not free at the end of the class
void eproperty::InterfaceData::add(eproperty::Property* _pointerOnProperty) {
if (_pointerOnProperty == null) {
EPROPERTY_ERROR("Try to link a null properties");
return;
}
for (auto &it : m_list) {
if( it != null
&& it->getName() == _pointerOnProperty->getName()) {
EPROPERTY_CRITICAL("2 property can not have the same name ... ==> generate runtime error");
}
}
m_list.pushBack(_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() {
// remove all pointer on these properties
m_list.clear();
}
// 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 ...
bool eproperty::InterfaceData::set(const etk::String& _property, const etk::String& _value) {
for (auto &it : m_list) {
if( it != null
&& it->getName() == _property) {
it->setString(_value);
return true;
}
}
// can not find the properties :
return false;
}
etk::String eproperty::InterfaceData::get(const etk::String& _property) const {
for (auto &it : m_list) {
if( it != null
&& it->getName() == _property) {
return it->getString();
}
}
return "???";
}
void eproperty::InterfaceData::display(bool _changeOnly) const {
EPROPERTY_INFO(" Object properties:");
for (auto &it : m_list) {
if(it != null) {
etk::String paramName = it->getName();
etk::String paramVal = it->getString();
etk::String paramInfo = it->getInfo();
if ( _changeOnly == false
|| it->isDefault() == false) {
EPROPERTY_INFO(" | param='" << paramName << "' value=" << paramVal << " (" << paramInfo << ")");
}
} else {
EPROPERTY_INFO(" | param=null");
}
}
}
etk::Map<etk::String, etk::String> eproperty::InterfaceData::getAll(bool _notIfDefault) const {
etk::Map<etk::String, etk::String> out;
for (auto &it : m_list) {
if(it != null) {
etk::String paramName = it->getName();
etk::String paramVal = it->getString();
if ( _notIfDefault == false
|| it->isDefault() == false) {
out.set(paramName, paramVal);
}
}
}
return out;
}
size_t eproperty::InterfaceData::size() const {
return m_list.size();
}
eproperty::Property* eproperty::InterfaceData::getRaw(const size_t& _id) const {
if (_id >= m_list.size()) {
EPROPERTY_ERROR("Wrong ID for property list. " << _id << " >= " << m_list.size());
return null;
}
return m_list[_id];
}
eproperty::Property* eproperty::InterfaceData::getRaw(const etk::String _name) const {
for (auto &it : m_list) {
if(it->getName() == _name) {
return it;
}
}
return null;
}

View File

@ -0,0 +1,92 @@
/** @file
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license MPL v2.0 (see license file)
*/
#pragma once
#include <etk/Vector.hpp>
#include <etk/Map.hpp>
namespace eproperty {
class Property;
class Ref;
/**
* @brief Interface data to collect the property list (for abstarction connection)
*/
class InterfaceData {
private:
etk::Vector<eproperty::Property*> m_list; //!< list of availlable properties (no need to free)
public:
/**
* @brief Constructor.
*/
InterfaceData();
/**
* @brief Destructor.
*/
virtual ~InterfaceData();
/**
* @brief Register a property class pointer in the List of properties
* @note This class does not destroy the property pointer!!!
* @param[in] _pointerOnProperty Pointer on the property that might be added.
*/
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.
* @note no delete, just clean and inform that a property has not been removed.
*/
void clean();
/**
* @brief Set a specific value to the property reference name.
* @param[in] _property The property string name.
* @param[in] _value The new value of the property (string).
* @return true Property update.
* @return false Property not update.
*/
bool set(const etk::String& _property, const etk::String& _value);
/**
* @brief Get a specific value of the property reference name.
* @param[in] _property The property string name.
* @return The value of the property (string).
*/
etk::String get(const etk::String& _property) const;
/**
* @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.
*/
void display(bool _changeOnly = false) const;
/**
* @brief Get All the property configuration:
* @param[in] _notIfDefault if true the parameter value with default value are not extracted.
* @return map on the properties
*/
etk::Map<etk::String, etk::String> getAll(bool _notIfDefault=true) const;
public:
/**
* @brief Get count of properties.
* @return The number of the property.
*/
size_t size() const;
/**
* @brief Get name of a properties.
* @param[in] _id Id of the property.
* @return pointer on the property.
*/
eproperty::Property* getRaw(const size_t& _id) const;
/**
* @brief Get name of a properties.
* @param[in] _name name of the property.
* @return pointer on the property.
*/
eproperty::Property* getRaw(const etk::String _name) const;
};
}

View File

@ -1,26 +1,25 @@
/**
/** @file
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
* @license MPL v2.0 (see license file)
*/
#pragma once
#include <eproperty/PropertyType.h>
#include <map>
#include <typeinfo>
#undef __class__
#define __class__ "List<T>"
#include <eproperty/PropertyType.hpp>
#include <etk/Map.hpp>
namespace eproperty {
/**
* @brief Set a list of value availlable (for enumeration)
*/
template<class TYPE> class List : public PropertyType<TYPE> {
private:
std::map<std::string, TYPE> m_list; //!< pointer on the list of all elements.
etk::Map<etk::String, TYPE> m_list; //!< pointer on the list of all elements.
public:
/**
* @brief Create a parameter with List of element parameter.
* @brief Create a parameter with List of element parameter (null if none).
* @param[in] _owner reference on the parameter lister.
* @param[in] _name Static name of the parameter.
* @param[in] _defaultValue Default value of the parameter.
@ -29,26 +28,72 @@ namespace eproperty {
*/
template<class CLASS_TYPE>
List(CLASS_TYPE* _owner,
const std::string& _name,
const etk::String& _name,
const TYPE& _defaultValue,
const std::string& _description="",
void (CLASS_TYPE::*_setObs)()=nullptr) :
const etk::String& _description="",
void (CLASS_TYPE::*_setObs)()=null) :
eproperty::PropertyType<TYPE>(_owner, _name, _defaultValue, _description, _setObs) {
};
/**
* @brief Destructor.
* @brief Create a parameter with List of element parameter (null if none).
* @param[in] _defaultValue Default value of the parameter.
*/
List(const 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.
*/
virtual ~List() = default;
void add(const TYPE& _value, const std::string& _name, const std::string& _description = "") {
/**
* @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
* @param[in] _value Value of the string
* @param[in] _name String of the value
* @param[in] _description Description of the parameter value
*/
void add(const TYPE& _value, const etk::String& _name, const etk::String& _description = "") {
auto it = m_list.find(_name);
if (it != m_list.end()) {
it->second = _value;
return;
}
m_list.insert(std::make_pair(_name, _value));
m_list.add(_name, _value);
}
void remove(const std::string& _name) {
/**
* @brief Remove a value of the element availlable
* @param[in] _name Name of the value to remove
*/
void remove(const etk::String& _name) {
auto it = m_list.find(_name);
bool firstValue = false;
bool firstDefault = false;
@ -75,7 +120,12 @@ namespace eproperty {
eproperty::PropertyType<TYPE>::m_value = m_list.begin()->second;
}
}
void rename(const std::string& _nameOld, const std::string& _nameNew) {
/**
* @brief Rename a value of the property
* @param[in] _nameOld Old property name to replace
* @param[in] _nameNew New name of the property
*/
void rename(const etk::String& _nameOld, const etk::String& _nameNew) {
//get old value
TYPE value;
auto it = m_list.find(_nameOld);
@ -88,10 +138,10 @@ namespace eproperty {
remove(_nameOld);
add(value, _nameNew);
}
std::string getPropertyType() const override {
etk::String getPropertyType() const override {
return "eproperty::List";
}
void setString(const std::string& _newVal) override {
void setString(const etk::String& _newVal) override {
auto it = m_list.find(_newVal);
if (it != m_list.end()) {
if (it->second != eproperty::PropertyType<TYPE>::m_value) {
@ -101,21 +151,23 @@ namespace eproperty {
return;
}
EPROPERTY_WARNING("paramList value='" << _newVal << "' is not un the list ... ==> no change");
for (auto &it : m_list) {
EPROPERTY_VERBOSE(" element : " << it.first);
}
#ifdef DEBUG
for (auto &it : m_list) {
EPROPERTY_VERBOSE(" element : " << it.first);
}
#endif
}
std::string getInfo() const override {
std::string list = "List default=" + getValueSpecific(eproperty::PropertyType<TYPE>::m_default) + " in : [";
etk::String getInfo() const override {
etk::String list = "List default=" + getValueSpecific(eproperty::PropertyType<TYPE>::m_default) + " in : [";
for (auto &it : m_list) {
list += it.first + "/";
}
return list + "]";
}
std::vector<std::string> getListValue() const override {
std::vector<std::string> out;
etk::Vector<etk::String> getListValue() const override {
etk::Vector<etk::String> out;
for (auto &it : m_list) {
out.push_back(it.first);
out.pushBack(it.first);
}
return out;
}
@ -154,7 +206,7 @@ namespace eproperty {
* @param[in] _intValue value that might be converted in string.
* @return the description string coresponding to this ID.
*/
std::string getValueSpecific(const TYPE& _valueRequested) const override {
etk::String getValueSpecific(const TYPE& _valueRequested) const override {
for (auto &it : m_list) {
if (it.second == _valueRequested) {
return it.first;
@ -163,12 +215,10 @@ namespace eproperty {
return "???";
}
};
template<typename TYPE> std::ostream& operator <<(std::ostream& _os, const eproperty::List<TYPE>& _obj) {
//! @not_in_doc
template<typename TYPE> etk::Stream& operator <<(etk::Stream& _os, const eproperty::List<TYPE>& _obj) {
_os << _obj.get();
return _os;
}
}
#undef __class__
#define __class__ nullptr

View File

@ -1,36 +1,92 @@
/**
/** @file
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
* @license MPL v2.0 (see license file)
*/
#include <eproperty/debug.h>
#include <eproperty/Interface.h>
#include <eproperty/Property.h>
#include <eproperty/debug.hpp>
#include <eproperty/Interface.hpp>
#include <eproperty/Property.hpp>
eproperty::Property::Property(eproperty::Interface* _paramInterfaceLink, const std::string& _name) :
void eproperty::Property::linkInterface() {
// add a reference on the current Property ...
if (m_interfaceLink != null) {
m_interfaceLink->properties.add(this);
}
}
void eproperty::Property::unLinkInterface() {
if (m_interfaceLink != null) {
m_interfaceLink->properties.remove(this);
}
}
eproperty::Property::Property(eproperty::Interface* _paramInterfaceLink, const etk::String& _name) :
m_interfaceLink(_paramInterfaceLink),
m_setObserver(),
m_name(_name) {
// add a reference on the current Property ...
if (m_interfaceLink != nullptr) {
m_interfaceLink->propertyAdd(this);
}
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) {
m_setObserver = _setObs;
}
std::string eproperty::Property::getName() const {
etk::String eproperty::Property::getName() const {
return m_name;
}
void eproperty::Property::notifyChange() const {
if (m_setObserver != nullptr) {
if (m_setObserver != null) {
m_setObserver();
}
//m_interfaceLink.onPropertyChangeValue();

View File

@ -1,100 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
*/
#pragma once
#include <eproperty/Interface.h>
#include <string>
#include <typeinfo>
#include <functional>
namespace eproperty {
class Ref;
class Property {
public:
using Observer = std::function<void()>;
private:
eproperty::Interface* m_interfaceLink;
Observer m_setObserver;
std::string m_name;
public:
Property(eproperty::Interface* _paramInterfaceLink, const std::string& _name);
virtual ~Property() = default;
protected:
void setObserver(eproperty::Property::Observer _setObs);
public:
/**
* @brief call main class that PropertyChange
*/
void notifyChange() const;
/**
* @brief Get the name of the Property.
* @return The name of the Property
*/
virtual std::string getName() const;
/**
* @brief Description of the Propertys.
* @return Descriptive information of the Property (for remote UI).
*/
virtual std::string getInfo() const = 0;
/**
* @brief Get the Property type of the class in string mode.
* @return The string type of the Property.
*/
virtual std::string getPropertyType() const = 0;
/**
* @brief Get the type of the Property in string mode.
* @return The string type of the Property.
*/
virtual std::string getType() const = 0;
/**
* @brief Get the string of the current value of the Property.
* @return The string description of the value.
*/
virtual std::string getString() const = 0;
/**
* @brief Get the string of the default value of the Property.
* @return the string decription of the default value.
*/
virtual std::string getDefault() const = 0;
/**
* @brief Set a new value of the Property (with string interface).
* @param[in] _newVal New value of the Propertys.
*/
virtual void setString(const std::string& _newVal) = 0;
/**
* @brief Check if the value is the default
* @return true : the vakue is the default one, false otherwise.
*/
virtual bool isDefault() const = 0;
/**
* @brief Reset the value to the default value.
*/
virtual void setDefault() = 0;
/**
* @brief Specific for eproperty::List to get all the possible values
* @return Descriptive information of the Property (for remote UI).
*/
virtual std::vector<std::string> getListValue() const {
return std::vector<std::string>();
}
public:
template<class TYPE>
bool operator== (const TYPE& _obj) const = delete;
template<class TYPE>
bool operator!= (const TYPE& _obj) const = delete;
template<class TYPE>
bool operator<= (const TYPE& _obj) const = delete;
template<class TYPE>
bool operator>= (const TYPE& _obj) const = delete;
template<class TYPE>
bool operator< (const TYPE& _obj) const = delete;
template<class TYPE>
bool operator> (const TYPE& _obj) const = delete;
};
}

189
eproperty/Property.hpp Normal file
View File

@ -0,0 +1,189 @@
/** @file
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license MPL v2.0 (see license file)
*/
#pragma once
#include <eproperty/Interface.hpp>
#include <etk/String.hpp>
#include <etk/typeTrait.hpp>
#include <etk/Function.hpp>
/**
* @brief eproperty global interface for all property implementation
*/
namespace eproperty {
class Ref;
/**
* @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 {
public:
using Observer = etk::Function<void()>; //!< Local main object observer of changing value of the property
protected:
eproperty::Interface* m_interfaceLink = null; //!< Base interface class to group all the property
Observer m_setObserver; //!< Observer of the changing value
etk::String m_name; //!< Name of the property
public:
/**
* @brief Basic property elements
* @param[in] _paramInterfaceLink Link on the esignal::Interface class to register parameter (can be null)
* @param[in] _name Name of the parameter (must be unique if _paramInterfaceLink is define)
*/
Property(eproperty::Interface* _paramInterfaceLink, const etk::String& _name);
/**
* @brief Basic property elements
*/
Property();
/**
* @brief Remove copy contructor
*/
Property(const Property& _obj) = delete;
/**
* @brief Enable move contructor
*/
Property(Property&& _obj);
/**
* @brief Virtualize the destructor
* @internal
*/
virtual ~Property();
/**
* @brief Remove copy operator
*/
Property& operator=(const Property& _obj) = delete;
/**
* @brief Enable move operator
*/
Property& operator=(Property&& _obj);
protected:
/**
* @brief Set the change observer of the property
* @param[in] _setObs New observer of the property
*/
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:
/**
* @brief call main class that PropertyChange
*/
void notifyChange() const;
/**
* @brief Get the name of the Property.
* @return The name of the Property
*/
virtual etk::String getName() const;
/**
* @brief Description of the Propertys.
* @return Descriptive information of the Property (for remote UI).
*/
virtual etk::String getInfo() const = 0;
/**
* @brief Get the Property type of the class in string mode.
* @return The string type of the Property.
*/
virtual etk::String getPropertyType() const = 0;
/**
* @brief Get the type of the Property in string mode.
* @return The string type of the Property.
*/
virtual etk::String getType() const = 0;
/**
* @brief Get the string of the current value of the Property.
* @return The string description of the value.
*/
virtual etk::String getString() const = 0;
/**
* @brief Get the string of the default value of the Property.
* @return the string decription of the default value.
*/
virtual etk::String getDefault() const = 0;
/**
* @brief Set a new value of the Property (with string interface).
* @param[in] _newVal New value of the Propertys.
*/
virtual void setString(const etk::String& _newVal) = 0;
/**
* @brief Check if the value is the default
* @return true : the vakue is the default one, false otherwise.
*/
virtual bool isDefault() const = 0;
/**
* @brief Reset the value to the default value.
*/
virtual void setDefault() = 0;
/**
* @brief Specific for eproperty::List to get all the possible values
* @return Descriptive information of the Property (for remote UI).
*/
virtual etk::Vector<etk::String> getListValue() const {
return etk::Vector<etk::String>();
}
public:
/**
* @brief Eguality comparaison operator (REMOVED)
* @param[in] _obj Object to compare
* @return true The current object is identic
* @return false The current object is NOT identic
*/
template<class TYPE>
bool operator== (const TYPE& _obj) const = delete;
/**
* @brief IN-Eguality comparaison operator (REMOVED)
* @param[in] _obj Object to compare
* @return true The current object is NOT identic
* @return false The current object is identic
*/
template<class TYPE>
bool operator!= (const TYPE& _obj) const = delete;
/**
* @brief Lesser eguality comparaison operator (REMOVED)
* @param[in] _obj Object to compare
* @return true The current object lesser or equal than input object
* @return false The current object greater than input object
*/
template<class TYPE>
bool operator<= (const TYPE& _obj) const = delete;
/**
* @brief Greater eguality comparaison operator (REMOVED)
* @param[in] _obj Object to compare
* @return true The current object greater or equal than input object
* @return false The current object lesser than input object
*/
template<class TYPE>
bool operator>= (const TYPE& _obj) const = delete;
/**
* @brief Lesser comparaison operator (REMOVED)
* @param[in] _obj Object to compare
* @return true The current object lesser than input object
* @return false The current object greater or equal than input object
*/
template<class TYPE>
bool operator< (const TYPE& _obj) const = delete;
/**
* @brief Greater comparaison operator (REMOVED)
* @param[in] _obj Object to compare
* @return true The current object greater than input object
* @return false The current object lesser or equal than input object
*/
template<class TYPE>
bool operator> (const TYPE& _obj) const = delete;
};
}

View File

@ -1,135 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
*/
#pragma once
#include <eproperty/Interface.h>
#include <eproperty/Property.h>
#include <eproperty/debug.h>
#undef __class__
#define __class__ "PropertyType<T>"
namespace eproperty {
template<class TYPE> class PropertyType : public Property {
protected:
TYPE m_value; //!< Current value.
TYPE m_default; //!< Default value.
public:
/**
* @brief Create a parameter with a specific type.
* @param[in] _owner Owner of the parameter.
* @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>
PropertyType(CLASS_TYPE* _owner,
const std::string& _name,
const TYPE& _defaultValue,
const std::string& _description = "",
void (CLASS_TYPE::*_setObs)()=nullptr) :
Property(_owner, _name),
m_value(_defaultValue),
m_default(_defaultValue) {
if (_setObs != nullptr) {
setObserver([=](){(*_owner.*_setObs)();});
}
}
/**
* @brief Destructor.
*/
virtual ~PropertyType() = default;
std::string getPropertyType() const override {
return "eproperty::Value";
}
std::string getType() const override {
return typeid(TYPE).name();
}
std::string getString() const override {
return getValueSpecific(m_value);
}
std::string getDefault() const override {
return getValueSpecific(m_default);
}
std::string getInfo() const override {
return getType() + " default=" + getDefault();
}
bool isDefault() const override {
return m_value == m_default;
}
void setDefault() override {
set(m_default);
}
virtual void changeDefault(const TYPE& _newDefault) {
m_default = _newDefault;
}
public:
/**
* @brief Get the value of the current parameter.
* @note For performence, this function must be inline
* @return the Reference value
*/
const inline TYPE& get() const {
return m_value;
};
/**
* @brief Set a new value for this parameter
* @param[in] newVal New value to set (set the nearest value if range is set)
*/
virtual void set(const TYPE& _newVal) {
if (_newVal != m_value) {
m_value = _newVal;
notifyChange();
}
}
/**
* @brief Set the value of the current parameter (no check (for internal set with no check).
* @note For performence, this function must be inline
* @note Only use by the owner of the property (can not be check on compile time for now ...)
* TODO: Do it better ... compile check
* @param[in] newVal New value to set
*/
inline void setDirect(const TYPE& _newVal) {
m_value = _newVal;
}
virtual void setDirectCheck(const TYPE& _newVal) {
m_value = _newVal;
}
/**
* @brief Get the value of the current parameter (no check (for internal set with no check).
* @note For performence, this function must be inline
* @note Only use by the owner of the property (can not be check on compile time for now ...)
* TODO: Do it better ... compile check
* @return a reference on the value
*/
TYPE& getDirect() {
return m_value;
}
virtual std::string getValueSpecific(const TYPE& _valueRequested) const = 0;
public:
operator const TYPE&() const {
return m_value;
}
const TYPE& operator *() const noexcept {
return m_value;
}
const TYPE* operator->() const noexcept {
return &m_value;
}
const PropertyType<TYPE>& operator= (const TYPE& _newVal) = delete;
};
template<typename TYPE> std::ostream& operator <<(std::ostream& _os, const eproperty::PropertyType<TYPE>& _obj) {
_os << _obj.get();
return _os;
}
}
#undef __class__
#define __class__ nullptr

199
eproperty/PropertyType.hpp Normal file
View File

@ -0,0 +1,199 @@
/** @file
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license MPL v2.0 (see license file)
*/
#pragma once
#include <eproperty/Interface.hpp>
#include <eproperty/Property.hpp>
#include <eproperty/debug.hpp>
#include <etk/typeInfo.hpp>
namespace eproperty {
/**
* @brief Template base of the property (have a generic set and get for string)
*/
template<class TYPE> class PropertyType : public Property {
protected:
TYPE m_value; //!< Current value.
TYPE m_default; //!< Default value.
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>
PropertyType(CLASS_TYPE* _owner,
const etk::String& _name,
const TYPE& _defaultValue,
const etk::String& _description = "",
void (CLASS_TYPE::*_setObs)()=null) :
Property(_owner, _name),
m_value(_defaultValue),
m_default(_defaultValue) {
if (_setObs != null) {
setObserver([=](){(*_owner.*_setObs)();});
}
}
/**
* @brief Create a parameter with a specific type.
* @param[in] _defaultValue Default value of the parameter.
*/
PropertyType(const TYPE& _defaultValue) :
m_value(_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.
*/
virtual ~PropertyType() = default;
/**
* @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";
}
etk::String getType() const override {
//return typeid(TYPE).name(); // With generic STL & RTTI ...
return ETK_GET_TYPE_NAME(TYPE);
}
etk::String getString() const override {
return getValueSpecific(m_value);
}
etk::String getDefault() const override {
return getValueSpecific(m_default);
}
etk::String getInfo() const override {
return getType() + " default=" + getDefault();
}
bool isDefault() const override {
return m_value == m_default;
}
void setDefault() override {
set(m_default);
}
/**
* @brief Set new default value on the property
* @param[in] _newDefault New value to set
*/
virtual void changeDefault(const TYPE& _newDefault) {
m_default = _newDefault;
}
public:
/**
* @brief Get the value of the current parameter.
* @note For performence, this function must be inline
* @return the Reference value
*/
const inline TYPE& get() const {
return m_value;
};
/**
* @brief Set a new value for this parameter
* @param[in] _newVal New value to set (set the nearest value if range is set)
*/
virtual void set(const TYPE& _newVal) {
if (_newVal != m_value) {
m_value = _newVal;
notifyChange();
}
}
/**
* @brief Set the value of the current parameter (no check (for internal set with no check).
* @note For performence, this function must be inline
* @note Only use by the owner of the property (can not be check on compile time for now ...)
* TODO: Do it better ... compile check
* @param[in] _newVal New value to set
*/
inline void setDirect(const TYPE& _newVal) {
m_value = _newVal;
}
/**
* @brief Set the value of the current parameter (check range and ... if needed).
* @note Only use by the owner of the property/
* @param[in] _newVal New value to set
*/
virtual void setDirectCheck(const TYPE& _newVal) {
m_value = _newVal;
}
/**
* @brief Get the value of the current parameter (no check (for internal set with no check).
* @note For performence, this function must be inline
* @note Only use by the owner of the property (can not be check on compile time for now ...)
* TODO: Do it better ... compile check
* @return a reference on the value
*/
TYPE& getDirect() {
return m_value;
}
/**
* @brief Get the string of the specify value.
* @param[in] _valueRequested Value to convert in string
* @return convertion of the value in string.
*/
virtual etk::String getValueSpecific(const TYPE& _valueRequested) const = 0;
public:
/**
* @brief Const cast the property in the Type of the data
* @return Const reference on the value.
*/
operator const TYPE&() const {
return m_value;
}
/**
* @brief Get the property Value
* @return Const reference on the value.
*/
const TYPE& operator *() const noexcept {
return m_value;
}
/**
* @brief Get the property Value
* @return Const reference on the value.
*/
const TYPE* operator->() const noexcept {
return &m_value;
}
/**
* @brief Assignation opérator (REMOVED)
* @param _newVal Value to asign
* @return Reference on current object
*/
PropertyType<TYPE>& operator= (const TYPE& _newVal) = delete;
};
//! @not_in_doc
template<typename TYPE> etk::Stream& operator <<(etk::Stream& _os, const eproperty::PropertyType<TYPE>& _obj) {
_os << _obj.get();
return _os;
}
}

View File

@ -1,68 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
*/
#pragma once
#include <eproperty/Interface.h>
#include <eproperty/Value.h>
#include <typeinfo>
#undef __class__
#define __class__ "Range<T>"
namespace eproperty {
template<class TYPE> class Range : public Value<TYPE> {
private:
TYPE m_min; //!< Minimum value.
TYPE m_max; //!< Maximum value.
public:
/**
* @brief Create a parameter with a specific type.
* @param[in] _owner reference on the parameter lister.
* @param[in] _name Static name of the parameter.
* @param[in] _defaultValue Default value of the parameter.
* @param[in] _min Minumum value.
* @param[in] _max Maximum value.
* @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>
Range(CLASS_TYPE* _owner,
const std::string& _name,
const TYPE& _defaultValue,
const TYPE& _min,
const TYPE& _max,
const std::string& _description = "",
void (CLASS_TYPE::*_setObs)()=nullptr) :
eproperty::Value<TYPE>(_owner, _name, _defaultValue, _description, _setObs),
m_min(_min),
m_max(_max) {
if (m_min > m_max) {
//EPROPERTY_CRITICAL("min > max...");
}
};
/**
* @brief Destructor.
*/
virtual ~Range() = default;
std::string getPropertyType() const override;
void setString(const std::string& _newVal) override;
std::string getInfo() const override;
public:
void set(const TYPE& _newVal) override;
void setDirectCheck(const TYPE& _newVal) override;
};
template<typename TYPE> std::ostream& operator <<(std::ostream& _os, const eproperty::Range<TYPE>& _obj) {
_os << _obj.get();
return _os;
}
}
#undef __class__
#define __class__ nullptr

103
eproperty/Range.hpp Normal file
View File

@ -0,0 +1,103 @@
/** @file
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license MPL v2.0 (see license file)
*/
#pragma once
#include <eproperty/Interface.hpp>
#include <eproperty/Value.hpp>
namespace eproperty {
/**
* @brief Range template of the property (limit with a min and a max value)
* @tparam TYPE Tpe of the range value
*/
template<class TYPE> class Range : public Value<TYPE> {
private:
TYPE m_min; //!< Minimum value.
TYPE m_max; //!< Maximum value.
public:
/**
* @brief Create a parameter with a specific type.
* @param[in] _owner reference on the parameter lister (null if none).
* @param[in] _name Static name of the parameter.
* @param[in] _defaultValue Default value of the parameter.
* @param[in] _min Minumum value.
* @param[in] _max Maximum value.
* @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>
Range(CLASS_TYPE* _owner,
const etk::String& _name,
const TYPE& _defaultValue,
const TYPE& _min,
const TYPE& _max,
const etk::String& _description = "",
void (CLASS_TYPE::*_setObs)()=null) :
eproperty::Value<TYPE>(_owner, _name, _defaultValue, _description, _setObs),
m_min(_min),
m_max(_max) {
if (m_min > m_max) {
//EPROPERTY_CRITICAL("min > max...");
}
};
/**
* @brief Create a parameter with a specific type.
* @param[in] _defaultValue Default value of the parameter.
* @param[in] _min Minumum value.
* @param[in] _max Maximum value.
*/
Range(const TYPE& _defaultValue,
const TYPE& _min,
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.
*/
virtual ~Range() = default;
/**
* @brief Remove copy operator
*/
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:
void set(const TYPE& _newVal) override;
void setDirectCheck(const TYPE& _newVal) override;
};
//! @not_in_doc
template<typename TYPE> etk::Stream& operator <<(etk::Stream& _os, const eproperty::Range<TYPE>& _obj) {
_os << _obj.get();
return _os;
}
}

View File

@ -1,57 +0,0 @@
/**
* @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>
#undef __class__
#define __class__ "Value<T>"
namespace eproperty {
template<class TYPE> class Value : public PropertyType<TYPE> {
public:
/**
* @brief Create a parameter with a specific type.
* @param[in] _owner Owner of the parameter.
* @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) {
}
protected:
/**
* @brief Get the string of the specify value.
* @return convetion of the velue in string.
*/
std::string getValueSpecific(const TYPE& _valueRequested) const override;
void setString(const std::string& _newVal) override;
};
template<typename TYPE> std::ostream& operator <<(std::ostream& _os, const eproperty::Value<TYPE>& _obj) {
_os << _obj.get();
return _os;
}
}
#undef __class__
#define __class__ nullptr

84
eproperty/Value.hpp Normal file
View File

@ -0,0 +1,84 @@
/** @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;
}
}

View File

@ -1,12 +1,12 @@
/**
/** @file
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
* @license MPL v2.0 (see license file)
*/
#include <eproperty/debug.h>
#include <eproperty/debug.hpp>
int32_t eproperty::getLogId() {
static int32_t g_val = elog::registerInstance("eproperty");

View File

@ -1,13 +1,13 @@
/**
/** @file
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
* @license MPL v2.0 (see license file)
*/
#pragma once
#include <elog/log.h>
#include <elog/log.hpp>
namespace eproperty {
int32_t getLogId();

View File

@ -1,18 +1,16 @@
/**
/** @file
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
* @license MPL v2.0 (see license file)
*/
#include <eproperty/details/Range.hxx>
#include <etk/types.h>
#include <etk/math/Vector2D.h>
#include <etk/math/Vector3D.h>
#include <etk/Color.h>
#include <etk/types.hpp>
#include <etk/math/Vector2D.hpp>
#include <etk/math/Vector3D.hpp>
#include <etk/Color.hpp>
#undef __class__
#define __class__ "Range<T>"
// void generic properties
template class eproperty::Range<int64_t>;
template class eproperty::Range<int32_t>;

View File

@ -1,32 +1,42 @@
/**
/** @file
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
* @license MPL v2.0 (see license file)
*/
#pragma once
#include <eproperty/Range.h>
#include <eproperty/Range.hpp>
#undef __class__
#define __class__ "Range<T>"
template<class TYPE>
std::string eproperty::Range<TYPE>::getPropertyType() const {
eproperty::Range<TYPE>::Range(const TYPE& _defaultValue,
const TYPE& _min,
const TYPE& _max) :
eproperty::Value<TYPE>(_defaultValue),
m_min(_min),
m_max(_max) {
if (m_min > m_max) {
//EPROPERTY_CRITICAL("min > max...");
}
}
template<class TYPE>
etk::String eproperty::Range<TYPE>::getPropertyType() const {
return "eproperty::Range";
}
template<class TYPE>
void eproperty::Range<TYPE>::setString(const std::string& _newVal) {
void eproperty::Range<TYPE>::setString(const etk::String& _newVal) {
TYPE val;
// when you want to set an element in parameter you will implement the function template std::from_string
// when you want to set an element in parameter you will implement the function template etk::from_string
etk::from_string(val, _newVal);
set(val);
}
template<class TYPE>
std::string eproperty::Range<TYPE>::getInfo() const {
etk::String eproperty::Range<TYPE>::getInfo() const {
return eproperty::Value<TYPE>::getType() + " default=" + eproperty::Value<TYPE>::getDefault();
}
@ -38,7 +48,7 @@ void eproperty::Range<TYPE>::set(const TYPE& _newVal) {
eproperty::Value<TYPE>::notifyChange();
}
} else {
TYPE newVal = std::avg(m_min, _newVal, m_max);
TYPE newVal = etk::avg(m_min, _newVal, m_max);
if (newVal != eproperty::Value<TYPE>::m_value) {
eproperty::Value<TYPE>::m_value = newVal;
eproperty::Value<TYPE>::notifyChange();
@ -53,7 +63,7 @@ void eproperty::Range<TYPE>::setDirectCheck(const TYPE& _newVal) {
eproperty::Value<TYPE>::m_value = _newVal;
}
} else {
TYPE newVal = std::avg(m_min, _newVal, m_max);
TYPE newVal = etk::avg(m_min, _newVal, m_max);
if (newVal != eproperty::Value<TYPE>::m_value) {
eproperty::Value<TYPE>::m_value = newVal;
}

View File

@ -1,24 +1,24 @@
/**
/** @file
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
* @license MPL v2.0 (see license file)
*/
#include <eproperty/details/Value.hxx>
#include <etk/types.h>
#include <etk/math/Vector2D.h>
#include <etk/math/Vector3D.h>
#include <etk/Color.h>
#include <etk/types.hpp>
#include <etk/math/Vector2D.hpp>
#include <etk/math/Vector3D.hpp>
#include <etk/Color.hpp>
#include <etk/path/Path.hpp>
#include <etk/uri/Uri.hpp>
#undef __class__
#define __class__ "Value<T>"
// void generic properties
template class eproperty::Value<bool>;
template class eproperty::Value<std::string>;
template class eproperty::Value<etk::String>;
#if __CPP_VERSION__ >= 2011
template class eproperty::Value<std::u32string>;
template class eproperty::Value<etk::UString>;
#endif
template class eproperty::Value<int64_t>;
template class eproperty::Value<int32_t>;
@ -48,3 +48,6 @@ template class eproperty::Value<etk::Color<unsigned char,4>>;
template class eproperty::Value<etk::Color<unsigned char,3>>;
template class eproperty::Value<etk::Color<float,4>>;
template class eproperty::Value<etk::Color<float,3>>;
template class eproperty::Value<etk::Path>;
template class eproperty::Value<etk::Uri>;

View File

@ -1,31 +1,30 @@
/**
/** @file
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
* @license MPL v2.0 (see license file)
*/
#pragma once
#include <eproperty/Value.h>
#include <eproperty/Value.hpp>
#undef __class__
#define __class__ "Value<T>"
template<class TYPE>
std::string eproperty::Value<TYPE>::getValueSpecific(const TYPE& _valueRequested) const {
return etk::to_string(_valueRequested);
eproperty::Value<TYPE>::Value(const TYPE& _defaultValue) :
eproperty::PropertyType<TYPE>(_defaultValue) {
}
template<class TYPE>
void eproperty::Value<TYPE>::setString(const std::string& _newVal) {
// when you want to set an element in parameter you will implement the function template std::from_string
etk::String eproperty::Value<TYPE>::getValueSpecific(const TYPE& _valueRequested) const {
return etk::toString(_valueRequested);
}
template<class TYPE>
void eproperty::Value<TYPE>::setString(const etk::String& _newVal) {
// when you want to set an element in parameter you will implement the function template etk::from_string
etk::from_string(eproperty::PropertyType<TYPE>::m_value, _newVal);
// TODO : Do it better ...
eproperty::PropertyType<TYPE>::notifyChange();
}
#undef __class__
#define __class__ nullptr

35
lutin_eproperty-sample.py Normal file
View File

@ -0,0 +1,35 @@
#!/usr/bin/python
import realog.debug as debug
import lutin.tools as tools
def get_type():
return "BINARY"
def get_sub_type():
return "SAMPLE"
def get_desc():
return "e-property sample 1"
def get_licence():
return "MPL-2"
def get_compagny_type():
return "com"
def get_compagny_name():
return "atria-soft"
def get_maintainer():
return "authors.txt"
def configure(target, my_module):
my_module.add_src_file([
'sample/sampleAll.cpp'
])
my_module.add_depend([
'eproperty',
'test-debug'
])
return True

View File

@ -1,7 +1,6 @@
#!/usr/bin/python
import lutin.module as module
import realog.debug as debug
import lutin.tools as tools
import datetime
def get_type():
@ -14,7 +13,7 @@ def get_desc():
return "e-property test software"
def get_licence():
return "APACHE-2"
return "MPL-2"
def get_compagny_type():
return "com"
@ -23,17 +22,20 @@ def get_compagny_name():
return "atria-soft"
def get_maintainer():
return ["Mr DUPIN Edouard <yui.heero@gmail.com>"]
return "authors.txt"
def create(target, module_name):
my_module = module.Module(__file__, module_name, get_type())
def configure(target, my_module):
my_module.add_src_file([
'test/main.cpp',
'test/declareProperties.cpp',
'test/test_list.cpp',
'test/test_range.cpp',
'test/test_value.cpp'
])
my_module.add_module_depend(['eproperty', 'gtest', 'test-debug'])
return my_module
'test/main.cpp',
'test/declareProperties.cpp',
'test/test_list.cpp',
'test/test_range.cpp',
'test/test_value.cpp'
])
my_module.add_depend([
'eproperty',
'etest',
'test-debug'
])
return True

View File

@ -1,7 +1,6 @@
#!/usr/bin/python
import lutin.module as module
import lutin.tools as tools
import lutin.debug as debug
import realog.debug as debug
import os
@ -12,7 +11,7 @@ def get_desc():
return "eproperty is a property interface for basic class"
def get_licence():
return "APACHE-2"
return "MPL-2"
def get_compagny_type():
return "com"
@ -21,36 +20,38 @@ def get_compagny_name():
return "atria-soft"
def get_maintainer():
return ["Mr DUPIN Edouard <yui.heero@gmail.com>"]
return "authors.txt"
def get_version():
return [0,1,"dev"]
return "version.txt"
def create(target, module_name):
my_module = module.Module(__file__, module_name, get_type())
my_module.add_extra_compile_flags()
def configure(target, my_module):
my_module.add_extra_flags()
my_module.add_src_file([
'eproperty/debug.cpp',
'eproperty/Property.cpp',
'eproperty/Interface.cpp',
'eproperty/details/Range.cpp',
'eproperty/details/Value.cpp',
])
'eproperty/debug.cpp',
'eproperty/Property.cpp',
'eproperty/InterfaceData.cpp',
'eproperty/details/Range.cpp',
'eproperty/details/Value.cpp',
])
my_module.add_header_file([
'eproperty/debug.h',
'eproperty/Value.h',
'eproperty/Interface.h',
'eproperty/Property.h',
'eproperty/PropertyType.h',
'eproperty/Range.h',
'eproperty/List.h',
'eproperty/details/Range.hxx',
'eproperty/details/Value.hxx',
])
my_module.add_module_depend(['etk'])
my_module.add_path(tools.get_current_path(__file__))
my_module.compile_flags('c++', [
"-DEPROPERTY_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\""
])
return my_module
'eproperty/debug.hpp',
'eproperty/Value.hpp',
'eproperty/Interface.hpp',
'eproperty/InterfaceData.hpp',
'eproperty/Property.hpp',
'eproperty/PropertyType.hpp',
'eproperty/Range.hpp',
'eproperty/List.hpp',
'eproperty/details/Range.hxx',
'eproperty/details/Value.hxx',
])
my_module.add_depend([
'etk'
])
my_module.add_path(".")
my_module.add_flag('c++', [
"-DEPROPERTY_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\""
])
return True

166
sample/sampleAll.cpp Normal file
View File

@ -0,0 +1,166 @@
/** @file
* @author Edouard DUPIN
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license MPL v2.0 (see license file)
*/
#include <etk/etk.hpp>
#include <test-debug/debug.hpp>
//! [eproperty_sample_all]
//! [eproperty_sample_declare_interface]
#include <eproperty/Interface.hpp>
//! [eproperty_sample_declare_interface]
//! [eproperty_sample_declare_value]
#include <eproperty/Value.hpp>
//! [eproperty_sample_declare_value]
//! [eproperty_sample_declare_list]
#include <eproperty/List.hpp>
//! [eproperty_sample_declare_list]
//! [eproperty_sample_declare_range]
#include <eproperty/Range.hpp>
//! [eproperty_sample_declare_range]
//! [eproperty_sample_declare_an_enum]
enum simpleEnum {
simpleEnum_enum1,
simpleEnum_enum2,
simpleEnum_enum3,
simpleEnum_enum4,
};
// Declare type in CPP only
#include <etk/typeInfo.hpp>
ETK_DECLARE_TYPE(enum simpleEnum);
//! [eproperty_sample_declare_an_enum]
//! [eproperty_sample_class_with_interface]
//! [eproperty_sample_declare_class_with_interface]
class sampleClassGroup : public eproperty::Interface {
//! [eproperty_sample_declare_class_with_interface]
public:
//! [eproperty_sample_declare_class_property_value]
eproperty::Value<etk::String> propertyValue; //!< Simple property Value with type string
//! [eproperty_sample_declare_class_property_value]
//! [eproperty_sample_declare_class_property_list]
eproperty::List<enum simpleEnum> propertyList; //!< Simple property List with type enumeration
//! [eproperty_sample_declare_class_property_list]
//! [eproperty_sample_declare_class_property_range]
eproperty::Range<int32_t> propertyRange; //!< Simple property Range with type integer
//! [eproperty_sample_declare_class_property_range]
sampleClassGroup():
//! [eproperty_sample_initialize_class_property_value]
propertyValue(this, "value", "default value", "optionnal Description", &sampleClassGroup::onPropertyChangeValue),
//! [eproperty_sample_initialize_class_property_value]
//! [eproperty_sample_initialize_class_property_list]
propertyList(this, "list", simpleEnum_enum4),
//! [eproperty_sample_initialize_class_property_list]
//! [eproperty_sample_initialize_class_property_range]
propertyRange(this, "range", 5646546, -5, 555555555) {
//! [eproperty_sample_initialize_class_property_range]
// add all enumeration values
//! [eproperty_sample_initialize_class_property_list_add]
propertyList.add(simpleEnum_enum1, "enum1");
propertyList.add(simpleEnum_enum2, "enum2");
propertyList.add(simpleEnum_enum3, "enum3");
propertyList.add(simpleEnum_enum4, "enum4");
//! [eproperty_sample_initialize_class_property_list_add]
//! [eproperty_sample_initialize_class_property_list_rename]
// Rename an element
propertyList.rename("enum1", "new enum name");
// Remove an element
propertyList.remove("enum2");
//! [eproperty_sample_initialize_class_property_list_rename]
//! [eproperty_sample_initialize_class_property_set_direct]
// no check on the value set (the faster in CPU cycle)
propertyValue.setDirect("New Value to Set");
// Check the internal value (better for range)
propertyRange.setDirectCheck(-5555);
//! [eproperty_sample_initialize_class_property_set_direct]
}
//! [eproperty_sample_initialize_class_property_value_callback]
void onPropertyChangeValue() {
TEST_PRINT("Property value has change ... " << *propertyValue);
TEST_INFO("Use properties:");
//! [eproperty_sample_get_value_value]
TEST_INFO(" value:" << *propertyValue);
//! [eproperty_sample_get_value_value]
//! [eproperty_sample_get_value_range]
TEST_INFO(" range:" << *propertyRange);
//! [eproperty_sample_get_value_range]
//! [eproperty_sample_get_value_list]
TEST_INFO(" list:" << *propertyList);
//! [eproperty_sample_get_value_list]
}
//! [eproperty_sample_initialize_class_property_value_callback]
};
//! [eproperty_sample_class_with_interface]
//! [eproperty_sample_class_without_interface]
class sampleClassSolo {
public:
eproperty::Value<etk::String> propertyValue;
eproperty::List<enum simpleEnum> propertyList;
eproperty::Range<int32_t> propertyRange;
sampleClassSolo():
//! [eproperty_sample_initialize_class_property_value2]
propertyValue("default value"),
//! [eproperty_sample_initialize_class_property_value2]
//! [eproperty_sample_initialize_class_property_list2]
propertyList(simpleEnum_enum4),
//! [eproperty_sample_initialize_class_property_list2]
//! [eproperty_sample_initialize_class_property_range2]
propertyRange(5646546, -5, 555555555) {
//! [eproperty_sample_initialize_class_property_range2]
propertyList.add(simpleEnum_enum1, "enum1");
propertyList.add(simpleEnum_enum2, "enum2");
propertyList.add(simpleEnum_enum3, "enum3");
propertyList.add(simpleEnum_enum4, "enum4");
}
};
//! [eproperty_sample_class_without_interface]
void simpleSet() {
//! [eproperty_sample_use_declare_class]
sampleClassGroup myClass;
//! [eproperty_sample_use_declare_class]
//! [eproperty_sample_use_set_value_1]
myClass.propertyValue.set("New Value");
myClass.propertyValue.setString("New Value 2");
//! [eproperty_sample_use_set_value_1]
//! [eproperty_sample_use_set_list_1]
myClass.propertyList.set(simpleEnum_enum3);
myClass.propertyList.setString("enum3");
//! [eproperty_sample_use_set_list_1]
//! [eproperty_sample_use_set_range_1]
myClass.propertyRange.set(15621);
myClass.propertyRange.setString("15621");
//! [eproperty_sample_use_set_range_1]
//! [eproperty_sample_use_set_value_2]
myClass.properties.set("value", "New Value in string");
//! [eproperty_sample_use_set_value_2]
//! [eproperty_sample_use_set_list_2]
myClass.properties.set("list", "enum4");
//! [eproperty_sample_use_set_list_2]
//! [eproperty_sample_use_set_range_2]
myClass.properties.set("range", "-2");
//! [eproperty_sample_use_set_range_2]
}
//! [eproperty_sample_all]
int main(int _argc, const char *_argv[]) {
etk::init(_argc, _argv);
TEST_INFO("simpleSet [START] ***************************");
simpleSet();
TEST_INFO("simpleSet [STOP] ***************************");
return 0;
}

View File

@ -3,23 +3,19 @@
*
* @copyright 2016, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
* @license MPL v2.0 (see license file)
*/
#define NAME "Empty"
#include <etk/types.h>
#include <etk/etk.h>
#include <test-debug/debug.h>
#include <gtest/gtest.h>
#undef __class__
#define __class__ "eproperty-test"
#include <etk/types.hpp>
#include <etk/etk.hpp>
#include <test-debug/debug.hpp>
#include <etest/etest.hpp>
int main(int _argc, const char *_argv[]) {
::testing::InitGoogleTest(&_argc, const_cast<char **>(_argv));
etk::init(_argc, _argv);
etest::init(_argc, _argv);
for (int32_t iii=0; iii<_argc ; ++iii) {
std::string data = _argv[iii];
etk::String data = _argv[iii];
if ( data == "-h"
|| data == "--help") {
TEST_PRINT("eproperty-test - help : ");

1
version.txt Normal file
View File

@ -0,0 +1 @@
1.0.0