frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

JsonCpp to QTJson (Final Part) (#273)

Browse Source 
* Update CMakeLists.txt

* Update Hyperion.h

* Update LedDevice.h

* Update LedDeviceFactory.h

* Update Hyperion.cpp

* Update LedString.cpp

* Update JsonClientConnection.cpp

* Update LedDeviceAdalight.cpp

* Update LedDeviceAdalight.h

* Update LedDeviceAPA102.cpp

* Update LedDeviceAdalightApa102.h

* Update LedDeviceAdalightApa102.cpp

* Update LedDeviceAPA102.h

* Update LedDeviceAtmo.cpp

* Update LedDeviceAtmo.h

* Update LedDeviceAtmoOrb.cpp

* Update LedDeviceAtmoOrb.h

* Update LedDeviceDMX.cpp

* Update LedDeviceDMX.h

* Update LedDeviceFactory.cpp

* Update LedDeviceFadeCandy.cpp

* Update LedDeviceFadeCandy.h

* Update LedDeviceFile.cpp

* Update LedDeviceFile.h

* Update LedDeviceHyperionUsbasp.cpp

* Update LedDeviceHyperionUsbasp.h

* Update LedDeviceLightpack.cpp

* Update LedDeviceLightpack.h

* Update LedDeviceLpd6803.cpp

* Update LedDeviceLpd6803.h

* Update LedDeviceLpd8806.cpp

* Update LedDeviceLpd8806.h

* Update LedDeviceMultiLightpack.cpp

* Update LedDeviceMultiLightpack.h

* Update LedDeviceP9813.cpp

* Update LedDeviceP9813.h

* Update LedDevicePaintpack.cpp

* Update LedDevicePaintpack.h

* Update LedDevicePhilipsHue.cpp

* Update LedDevicePhilipsHue.h

* Update LedDevicePiBlaster.cpp

* Update LedDevicePiBlaster.h

* Update LedDeviceRawHID.cpp

* Update LedDeviceRawHID.h

* Update LedDeviceSedu.cpp

* Update LedDeviceSedu.h

* Update LedDeviceSk6812SPI.cpp

* Update LedDeviceSk6812SPI.h

* Update LedDeviceTinkerforge.cpp

* Update LedDeviceTinkerforge.h

* Update LedDeviceTpm2.cpp

* Update LedDeviceTpm2.h

* Update LedDeviceTpm2net.cpp

* Update LedDeviceTpm2net.h

* Update LedDeviceUdpE131.cpp

* Update LedDeviceUdpE131.h

* Update LedDeviceUdpH801.cpp

* Update LedDeviceUdpH801.h

* Update LedDeviceUdpRaw.cpp

* Update LedDeviceUdpRaw.h

* Update LedDeviceWs2801.cpp

* Update LedDeviceWs2801.h

* Update LedDeviceWS2812b.cpp

* Update LedDeviceWS2812b.h

* Update LedDeviceWs2812SPI.cpp

* Update LedDeviceWs2812SPI.h

* Update LedDeviceWS281x.cpp

* Update LedDeviceWS281x.h

* Update ProviderHID.cpp

* Update ProviderHID.h

* Update ProviderRs232.cpp

* Update ProviderRs232.h

* Update ProviderSpi.cpp

* Update ProviderSpi.h

* Update ProviderUdp.cpp

* Update ProviderUdp.h

* Update LedDevice.cpp

* Update CMakeLists.txt

* Update hyperiond.cpp

* Update hyperiond.h

* Update TestSpi.cpp

* Delete AUTHORS

* Delete CMakeLists.txt

* Delete LICENSE

* Delete json_batchallocator.h

* Delete json_internalarray.inl

* Delete json_internalmap.inl

* Delete json_reader.cpp

* Delete json_tool.h

* Delete json_value.cpp

* Delete json_valueiterator.inl

* Delete json_writer.cpp

* Delete sconscript

* Delete autolink.h

* Delete config.h

* Delete features.h

* Delete forwards.h

* Delete json.h

* Delete reader.h

* Delete value.h

* Delete writer.h
This commit is contained in:
Paulchen Panther 2016-10-13 21:59:58 +02:00 committed by redPanther
parent 48d8781cdf
commit 464de381a0
101 changed files with 313 additions and 7305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dependencies/CMakeLists.txt vendored
View File

@ -1,5 +1,4 @@
add_subdirectory(build/hidapi) add_subdirectory(build/hidapi)
add_subdirectory(build/jsoncpp)
add_subdirectory(build/tinkerforge) add_subdirectory(build/tinkerforge)
if(ENABLE_WS281XPWM) if(ENABLE_WS281XPWM)

1
dependencies/build/jsoncpp/AUTHORS vendored
View File

@ -1 +0,0 @@
Baptiste Lepilleur <blep@users.sourceforge.net>

24
dependencies/build/jsoncpp/CMakeLists.txt vendored
View File

@ -1,24 +0,0 @@
project(jsoncpp)
# define the current source/header path
set(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/dependencies/include/json)
set(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/dependencies/build/jsoncpp)
add_library(jsoncpp
${CURRENT_HEADER_DIR}/autolink.h
${CURRENT_HEADER_DIR}/config.h
${CURRENT_HEADER_DIR}/features.h
${CURRENT_HEADER_DIR}/forwards.h
${CURRENT_HEADER_DIR}/json.h
${CURRENT_HEADER_DIR}/reader.h
${CURRENT_HEADER_DIR}/value.h
${CURRENT_HEADER_DIR}/writer.h
${CURRENT_SOURCE_DIR}/json_batchallocator.h
${CURRENT_SOURCE_DIR}/json_internalarray.inl
${CURRENT_SOURCE_DIR}/json_internalmap.inl
${CURRENT_SOURCE_DIR}/json_reader.cpp
${CURRENT_SOURCE_DIR}/json_tool.h
${CURRENT_SOURCE_DIR}/json_value.cpp
${CURRENT_SOURCE_DIR}/json_valueiterator.inl
${CURRENT_SOURCE_DIR}/json_writer.cpp)

55
dependencies/build/jsoncpp/LICENSE vendored
View File

@ -1,55 +0,0 @@
The JsonCpp library's source code, including accompanying documentation,
tests and demonstration applications, are licensed under the following
conditions...
The author (Baptiste Lepilleur) explicitly disclaims copyright in all
jurisdictions which recognize such a disclaimer. In such jurisdictions,
this software is released into the Public Domain.
In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is
released under the terms of the MIT License (see below).
In jurisdictions which recognize Public Domain property, the user of this
software may choose to accept it either as 1) Public Domain, 2) under the
conditions of the MIT License (see below), or 3) under the terms of dual
Public Domain/MIT License conditions described here, as they choose.
The MIT License is about as close to Public Domain as a license can get, and is
described in clear, concise terms at:
http://en.wikipedia.org/wiki/MIT_License
The full text of the MIT License follows:
========================================================================
Copyright (c) 2007-2010 Baptiste Lepilleur
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use, copy,
modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
========================================================================
(END LICENSE TEXT)
The MIT license is compatible with both the GPL and commercial
software, affording one all of the rights of Public Domain with the
minor nuisance of being required to keep the above copyright notice
and license text in the source code. Note also that by accepting the
Public Domain "license" you can re-license your copy using whatever
license you like.

130
dependencies/build/jsoncpp/json_batchallocator.h vendored
View File

@ -1,130 +0,0 @@
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#ifndef JSONCPP_BATCHALLOCATOR_H_INCLUDED
# define JSONCPP_BATCHALLOCATOR_H_INCLUDED
# include <stdlib.h>
# include <assert.h>
# ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
namespace Json {
/* Fast memory allocator.
*
* This memory allocator allocates memory for a batch of object (specified by
* the page size, the number of object in each page).
*
* It does not allow the destruction of a single object. All the allocated objects
* can be destroyed at once. The memory can be either released or reused for future
* allocation.
*
* The in-place new operator must be used to construct the object using the pointer
* returned by allocate.
*/
template<typename AllocatedType
,const unsigned int objectPerAllocation>
class BatchAllocator
{
public:
typedef AllocatedType Type;
BatchAllocator( unsigned int objectsPerPage = 255 )
: freeHead_( 0 )
, objectsPerPage_( objectsPerPage )
{
// printf( "Size: %d => %s\n", sizeof(AllocatedType), typeid(AllocatedType).name() );
assert( sizeof(AllocatedType) * objectPerAllocation >= sizeof(AllocatedType *) ); // We must be able to store a slist in the object free space.
assert( objectsPerPage >= 16 );
batches_ = allocateBatch( 0 ); // allocated a dummy page
currentBatch_ = batches_;
}
~BatchAllocator()
{
for ( BatchInfo *batch = batches_; batch; )
{
BatchInfo *nextBatch = batch->next_;
free( batch );
batch = nextBatch;
}
}
/// allocate space for an array of objectPerAllocation object.
/// @warning it is the responsability of the caller to call objects constructors.
AllocatedType *allocate()
{
if ( freeHead_ ) // returns node from free list.
{
AllocatedType *object = freeHead_;
freeHead_ = *(AllocatedType **)object;
return object;
}
if ( currentBatch_->used_ == currentBatch_->end_ )
{
currentBatch_ = currentBatch_->next_;
while ( currentBatch_ && currentBatch_->used_ == currentBatch_->end_ )
currentBatch_ = currentBatch_->next_;
if ( !currentBatch_ ) // no free batch found, allocate a new one
{
currentBatch_ = allocateBatch( objectsPerPage_ );
currentBatch_->next_ = batches_; // insert at the head of the list
batches_ = currentBatch_;
}
}
AllocatedType *allocated = currentBatch_->used_;
currentBatch_->used_ += objectPerAllocation;
return allocated;
}
/// Release the object.
/// @warning it is the responsability of the caller to actually destruct the object.
void release( AllocatedType *object )
{
assert( object != 0 );
*(AllocatedType **)object = freeHead_;
freeHead_ = object;
}
private:
struct BatchInfo
{
BatchInfo *next_;
AllocatedType *used_;
AllocatedType *end_;
AllocatedType buffer_[objectPerAllocation];
};
// disabled copy constructor and assignement operator.
BatchAllocator( const BatchAllocator & );
void operator =( const BatchAllocator &);
static BatchInfo *allocateBatch( unsigned int objectsPerPage )
{
const unsigned int mallocSize = sizeof(BatchInfo) - sizeof(AllocatedType)* objectPerAllocation
+ sizeof(AllocatedType) * objectPerAllocation * objectsPerPage;
BatchInfo *batch = static_cast<BatchInfo*>( malloc( mallocSize ) );
batch->next_ = 0;
batch->used_ = batch->buffer_;
batch->end_ = batch->buffer_ + objectsPerPage;
return batch;
}
BatchInfo *batches_;
BatchInfo *currentBatch_;
/// Head of a single linked list within the allocated space of freeed object
AllocatedType *freeHead_;
unsigned int objectsPerPage_;
};
} // namespace Json
# endif // ifndef JSONCPP_DOC_INCLUDE_IMPLEMENTATION
#endif // JSONCPP_BATCHALLOCATOR_H_INCLUDED

456
dependencies/build/jsoncpp/json_internalarray.inl vendored
View File

@ -1,456 +0,0 @@
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
// included by json_value.cpp
namespace Json {
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
// class ValueInternalArray
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
ValueArrayAllocator::~ValueArrayAllocator()
{
}
// //////////////////////////////////////////////////////////////////
// class DefaultValueArrayAllocator
// //////////////////////////////////////////////////////////////////
#ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
class DefaultValueArrayAllocator : public ValueArrayAllocator
{
public: // overridden from ValueArrayAllocator
virtual ~DefaultValueArrayAllocator()
{
}
virtual ValueInternalArray *newArray()
{
return new ValueInternalArray();
}
virtual ValueInternalArray *newArrayCopy( const ValueInternalArray &other )
{
return new ValueInternalArray( other );
}
virtual void destructArray( ValueInternalArray *array )
{
delete array;
}
virtual void reallocateArrayPageIndex( Value **&indexes,
ValueInternalArray::PageIndex &indexCount,
ValueInternalArray::PageIndex minNewIndexCount )
{
ValueInternalArray::PageIndex newIndexCount = (indexCount*3)/2 + 1;
if ( minNewIndexCount > newIndexCount )
newIndexCount = minNewIndexCount;
void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount );
if ( !newIndexes )
throw std::bad_alloc();
indexCount = newIndexCount;
indexes = static_cast<Value **>( newIndexes );
}
virtual void releaseArrayPageIndex( Value **indexes,
ValueInternalArray::PageIndex indexCount )
{
if ( indexes )
free( indexes );
}
virtual Value *allocateArrayPage()
{
return static_cast<Value *>( malloc( sizeof(Value) * ValueInternalArray::itemsPerPage ) );
}
virtual void releaseArrayPage( Value *value )
{
if ( value )
free( value );
}
};
#else // #ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
/// @todo make this thread-safe (lock when accessign batch allocator)
class DefaultValueArrayAllocator : public ValueArrayAllocator
{
public: // overridden from ValueArrayAllocator
virtual ~DefaultValueArrayAllocator()
{
}
virtual ValueInternalArray *newArray()
{
ValueInternalArray *array = arraysAllocator_.allocate();
new (array) ValueInternalArray(); // placement new
return array;
}
virtual ValueInternalArray *newArrayCopy( const ValueInternalArray &other )
{
ValueInternalArray *array = arraysAllocator_.allocate();
new (array) ValueInternalArray( other ); // placement new
return array;
}
virtual void destructArray( ValueInternalArray *array )
{
if ( array )
{
array->~ValueInternalArray();
arraysAllocator_.release( array );
}
}
virtual void reallocateArrayPageIndex( Value **&indexes,
ValueInternalArray::PageIndex &indexCount,
ValueInternalArray::PageIndex minNewIndexCount )
{
ValueInternalArray::PageIndex newIndexCount = (indexCount*3)/2 + 1;
if ( minNewIndexCount > newIndexCount )
newIndexCount = minNewIndexCount;
void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount );
if ( !newIndexes )
throw std::bad_alloc();
indexCount = newIndexCount;
indexes = static_cast<Value **>( newIndexes );
}
virtual void releaseArrayPageIndex( Value **indexes,
ValueInternalArray::PageIndex indexCount )
{
if ( indexes )
free( indexes );
}
virtual Value *allocateArrayPage()
{
return static_cast<Value *>( pagesAllocator_.allocate() );
}
virtual void releaseArrayPage( Value *value )
{
if ( value )
pagesAllocator_.release( value );
}
private:
BatchAllocator<ValueInternalArray,1> arraysAllocator_;
BatchAllocator<Value,ValueInternalArray::itemsPerPage> pagesAllocator_;
};
#endif // #ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
static ValueArrayAllocator *&arrayAllocator()
{
static DefaultValueArrayAllocator defaultAllocator;
static ValueArrayAllocator *arrayAllocator = &defaultAllocator;
return arrayAllocator;
}
static struct DummyArrayAllocatorInitializer {
DummyArrayAllocatorInitializer()
{
arrayAllocator(); // ensure arrayAllocator() statics are initialized before main().
}
} dummyArrayAllocatorInitializer;
// //////////////////////////////////////////////////////////////////
// class ValueInternalArray
// //////////////////////////////////////////////////////////////////
bool
ValueInternalArray::equals( const IteratorState &x,
const IteratorState &other )
{
return x.array_ == other.array_
&& x.currentItemIndex_ == other.currentItemIndex_
&& x.currentPageIndex_ == other.currentPageIndex_;
}
void
ValueInternalArray::increment( IteratorState &it )
{
JSON_ASSERT_MESSAGE( it.array_ &&
(it.currentPageIndex_ - it.array_->pages_)*itemsPerPage + it.currentItemIndex_
!= it.array_->size_,
"ValueInternalArray::increment(): moving iterator beyond end" );
++(it.currentItemIndex_);
if ( it.currentItemIndex_ == itemsPerPage )
{
it.currentItemIndex_ = 0;
++(it.currentPageIndex_);
}
}
void
ValueInternalArray::decrement( IteratorState &it )
{
JSON_ASSERT_MESSAGE( it.array_ && it.currentPageIndex_ == it.array_->pages_
&& it.currentItemIndex_ == 0,
"ValueInternalArray::decrement(): moving iterator beyond end" );
if ( it.currentItemIndex_ == 0 )
{
it.currentItemIndex_ = itemsPerPage-1;
--(it.currentPageIndex_);
}
else
{
--(it.currentItemIndex_);
}
}
Value &
ValueInternalArray::unsafeDereference( const IteratorState &it )
{
return (*(it.currentPageIndex_))[it.currentItemIndex_];
}
Value &
ValueInternalArray::dereference( const IteratorState &it )
{
JSON_ASSERT_MESSAGE( it.array_ &&
(it.currentPageIndex_ - it.array_->pages_)*itemsPerPage + it.currentItemIndex_
< it.array_->size_,
"ValueInternalArray::dereference(): dereferencing invalid iterator" );
return unsafeDereference( it );
}
void
ValueInternalArray::makeBeginIterator( IteratorState &it ) const
{
it.array_ = const_cast<ValueInternalArray *>( this );
it.currentItemIndex_ = 0;
it.currentPageIndex_ = pages_;
}
void
ValueInternalArray::makeIterator( IteratorState &it, ArrayIndex index ) const
{
it.array_ = const_cast<ValueInternalArray *>( this );
it.currentItemIndex_ = index % itemsPerPage;
it.currentPageIndex_ = pages_ + index / itemsPerPage;
}
void
ValueInternalArray::makeEndIterator( IteratorState &it ) const
{
makeIterator( it, size_ );
}
ValueInternalArray::ValueInternalArray()
: pages_( 0 )
, size_( 0 )
, pageCount_( 0 )
{
}
ValueInternalArray::ValueInternalArray( const ValueInternalArray &other )
: pages_( 0 )
, pageCount_( 0 )
, size_( other.size_ )
{
PageIndex minNewPages = other.size_ / itemsPerPage;
arrayAllocator()->reallocateArrayPageIndex( pages_, pageCount_, minNewPages );
JSON_ASSERT_MESSAGE( pageCount_ >= minNewPages,
"ValueInternalArray::reserve(): bad reallocation" );
IteratorState itOther;
other.makeBeginIterator( itOther );
Value *value;
for ( ArrayIndex index = 0; index < size_; ++index, increment(itOther) )
{
if ( index % itemsPerPage == 0 )
{
PageIndex pageIndex = index / itemsPerPage;
value = arrayAllocator()->allocateArrayPage();
pages_[pageIndex] = value;
}
new (value) Value( dereference( itOther ) );
}
}
ValueInternalArray &
ValueInternalArray::operator =( const ValueInternalArray &other )
{
ValueInternalArray temp( other );
swap( temp );
return *this;
}
ValueInternalArray::~ValueInternalArray()
{
// destroy all constructed items
IteratorState it;
IteratorState itEnd;
makeBeginIterator( it);
makeEndIterator( itEnd );
for ( ; !equals(it,itEnd); increment(it) )
{
Value *value = &dereference(it);
value->~Value();
}
// release all pages
PageIndex lastPageIndex = size_ / itemsPerPage;
for ( PageIndex pageIndex = 0; pageIndex < lastPageIndex; ++pageIndex )
arrayAllocator()->releaseArrayPage( pages_[pageIndex] );
// release pages index
arrayAllocator()->releaseArrayPageIndex( pages_, pageCount_ );
}
void
ValueInternalArray::swap( ValueInternalArray &other )
{
Value **tempPages = pages_;
pages_ = other.pages_;
other.pages_ = tempPages;
ArrayIndex tempSize = size_;
size_ = other.size_;
other.size_ = tempSize;
PageIndex tempPageCount = pageCount_;
pageCount_ = other.pageCount_;
other.pageCount_ = tempPageCount;
}
void
ValueInternalArray::clear()
{
ValueInternalArray dummy;
swap( dummy );
}
void
ValueInternalArray::resize( ArrayIndex newSize )
{
if ( newSize == 0 )
clear();
else if ( newSize < size_ )
{
IteratorState it;
IteratorState itEnd;
makeIterator( it, newSize );
makeIterator( itEnd, size_ );
for ( ; !equals(it,itEnd); increment(it) )
{
Value *value = &dereference(it);
value->~Value();
}
PageIndex pageIndex = (newSize + itemsPerPage - 1) / itemsPerPage;
PageIndex lastPageIndex = size_ / itemsPerPage;
for ( ; pageIndex < lastPageIndex; ++pageIndex )
arrayAllocator()->releaseArrayPage( pages_[pageIndex] );
size_ = newSize;
}
else if ( newSize > size_ )
resolveReference( newSize );
}
void
ValueInternalArray::makeIndexValid( ArrayIndex index )
{
// Need to enlarge page index ?
if ( index >= pageCount_ * itemsPerPage )
{
PageIndex minNewPages = (index + 1) / itemsPerPage;
arrayAllocator()->reallocateArrayPageIndex( pages_, pageCount_, minNewPages );
JSON_ASSERT_MESSAGE( pageCount_ >= minNewPages, "ValueInternalArray::reserve(): bad reallocation" );
}
// Need to allocate new pages ?
ArrayIndex nextPageIndex =
(size_ % itemsPerPage) != 0 ? size_ - (size_%itemsPerPage) + itemsPerPage
: size_;
if ( nextPageIndex <= index )
{
PageIndex pageIndex = nextPageIndex / itemsPerPage;
PageIndex pageToAllocate = (index - nextPageIndex) / itemsPerPage + 1;
for ( ; pageToAllocate-- > 0; ++pageIndex )
pages_[pageIndex] = arrayAllocator()->allocateArrayPage();
}
// Initialize all new entries
IteratorState it;
IteratorState itEnd;
makeIterator( it, size_ );
size_ = index + 1;
makeIterator( itEnd, size_ );
for ( ; !equals(it,itEnd); increment(it) )
{
Value *value = &dereference(it);
new (value) Value(); // Construct a default value using placement new
}
}
Value &
ValueInternalArray::resolveReference( ArrayIndex index )
{
if ( index >= size_ )
makeIndexValid( index );
return pages_[index/itemsPerPage][index%itemsPerPage];
}
Value *
ValueInternalArray::find( ArrayIndex index ) const
{
if ( index >= size_ )
return 0;
return &(pages_[index/itemsPerPage][index%itemsPerPage]);
}
ValueInternalArray::ArrayIndex
ValueInternalArray::size() const
{
return size_;
}
int
ValueInternalArray::distance( const IteratorState &x, const IteratorState &y )
{
return indexOf(y) - indexOf(x);
}
ValueInternalArray::ArrayIndex
ValueInternalArray::indexOf( const IteratorState &iterator )
{
if ( !iterator.array_ )
return ArrayIndex(-1);
return ArrayIndex(
(iterator.currentPageIndex_ - iterator.array_->pages_) * itemsPerPage
+ iterator.currentItemIndex_ );
}
int
ValueInternalArray::compare( const ValueInternalArray &other ) const
{
int sizeDiff( size_ - other.size_ );
if ( sizeDiff != 0 )
return sizeDiff;
for ( ArrayIndex index =0; index < size_; ++index )
{
int diff = pages_[index/itemsPerPage][index%itemsPerPage].compare(
other.pages_[index/itemsPerPage][index%itemsPerPage] );
if ( diff != 0 )
return diff;
}
return 0;
}
} // namespace Json

615
dependencies/build/jsoncpp/json_internalmap.inl vendored
View File

@ -1,615 +0,0 @@
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
// included by json_value.cpp
namespace Json {
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
// class ValueInternalMap
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
/** \internal MUST be safely initialized using memset( this, 0, sizeof(ValueInternalLink) );
* This optimization is used by the fast allocator.
*/
ValueInternalLink::ValueInternalLink()
: previous_( 0 )
, next_( 0 )
{
}
ValueInternalLink::~ValueInternalLink()
{
for ( int index =0; index < itemPerLink; ++index )
{
if ( !items_[index].isItemAvailable() )
{
if ( !items_[index].isMemberNameStatic() )
free( keys_[index] );
}
else
break;
}
}
ValueMapAllocator::~ValueMapAllocator()
{
}
#ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
class DefaultValueMapAllocator : public ValueMapAllocator
{
public: // overridden from ValueMapAllocator
virtual ValueInternalMap *newMap()
{
return new ValueInternalMap();
}
virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other )
{
return new ValueInternalMap( other );
}
virtual void destructMap( ValueInternalMap *map )
{
delete map;
}
virtual ValueInternalLink *allocateMapBuckets( unsigned int size )
{
return new ValueInternalLink[size];
}
virtual void releaseMapBuckets( ValueInternalLink *links )
{
delete [] links;
}
virtual ValueInternalLink *allocateMapLink()
{
return new ValueInternalLink();
}
virtual void releaseMapLink( ValueInternalLink *link )
{
delete link;
}
};
#else
/// @todo make this thread-safe (lock when accessign batch allocator)
class DefaultValueMapAllocator : public ValueMapAllocator
{
public: // overridden from ValueMapAllocator
virtual ValueInternalMap *newMap()
{
ValueInternalMap *map = mapsAllocator_.allocate();
new (map) ValueInternalMap(); // placement new
return map;
}
virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other )
{
ValueInternalMap *map = mapsAllocator_.allocate();
new (map) ValueInternalMap( other ); // placement new
return map;
}
virtual void destructMap( ValueInternalMap *map )
{
if ( map )
{
map->~ValueInternalMap();
mapsAllocator_.release( map );
}
}
virtual ValueInternalLink *allocateMapBuckets( unsigned int size )
{
return new ValueInternalLink[size];
}
virtual void releaseMapBuckets( ValueInternalLink *links )
{
delete [] links;
}
virtual ValueInternalLink *allocateMapLink()
{
ValueInternalLink *link = linksAllocator_.allocate();
memset( link, 0, sizeof(ValueInternalLink) );
return link;
}
virtual void releaseMapLink( ValueInternalLink *link )
{
link->~ValueInternalLink();
linksAllocator_.release( link );
}
private:
BatchAllocator<ValueInternalMap,1> mapsAllocator_;
BatchAllocator<ValueInternalLink,1> linksAllocator_;
};
#endif
static ValueMapAllocator *&mapAllocator()
{
static DefaultValueMapAllocator defaultAllocator;
static ValueMapAllocator *mapAllocator = &defaultAllocator;
return mapAllocator;
}
static struct DummyMapAllocatorInitializer {
DummyMapAllocatorInitializer()
{
mapAllocator(); // ensure mapAllocator() statics are initialized before main().
}
} dummyMapAllocatorInitializer;
// h(K) = value * K >> w ; with w = 32 & K prime w.r.t. 2^32.
/*
use linked list hash map.
buckets array is a container.
linked list element contains 6 key/values. (memory = (16+4) * 6 + 4 = 124)
value have extra state: valid, available, deleted
*/
ValueInternalMap::ValueInternalMap()
: buckets_( 0 )
, tailLink_( 0 )
, bucketsSize_( 0 )
, itemCount_( 0 )
{
}
ValueInternalMap::ValueInternalMap( const ValueInternalMap &other )
: buckets_( 0 )
, tailLink_( 0 )
, bucketsSize_( 0 )
, itemCount_( 0 )
{
reserve( other.itemCount_ );
IteratorState it;
IteratorState itEnd;
other.makeBeginIterator( it );
other.makeEndIterator( itEnd );
for ( ; !equals(it,itEnd); increment(it) )
{
bool isStatic;
const char *memberName = key( it, isStatic );
const Value &aValue = value( it );
resolveReference(memberName, isStatic) = aValue;
}
}
ValueInternalMap &
ValueInternalMap::operator =( const ValueInternalMap &other )
{
ValueInternalMap dummy( other );
swap( dummy );
return *this;
}
ValueInternalMap::~ValueInternalMap()
{
if ( buckets_ )
{
for ( BucketIndex bucketIndex =0; bucketIndex < bucketsSize_; ++bucketIndex )
{
ValueInternalLink *link = buckets_[bucketIndex].next_;
while ( link )
{
ValueInternalLink *linkToRelease = link;
link = link->next_;
mapAllocator()->releaseMapLink( linkToRelease );
}
}
mapAllocator()->releaseMapBuckets( buckets_ );
}
}
void
ValueInternalMap::swap( ValueInternalMap &other )
{
ValueInternalLink *tempBuckets = buckets_;
buckets_ = other.buckets_;
other.buckets_ = tempBuckets;
ValueInternalLink *tempTailLink = tailLink_;
tailLink_ = other.tailLink_;
other.tailLink_ = tempTailLink;
BucketIndex tempBucketsSize = bucketsSize_;
bucketsSize_ = other.bucketsSize_;
other.bucketsSize_ = tempBucketsSize;
BucketIndex tempItemCount = itemCount_;
itemCount_ = other.itemCount_;
other.itemCount_ = tempItemCount;
}
void
ValueInternalMap::clear()
{
ValueInternalMap dummy;
swap( dummy );
}
ValueInternalMap::BucketIndex
ValueInternalMap::size() const
{
return itemCount_;
}
bool
ValueInternalMap::reserveDelta( BucketIndex growth )
{
return reserve( itemCount_ + growth );
}
bool
ValueInternalMap::reserve( BucketIndex newItemCount )
{
if ( !buckets_ && newItemCount > 0 )
{
buckets_ = mapAllocator()->allocateMapBuckets( 1 );
bucketsSize_ = 1;
tailLink_ = &buckets_[0];
}
// BucketIndex idealBucketCount = (newItemCount + ValueInternalLink::itemPerLink) / ValueInternalLink::itemPerLink;
return true;
}
const Value *
ValueInternalMap::find( const char *key ) const
{
if ( !bucketsSize_ )
return 0;
HashKey hashedKey = hash( key );
BucketIndex bucketIndex = hashedKey % bucketsSize_;
for ( const ValueInternalLink *current = &buckets_[bucketIndex];
current != 0;
current = current->next_ )
{
for ( BucketIndex index=0; index < ValueInternalLink::itemPerLink; ++index )
{
if ( current->items_[index].isItemAvailable() )
return 0;
if ( strcmp( key, current->keys_[index] ) == 0 )
return &current->items_[index];
}
}
return 0;
}
Value *
ValueInternalMap::find( const char *key )
{
const ValueInternalMap *constThis = this;
return const_cast<Value *>( constThis->find( key ) );
}
Value &
ValueInternalMap::resolveReference( const char *key,
bool isStatic )
{
HashKey hashedKey = hash( key );
if ( bucketsSize_ )
{
BucketIndex bucketIndex = hashedKey % bucketsSize_;
ValueInternalLink **previous = 0;
BucketIndex index;
for ( ValueInternalLink *current = &buckets_[bucketIndex];
current != 0;
previous = &current->next_, current = current->next_ )
{
for ( index=0; index < ValueInternalLink::itemPerLink; ++index )
{
if ( current->items_[index].isItemAvailable() )
return setNewItem( key, isStatic, current, index );
if ( strcmp( key, current->keys_[index] ) == 0 )
return current->items_[index];
}
}
}
reserveDelta( 1 );
return unsafeAdd( key, isStatic, hashedKey );
}
void
ValueInternalMap::remove( const char *key )
{
HashKey hashedKey = hash( key );
if ( !bucketsSize_ )
return;
BucketIndex bucketIndex = hashedKey % bucketsSize_;
for ( ValueInternalLink *link = &buckets_[bucketIndex];
link != 0;
link = link->next_ )
{
BucketIndex index;
for ( index =0; index < ValueInternalLink::itemPerLink; ++index )
{
if ( link->items_[index].isItemAvailable() )
return;
if ( strcmp( key, link->keys_[index] ) == 0 )
{
doActualRemove( link, index, bucketIndex );
return;
}
}
}
}
void
ValueInternalMap::doActualRemove( ValueInternalLink *link,
BucketIndex index,
BucketIndex bucketIndex )
{
// find last item of the bucket and swap it with the 'removed' one.
// set removed items flags to 'available'.
// if last page only contains 'available' items, then desallocate it (it's empty)
ValueInternalLink *&lastLink = getLastLinkInBucket( index );
BucketIndex lastItemIndex = 1; // a link can never be empty, so start at 1
for ( ;
lastItemIndex < ValueInternalLink::itemPerLink;
++lastItemIndex ) // may be optimized with dicotomic search
{
if ( lastLink->items_[lastItemIndex].isItemAvailable() )
break;
}
BucketIndex lastUsedIndex = lastItemIndex - 1;
Value *valueToDelete = &link->items_[index];
Value *valueToPreserve = &lastLink->items_[lastUsedIndex];
if ( valueToDelete != valueToPreserve )
valueToDelete->swap( *valueToPreserve );
if ( lastUsedIndex == 0 ) // page is now empty
{ // remove it from bucket linked list and delete it.
ValueInternalLink *linkPreviousToLast = lastLink->previous_;
if ( linkPreviousToLast != 0 ) // can not deleted bucket link.
{
mapAllocator()->releaseMapLink( lastLink );
linkPreviousToLast->next_ = 0;
lastLink = linkPreviousToLast;
}
}
else
{
Value dummy;
valueToPreserve->swap( dummy ); // restore deleted to default Value.
valueToPreserve->setItemUsed( false );
}
--itemCount_;
}
ValueInternalLink *&
ValueInternalMap::getLastLinkInBucket( BucketIndex bucketIndex )
{
if ( bucketIndex == bucketsSize_ - 1 )
return tailLink_;
ValueInternalLink *&previous = buckets_[bucketIndex+1].previous_;
if ( !previous )
previous = &buckets_[bucketIndex];
return previous;
}
Value &
ValueInternalMap::setNewItem( const char *key,
bool isStatic,
ValueInternalLink *link,
BucketIndex index )
{
char *duplicatedKey = makeMemberName( key );
++itemCount_;
link->keys_[index] = duplicatedKey;
link->items_[index].setItemUsed();
link->items_[index].setMemberNameIsStatic( isStatic );
return link->items_[index]; // items already default constructed.
}
Value &
ValueInternalMap::unsafeAdd( const char *key,
bool isStatic,
HashKey hashedKey )
{
JSON_ASSERT_MESSAGE( bucketsSize_ > 0, "ValueInternalMap::unsafeAdd(): internal logic error." );
BucketIndex bucketIndex = hashedKey % bucketsSize_;
ValueInternalLink *&previousLink = getLastLinkInBucket( bucketIndex );
ValueInternalLink *link = previousLink;
BucketIndex index;
for ( index =0; index < ValueInternalLink::itemPerLink; ++index )
{
if ( link->items_[index].isItemAvailable() )
break;
}
if ( index == ValueInternalLink::itemPerLink ) // need to add a new page
{
ValueInternalLink *newLink = mapAllocator()->allocateMapLink();
index = 0;
link->next_ = newLink;
previousLink = newLink;
link = newLink;
}
return setNewItem( key, isStatic, link, index );
}
ValueInternalMap::HashKey
ValueInternalMap::hash( const char *key ) const
{
HashKey hash = 0;
while ( *key )
hash += *key++ * 37;
return hash;
}
int
ValueInternalMap::compare( const ValueInternalMap &other ) const
{
int sizeDiff( itemCount_ - other.itemCount_ );
if ( sizeDiff != 0 )
return sizeDiff;
// Strict order guaranty is required. Compare all keys FIRST, then compare values.
IteratorState it;
IteratorState itEnd;
makeBeginIterator( it );
makeEndIterator( itEnd );
for ( ; !equals(it,itEnd); increment(it) )
{
if ( !other.find( key( it ) ) )
return 1;
}
// All keys are equals, let's compare values
makeBeginIterator( it );
for ( ; !equals(it,itEnd); increment(it) )
{
const Value *otherValue = other.find( key( it ) );
int valueDiff = value(it).compare( *otherValue );
if ( valueDiff != 0 )
return valueDiff;
}
return 0;
}
void
ValueInternalMap::makeBeginIterator( IteratorState &it ) const
{
it.map_ = const_cast<ValueInternalMap *>( this );
it.bucketIndex_ = 0;
it.itemIndex_ = 0;
it.link_ = buckets_;
}
void
ValueInternalMap::makeEndIterator( IteratorState &it ) const
{
it.map_ = const_cast<ValueInternalMap *>( this );
it.bucketIndex_ = bucketsSize_;
it.itemIndex_ = 0;
it.link_ = 0;
}
bool
ValueInternalMap::equals( const IteratorState &x, const IteratorState &other )
{
return x.map_ == other.map_
&& x.bucketIndex_ == other.bucketIndex_
&& x.link_ == other.link_
&& x.itemIndex_ == other.itemIndex_;
}
void
ValueInternalMap::incrementBucket( IteratorState &iterator )
{
++iterator.bucketIndex_;
JSON_ASSERT_MESSAGE( iterator.bucketIndex_ <= iterator.map_->bucketsSize_,
"ValueInternalMap::increment(): attempting to iterate beyond end." );
if ( iterator.bucketIndex_ == iterator.map_->bucketsSize_ )
iterator.link_ = 0;
else
iterator.link_ = &(iterator.map_->buckets_[iterator.bucketIndex_]);
iterator.itemIndex_ = 0;
}
void
ValueInternalMap::increment( IteratorState &iterator )
{
JSON_ASSERT_MESSAGE( iterator.map_, "Attempting to iterator using invalid iterator." );
++iterator.itemIndex_;
if ( iterator.itemIndex_ == ValueInternalLink::itemPerLink )
{
JSON_ASSERT_MESSAGE( iterator.link_ != 0,
"ValueInternalMap::increment(): attempting to iterate beyond end." );
iterator.link_ = iterator.link_->next_;
if ( iterator.link_ == 0 )
incrementBucket( iterator );
}
else if ( iterator.link_->items_[iterator.itemIndex_].isItemAvailable() )
{
incrementBucket( iterator );
}
}
void
ValueInternalMap::decrement( IteratorState &iterator )
{
if ( iterator.itemIndex_ == 0 )
{
JSON_ASSERT_MESSAGE( iterator.map_, "Attempting to iterate using invalid iterator." );
if ( iterator.link_ == &iterator.map_->buckets_[iterator.bucketIndex_] )
{
JSON_ASSERT_MESSAGE( iterator.bucketIndex_ > 0, "Attempting to iterate beyond beginning." );
--(iterator.bucketIndex_);
}
iterator.link_ = iterator.link_->previous_;
iterator.itemIndex_ = ValueInternalLink::itemPerLink - 1;
}
}
const char *
ValueInternalMap::key( const IteratorState &iterator )
{
JSON_ASSERT_MESSAGE( iterator.link_, "Attempting to iterate using invalid iterator." );
return iterator.link_->keys_[iterator.itemIndex_];
}
const char *
ValueInternalMap::key( const IteratorState &iterator, bool &isStatic )
{
JSON_ASSERT_MESSAGE( iterator.link_, "Attempting to iterate using invalid iterator." );
isStatic = iterator.link_->items_[iterator.itemIndex_].isMemberNameStatic();
return iterator.link_->keys_[iterator.itemIndex_];
}
Value &
ValueInternalMap::value( const IteratorState &iterator )
{
JSON_ASSERT_MESSAGE( iterator.link_, "Attempting to iterate using invalid iterator." );
return iterator.link_->items_[iterator.itemIndex_];
}
int
ValueInternalMap::distance( const IteratorState &x, const IteratorState &y )
{
int offset = 0;
IteratorState it = x;
while ( !equals( it, y ) )
increment( it );
return offset;
}
} // namespace Json

880
dependencies/build/jsoncpp/json_reader.cpp vendored
View File

@ -1,880 +0,0 @@
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#if !defined(JSON_IS_AMALGAMATION)
# include <json/reader.h>
# include <json/value.h>
# include "json_tool.h"
#endif // if !defined(JSON_IS_AMALGAMATION)
#include <utility>
#include <cstdio>
#include <cassert>
#include <cstring>
#include <iostream>
#include <stdexcept>
#if _MSC_VER >= 1400 // VC++ 8.0
#pragma warning( disable : 4996 ) // disable warning about strdup being deprecated.
#endif
namespace Json {
// Implementation of class Features
// ////////////////////////////////
Features::Features()
: allowComments_( true )
, strictRoot_( false )
{
}
Features
Features::all()
{
return Features();
}
Features
Features::strictMode()
{
Features features;
features.allowComments_ = false;
features.strictRoot_ = true;
return features;
}
// Implementation of class Reader
// ////////////////////////////////
static inline bool
in( Reader::Char c, Reader::Char c1, Reader::Char c2, Reader::Char c3, Reader::Char c4 )
{
return c == c1 || c == c2 || c == c3 || c == c4;
}
static inline bool
in( Reader::Char c, Reader::Char c1, Reader::Char c2, Reader::Char c3, Reader::Char c4, Reader::Char c5 )
{
return c == c1 || c == c2 || c == c3 || c == c4 || c == c5;
}
static bool
containsNewLine( Reader::Location begin,
Reader::Location end )
{
for ( ;begin < end; ++begin )
if ( *begin == '\n' || *begin == '\r' )
return true;
return false;
}
// Class Reader
// //////////////////////////////////////////////////////////////////
Reader::Reader()
: features_( Features::all() )
{
}
Reader::Reader( const Features &features )
: features_( features )
{
}
bool
Reader::parse( const std::string &document,
Value &root,
bool collectComments )
{
document_ = document;
const char *begin = document_.c_str();
const char *end = begin + document_.length();
return parse( begin, end, root, collectComments );
}
bool
Reader::parse( std::istream& sin,
Value &root,
bool collectComments )
{
//std::istream_iterator<char> begin(sin);
//std::istream_iterator<char> end;
// Those would allow streamed input from a file, if parse() were a
// template function.
// Since std::string is reference-counted, this at least does not
// create an extra copy.
std::string doc;
std::getline(sin, doc, (char)EOF);
return parse( doc, root, collectComments );
}
bool
Reader::parse( const char *beginDoc, const char *endDoc,
Value &root,
bool collectComments )
{
if ( !features_.allowComments_ )
{
collectComments = false;
}
begin_ = beginDoc;
end_ = endDoc;
collectComments_ = collectComments;
current_ = begin_;
lastValueEnd_ = 0;
lastValue_ = 0;
commentsBefore_ = "";
errors_.clear();
while ( !nodes_.empty() )
nodes_.pop();
nodes_.push( &root );
bool successful = readValue();
Token token;
skipCommentTokens( token );
if ( collectComments_ && !commentsBefore_.empty() )
root.setComment( commentsBefore_, commentAfter );
if ( features_.strictRoot_ )
{
if ( !root.isArray() && !root.isObject() )
{
// Set error location to start of doc, ideally should be first token found in doc
token.type_ = tokenError;
token.start_ = beginDoc;
token.end_ = endDoc;
addError( "A valid JSON document must be either an array or an object value.",
token );
return false;
}
}
return successful;
}
bool
Reader::readValue()
{
Token token;
skipCommentTokens( token );
bool successful = true;
if ( collectComments_ && !commentsBefore_.empty() )
{
currentValue().setComment( commentsBefore_, commentBefore );
commentsBefore_ = "";
}
switch ( token.type_ )
{
case tokenObjectBegin:
successful = readObject( token );
break;
case tokenArrayBegin:
successful = readArray( token );
break;
case tokenNumber:
successful = decodeNumber( token );
break;
case tokenString:
successful = decodeString( token );
break;
case tokenTrue:
currentValue() = true;
break;
case tokenFalse:
currentValue() = false;
break;
case tokenNull:
currentValue() = Value();
break;
default:
return addError( "Syntax error: value, object or array expected.", token );
}
if ( collectComments_ )
{
lastValueEnd_ = current_;
lastValue_ = &currentValue();
}
return successful;
}
void
Reader::skipCommentTokens( Token &token )
{
if ( features_.allowComments_ )
{
do
{
readToken( token );
}
while ( token.type_ == tokenComment );
}
else
{
readToken( token );
}
}
bool
Reader::expectToken( TokenType type, Token &token, const char *message )
{
readToken( token );
if ( token.type_ != type )
return addError( message, token );
return true;
}
bool
Reader::readToken( Token &token )
{
skipSpaces();
token.start_ = current_;
Char c = getNextChar();
bool ok = true;
switch ( c )
{
case '{':
token.type_ = tokenObjectBegin;
break;
case '}':
token.type_ = tokenObjectEnd;
break;
case '[':
token.type_ = tokenArrayBegin;
break;
case ']':
token.type_ = tokenArrayEnd;
break;
case '"':
token.type_ = tokenString;
ok = readString();
break;
case '/':
token.type_ = tokenComment;
ok = readComment();
break;
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
case '-':
token.type_ = tokenNumber;
readNumber();
break;
case 't':
token.type_ = tokenTrue;
ok = match( "rue", 3 );
break;
case 'f':
token.type_ = tokenFalse;
ok = match( "alse", 4 );
break;
case 'n':
token.type_ = tokenNull;
ok = match( "ull", 3 );
break;
case ',':
token.type_ = tokenArraySeparator;
break;
case ':':
token.type_ = tokenMemberSeparator;
break;
case 0:
token.type_ = tokenEndOfStream;
break;
default:
ok = false;
break;
}
if ( !ok )
token.type_ = tokenError;
token.end_ = current_;
return true;
}
void
Reader::skipSpaces()
{
while ( current_ != end_ )
{
Char c = *current_;
if ( c == ' ' || c == '\t' || c == '\r' || c == '\n' )
++current_;
else
break;
}
}
bool
Reader::match( Location pattern,
int patternLength )
{
if ( end_ - current_ < patternLength )
return false;
int index = patternLength;
while ( index-- )
if ( current_[index] != pattern[index] )
return false;
current_ += patternLength;
return true;
}
bool
Reader::readComment()
{
Location commentBegin = current_ - 1;
Char c = getNextChar();
bool successful = false;
if ( c == '*' )
successful = readCStyleComment();
else if ( c == '/' )
successful = readCppStyleComment();
if ( !successful )
return false;
if ( collectComments_ )
{
CommentPlacement placement = commentBefore;
if ( lastValueEnd_ && !containsNewLine( lastValueEnd_, commentBegin ) )
{
if ( c != '*' || !containsNewLine( commentBegin, current_ ) )
placement = commentAfterOnSameLine;
}
addComment( commentBegin, current_, placement );
}
return true;
}
void
Reader::addComment( Location begin,
Location end,
CommentPlacement placement )
{
assert( collectComments_ );
if ( placement == commentAfterOnSameLine )
{
assert( lastValue_ != 0 );
lastValue_->setComment( std::string( begin, end ), placement );
}
else
{
if ( !commentsBefore_.empty() )
commentsBefore_ += "\n";
commentsBefore_ += std::string( begin, end );
}
}
bool
Reader::readCStyleComment()
{
while ( current_ != end_ )
{
Char c = getNextChar();
if ( c == '*' && *current_ == '/' )
break;
}
return getNextChar() == '/';
}
bool
Reader::readCppStyleComment()
{
while ( current_ != end_ )
{
Char c = getNextChar();
if ( c == '\r' || c == '\n' )
break;
}
return true;
}
void
Reader::readNumber()
{
while ( current_ != end_ )
{
if ( !(*current_ >= '0' && *current_ <= '9') &&
!in( *current_, '.', 'e', 'E', '+', '-' ) )
break;
++current_;
}
}
bool
Reader::readString()
{
Char c = 0;
while ( current_ != end_ )
{
c = getNextChar();
if ( c == '\\' )
getNextChar();
else if ( c == '"' )
break;
}
return c == '"';
}
bool
Reader::readObject( Token &/*tokenStart*/ )
{
Token tokenName;
std::string name;
currentValue() = Value( objectValue );
while ( readToken( tokenName ) )
{
bool initialTokenOk = true;
while ( tokenName.type_ == tokenComment && initialTokenOk )
initialTokenOk = readToken( tokenName );
if ( !initialTokenOk )
break;
if ( tokenName.type_ == tokenObjectEnd && name.empty() ) // empty object
return true;
if ( tokenName.type_ != tokenString )
break;
name = "";
if ( !decodeString( tokenName, name ) )
return recoverFromError( tokenObjectEnd );
Token colon;
if ( !readToken( colon ) || colon.type_ != tokenMemberSeparator )
{
return addErrorAndRecover( "Missing ':' after object member name",
colon,
tokenObjectEnd );
}
Value &value = currentValue()[ name ];
nodes_.push( &value );
bool ok = readValue();
nodes_.pop();
if ( !ok ) // error already set
return recoverFromError( tokenObjectEnd );
Token comma;
if ( !readToken( comma )
|| ( comma.type_ != tokenObjectEnd &&
comma.type_ != tokenArraySeparator &&
comma.type_ != tokenComment ) )
{
return addErrorAndRecover( "Missing ',' or '}' in object declaration",
comma,
tokenObjectEnd );
}
bool finalizeTokenOk = true;
while ( comma.type_ == tokenComment &&
finalizeTokenOk )
finalizeTokenOk = readToken( comma );
if ( comma.type_ == tokenObjectEnd )
return true;
}
return addErrorAndRecover( "Missing '}' or object member name",
tokenName,
tokenObjectEnd );
}
bool
Reader::readArray( Token &/*tokenStart*/ )
{
currentValue() = Value( arrayValue );
skipSpaces();
if ( *current_ == ']' ) // empty array
{
Token endArray;
readToken( endArray );
return true;
}
int index = 0;
for (;;)
{
Value &value = currentValue()[ index++ ];
nodes_.push( &value );
bool ok = readValue();
nodes_.pop();
if ( !ok ) // error already set
return recoverFromError( tokenArrayEnd );
Token token;
// Accept Comment after last item in the array.
ok = readToken( token );
while ( token.type_ == tokenComment && ok )
{
ok = readToken( token );
}
bool badTokenType = ( token.type_ != tokenArraySeparator &&
token.type_ != tokenArrayEnd );
if ( !ok || badTokenType )
{
return addErrorAndRecover( "Missing ',' or ']' in array declaration",
token,
tokenArrayEnd );
}
if ( token.type_ == tokenArrayEnd )
break;
}
return true;
}
bool
Reader::decodeNumber( Token &token )
{
bool isDouble = false;
for ( Location inspect = token.start_; inspect != token.end_; ++inspect )
{
isDouble = isDouble
|| in( *inspect, '.', 'e', 'E', '+' )
|| ( *inspect == '-' && inspect != token.start_ );
}
if ( isDouble )
return decodeDouble( token );
// Attempts to parse the number as an integer. If the number is
// larger than the maximum supported value of an integer then
// we decode the number as a double.
Location current = token.start_;
bool isNegative = *current == '-';
if ( isNegative )
++current;
Value::LargestUInt maxIntegerValue = isNegative ? Value::LargestUInt(-Value::minLargestInt)
: Value::maxLargestUInt;
Value::LargestUInt threshold = maxIntegerValue / 10;
Value::UInt lastDigitThreshold = Value::UInt( maxIntegerValue % 10 );
assert( lastDigitThreshold >=0 && lastDigitThreshold <= 9 );
Value::LargestUInt value = 0;
while ( current < token.end_ )
{
Char c = *current++;
if ( c < '0' || c > '9' )
return addError( "'" + std::string( token.start_, token.end_ ) + "' is not a number.", token );
Value::UInt digit(c - '0');
if ( value >= threshold )
{
// If the current digit is not the last one, or if it is
// greater than the last digit of the maximum integer value,
// the parse the number as a double.
if ( current != token.end_ || digit > lastDigitThreshold )
{
return decodeDouble( token );
}
}
value = value * 10 + digit;
}
if ( isNegative )
currentValue() = -Value::LargestInt( value );
else if ( value <= Value::LargestUInt(Value::maxInt) )
currentValue() = Value::LargestInt( value );
else
currentValue() = value;
return true;
}
bool
Reader::decodeDouble( Token &token )
{
double value = 0;
const int bufferSize = 32;
int count;
int length = int(token.end_ - token.start_);
if ( length <= bufferSize )
{
Char buffer[bufferSize+1];
memcpy( buffer, token.start_, length );
buffer[length] = 0;
count = sscanf( buffer, "%lf", &value );
}
else
{
std::string buffer( token.start_, token.end_ );
count = sscanf( buffer.c_str(), "%lf", &value );
}
if ( count != 1 )
return addError( "'" + std::string( token.start_, token.end_ ) + "' is not a number.", token );
currentValue() = value;
return true;
}
bool
Reader::decodeString( Token &token )
{
std::string decoded;
if ( !decodeString( token, decoded ) )
return false;
currentValue() = decoded;
return true;
}
bool
Reader::decodeString( Token &token, std::string &decoded )
{
decoded.reserve( token.end_ - token.start_ - 2 );
Location current = token.start_ + 1; // skip '"'
Location end = token.end_ - 1; // do not include '"'
while ( current != end )
{
Char c = *current++;
if ( c == '"' )
break;
else if ( c == '\\' )
{
if ( current == end )
return addError( "Empty escape sequence in string", token, current );
Char escape = *current++;
switch ( escape )
{
case '"': decoded += '"'; break;
case '/': decoded += '/'; break;
case '\\': decoded += '\\'; break;
case 'b': decoded += '\b'; break;
case 'f': decoded += '\f'; break;
case 'n': decoded += '\n'; break;
case 'r': decoded += '\r'; break;
case 't': decoded += '\t'; break;
case 'u':
{
unsigned int unicode;
if ( !decodeUnicodeCodePoint( token, current, end, unicode ) )
return false;
decoded += codePointToUTF8(unicode);
}
break;
default:
return addError( "Bad escape sequence in string", token, current );
}
}
else
{
decoded += c;
}
}
return true;
}
bool
Reader::decodeUnicodeCodePoint( Token &token,
Location &current,
Location end,
unsigned int &unicode )
{
if ( !decodeUnicodeEscapeSequence( token, current, end, unicode ) )
return false;
if (unicode >= 0xD800 && unicode <= 0xDBFF)
{
// surrogate pairs
if (end - current < 6)
return addError( "additional six characters expected to parse unicode surrogate pair.", token, current );
unsigned int surrogatePair;
if (*(current++) == '\\' && *(current++)== 'u')
{
if (decodeUnicodeEscapeSequence( token, current, end, surrogatePair ))
{
unicode = 0x10000 + ((unicode & 0x3FF) << 10) + (surrogatePair & 0x3FF);
}
else
return false;
}
else
return addError( "expecting another \\u token to begin the second half of a unicode surrogate pair", token, current );
}
return true;
}
bool
Reader::decodeUnicodeEscapeSequence( Token &token,
Location &current,
Location end,
unsigned int &unicode )
{
if ( end - current < 4 )
return addError( "Bad unicode escape sequence in string: four digits expected.", token, current );
unicode = 0;
for ( int index =0; index < 4; ++index )
{
Char c = *current++;
unicode *= 16;
if ( c >= '0' && c <= '9' )
unicode += c - '0';
else if ( c >= 'a' && c <= 'f' )
unicode += c - 'a' + 10;
else if ( c >= 'A' && c <= 'F' )
unicode += c - 'A' + 10;
else
return addError( "Bad unicode escape sequence in string: hexadecimal digit expected.", token, current );
}
return true;
}
bool
Reader::addError( const std::string &message,
Token &token,
Location extra )
{
ErrorInfo info;
info.token_ = token;
info.message_ = message;
info.extra_ = extra;
errors_.push_back( info );
return false;
}
bool
Reader::recoverFromError( TokenType skipUntilToken )
{
int errorCount = int(errors_.size());
Token skip;
for (;;)
{
if ( !readToken(skip) )
errors_.resize( errorCount ); // discard errors caused by recovery
if ( skip.type_ == skipUntilToken || skip.type_ == tokenEndOfStream )
break;
}
errors_.resize( errorCount );
return false;
}
bool
Reader::addErrorAndRecover( const std::string &message,
Token &token,
TokenType skipUntilToken )
{
addError( message, token );
return recoverFromError( skipUntilToken );
}
Value &
Reader::currentValue()
{
return *(nodes_.top());
}
Reader::Char
Reader::getNextChar()
{
if ( current_ == end_ )
return 0;
return *current_++;
}
void
Reader::getLocationLineAndColumn( Location location,
int &line,
int &column ) const
{
Location current = begin_;
Location lastLineStart = current;
line = 0;
while ( current < location && current != end_ )
{
Char c = *current++;
if ( c == '\r' )
{
if ( *current == '\n' )
++current;
lastLineStart = current;
++line;
}
else if ( c == '\n' )
{
lastLineStart = current;
++line;
}
}
// column & line start at 1
column = int(location - lastLineStart) + 1;
++line;
}
std::string
Reader::getLocationLineAndColumn( Location location ) const
{
int line, column;
getLocationLineAndColumn( location, line, column );
char buffer[18+16+16+1];
sprintf( buffer, "Line %d, Column %d", line, column );
return buffer;
}
// Deprecated. Preserved for backward compatibility
std::string
Reader::getFormatedErrorMessages() const
{
return getFormattedErrorMessages();
}
std::string
Reader::getFormattedErrorMessages() const
{
std::string formattedMessage;
for ( Errors::const_iterator itError = errors_.begin();
itError != errors_.end();
++itError )
{
const ErrorInfo &error = *itError;
formattedMessage += "* " + getLocationLineAndColumn( error.token_.start_ ) + "\n";
formattedMessage += " " + error.message_ + "\n";
if ( error.extra_ )
formattedMessage += "See " + getLocationLineAndColumn( error.extra_ ) + " for detail.\n";
}
return formattedMessage;
}
std::istream& operator>>( std::istream &sin, Value &root )
{
Json::Reader reader;
bool ok = reader.parse(sin, root, true);
//JSON_ASSERT( ok );
if (!ok) throw std::runtime_error(reader.getFormattedErrorMessages());
return sin;
}
} // namespace Json

93
dependencies/build/jsoncpp/json_tool.h vendored
View File

@ -1,93 +0,0 @@
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#ifndef LIB_JSONCPP_JSON_TOOL_H_INCLUDED
# define LIB_JSONCPP_JSON_TOOL_H_INCLUDED
/* This header provides common string manipulation support, such as UTF-8,
* portable conversion from/to string...
*
* It is an internal header that must not be exposed.
*/
namespace Json {
/// Converts a unicode code-point to UTF-8.
static inline std::string
codePointToUTF8(unsigned int cp)
{
std::string result;
// based on description from http://en.wikipedia.org/wiki/UTF-8
if (cp <= 0x7f)
{
result.resize(1);
result[0] = static_cast<char>(cp);
}
else if (cp <= 0x7FF)
{
result.resize(2);
result[1] = static_cast<char>(0x80 | (0x3f & cp));
result[0] = static_cast<char>(0xC0 | (0x1f & (cp >> 6)));
}
else if (cp <= 0xFFFF)
{
result.resize(3);
result[2] = static_cast<char>(0x80 | (0x3f & cp));
result[1] = 0x80 | static_cast<char>((0x3f & (cp >> 6)));
result[0] = 0xE0 | static_cast<char>((0xf & (cp >> 12)));
}
else if (cp <= 0x10FFFF)
{
result.resize(4);
result[3] = static_cast<char>(0x80 | (0x3f & cp));
result[2] = static_cast<char>(0x80 | (0x3f & (cp >> 6)));
result[1] = static_cast<char>(0x80 | (0x3f & (cp >> 12)));
result[0] = static_cast<char>(0xF0 | (0x7 & (cp >> 18)));
}
return result;
}
/// Returns true if ch is a control character (in range [0,32[).
static inline bool
isControlCharacter(char ch)
{
return ch > 0 && ch <= 0x1F;
}
enum {
/// Constant that specify the size of the buffer that must be passed to uintToString.
uintToStringBufferSize = 3*sizeof(LargestUInt)+1
};
// Defines a char buffer for use with uintToString().
typedef char UIntToStringBuffer[uintToStringBufferSize];
/** Converts an unsigned integer to string.
* @param value Unsigned interger to convert to string
* @param current Input/Output string buffer.
* Must have at least uintToStringBufferSize chars free.
*/
static inline void
uintToString( LargestUInt value,
char *&current )
{
*--current = 0;
do
{
*--current = char(value % 10) + '0';
value /= 10;
}
while ( value != 0 );
}
} // namespace Json {
#endif // LIB_JSONCPP_JSON_TOOL_H_INCLUDED

1829
dependencies/build/jsoncpp/json_value.cpp vendored
View File

File diff suppressed because it is too large Load Diff

299
dependencies/build/jsoncpp/json_valueiterator.inl vendored
View File

@ -1,299 +0,0 @@
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
// included by json_value.cpp
namespace Json {
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
// class ValueIteratorBase
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
ValueIteratorBase::ValueIteratorBase()
#ifndef JSON_VALUE_USE_INTERNAL_MAP
: current_()
, isNull_( true )
{
}
#else
: isArray_( true )
, isNull_( true )
{
iterator_.array_ = ValueInternalArray::IteratorState();
}
#endif
#ifndef JSON_VALUE_USE_INTERNAL_MAP
ValueIteratorBase::ValueIteratorBase( const Value::ObjectValues::iterator &current )
: current_( current )
, isNull_( false )
{
}
#else
ValueIteratorBase::ValueIteratorBase( const ValueInternalArray::IteratorState &state )
: isArray_( true )
{
iterator_.array_ = state;
}
ValueIteratorBase::ValueIteratorBase( const ValueInternalMap::IteratorState &state )
: isArray_( false )
{
iterator_.map_ = state;
}
#endif
Value &
ValueIteratorBase::deref() const
{
#ifndef JSON_VALUE_USE_INTERNAL_MAP
return current_->second;
#else
if ( isArray_ )
return ValueInternalArray::dereference( iterator_.array_ );
return ValueInternalMap::value( iterator_.map_ );
#endif
}
void
ValueIteratorBase::increment()
{
#ifndef JSON_VALUE_USE_INTERNAL_MAP
++current_;
#else
if ( isArray_ )
ValueInternalArray::increment( iterator_.array_ );
ValueInternalMap::increment( iterator_.map_ );
#endif
}
void
ValueIteratorBase::decrement()
{
#ifndef JSON_VALUE_USE_INTERNAL_MAP
--current_;
#else
if ( isArray_ )
ValueInternalArray::decrement( iterator_.array_ );
ValueInternalMap::decrement( iterator_.map_ );
#endif
}
ValueIteratorBase::difference_type
ValueIteratorBase::computeDistance( const SelfType &other ) const
{
#ifndef JSON_VALUE_USE_INTERNAL_MAP
# ifdef JSON_USE_CPPTL_SMALLMAP
return current_ - other.current_;
# else
// Iterator for null value are initialized using the default
// constructor, which initialize current_ to the default
// std::map::iterator. As begin() and end() are two instance
// of the default std::map::iterator, they can not be compared.
// To allow this, we handle this comparison specifically.
if ( isNull_ && other.isNull_ )
{
return 0;
}
// Usage of std::distance is not portable (does not compile with Sun Studio 12 RogueWave STL,
// which is the one used by default).
// Using a portable hand-made version for non random iterator instead:
// return difference_type( std::distance( current_, other.current_ ) );
difference_type myDistance = 0;
for ( Value::ObjectValues::iterator it = current_; it != other.current_; ++it )
{
++myDistance;
}
return myDistance;
# endif
#else
if ( isArray_ )
return ValueInternalArray::distance( iterator_.array_, other.iterator_.array_ );
return ValueInternalMap::distance( iterator_.map_, other.iterator_.map_ );
#endif
}
bool
ValueIteratorBase::isEqual( const SelfType &other ) const
{
#ifndef JSON_VALUE_USE_INTERNAL_MAP
if ( isNull_ )
{
return other.isNull_;
}
return current_ == other.current_;
#else
if ( isArray_ )
return ValueInternalArray::equals( iterator_.array_, other.iterator_.array_ );
return ValueInternalMap::equals( iterator_.map_, other.iterator_.map_ );
#endif
}
void
ValueIteratorBase::copy( const SelfType &other )
{
#ifndef JSON_VALUE_USE_INTERNAL_MAP
current_ = other.current_;
#else
if ( isArray_ )
iterator_.array_ = other.iterator_.array_;
iterator_.map_ = other.iterator_.map_;
#endif
}
Value
ValueIteratorBase::key() const
{
#ifndef JSON_VALUE_USE_INTERNAL_MAP
const Value::CZString czstring = (*current_).first;
if ( czstring.c_str() )
{
if ( czstring.isStaticString() )
return Value( StaticString( czstring.c_str() ) );
return Value( czstring.c_str() );
}
return Value( czstring.index() );
#else
if ( isArray_ )
return Value( ValueInternalArray::indexOf( iterator_.array_ ) );
bool isStatic;
const char *memberName = ValueInternalMap::key( iterator_.map_, isStatic );
if ( isStatic )
return Value( StaticString( memberName ) );
return Value( memberName );
#endif
}
UInt
ValueIteratorBase::index() const
{
#ifndef JSON_VALUE_USE_INTERNAL_MAP
const Value::CZString czstring = (*current_).first;
if ( !czstring.c_str() )
return czstring.index();
return Value::UInt( -1 );
#else
if ( isArray_ )
return Value::UInt( ValueInternalArray::indexOf( iterator_.array_ ) );
return Value::UInt( -1 );
#endif
}
const char *
ValueIteratorBase::memberName() const
{
#ifndef JSON_VALUE_USE_INTERNAL_MAP
const char *name = (*current_).first.c_str();
return name ? name : "";
#else
if ( !isArray_ )
return ValueInternalMap::key( iterator_.map_ );
return "";
#endif
}
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
// class ValueConstIterator
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
ValueConstIterator::ValueConstIterator()
{
}
#ifndef JSON_VALUE_USE_INTERNAL_MAP
ValueConstIterator::ValueConstIterator( const Value::ObjectValues::iterator &current )
: ValueIteratorBase( current )
{
}
#else
ValueConstIterator::ValueConstIterator( const ValueInternalArray::IteratorState &state )
: ValueIteratorBase( state )
{
}
ValueConstIterator::ValueConstIterator( const ValueInternalMap::IteratorState &state )
: ValueIteratorBase( state )
{
}
#endif
ValueConstIterator &
ValueConstIterator::operator =( const ValueIteratorBase &other )
{
copy( other );
return *this;
}
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
// class ValueIterator
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////
ValueIterator::ValueIterator()
{
}
#ifndef JSON_VALUE_USE_INTERNAL_MAP
ValueIterator::ValueIterator( const Value::ObjectValues::iterator &current )
: ValueIteratorBase( current )
{
}
#else
ValueIterator::ValueIterator( const ValueInternalArray::IteratorState &state )
: ValueIteratorBase( state )
{
}
ValueIterator::ValueIterator( const ValueInternalMap::IteratorState &state )
: ValueIteratorBase( state )
{
}
#endif
ValueIterator::ValueIterator( const ValueConstIterator &other )
: ValueIteratorBase( other )
{
}
ValueIterator::ValueIterator( const ValueIterator &other )
: ValueIteratorBase( other )
{
}
ValueIterator &
ValueIterator::operator =( const SelfType &other )
{
copy( other );
return *this;
}
} // namespace Json

838
dependencies/build/jsoncpp/json_writer.cpp vendored
View File

@ -1,838 +0,0 @@
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#if !defined(JSON_IS_AMALGAMATION)
# include <json/writer.h>
# include "json_tool.h"
#endif // if !defined(JSON_IS_AMALGAMATION)
#include <utility>
#include <assert.h>
#include <stdio.h>
#include <string.h>
#include <iostream>
#include <sstream>
#include <iomanip>
#if _MSC_VER >= 1400 // VC++ 8.0
#pragma warning( disable : 4996 ) // disable warning about strdup being deprecated.
#endif
namespace Json {
static bool containsControlCharacter( const char* str )
{
while ( *str )
{
if ( isControlCharacter( *(str++) ) )
return true;
}
return false;
}
std::string valueToString( LargestInt value )
{
UIntToStringBuffer buffer;
char *current = buffer + sizeof(buffer);
bool isNegative = value < 0;
if ( isNegative )
value = -value;
uintToString( LargestUInt(value), current );
if ( isNegative )
*--current = '-';
assert( current >= buffer );
return current;
}
std::string valueToString( LargestUInt value )
{
UIntToStringBuffer buffer;
char *current = buffer + sizeof(buffer);
uintToString( value, current );
assert( current >= buffer );
return current;
}
#if defined(JSON_HAS_INT64)
std::string valueToString( Int value )
{
return valueToString( LargestInt(value) );
}
std::string valueToString( UInt value )
{
return valueToString( LargestUInt(value) );
}
#endif // # if defined(JSON_HAS_INT64)
std::string valueToString( double value )
{
char buffer[32];
#if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) // Use secure version with visual studio 2005 to avoid warning.
sprintf_s(buffer, sizeof(buffer), "%#.16g", value);
#else
sprintf(buffer, "%#.16g", value);
#endif
char* ch = buffer + strlen(buffer) - 1;
if (*ch != '0') return buffer; // nothing to truncate, so save time
while(ch > buffer && *ch == '0'){
--ch;
}
char* last_nonzero = ch;
while(ch >= buffer){
switch(*ch){
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
--ch;
continue;
case '.':
// Truncate zeroes to save bytes in output, but keep one.
*(last_nonzero+2) = '\0';
return buffer;
default:
return buffer;
}
}
return buffer;
}
std::string valueToString( bool value )
{
return value ? "true" : "false";
}
std::string valueToQuotedString( const char *value )
{
// Not sure how to handle unicode...
if (strpbrk(value, "\"\\\b\f\n\r\t") == NULL && !containsControlCharacter( value ))
return std::string("\"") + value + "\"";
// We have to walk value and escape any special characters.
// Appending to std::string is not efficient, but this should be rare.
// (Note: forward slashes are *not* rare, but I am not escaping them.)
std::string::size_type maxsize = strlen(value)*2 + 3; // allescaped+quotes+NULL
std::string result;
result.reserve(maxsize); // to avoid lots of mallocs
result += "\"";
for (const char* c=value; *c != 0; ++c)
{
switch(*c)
{
case '\"':
result += "\\\"";
break;
case '\\':
result += "\\\\";
break;
case '\b':
result += "\\b";
break;
case '\f':
result += "\\f";
break;
case '\n':
result += "\\n";
break;
case '\r':
result += "\\r";
break;
case '\t':
result += "\\t";
break;
//case '/':
// Even though \/ is considered a legal escape in JSON, a bare
// slash is also legal, so I see no reason to escape it.
// (I hope I am not misunderstanding something.
// blep notes: actually escaping \/ may be useful in javascript to avoid </
// sequence.
// Should add a flag to allow this compatibility mode and prevent this
// sequence from occurring.
default:
if ( isControlCharacter( *c ) )
{
std::ostringstream oss;
oss << "\\u" << std::hex << std::uppercase << std::setfill('0') << std::setw(4) << static_cast<int>(*c);
result += oss.str();
}
else
{
result += *c;
}
break;
}
}
result += "\"";
return result;
}
// Class Writer
// //////////////////////////////////////////////////////////////////
Writer::~Writer()
{
}
// Class FastWriter
// //////////////////////////////////////////////////////////////////
FastWriter::FastWriter()
: yamlCompatiblityEnabled_( false )
{
}
void
FastWriter::enableYAMLCompatibility()
{
yamlCompatiblityEnabled_ = true;
}
std::string
FastWriter::write( const Value &root )
{
document_ = "";
writeValue( root );
document_ += "\n";
return document_;
}
void
FastWriter::writeValue( const Value &value )
{
switch ( value.type() )
{
case nullValue:
document_ += "null";
break;
case intValue:
document_ += valueToString( value.asLargestInt() );
break;
case uintValue:
document_ += valueToString( value.asLargestUInt() );
break;
case realValue:
document_ += valueToString( value.asDouble() );
break;
case stringValue:
document_ += valueToQuotedString( value.asCString() );
break;
case booleanValue:
document_ += valueToString( value.asBool() );
break;
case arrayValue:
{
document_ += "[";
int size = value.size();
for ( int index =0; index < size; ++index )
{
if ( index > 0 )
document_ += ",";
writeValue( value[index] );
}
document_ += "]";
}
break;
case objectValue:
{
Value::Members members( value.getMemberNames() );
document_ += "{";
for ( Value::Members::iterator it = members.begin();
it != members.end();
++it )
{
const std::string &name = *it;
if ( it != members.begin() )
document_ += ",";
document_ += valueToQuotedString( name.c_str() );
document_ += yamlCompatiblityEnabled_ ? ": "
: ":";
writeValue( value[name] );
}
document_ += "}";
}
break;
}
}
// Class StyledWriter
// //////////////////////////////////////////////////////////////////
StyledWriter::StyledWriter()
: rightMargin_( 74 )
, indentSize_( 3 )
{
}
std::string
StyledWriter::write( const Value &root )
{
document_ = "";
addChildValues_ = false;
indentString_ = "";
writeCommentBeforeValue( root );
writeValue( root );
writeCommentAfterValueOnSameLine( root );
document_ += "\n";
return document_;
}
void
StyledWriter::writeValue( const Value &value )
{
switch ( value.type() )
{
case nullValue:
pushValue( "null" );
break;
case intValue:
pushValue( valueToString( value.asLargestInt() ) );
break;
case uintValue:
pushValue( valueToString( value.asLargestUInt() ) );
break;
case realValue:
pushValue( valueToString( value.asDouble() ) );
break;
case stringValue:
pushValue( valueToQuotedString( value.asCString() ) );
break;
case booleanValue:
pushValue( valueToString( value.asBool() ) );
break;
case arrayValue:
writeArrayValue( value);
break;
case objectValue:
{
Value::Members members( value.getMemberNames() );
if ( members.empty() )
pushValue( "{}" );
else
{
writeWithIndent( "{" );
indent();
Value::Members::iterator it = members.begin();
for (;;)
{
const std::string &name = *it;
const Value &childValue = value[name];
writeCommentBeforeValue( childValue );
writeWithIndent( valueToQuotedString( name.c_str() ) );
document_ += " : ";
writeValue( childValue );
if ( ++it == members.end() )
{
writeCommentAfterValueOnSameLine( childValue );
break;
}
document_ += ",";
writeCommentAfterValueOnSameLine( childValue );
}
unindent();
writeWithIndent( "}" );
}
}
break;
}
}
void
StyledWriter::writeArrayValue( const Value &value )
{
unsigned size = value.size();
if ( size == 0 )
pushValue( "[]" );
else
{
bool isArrayMultiLine = isMultineArray( value );
if ( isArrayMultiLine )
{
writeWithIndent( "[" );
indent();
bool hasChildValue = !childValues_.empty();
unsigned index =0;
for (;;)
{
const Value &childValue = value[index];
writeCommentBeforeValue( childValue );
if ( hasChildValue )
writeWithIndent( childValues_[index] );
else
{
writeIndent();
writeValue( childValue );
}
if ( ++index == size )
{
writeCommentAfterValueOnSameLine( childValue );
break;
}
document_ += ",";
writeCommentAfterValueOnSameLine( childValue );
}
unindent();
writeWithIndent( "]" );
}
else // output on a single line
{
assert( childValues_.size() == size );
document_ += "[ ";
for ( unsigned index =0; index < size; ++index )
{
if ( index > 0 )
document_ += ", ";
document_ += childValues_[index];
}
document_ += " ]";
}
}
}
bool
StyledWriter::isMultineArray( const Value &value )
{
int size = value.size();
bool isMultiLine = size*3 >= rightMargin_ ;
childValues_.clear();
for ( int index =0; index < size && !isMultiLine; ++index )
{
const Value &childValue = value[index];
isMultiLine = isMultiLine ||
( (childValue.isArray() || childValue.isObject()) &&
childValue.size() > 0 );
}
if ( !isMultiLine ) // check if line length > max line length
{
childValues_.reserve( size );
addChildValues_ = true;
int lineLength = 4 + (size-1)*2; // '[ ' + ', '*n + ' ]'
for ( int index =0; index < size && !isMultiLine; ++index )
{
writeValue( value[index] );
lineLength += int( childValues_[index].length() );
isMultiLine = isMultiLine && hasCommentForValue( value[index] );
}
addChildValues_ = false;
isMultiLine = isMultiLine || lineLength >= rightMargin_;
}
return isMultiLine;
}
void
StyledWriter::pushValue( const std::string &value )
{
if ( addChildValues_ )
childValues_.push_back( value );
else
document_ += value;
}
void
StyledWriter::writeIndent()
{
if ( !document_.empty() )
{
char last = document_[document_.length()-1];
if ( last == ' ' ) // already indented
return;
if ( last != '\n' ) // Comments may add new-line
document_ += '\n';
}
document_ += indentString_;
}
void
StyledWriter::writeWithIndent( const std::string &value )
{
writeIndent();
document_ += value;
}
void
StyledWriter::indent()
{
indentString_ += std::string( indentSize_, ' ' );
}
void
StyledWriter::unindent()
{
assert( int(indentString_.size()) >= indentSize_ );
indentString_.resize( indentString_.size() - indentSize_ );
}
void
StyledWriter::writeCommentBeforeValue( const Value &root )
{
if ( !root.hasComment( commentBefore ) )
return;
document_ += normalizeEOL( root.getComment( commentBefore ) );
document_ += "\n";
}
void
StyledWriter::writeCommentAfterValueOnSameLine( const Value &root )
{
if ( root.hasComment( commentAfterOnSameLine ) )
document_ += " " + normalizeEOL( root.getComment( commentAfterOnSameLine ) );
if ( root.hasComment( commentAfter ) )
{
document_ += "\n";
document_ += normalizeEOL( root.getComment( commentAfter ) );
document_ += "\n";
}
}
bool
StyledWriter::hasCommentForValue( const Value &value )
{
return value.hasComment( commentBefore )
|| value.hasComment( commentAfterOnSameLine )
|| value.hasComment( commentAfter );
}
std::string
StyledWriter::normalizeEOL( const std::string &text )
{
std::string normalized;
normalized.reserve( text.length() );
const char *begin = text.c_str();
const char *end = begin + text.length();
const char *current = begin;
while ( current != end )
{
char c = *current++;
if ( c == '\r' ) // mac or dos EOL
{
if ( *current == '\n' ) // convert dos EOL
++current;
normalized += '\n';
}
else // handle unix EOL & other char
normalized += c;
}
return normalized;
}
// Class StyledStreamWriter
// //////////////////////////////////////////////////////////////////
StyledStreamWriter::StyledStreamWriter( std::string indentation )
: document_(NULL)
, rightMargin_( 74 )
, indentation_( indentation )
{
}
void
StyledStreamWriter::write( std::ostream &out, const Value &root )
{
document_ = &out;
addChildValues_ = false;
indentString_ = "";
writeCommentBeforeValue( root );
writeValue( root );
writeCommentAfterValueOnSameLine( root );
*document_ << "\n";
document_ = NULL; // Forget the stream, for safety.
}
void
StyledStreamWriter::writeValue( const Value &value )
{
switch ( value.type() )
{
case nullValue:
pushValue( "null" );
break;
case intValue:
pushValue( valueToString( value.asLargestInt() ) );
break;
case uintValue:
pushValue( valueToString( value.asLargestUInt() ) );
break;
case realValue:
pushValue( valueToString( value.asDouble() ) );
break;
case stringValue:
pushValue( valueToQuotedString( value.asCString() ) );
break;
case booleanValue:
pushValue( valueToString( value.asBool() ) );
break;
case arrayValue:
writeArrayValue( value);
break;
case objectValue:
{
Value::Members members( value.getMemberNames() );
if ( members.empty() )
pushValue( "{}" );
else
{
writeWithIndent( "{" );
indent();
Value::Members::iterator it = members.begin();
for (;;)
{
const std::string &name = *it;
const Value &childValue = value[name];
writeCommentBeforeValue( childValue );
writeWithIndent( valueToQuotedString( name.c_str() ) );
*document_ << " : ";
writeValue( childValue );
if ( ++it == members.end() )
{
writeCommentAfterValueOnSameLine( childValue );
break;
}
*document_ << ",";
writeCommentAfterValueOnSameLine( childValue );
}
unindent();
writeWithIndent( "}" );
}
}
break;
}
}
void
StyledStreamWriter::writeArrayValue( const Value &value )
{
unsigned size = value.size();
if ( size == 0 )
pushValue( "[]" );
else
{
bool isArrayMultiLine = isMultineArray( value );
if ( isArrayMultiLine )
{
writeWithIndent( "[" );
indent();
bool hasChildValue = !childValues_.empty();
unsigned index =0;
for (;;)
{
const Value &childValue = value[index];
writeCommentBeforeValue( childValue );
if ( hasChildValue )
writeWithIndent( childValues_[index] );
else
{
writeIndent();
writeValue( childValue );
}
if ( ++index == size )
{
writeCommentAfterValueOnSameLine( childValue );
break;
}
*document_ << ",";
writeCommentAfterValueOnSameLine( childValue );
}
unindent();
writeWithIndent( "]" );
}
else // output on a single line
{
assert( childValues_.size() == size );
*document_ << "[ ";
for ( unsigned index =0; index < size; ++index )
{
if ( index > 0 )
*document_ << ", ";
*document_ << childValues_[index];
}
*document_ << " ]";
}
}
}
bool
StyledStreamWriter::isMultineArray( const Value &value )
{
int size = value.size();
bool isMultiLine = size*3 >= rightMargin_ ;
childValues_.clear();
for ( int index =0; index < size && !isMultiLine; ++index )
{
const Value &childValue = value[index];
isMultiLine = isMultiLine ||
( (childValue.isArray() || childValue.isObject()) &&
childValue.size() > 0 );
}
if ( !isMultiLine ) // check if line length > max line length
{
childValues_.reserve( size );
addChildValues_ = true;
int lineLength = 4 + (size-1)*2; // '[ ' + ', '*n + ' ]'
for ( int index =0; index < size && !isMultiLine; ++index )
{
writeValue( value[index] );
lineLength += int( childValues_[index].length() );
isMultiLine = isMultiLine && hasCommentForValue( value[index] );
}
addChildValues_ = false;
isMultiLine = isMultiLine || lineLength >= rightMargin_;
}
return isMultiLine;
}
void
StyledStreamWriter::pushValue( const std::string &value )
{
if ( addChildValues_ )
childValues_.push_back( value );
else
*document_ << value;
}
void
StyledStreamWriter::writeIndent()
{
/*
Some comments in this method would have been nice. ;-)
if ( !document_.empty() )
{
char last = document_[document_.length()-1];
if ( last == ' ' ) // already indented
return;
if ( last != '\n' ) // Comments may add new-line
*document_ << '\n';
}
*/
*document_ << '\n' << indentString_;
}
void
StyledStreamWriter::writeWithIndent( const std::string &value )
{
writeIndent();
*document_ << value;
}
void
StyledStreamWriter::indent()
{
indentString_ += indentation_;
}
void
StyledStreamWriter::unindent()
{
assert( indentString_.size() >= indentation_.size() );
indentString_.resize( indentString_.size() - indentation_.size() );
}
void
StyledStreamWriter::writeCommentBeforeValue( const Value &root )
{
if ( !root.hasComment( commentBefore ) )
return;
*document_ << normalizeEOL( root.getComment( commentBefore ) );
*document_ << "\n";
}
void
StyledStreamWriter::writeCommentAfterValueOnSameLine( const Value &root )
{
if ( root.hasComment( commentAfterOnSameLine ) )
*document_ << " " + normalizeEOL( root.getComment( commentAfterOnSameLine ) );
if ( root.hasComment( commentAfter ) )
{
*document_ << "\n";
*document_ << normalizeEOL( root.getComment( commentAfter ) );
*document_ << "\n";
}
}
bool
StyledStreamWriter::hasCommentForValue( const Value &value )
{
return value.hasComment( commentBefore )
|| value.hasComment( commentAfterOnSameLine )
|| value.hasComment( commentAfter );
}
std::string
StyledStreamWriter::normalizeEOL( const std::string &text )
{
std::string normalized;
normalized.reserve( text.length() );
const char *begin = text.c_str();
const char *end = begin + text.length();
const char *current = begin;
while ( current != end )
{
char c = *current++;
if ( c == '\r' ) // mac or dos EOL
{
if ( *current == '\n' ) // convert dos EOL
++current;
normalized += '\n';
}
else // handle unix EOL & other char
normalized += c;
}
return normalized;
}
std::ostream& operator<<( std::ostream &sout, const Value &root )
{
Json::StyledStreamWriter writer;
writer.write(sout, root);
return sout;
}
} // namespace Json

8
dependencies/build/jsoncpp/sconscript vendored
View File

@ -1,8 +0,0 @@
Import( 'env buildLibrary' )
buildLibrary( env, Split( """
json_reader.cpp
json_value.cpp
json_writer.cpp
""" ),
'json' )

24
dependencies/include/json/autolink.h vendored
View File

@ -1,24 +0,0 @@
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#ifndef JSON_AUTOLINK_H_INCLUDED
# define JSON_AUTOLINK_H_INCLUDED
# include "config.h"
# ifdef JSON_IN_CPPTL
# include <cpptl/cpptl_autolink.h>
# endif
# if !defined(JSON_NO_AUTOLINK) && !defined(JSON_DLL_BUILD) && !defined(JSON_IN_CPPTL)
# define CPPTL_AUTOLINK_NAME "json"
# undef CPPTL_AUTOLINK_DLL
# ifdef JSON_DLL
# define CPPTL_AUTOLINK_DLL
# endif
# include "autolink.h"
# endif
#endif // JSON_AUTOLINK_H_INCLUDED

96
dependencies/include/json/config.h vendored
View File

@ -1,96 +0,0 @@
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#ifndef JSON_CONFIG_H_INCLUDED
# define JSON_CONFIG_H_INCLUDED
/// If defined, indicates that json library is embedded in CppTL library.
//# define JSON_IN_CPPTL 1
/// If defined, indicates that json may leverage CppTL library
//# define JSON_USE_CPPTL 1
/// If defined, indicates that cpptl vector based map should be used instead of std::map
/// as Value container.
//# define JSON_USE_CPPTL_SMALLMAP 1
/// If defined, indicates that Json specific container should be used
/// (hash table & simple deque container with customizable allocator).
/// THIS FEATURE IS STILL EXPERIMENTAL! There is know bugs: See #3177332
//# define JSON_VALUE_USE_INTERNAL_MAP 1
/// Force usage of standard new/malloc based allocator instead of memory pool based allocator.
/// The memory pools allocator used optimization (initializing Value and ValueInternalLink
/// as if it was a POD) that may cause some validation tool to report errors.
/// Only has effects if JSON_VALUE_USE_INTERNAL_MAP is defined.
//# define JSON_USE_SIMPLE_INTERNAL_ALLOCATOR 1
/// If defined, indicates that Json use exception to report invalid type manipulation
/// instead of C assert macro.
# define JSON_USE_EXCEPTION 1
/// If defined, indicates that the source file is amalgated
/// to prevent private header inclusion.
/// Remarks: it is automatically defined in the generated amalgated header.
// #define JSON_IS_AMALGAMATION
# ifdef JSON_IN_CPPTL
# include <cpptl/config.h>
# ifndef JSON_USE_CPPTL
# define JSON_USE_CPPTL 1
# endif
# endif
# ifdef JSON_IN_CPPTL
# define JSON_API CPPTL_API
# elif defined(JSON_DLL_BUILD)
# define JSON_API __declspec(dllexport)
# elif defined(JSON_DLL)
# define JSON_API __declspec(dllimport)
# else
# define JSON_API
# endif
// If JSON_NO_INT64 is defined, then Json only support C++ "int" type for integer
// Storages, and 64 bits integer support is disabled.
// #define JSON_NO_INT64 1
#if defined(_MSC_VER) && _MSC_VER <= 1200 // MSVC 6
// Microsoft Visual Studio 6 only support conversion from __int64 to double
// (no conversion from unsigned __int64).
#define JSON_USE_INT64_DOUBLE_CONVERSION 1
#endif // if defined(_MSC_VER) && _MSC_VER < 1200 // MSVC 6
#if defined(_MSC_VER) && _MSC_VER >= 1500 // MSVC 2008
/// Indicates that the following function is deprecated.
# define JSONCPP_DEPRECATED(message) __declspec(deprecated(message))
#endif
#if !defined(JSONCPP_DEPRECATED)
# define JSONCPP_DEPRECATED(message)
#endif // if !defined(JSONCPP_DEPRECATED)
namespace Json {
typedef int Int;
typedef unsigned int UInt;
# if defined(JSON_NO_INT64)
typedef int LargestInt;
typedef unsigned int LargestUInt;
# undef JSON_HAS_INT64
# else // if defined(JSON_NO_INT64)
// For Microsoft Visual use specific types as long long is not supported
# if defined(_MSC_VER) // Microsoft Visual Studio
typedef __int64 Int64;
typedef unsigned __int64 UInt64;
# else // if defined(_MSC_VER) // Other platforms, use long long
typedef long long int Int64;
typedef unsigned long long int UInt64;
# endif // if defined(_MSC_VER)
typedef Int64 LargestInt;
typedef UInt64 LargestUInt;
# define JSON_HAS_INT64
# endif // if defined(JSON_NO_INT64)
} // end namespace Json
#endif // JSON_CONFIG_H_INCLUDED

49
dependencies/include/json/features.h vendored
View File

@ -1,49 +0,0 @@
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#ifndef CPPTL_JSON_FEATURES_H_INCLUDED
# define CPPTL_JSON_FEATURES_H_INCLUDED
#if !defined(JSON_IS_AMALGAMATION)
# include "forwards.h"
#endif // if !defined(JSON_IS_AMALGAMATION)
namespace Json {
/** \brief Configuration passed to reader and writer.
* This configuration object can be used to force the Reader or Writer
* to behave in a standard conforming way.
*/
class JSON_API Features
{
public:
/** \brief A configuration that allows all features and assumes all strings are UTF-8.
* - C & C++ comments are allowed
* - Root object can be any JSON value
* - Assumes Value strings are encoded in UTF-8
*/
static Features all();
/** \brief A configuration that is strictly compatible with the JSON specification.
* - Comments are forbidden.
* - Root object must be either an array or an object value.
* - Assumes Value strings are encoded in UTF-8
*/
static Features strictMode();
/** \brief Initialize the configuration like JsonConfig::allFeatures;
*/
Features();
/// \c true if comments are allowed. Default: \c true.
bool allowComments_;
/// \c true if root must be either an array or an object value. Default: \c false.
bool strictRoot_;
};
} // namespace Json
#endif // CPPTL_JSON_FEATURES_H_INCLUDED

44
dependencies/include/json/forwards.h vendored
View File

@ -1,44 +0,0 @@
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#ifndef JSON_FORWARDS_H_INCLUDED
# define JSON_FORWARDS_H_INCLUDED
#if !defined(JSON_IS_AMALGAMATION)
# include "config.h"
#endif // if !defined(JSON_IS_AMALGAMATION)
namespace Json {
// writer.h
class FastWriter;
class StyledWriter;
// reader.h
class Reader;
// features.h
class Features;
// value.h
typedef unsigned int ArrayIndex;
class StaticString;
class Path;
class PathArgument;
class Value;
class ValueIteratorBase;
class ValueIterator;
class ValueConstIterator;
#ifdef JSON_VALUE_USE_INTERNAL_MAP
class ValueMapAllocator;
class ValueInternalLink;
class ValueInternalArray;
class ValueInternalMap;
#endif // #ifdef JSON_VALUE_USE_INTERNAL_MAP
} // namespace Json
#endif // JSON_FORWARDS_H_INCLUDED

15
dependencies/include/json/json.h vendored
View File

@ -1,15 +0,0 @@
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#ifndef JSON_JSON_H_INCLUDED
# define JSON_JSON_H_INCLUDED
# include "autolink.h"
# include "value.h"
# include "reader.h"
# include "writer.h"
# include "features.h"
#endif // JSON_JSON_H_INCLUDED

214
dependencies/include/json/reader.h vendored
View File

@ -1,214 +0,0 @@
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#ifndef CPPTL_JSON_READER_H_INCLUDED
# define CPPTL_JSON_READER_H_INCLUDED
#if !defined(JSON_IS_AMALGAMATION)
# include "features.h"
# include "value.h"
#endif // if !defined(JSON_IS_AMALGAMATION)
# include <deque>
# include <stack>
# include <string>
# include <iostream>
namespace Json {
/** \brief Unserialize a <a HREF="http://www.json.org">JSON</a> document into a Value.
*
*/
class JSON_API Reader
{
public:
typedef char Char;
typedef const Char *Location;
/** \brief Constructs a Reader allowing all features
* for parsing.
*/
Reader();
/** \brief Constructs a Reader allowing the specified feature set
* for parsing.
*/
Reader( const Features &features );
/** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
* \param document UTF-8 encoded string containing the document to read.
* \param root [out] Contains the root value of the document if it was
* successfully parsed.
* \param collectComments \c true to collect comment and allow writing them back during
* serialization, \c false to discard comments.
* This parameter is ignored if Features::allowComments_
* is \c false.
* \return \c true if the document was successfully parsed, \c false if an error occurred.
*/
bool parse( const std::string &document,
Value &root,
bool collectComments = true );
/** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
* \param beginDoc Pointer on the beginning of the UTF-8 encoded string of the document to read.
* \param endDoc Pointer on the end of the UTF-8 encoded string of the document to read.
\ Must be >= beginDoc.
* \param root [out] Contains the root value of the document if it was
* successfully parsed.
* \param collectComments \c true to collect comment and allow writing them back during
* serialization, \c false to discard comments.
* This parameter is ignored if Features::allowComments_
* is \c false.
* \return \c true if the document was successfully parsed, \c false if an error occurred.
*/
bool parse( const char *beginDoc, const char *endDoc,
Value &root,
bool collectComments = true );
/// \brief Parse from input stream.
/// \see Json::operator>>(std::istream&, Json::Value&).
bool parse( std::istream &is,
Value &root,
bool collectComments = true );
/** \brief Returns a user friendly string that list errors in the parsed document.
* \return Formatted error message with the list of errors with their location in
* the parsed document. An empty string is returned if no error occurred
* during parsing.
* \deprecated Use getFormattedErrorMessages() instead (typo fix).
*/
JSONCPP_DEPRECATED("Use getFormattedErrorMessages instead")
std::string getFormatedErrorMessages() const;
/** \brief Returns a user friendly string that list errors in the parsed document.
* \return Formatted error message with the list of errors with their location in
* the parsed document. An empty string is returned if no error occurred
* during parsing.
*/
std::string getFormattedErrorMessages() const;
private:
enum TokenType
{
tokenEndOfStream = 0,
tokenObjectBegin,
tokenObjectEnd,
tokenArrayBegin,
tokenArrayEnd,
tokenString,
tokenNumber,
tokenTrue,
tokenFalse,
tokenNull,
tokenArraySeparator,
tokenMemberSeparator,
tokenComment,
tokenError
};
class Token
{
public:
TokenType type_;
Location start_;
Location end_;
};
class ErrorInfo
{
public:
Token token_;
std::string message_;
Location extra_;
};
typedef std::deque<ErrorInfo> Errors;
bool expectToken( TokenType type, Token &token, const char *message );
bool readToken( Token &token );
void skipSpaces();
bool match( Location pattern,
int patternLength );
bool readComment();
bool readCStyleComment();
bool readCppStyleComment();
bool readString();
void readNumber();
bool readValue();
bool readObject( Token &token );
bool readArray( Token &token );
bool decodeNumber( Token &token );
bool decodeString( Token &token );
bool decodeString( Token &token, std::string &decoded );
bool decodeDouble( Token &token );
bool decodeUnicodeCodePoint( Token &token,
Location &current,
Location end,
unsigned int &unicode );
bool decodeUnicodeEscapeSequence( Token &token,
Location &current,
Location end,
unsigned int &unicode );
bool addError( const std::string &message,
Token &token,
Location extra = 0 );
bool recoverFromError( TokenType skipUntilToken );
bool addErrorAndRecover( const std::string &message,
Token &token,
TokenType skipUntilToken );
void skipUntilSpace();
Value &currentValue();
Char getNextChar();
void getLocationLineAndColumn( Location location,
int &line,
int &column ) const;
std::string getLocationLineAndColumn( Location location ) const;
void addComment( Location begin,
Location end,
CommentPlacement placement );
void skipCommentTokens( Token &token );
typedef std::stack<Value *> Nodes;
Nodes nodes_;
Errors errors_;
std::string document_;
Location begin_;
Location end_;
Location current_;
Location lastValueEnd_;
Value *lastValue_;
std::string commentsBefore_;
Features features_;
bool collectComments_;
};
/** \brief Read from 'sin' into 'root'.
Always keep comments from the input JSON.
This can be used to read a file into a particular sub-object.
For example:
\code
Json::Value root;
cin >> root["dir"]["file"];
cout << root;
\endcode
Result:
\verbatim
{
"dir": {
"file": {
// The input stream JSON would be nested here.
}
}
}
\endverbatim
\throw std::exception on parse error.
\see Json::operator<<()
*/
std::istream& operator>>( std::istream&, Value& );
} // namespace Json
#endif // CPPTL_JSON_READER_H_INCLUDED

1103
dependencies/include/json/value.h vendored
View File

File diff suppressed because it is too large Load Diff

185
dependencies/include/json/writer.h vendored
View File

@ -1,185 +0,0 @@
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#ifndef JSON_WRITER_H_INCLUDED
# define JSON_WRITER_H_INCLUDED
#if !defined(JSON_IS_AMALGAMATION)
# include "value.h"
#endif // if !defined(JSON_IS_AMALGAMATION)
# include <vector>
# include <string>
# include <iostream>
namespace Json {
class Value;
/** \brief Abstract class for writers.
*/
class JSON_API Writer
{
public:
virtual ~Writer();
virtual std::string write( const Value &root ) = 0;
};
/** \brief Outputs a Value in <a HREF="http://www.json.org">JSON</a> format without formatting (not human friendly).
*
* The JSON document is written in a single line. It is not intended for 'human' consumption,
* but may be usefull to support feature such as RPC where bandwith is limited.
* \sa Reader, Value
*/
class JSON_API FastWriter : public Writer
{
public:
FastWriter();
virtual ~FastWriter(){}
void enableYAMLCompatibility();
public: // overridden from Writer
virtual std::string write( const Value &root );
private:
void writeValue( const Value &value );
std::string document_;
bool yamlCompatiblityEnabled_;
};
/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a human friendly way.
*
* The rules for line break and indent are as follow:
* - Object value:
* - if empty then print {} without indent and line break
* - if not empty the print '{', line break & indent, print one value per line
* and then unindent and line break and print '}'.
* - Array value:
* - if empty then print [] without indent and line break
* - if the array contains no object value, empty array or some other value types,
* and all the values fit on one lines, then print the array on a single line.
* - otherwise, it the values do not fit on one line, or the array contains
* object or non empty array, then print one value per line.
*
* If the Value have comments then they are outputed according to their #CommentPlacement.
*
* \sa Reader, Value, Value::setComment()
*/
class JSON_API StyledWriter: public Writer
{
public:
StyledWriter();
virtual ~StyledWriter(){}
public: // overridden from Writer
/** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
* \param root Value to serialize.
* \return String containing the JSON document that represents the root value.
*/
virtual std::string write( const Value &root );
private:
void writeValue( const Value &value );
void writeArrayValue( const Value &value );
bool isMultineArray( const Value &value );
void pushValue( const std::string &value );
void writeIndent();
void writeWithIndent( const std::string &value );
void indent();
void unindent();
void writeCommentBeforeValue( const Value &root );
void writeCommentAfterValueOnSameLine( const Value &root );
bool hasCommentForValue( const Value &value );
static std::string normalizeEOL( const std::string &text );
typedef std::vector<std::string> ChildValues;
ChildValues childValues_;
std::string document_;
std::string indentString_;
int rightMargin_;
int indentSize_;
bool addChildValues_;
};
/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a human friendly way,
to a stream rather than to a string.
*
* The rules for line break and indent are as follow:
* - Object value:
* - if empty then print {} without indent and line break
* - if not empty the print '{', line break & indent, print one value per line
* and then unindent and line break and print '}'.
* - Array value:
* - if empty then print [] without indent and line break
* - if the array contains no object value, empty array or some other value types,
* and all the values fit on one lines, then print the array on a single line.
* - otherwise, it the values do not fit on one line, or the array contains
* object or non empty array, then print one value per line.
*
* If the Value have comments then they are outputed according to their #CommentPlacement.
*
* \param indentation Each level will be indented by this amount extra.
* \sa Reader, Value, Value::setComment()
*/
class JSON_API StyledStreamWriter
{
public:
StyledStreamWriter( std::string indentation="\t" );
~StyledStreamWriter(){}
public:
/** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
* \param out Stream to write to. (Can be ostringstream, e.g.)
* \param root Value to serialize.
* \note There is no point in deriving from Writer, since write() should not return a value.
*/
void write( std::ostream &out, const Value &root );
private:
void writeValue( const Value &value );
void writeArrayValue( const Value &value );
bool isMultineArray( const Value &value );
void pushValue( const std::string &value );
void writeIndent();
void writeWithIndent( const std::string &value );
void indent();
void unindent();
void writeCommentBeforeValue( const Value &root );
void writeCommentAfterValueOnSameLine( const Value &root );
bool hasCommentForValue( const Value &value );
static std::string normalizeEOL( const std::string &text );
typedef std::vector<std::string> ChildValues;
ChildValues childValues_;
std::ostream* document_;
std::string indentString_;
int rightMargin_;
std::string indentation_;
bool addChildValues_;
};
# if defined(JSON_HAS_INT64)
std::string JSON_API valueToString( Int value );
std::string JSON_API valueToString( UInt value );
# endif // if defined(JSON_HAS_INT64)
std::string JSON_API valueToString( LargestInt value );
std::string JSON_API valueToString( LargestUInt value );
std::string JSON_API valueToString( double value );
std::string JSON_API valueToString( bool value );
std::string JSON_API valueToQuotedString( const char *value );
/// \brief Output using the StyledStreamWriter.
/// \see Json::operator>>()
std::ostream& operator<<( std::ostream&, const Value &root );
} // namespace Json
#endif // JSON_WRITER_H_INCLUDED

7
include/hyperion/Hyperion.h
View File

@ -83,7 +83,7 @@ public:
/// ///
void freeObjects(); void freeObjects();
static Hyperion* initInstance(const Json::Value& jsonConfig, const QJsonObject& qjsonConfig, const std::string configFile); static Hyperion* initInstance(const QJsonObject& qjsonConfig, const std::string configFile);
static Hyperion* getInstance(); static Hyperion* getInstance();
/// ///
@ -304,9 +304,9 @@ private:
/// ///
/// Constructs the Hyperion instance based on the given Json configuration /// Constructs the Hyperion instance based on the given Json configuration
/// ///
/// @param[in] jsonConfig The Json configuration /// @param[in] qjsonConfig The Json configuration
/// ///
Hyperion(const Json::Value& jsonConfig, const QJsonObject& qjsonConfig, const std::string configFile); Hyperion(const QJsonObject& qjsonConfig, const std::string configFile);
/// The specifiation of the led frame construction and picture integration /// The specifiation of the led frame construction and picture integration
LedString _ledString; LedString _ledString;
@ -337,7 +337,6 @@ private:
MessageForwarder * _messageForwarder; MessageForwarder * _messageForwarder;
// json configuration // json configuration
const Json::Value& _jsonConfig;
const QJsonObject& _qjsonConfig; const QJsonObject& _qjsonConfig;
// the name of config file // the name of config file

6
include/leddevice/LedDevice.h
View File

@ -2,6 +2,9 @@
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <QJsonObject>
#include <QJsonArray>
#include <QJsonDocument>
// STL incldues // STL incldues
#include <vector> #include <vector>
@ -15,11 +18,10 @@
#include <utils/RgbToRgbw.h> #include <utils/RgbToRgbw.h>
#include <utils/Logger.h> #include <utils/Logger.h>
#include <functional> #include <functional>
#include <json/json.h>
class LedDevice; class LedDevice;
typedef LedDevice* ( *LedDeviceCreateFuncType ) ( const Json::Value& ); typedef LedDevice* ( *LedDeviceCreateFuncType ) ( const QJsonObject& );
typedef std::map<std::string,LedDeviceCreateFuncType> LedDeviceRegistry; typedef std::map<std::string,LedDeviceCreateFuncType> LedDeviceRegistry;
/// ///

5
include/leddevice/LedDeviceFactory.h
View File

@ -1,9 +1,6 @@
#pragma once #pragma once
// Json includes
#include <json/json.h>
// Leddevice includes // Leddevice includes
#include <leddevice/LedDevice.h> #include <leddevice/LedDevice.h>
@ -23,5 +20,5 @@ public:
/// @return The constructed LedDevice or nullptr if configuration is invalid. The ownership of /// @return The constructed LedDevice or nullptr if configuration is invalid. The ownership of
/// the constructed LedDevice is tranferred to the caller /// the constructed LedDevice is tranferred to the caller
/// ///
static LedDevice * construct(const Json::Value & deviceConfig, const int ledCount); static LedDevice * construct(const QJsonObject & deviceConfig, const int ledCount);
}; };

9
libsrc/hyperion/Hyperion.cpp
View File

@ -32,11 +32,11 @@
Hyperion* Hyperion::_hyperion = nullptr; Hyperion* Hyperion::_hyperion = nullptr;
Hyperion* Hyperion::initInstance(const Json::Value& jsonConfig, const QJsonObject& qjsonConfig, const std::string configFile) // REMOVE jsonConfig variable when the conversion from jsonCPP to QtJSON is finished Hyperion* Hyperion::initInstance(const QJsonObject& qjsonConfig, const std::string configFile) // REMOVE jsonConfig variable when the conversion from jsonCPP to QtJSON is finished
{ {
if ( Hyperion::_hyperion != nullptr ) if ( Hyperion::_hyperion != nullptr )
throw std::runtime_error("Hyperion::initInstance can be called only one time"); throw std::runtime_error("Hyperion::initInstance can be called only one time");
Hyperion::_hyperion = new Hyperion(jsonConfig, qjsonConfig, configFile); Hyperion::_hyperion = new Hyperion(qjsonConfig, configFile);
return Hyperion::_hyperion; return Hyperion::_hyperion;
} }
@ -514,7 +514,7 @@ MessageForwarder * Hyperion::getForwarder()
return _messageForwarder; return _messageForwarder;
} }
Hyperion::Hyperion(const Json::Value &jsonConfig, const QJsonObject &qjsonConfig, const std::string configFile) Hyperion::Hyperion(const QJsonObject &qjsonConfig, const std::string configFile)
: _ledString(createLedString(qjsonConfig["leds"], createColorOrder(qjsonConfig["device"].toObject()))) : _ledString(createLedString(qjsonConfig["leds"], createColorOrder(qjsonConfig["device"].toObject())))
, _ledStringClone(createLedStringClone(qjsonConfig["leds"], createColorOrder(qjsonConfig["device"].toObject()))) , _ledStringClone(createLedStringClone(qjsonConfig["leds"], createColorOrder(qjsonConfig["device"].toObject())))
, _muxer(_ledString.leds().size()) , _muxer(_ledString.leds().size())
@ -522,7 +522,6 @@ Hyperion::Hyperion(const Json::Value &jsonConfig, const QJsonObject &qjsonConfig
, _raw2ledAdjustment(createLedColorsAdjustment(_ledString.leds().size(), qjsonConfig["color"].toObject())) , _raw2ledAdjustment(createLedColorsAdjustment(_ledString.leds().size(), qjsonConfig["color"].toObject()))
, _effectEngine(nullptr) , _effectEngine(nullptr)
, _messageForwarder(createMessageForwarder(qjsonConfig["forwarder"].toObject())) , _messageForwarder(createMessageForwarder(qjsonConfig["forwarder"].toObject()))
, _jsonConfig(jsonConfig)
, _qjsonConfig(qjsonConfig) , _qjsonConfig(qjsonConfig)
, _configFile(configFile) , _configFile(configFile)
, _timer() , _timer()
@ -566,7 +565,7 @@ Hyperion::Hyperion(const Json::Value &jsonConfig, const QJsonObject &qjsonConfig
getComponentRegister().componentStateChanged(hyperion::COMP_FORWARDER, _messageForwarder->forwardingEnabled()); getComponentRegister().componentStateChanged(hyperion::COMP_FORWARDER, _messageForwarder->forwardingEnabled());
// initialize leddevices // initialize leddevices
_device = LedDeviceFactory::construct(jsonConfig["device"],_hwLedCount); _device = LedDeviceFactory::construct(qjsonConfig["device"].toObject(),_hwLedCount);
_deviceSmooth = createColorSmoothing(qjsonConfig["smoothing"].toObject(), _device); _deviceSmooth = createColorSmoothing(qjsonConfig["smoothing"].toObject(), _device);
getComponentRegister().componentStateChanged(hyperion::COMP_SMOOTHING, _deviceSmooth->componentState()); getComponentRegister().componentStateChanged(hyperion::COMP_SMOOTHING, _deviceSmooth->componentState());

3
libsrc/hyperion/LedString.cpp
View File

@ -3,9 +3,6 @@
#include <unistd.h> #include <unistd.h>
#include <iostream> #include <iostream>
// Json includes
#include <json/json.h>
// hyperion includes // hyperion includes
#include <hyperion/LedString.h> #include <hyperion/LedString.h>

2
libsrc/jsonserver/JsonClientConnection.cpp
View File

@ -348,7 +348,7 @@ void JsonClientConnection::handleColorCommand(const QJsonObject& message, const
std::vector<ColorRgb> colorData(_hyperion->getLedCount()); std::vector<ColorRgb> colorData(_hyperion->getLedCount());
const QJsonArray & jsonColor = message["color"].toArray(); const QJsonArray & jsonColor = message["color"].toArray();
Json::UInt i = 0; unsigned int i = 0;
for (; i < unsigned(jsonColor.size()/3) && i < _hyperion->getLedCount(); ++i) for (; i < unsigned(jsonColor.size()/3) && i < _hyperion->getLedCount(); ++i)
{ {
colorData[i].red = uint8_t(jsonColor.at(3u*i).toInt()); colorData[i].red = uint8_t(jsonColor.at(3u*i).toInt());

2
libsrc/leddevice/LedDevice.cpp
View File

@ -5,8 +5,6 @@
#include <QResource> #include <QResource>
#include <QStringList> #include <QStringList>
#include <QDir> #include <QDir>
#include <QJsonObject>
#include <QJsonDocument>
LedDeviceRegistry LedDevice::_ledDeviceMap = LedDeviceRegistry(); LedDeviceRegistry LedDevice::_ledDeviceMap = LedDeviceRegistry();
std::string LedDevice::_activeDevice = ""; std::string LedDevice::_activeDevice = "";

6
libsrc/leddevice/LedDeviceAPA102.cpp
View File

@ -1,17 +1,17 @@
#include "LedDeviceAPA102.h" #include "LedDeviceAPA102.h"
LedDeviceAPA102::LedDeviceAPA102(const Json::Value &deviceConfig) LedDeviceAPA102::LedDeviceAPA102(const QJsonObject &deviceConfig)
: ProviderSpi() : ProviderSpi()
{ {
_deviceReady = init(deviceConfig); _deviceReady = init(deviceConfig);
} }
LedDevice* LedDeviceAPA102::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceAPA102::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceAPA102(deviceConfig); return new LedDeviceAPA102(deviceConfig);
} }
bool LedDeviceAPA102::init(const Json::Value &deviceConfig) bool LedDeviceAPA102::init(const QJsonObject &deviceConfig)
{ {
ProviderSpi::init(deviceConfig); ProviderSpi::init(deviceConfig);
_latchTime_ns = 500000; // fixed latchtime _latchTime_ns = 500000; // fixed latchtime

6
libsrc/leddevice/LedDeviceAPA102.h
View File

@ -13,12 +13,12 @@ public:
/// ///
/// Constructs specific LedDevice /// Constructs specific LedDevice
/// ///
LedDeviceAPA102(const Json::Value &deviceConfig); LedDeviceAPA102(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
virtual bool init(const Json::Value &deviceConfig); virtual bool init(const QJsonObject &deviceConfig);
private: private:
/// ///
/// Writes the led color values to the led-device /// Writes the led color values to the led-device

6
libsrc/leddevice/LedDeviceAdalight.cpp
View File

@ -1,18 +1,18 @@
#include "LedDeviceAdalight.h" #include "LedDeviceAdalight.h"
LedDeviceAdalight::LedDeviceAdalight(const Json::Value &deviceConfig) LedDeviceAdalight::LedDeviceAdalight(const QJsonObject &deviceConfig)
: ProviderRs232() : ProviderRs232()
{ {
_deviceReady = init(deviceConfig); _deviceReady = init(deviceConfig);
} }
LedDevice* LedDeviceAdalight::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceAdalight::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceAdalight(deviceConfig); return new LedDeviceAdalight(deviceConfig);
} }
bool LedDeviceAdalight::init(const Json::Value &deviceConfig) bool LedDeviceAdalight::init(const QJsonObject &deviceConfig)
{ {
ProviderRs232::init(deviceConfig); ProviderRs232::init(deviceConfig);

6
libsrc/leddevice/LedDeviceAdalight.h
View File

@ -15,12 +15,12 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceAdalight(const Json::Value &deviceConfig); LedDeviceAdalight(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
virtual bool init(const Json::Value &deviceConfig); virtual bool init(const QJsonObject &deviceConfig);
private: private:
/// ///

6
libsrc/leddevice/LedDeviceAdalightApa102.cpp
View File

@ -1,17 +1,17 @@
#include "LedDeviceAdalightApa102.h" #include "LedDeviceAdalightApa102.h"
LedDeviceAdalightApa102::LedDeviceAdalightApa102(const Json::Value &deviceConfig) LedDeviceAdalightApa102::LedDeviceAdalightApa102(const QJsonObject &deviceConfig)
: ProviderRs232() : ProviderRs232()
{ {
_deviceReady = init(deviceConfig); _deviceReady = init(deviceConfig);
} }
LedDevice* LedDeviceAdalightApa102::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceAdalightApa102::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceAdalightApa102(deviceConfig); return new LedDeviceAdalightApa102(deviceConfig);
} }
bool LedDeviceAdalightApa102::init(const Json::Value &deviceConfig) bool LedDeviceAdalightApa102::init(const QJsonObject &deviceConfig)
{ {
ProviderRs232::init(deviceConfig); ProviderRs232::init(deviceConfig);

6
libsrc/leddevice/LedDeviceAdalightApa102.h
View File

@ -17,12 +17,12 @@ public:
/// @param outputDevice The name of the output device (eg '/dev/ttyS0') /// @param outputDevice The name of the output device (eg '/dev/ttyS0')
/// @param baudrate The used baudrate for writing to the output device /// @param baudrate The used baudrate for writing to the output device
/// ///
LedDeviceAdalightApa102(const Json::Value &deviceConfig); LedDeviceAdalightApa102(const QJsonObject &deviceConfig);
/// create leddevice when type in config is set to this type /// create leddevice when type in config is set to this type
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
virtual bool init(const Json::Value &deviceConfig); virtual bool init(const QJsonObject &deviceConfig);
private: private:
/// ///

7
libsrc/leddevice/LedDeviceAtmo.cpp
View File

@ -1,18 +1,18 @@
// hyperion local includes // hyperion local includes
#include "LedDeviceAtmo.h" #include "LedDeviceAtmo.h"
LedDeviceAtmo::LedDeviceAtmo(const Json::Value &deviceConfig) LedDeviceAtmo::LedDeviceAtmo(const QJsonObject &deviceConfig)
: ProviderRs232() : ProviderRs232()
{ {
_deviceReady = init(deviceConfig); _deviceReady = init(deviceConfig);
} }
LedDevice* LedDeviceAtmo::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceAtmo::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceAtmo(deviceConfig); return new LedDeviceAtmo(deviceConfig);
} }
bool LedDeviceAtmo::init(const Json::Value &deviceConfig) bool LedDeviceAtmo::init(const QJsonObject &deviceConfig)
{ {
ProviderRs232::init(deviceConfig); ProviderRs232::init(deviceConfig);
@ -36,4 +36,3 @@ int LedDeviceAtmo::write(const std::vector<ColorRgb> &ledValues)
memcpy(4 + _ledBuffer.data(), ledValues.data(), _ledCount * sizeof(ColorRgb)); memcpy(4 + _ledBuffer.data(), ledValues.data(), _ledCount * sizeof(ColorRgb));
return writeBytes(_ledBuffer.size(), _ledBuffer.data()); return writeBytes(_ledBuffer.size(), _ledBuffer.data());
} }

6
libsrc/leddevice/LedDeviceAtmo.h
View File

@ -14,12 +14,12 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceAtmo(const Json::Value &deviceConfig); LedDeviceAtmo(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
virtual bool init(const Json::Value &deviceConfig); virtual bool init(const QJsonObject &deviceConfig);
private: private:
/// ///

20
libsrc/leddevice/LedDeviceAtmoOrb.cpp
View File

@ -16,7 +16,7 @@ AtmoOrbLight::AtmoOrbLight(unsigned int id) {
// Not implemented // Not implemented
} }
LedDeviceAtmoOrb::LedDeviceAtmoOrb(const Json::Value &deviceConfig) LedDeviceAtmoOrb::LedDeviceAtmoOrb(const QJsonObject &deviceConfig)
: LedDevice() : LedDevice()
{ {
init(deviceConfig); init(deviceConfig);
@ -29,16 +29,16 @@ LedDeviceAtmoOrb::LedDeviceAtmoOrb(const Json::Value &deviceConfig)
joinedMulticastgroup = _udpSocket->joinMulticastGroup(_groupAddress); joinedMulticastgroup = _udpSocket->joinMulticastGroup(_groupAddress);
} }
bool LedDeviceAtmoOrb::init(const Json::Value &deviceConfig) bool LedDeviceAtmoOrb::init(const QJsonObject &deviceConfig)
{ {
_multicastGroup = deviceConfig["output"].asString().c_str(); _multicastGroup = deviceConfig["output"].toString().toStdString().c_str();
_useOrbSmoothing = deviceConfig.get("useOrbSmoothing", false).asBool(); _useOrbSmoothing = deviceConfig["useOrbSmoothing"].toBool(false);
_transitiontime = deviceConfig.get("transitiontime", 0).asInt(); _transitiontime = deviceConfig["transitiontime"].toInt(0);
_skipSmoothingDiff = deviceConfig.get("skipSmoothingDiff", 0).asInt(); _skipSmoothingDiff = deviceConfig["skipSmoothingDiff"].toInt(0);
_multiCastGroupPort = deviceConfig.get("port", 49692).asInt(); _multiCastGroupPort = deviceConfig["port"].toInt(49692);
_numLeds = deviceConfig.get("numLeds", 24).asInt(); _numLeds = deviceConfig["numLeds"].toInt(24);
const std::string orbId = deviceConfig["orbIds"].asString(); const std::string orbId = deviceConfig["orbIds"].toString().toStdString();
_orbIds.clear(); _orbIds.clear();
// If we find multiple Orb ids separate them and add to list // If we find multiple Orb ids separate them and add to list
@ -62,7 +62,7 @@ bool LedDeviceAtmoOrb::init(const Json::Value &deviceConfig)
return true; return true;
} }
LedDevice* LedDeviceAtmoOrb::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceAtmoOrb::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceAtmoOrb(deviceConfig); return new LedDeviceAtmoOrb(deviceConfig);
} }

8
libsrc/leddevice/LedDeviceAtmoOrb.h
View File

@ -46,17 +46,17 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceAtmoOrb(const Json::Value &deviceConfig); LedDeviceAtmoOrb(const QJsonObject &deviceConfig);
/// ///
/// Sets configuration /// Sets configuration
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
bool init(const Json::Value &deviceConfig); bool init(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
/// ///
/// Destructor of this device /// Destructor of this device
/// ///
@ -118,4 +118,4 @@ private:
/// @param bytes the byte array containing command to send over multicast /// @param bytes the byte array containing command to send over multicast
/// ///
void sendCommand(const QByteArray &bytes); void sendCommand(const QByteArray &bytes);
}; };

7
libsrc/leddevice/LedDeviceDMX.cpp
View File

@ -2,7 +2,7 @@
#include <QSerialPort> #include <QSerialPort>
#include <time.h> #include <time.h>
LedDeviceDMX::LedDeviceDMX(const Json::Value &deviceConfig) LedDeviceDMX::LedDeviceDMX(const QJsonObject &deviceConfig)
: ProviderRs232() : ProviderRs232()
, _dmxDeviceType(0) , _dmxDeviceType(0)
, _dmxStart(1) , _dmxStart(1)
@ -11,7 +11,7 @@ LedDeviceDMX::LedDeviceDMX(const Json::Value &deviceConfig)
, _dmxChannelCount(0) , _dmxChannelCount(0)
{ {
ProviderRs232::init(deviceConfig); ProviderRs232::init(deviceConfig);
std::string _dmxString = deviceConfig.get("dmxdevice", "invalid").asString(); std::string _dmxString = deviceConfig["dmxdevice"].toString("invalid").toStdString();
if (_dmxString == "raw") if (_dmxString == "raw")
{ {
_dmxDeviceType = 0; _dmxDeviceType = 0;
@ -42,7 +42,7 @@ LedDeviceDMX::LedDeviceDMX(const Json::Value &deviceConfig)
_ledBuffer[0] = 0x00; // NULL START code _ledBuffer[0] = 0x00; // NULL START code
} }
LedDevice* LedDeviceDMX::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceDMX::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceDMX(deviceConfig); return new LedDeviceDMX(deviceConfig);
} }
@ -85,4 +85,3 @@ int LedDeviceDMX::write(const std::vector<ColorRgb> &ledValues)
return writeBytes(_dmxChannelCount, _ledBuffer.data()); return writeBytes(_dmxChannelCount, _ledBuffer.data());
} }

4
libsrc/leddevice/LedDeviceDMX.h
View File

@ -14,10 +14,10 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceDMX(const Json::Value &deviceConfig); LedDeviceDMX(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
private: private:
/// ///

14
libsrc/leddevice/LedDeviceFactory.cpp
View File

@ -57,14 +57,14 @@
#include "LedDeviceWS281x.h" #include "LedDeviceWS281x.h"
#endif #endif
LedDevice * LedDeviceFactory::construct(const Json::Value & deviceConfig, const int ledCount) LedDevice * LedDeviceFactory::construct(const QJsonObject & deviceConfig, const int ledCount)
{ {
Logger * log = Logger::getInstance("LedDevice"); Logger * log = Logger::getInstance("LedDevice");
std::stringstream ss; QJsonDocument config(deviceConfig);
ss << deviceConfig; QString ss(config.toJson(QJsonDocument::Indented));
Info(log, "configuration: %s ", ss.str().c_str()); Info(log, "configuration: %s ", ss.toUtf8().constData());
std::string type = deviceConfig.get("type", "UNSPECIFIED").asString(); std::string type = deviceConfig["type"].toString("UNSPECIFIED").toStdString();
std::transform(type.begin(), type.end(), type.begin(), ::tolower); std::transform(type.begin(), type.end(), type.begin(), ::tolower);
// set amount of led to leddevice // set amount of led to leddevice
@ -148,8 +148,8 @@ LedDevice * LedDeviceFactory::construct(const Json::Value & deviceConfig, const
{ {
Error(log, "Dummy device used, because configured device '%s' throws error '%s'", type.c_str(), e.what()); Error(log, "Dummy device used, because configured device '%s' throws error '%s'", type.c_str(), e.what());
const Json::Value dummyDeviceConfig; const QJsonObject dummyDeviceConfig;
device = LedDeviceFile::construct(Json::nullValue); device = LedDeviceFile::construct(QJsonObject());
} }
device->open(); device->open();

34
libsrc/leddevice/LedDeviceFadeCandy.cpp
View File

@ -6,7 +6,7 @@ static const unsigned OPC_SYS_EX = 255; // OPC command codes
static const unsigned OPC_HEADER_SIZE = 4; // OPC header size static const unsigned OPC_HEADER_SIZE = 4; // OPC header size
LedDeviceFadeCandy::LedDeviceFadeCandy(const Json::Value &deviceConfig) LedDeviceFadeCandy::LedDeviceFadeCandy(const QJsonObject &deviceConfig)
: LedDevice() : LedDevice()
{ {
_deviceReady = init(deviceConfig); _deviceReady = init(deviceConfig);
@ -18,13 +18,13 @@ LedDeviceFadeCandy::~LedDeviceFadeCandy()
_client.close(); _client.close();
} }
LedDevice* LedDeviceFadeCandy::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceFadeCandy::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceFadeCandy(deviceConfig); return new LedDeviceFadeCandy(deviceConfig);
} }
bool LedDeviceFadeCandy::init(const Json::Value &deviceConfig) bool LedDeviceFadeCandy::init(const QJsonObject &deviceConfig)
{ {
_client.close(); _client.close();
@ -34,26 +34,26 @@ bool LedDeviceFadeCandy::init(const Json::Value &deviceConfig)
return false; return false;
} }
_host = deviceConfig.get("output", "127.0.0.1").asString(); _host = deviceConfig["output"].toString("127.0.0.1").toStdString();
_port = deviceConfig.get("port", 7890).asInt(); _port = deviceConfig["port"].toInt(7890);
_channel = deviceConfig.get("channel", 0).asInt(); _channel = deviceConfig["channel"].toInt(0);
_gamma = deviceConfig.get("gamma", 1.0).asDouble(); _gamma = deviceConfig["gamma"].toDouble(1.0);
_noDither = ! deviceConfig.get("dither", false).asBool(); _noDither = ! deviceConfig["dither"].toBool(false);
_noInterp = ! deviceConfig.get("interpolation", false).asBool(); _noInterp = ! deviceConfig["interpolation"].toBool(false);
_manualLED = deviceConfig.get("manualLed", false).asBool(); _manualLED = deviceConfig["manualLed"].toBool(false);
_ledOnOff = deviceConfig.get("ledOn", false).asBool(); _ledOnOff = deviceConfig["ledOn"].toBool(false);
_setFcConfig = deviceConfig.get("setFcConfig", false).asBool(); _setFcConfig = deviceConfig["setFcConfig"].toBool(false);
_whitePoint_r = 1.0; _whitePoint_r = 1.0;
_whitePoint_g = 1.0; _whitePoint_g = 1.0;
_whitePoint_b = 1.0; _whitePoint_b = 1.0;
const Json::Value whitePointConfig = deviceConfig["whitePoint"]; const QJsonArray whitePointConfig = deviceConfig["whitePoint"].toArray();
if ( whitePointConfig.isArray() && whitePointConfig.size() == 3 ) if ( !whitePointConfig.isEmpty() && whitePointConfig.size() == 3 )
{ {
_whitePoint_r = whitePointConfig[0].asDouble(); _whitePoint_r = whitePointConfig[0].toDouble();
_whitePoint_g = whitePointConfig[1].asDouble(); _whitePoint_g = whitePointConfig[1].toDouble();
_whitePoint_b = whitePointConfig[2].asDouble(); _whitePoint_b = whitePointConfig[2].toDouble();
} }
_opc_data.resize( _ledRGBCount + OPC_HEADER_SIZE ); _opc_data.resize( _ledRGBCount + OPC_HEADER_SIZE );

7
libsrc/leddevice/LedDeviceFadeCandy.h
View File

@ -38,7 +38,7 @@ public:
/// ///
/// @param deviceConfig json config for fadecandy /// @param deviceConfig json config for fadecandy
/// ///
LedDeviceFadeCandy(const Json::Value &deviceConfig); LedDeviceFadeCandy(const QJsonObject &deviceConfig);
/// ///
/// Destructor of the LedDevice; closes the tcp client /// Destructor of the LedDevice; closes the tcp client
@ -46,14 +46,14 @@ public:
virtual ~LedDeviceFadeCandy(); virtual ~LedDeviceFadeCandy();
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
/// ///
/// Sets configuration /// Sets configuration
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
bool init(const Json::Value &deviceConfig); bool init(const QJsonObject &deviceConfig);
/// ///
/// Writes the led color values to the led-device /// Writes the led color values to the led-device
@ -111,4 +111,3 @@ private:
void sendFadeCandyConfiguration(); void sendFadeCandyConfiguration();
}; };

8
libsrc/leddevice/LedDeviceFile.cpp
View File

@ -1,6 +1,6 @@
#include "LedDeviceFile.h" #include "LedDeviceFile.h"
LedDeviceFile::LedDeviceFile(const Json::Value &deviceConfig) LedDeviceFile::LedDeviceFile(const QJsonObject &deviceConfig)
: LedDevice() : LedDevice()
{ {
init(deviceConfig); init(deviceConfig);
@ -10,19 +10,19 @@ LedDeviceFile::~LedDeviceFile()
{ {
} }
LedDevice* LedDeviceFile::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceFile::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceFile(deviceConfig); return new LedDeviceFile(deviceConfig);
} }
bool LedDeviceFile::init(const Json::Value &deviceConfig) bool LedDeviceFile::init(const QJsonObject &deviceConfig)
{ {
if ( _ofs.is_open() ) if ( _ofs.is_open() )
{ {
_ofs.close(); _ofs.close();
} }
std::string fileName = deviceConfig.get("output","/dev/null").asString(); std::string fileName = deviceConfig["output"].toString("/dev/null").toStdString();
_ofs.open( fileName.c_str() ); _ofs.open( fileName.c_str() );
return true; return true;

6
libsrc/leddevice/LedDeviceFile.h
View File

@ -18,7 +18,7 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceFile(const Json::Value &deviceConfig); LedDeviceFile(const QJsonObject &deviceConfig);
/// ///
/// Destructor of this test-device /// Destructor of this test-device
@ -26,14 +26,14 @@ public:
virtual ~LedDeviceFile(); virtual ~LedDeviceFile();
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
/// ///
/// Sets configuration /// Sets configuration
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
virtual bool init(const Json::Value &deviceConfig); virtual bool init(const QJsonObject &deviceConfig);
protected: protected:
/// ///

8
libsrc/leddevice/LedDeviceHyperionUsbasp.cpp
View File

@ -11,7 +11,7 @@ uint16_t LedDeviceHyperionUsbasp::_usbProductId = 0x05dc;
std::string LedDeviceHyperionUsbasp::_usbProductDescription = "Hyperion led controller"; std::string LedDeviceHyperionUsbasp::_usbProductDescription = "Hyperion led controller";
LedDeviceHyperionUsbasp::LedDeviceHyperionUsbasp(const Json::Value &deviceConfig) LedDeviceHyperionUsbasp::LedDeviceHyperionUsbasp(const QJsonObject &deviceConfig)
: LedDevice() : LedDevice()
, _libusbContext(nullptr) , _libusbContext(nullptr)
, _deviceHandle(nullptr) , _deviceHandle(nullptr)
@ -37,9 +37,9 @@ LedDeviceHyperionUsbasp::~LedDeviceHyperionUsbasp()
} }
} }
bool LedDeviceHyperionUsbasp::init(const Json::Value &deviceConfig) bool LedDeviceHyperionUsbasp::init(const QJsonObject &deviceConfig)
{ {
std::string ledType = deviceConfig.get("output", "ws2801").asString(); std::string ledType = deviceConfig["output"].toString("ws2801").toStdString();
if (ledType != "ws2801" && ledType != "ws2812") if (ledType != "ws2801" && ledType != "ws2812")
{ {
throw std::runtime_error("HyperionUsbasp: invalid output; must be 'ws2801' or 'ws2812'."); throw std::runtime_error("HyperionUsbasp: invalid output; must be 'ws2801' or 'ws2812'.");
@ -50,7 +50,7 @@ bool LedDeviceHyperionUsbasp::init(const Json::Value &deviceConfig)
return true; return true;
} }
LedDevice* LedDeviceHyperionUsbasp::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceHyperionUsbasp::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceHyperionUsbasp(deviceConfig); return new LedDeviceHyperionUsbasp(deviceConfig);
} }

6
libsrc/leddevice/LedDeviceHyperionUsbasp.h
View File

@ -28,17 +28,17 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceHyperionUsbasp(const Json::Value &deviceConfig); LedDeviceHyperionUsbasp(const QJsonObject &deviceConfig);
/// ///
/// Sets configuration /// Sets configuration
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
bool init(const Json::Value &deviceConfig); bool init(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
/// ///
/// Destructor of the LedDevice; closes the output device if it is open /// Destructor of the LedDevice; closes the output device if it is open

8
libsrc/leddevice/LedDeviceLightpack.cpp
View File

@ -45,7 +45,7 @@ LedDeviceLightpack::LedDeviceLightpack(const std::string & serialNumber)
{ {
} }
LedDeviceLightpack::LedDeviceLightpack(const Json::Value &deviceConfig) LedDeviceLightpack::LedDeviceLightpack(const QJsonObject &deviceConfig)
: LedDevice() : LedDevice()
{ {
init(deviceConfig); init(deviceConfig);
@ -69,14 +69,14 @@ LedDeviceLightpack::~LedDeviceLightpack()
} }
} }
bool LedDeviceLightpack::init(const Json::Value &deviceConfig) bool LedDeviceLightpack::init(const QJsonObject &deviceConfig)
{ {
_serialNumber = deviceConfig.get("output", "").asString(); _serialNumber = deviceConfig["output"].toString("").toStdString();
return true; return true;
} }
LedDevice* LedDeviceLightpack::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceLightpack::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceLightpack(deviceConfig); return new LedDeviceLightpack(deviceConfig);
} }

6
libsrc/leddevice/LedDeviceLightpack.h
View File

@ -26,17 +26,17 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceLightpack(const Json::Value &deviceConfig); LedDeviceLightpack(const QJsonObject &deviceConfig);
/// ///
/// Sets configuration /// Sets configuration
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
bool init(const Json::Value &deviceConfig); bool init(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
/// ///
/// Destructor of the LedDevice; closes the output device if it is open /// Destructor of the LedDevice; closes the output device if it is open

6
libsrc/leddevice/LedDeviceLpd6803.cpp
View File

@ -1,17 +1,17 @@
#include "LedDeviceLpd6803.h" #include "LedDeviceLpd6803.h"
LedDeviceLpd6803::LedDeviceLpd6803(const Json::Value &deviceConfig) LedDeviceLpd6803::LedDeviceLpd6803(const QJsonObject &deviceConfig)
: ProviderSpi() : ProviderSpi()
{ {
_deviceReady = init(deviceConfig); _deviceReady = init(deviceConfig);
} }
LedDevice* LedDeviceLpd6803::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceLpd6803::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceLpd6803(deviceConfig); return new LedDeviceLpd6803(deviceConfig);
} }
bool LedDeviceLpd6803::init(const Json::Value &deviceConfig) bool LedDeviceLpd6803::init(const QJsonObject &deviceConfig)
{ {
ProviderSpi::init(deviceConfig); ProviderSpi::init(deviceConfig);

6
libsrc/leddevice/LedDeviceLpd6803.h
View File

@ -22,12 +22,12 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceLpd6803(const Json::Value &deviceConfig); LedDeviceLpd6803(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
virtual bool init(const Json::Value &deviceConfig); virtual bool init(const QJsonObject &deviceConfig);
private: private:
/// ///

6
libsrc/leddevice/LedDeviceLpd8806.cpp
View File

@ -1,17 +1,17 @@
#include "LedDeviceLpd8806.h" #include "LedDeviceLpd8806.h"
LedDeviceLpd8806::LedDeviceLpd8806(const Json::Value &deviceConfig) LedDeviceLpd8806::LedDeviceLpd8806(const QJsonObject &deviceConfig)
: ProviderSpi() : ProviderSpi()
{ {
_deviceReady = init(deviceConfig); _deviceReady = init(deviceConfig);
} }
LedDevice* LedDeviceLpd8806::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceLpd8806::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceLpd8806(deviceConfig); return new LedDeviceLpd8806(deviceConfig);
} }
bool LedDeviceLpd8806::init(const Json::Value &deviceConfig) bool LedDeviceLpd8806::init(const QJsonObject &deviceConfig)
{ {
ProviderSpi::init(deviceConfig); ProviderSpi::init(deviceConfig);

6
libsrc/leddevice/LedDeviceLpd8806.h
View File

@ -83,12 +83,12 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceLpd8806(const Json::Value &deviceConfig); LedDeviceLpd8806(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
virtual bool init(const Json::Value &deviceConfig); virtual bool init(const QJsonObject &deviceConfig);
private: private:
/// ///

4
libsrc/leddevice/LedDeviceMultiLightpack.cpp
View File

@ -17,7 +17,7 @@ bool compareLightpacks(LedDeviceLightpack * lhs, LedDeviceLightpack * rhs)
return lhs->getSerialNumber() < rhs->getSerialNumber(); return lhs->getSerialNumber() < rhs->getSerialNumber();
} }
LedDeviceMultiLightpack::LedDeviceMultiLightpack(const Json::Value &) LedDeviceMultiLightpack::LedDeviceMultiLightpack(const QJsonObject &)
: LedDevice() : LedDevice()
, _lightpacks() , _lightpacks()
{ {
@ -31,7 +31,7 @@ LedDeviceMultiLightpack::~LedDeviceMultiLightpack()
} }
} }
LedDevice* LedDeviceMultiLightpack::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceMultiLightpack::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceMultiLightpack(deviceConfig); return new LedDeviceMultiLightpack(deviceConfig);
} }

6
libsrc/leddevice/LedDeviceMultiLightpack.h
View File

@ -22,9 +22,7 @@ public:
/// ///
/// Constructs specific LedDevice /// Constructs specific LedDevice
/// ///
/// @param deviceConfig json device config LedDeviceMultiLightpack(const QJsonObject &);
///
LedDeviceMultiLightpack(const Json::Value &);
/// ///
/// Destructor of the LedDevice; closes the output device if it is open /// Destructor of the LedDevice; closes the output device if it is open
@ -32,7 +30,7 @@ public:
virtual ~LedDeviceMultiLightpack(); virtual ~LedDeviceMultiLightpack();
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
/// ///
/// Opens and configures the output device7 /// Opens and configures the output device7

6
libsrc/leddevice/LedDeviceP9813.cpp
View File

@ -1,17 +1,17 @@
#include "LedDeviceP9813.h" #include "LedDeviceP9813.h"
LedDeviceP9813::LedDeviceP9813(const Json::Value &deviceConfig) LedDeviceP9813::LedDeviceP9813(const QJsonObject &deviceConfig)
: ProviderSpi() : ProviderSpi()
{ {
_deviceReady = init(deviceConfig); _deviceReady = init(deviceConfig);
} }
LedDevice* LedDeviceP9813::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceP9813::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceP9813(deviceConfig); return new LedDeviceP9813(deviceConfig);
} }
bool LedDeviceP9813::init(const Json::Value &deviceConfig) bool LedDeviceP9813::init(const QJsonObject &deviceConfig)
{ {
ProviderSpi::init(deviceConfig); ProviderSpi::init(deviceConfig);

6
libsrc/leddevice/LedDeviceP9813.h
View File

@ -14,12 +14,12 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceP9813(const Json::Value &deviceConfig); LedDeviceP9813(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
virtual bool init(const Json::Value &deviceConfig); virtual bool init(const QJsonObject &deviceConfig);
private: private:
/// ///

4
libsrc/leddevice/LedDevicePaintpack.cpp
View File

@ -1,7 +1,7 @@
#include "LedDevicePaintpack.h" #include "LedDevicePaintpack.h"
// Use out report HID device // Use out report HID device
LedDevicePaintpack::LedDevicePaintpack(const Json::Value &deviceConfig) LedDevicePaintpack::LedDevicePaintpack(const QJsonObject &deviceConfig)
: ProviderHID() : ProviderHID()
{ {
ProviderHID::init(deviceConfig); ProviderHID::init(deviceConfig);
@ -12,7 +12,7 @@ LedDevicePaintpack::LedDevicePaintpack(const Json::Value &deviceConfig)
_ledBuffer[1] = 0; _ledBuffer[1] = 0;
} }
LedDevice* LedDevicePaintpack::construct(const Json::Value &deviceConfig) LedDevice* LedDevicePaintpack::construct(const QJsonObject &deviceConfig)
{ {
return new LedDevicePaintpack(deviceConfig); return new LedDevicePaintpack(deviceConfig);
} }

4
libsrc/leddevice/LedDevicePaintpack.h
View File

@ -14,10 +14,10 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDevicePaintpack(const Json::Value &deviceConfig); LedDevicePaintpack(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
private: private:
/// ///

71
libsrc/leddevice/LedDevicePhilipsHue.cpp
View File

@ -161,7 +161,7 @@ CiColor PhilipsHueLight::rgbToCiColor(float red, float green, float blue)
return xy; return xy;
} }
LedDevicePhilipsHue::LedDevicePhilipsHue(const Json::Value &deviceConfig) LedDevicePhilipsHue::LedDevicePhilipsHue(const QJsonObject &deviceConfig)
: LedDevice() : LedDevice()
{ {
_deviceReady = init(deviceConfig); _deviceReady = init(deviceConfig);
@ -177,22 +177,23 @@ LedDevicePhilipsHue::~LedDevicePhilipsHue()
delete manager; delete manager;
} }
bool LedDevicePhilipsHue::init(const Json::Value &deviceConfig) bool LedDevicePhilipsHue::init(const QJsonObject &deviceConfig)
{ {
host = deviceConfig["output"].asString().c_str(); host = deviceConfig["output"].toString().toStdString().c_str();
username = deviceConfig.get("username", "newdeveloper").asString().c_str(); username = deviceConfig["username"].toString("newdeveloper").toStdString().c_str();
switchOffOnBlack = deviceConfig.get("switchOffOnBlack", true).asBool(); switchOffOnBlack = deviceConfig["switchOffOnBlack"].toBool(true);
transitiontime = deviceConfig.get("transitiontime", 1).asInt(); transitiontime = deviceConfig["transitiontime"].toInt(1);
lightIds.clear(); lightIds.clear();
for (Json::Value::ArrayIndex i = 0; i < deviceConfig["lightIds"].size(); i++) QJsonArray lArray = deviceConfig["lightIds"].toArray();
for(int i = 0; i < lArray.size(); i++)
{ {
lightIds.push_back(deviceConfig["lightIds"][i].asInt()); lightIds.push_back(lArray[i].toInt());
} }
return true; return true;
} }
LedDevice* LedDevicePhilipsHue::construct(const Json::Value &deviceConfig) LedDevice* LedDevicePhilipsHue::construct(const QJsonObject &deviceConfig)
{ {
return new LedDevicePhilipsHue(deviceConfig); return new LedDevicePhilipsHue(deviceConfig);
} }
@ -319,26 +320,34 @@ QString LedDevicePhilipsHue::getUrl(QString route)
void LedDevicePhilipsHue::saveStates(unsigned int nLights) void LedDevicePhilipsHue::saveStates(unsigned int nLights)
{ {
QJsonParseError error;
QJsonDocument reader;
QJsonObject json;
QByteArray response;
// Clear saved lamps. // Clear saved lamps.
lights.clear(); lights.clear();
// Use json parser to parse reponse.
Json::Reader reader;
Json::FastWriter writer;
// Read light ids if none have been supplied by the user. // Read light ids if none have been supplied by the user.
if (lightIds.size() != nLights) if (lightIds.size() != nLights)
{ {
lightIds.clear(); lightIds.clear();
// //
QByteArray response = get("lights"); response = get("lights");
Json::Value json; // Use QJsonDocument to parse reponse.
if (!reader.parse(QString(response).toStdString(), json)) reader = QJsonDocument::fromJson(response, &error);
if (error.error != QJsonParseError::NoError)
{ {
throw std::runtime_error(("No lights found at " + getUrl("lights")).toStdString()); throw std::runtime_error(("No lights found at " + getUrl("lights")).toStdString());
} }
json = reader.object();
// Loop over all children. // Loop over all children.
for (Json::ValueIterator it = json.begin(); it != json.end() && lightIds.size() < nLights; it++) for (QJsonObject::iterator it = json.begin(); it != json.end() && lightIds.size() < nLights; it++)
{ {
int lightId = atoi(it.key().asCString()); int lightId = atoi(it.key().toStdString().c_str());
lightIds.push_back(lightId); lightIds.push_back(lightId);
Debug(_log, "nLights=%d: found light with id %d.", nLights, lightId); Debug(_log, "nLights=%d: found light with id %d.", nLights, lightId);
} }
@ -352,36 +361,40 @@ void LedDevicePhilipsHue::saveStates(unsigned int nLights)
for (unsigned int i = 0; i < nLights; i++) for (unsigned int i = 0; i < nLights; i++)
{ {
// Read the response. // Read the response.
QByteArray response = get(getRoute(lightIds.at(i))); response = get(getRoute(lightIds.at(i)));
// Parse JSON. // Parse JSON.
Json::Value json; reader = QJsonDocument::fromJson(response, &error);
if (!reader.parse(QString(response).toStdString(), json))
if (error.error != QJsonParseError::NoError)
{ {
// Error occured, break loop. // Error occured, break loop.
Error(_log, "saveStates(nLights=%d): got invalid response from light %s.", nLights, getUrl(getRoute(lightIds.at(i))).toStdString().c_str()); Error(_log, "saveStates(nLights=%d): got invalid response from light %s.", nLights, getUrl(getRoute(lightIds.at(i))).toStdString().c_str());
break; break;
} }
// Get state object values which are subject to change. // Get state object values which are subject to change.
Json::Value state(Json::objectValue); QJsonObject state;
if (!json.isMember("state")) if (!json.contains("state"))
{ {
Error(_log, "saveStates(nLights=%d): got no state for light from %s", nLights, getUrl(getRoute(lightIds.at(i))).toStdString().c_str()); Error(_log, "saveStates(nLights=%d): got no state for light from %s", nLights, getUrl(getRoute(lightIds.at(i))).toStdString().c_str());
break; break;
} }
if (!json["state"].isMember("on")) if (!json["state"].toObject().contains("on"))
{ {
Error(_log, "saveStates(nLights=%d,): got no valid state from light %s", nLights, getUrl(getRoute(lightIds.at(i))).toStdString().c_str()); Error(_log, "saveStates(nLights=%d,): got no valid state from light %s", nLights, getUrl(getRoute(lightIds.at(i))).toStdString().c_str());
break; break;
} }
state["on"] = json["state"]["on"]; state["on"] = json["state"].toObject()["on"];
if (json["state"]["on"] == true) if (json["state"].toObject()["on"].toBool() == true)
{ {
state["xy"] = json["state"]["xy"]; state["xy"] = json["state"].toObject()["xy"];
state["bri"] = json["state"]["bri"]; state["bri"] = json["state"].toObject()["bri"];
} }
// Determine the model id. // Determine the model id.
QString modelId = QString(writer.write(json["modelid"]).c_str()).trimmed().replace("\"", ""); QJsonDocument mId(json["modelid"].toObject());
QString originalState = QString(writer.write(state).c_str()).trimmed(); QString modelId = mId.toJson().trimmed().replace("\"", "");
QJsonDocument st(state);
QString originalState = mId.toJson().trimmed();
// Save state object. // Save state object.
lights.push_back(PhilipsHueLight(lightIds.at(i), originalState, modelId)); lights.push_back(PhilipsHueLight(lightIds.at(i), originalState, modelId));
} }

6
libsrc/leddevice/LedDevicePhilipsHue.h
View File

@ -115,7 +115,7 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDevicePhilipsHue(const Json::Value &deviceConfig); LedDevicePhilipsHue(const QJsonObject &deviceConfig);
/// ///
/// Destructor of this device /// Destructor of this device
@ -127,10 +127,10 @@ public:
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
bool init(const Json::Value &deviceConfig); bool init(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
/// Restores the original state of the leds. /// Restores the original state of the leds.
virtual int switchOff(); virtual int switchOff();

22
libsrc/leddevice/LedDevicePiBlaster.cpp
View File

@ -9,7 +9,7 @@
// Local LedDevice includes // Local LedDevice includes
#include "LedDevicePiBlaster.h" #include "LedDevicePiBlaster.h"
LedDevicePiBlaster::LedDevicePiBlaster(const Json::Value &deviceConfig) LedDevicePiBlaster::LedDevicePiBlaster(const QJsonObject &deviceConfig)
: _fid(nullptr) : _fid(nullptr)
{ {
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
@ -40,22 +40,23 @@ LedDevicePiBlaster::~LedDevicePiBlaster()
} }
bool LedDevicePiBlaster::init(const Json::Value &deviceConfig) bool LedDevicePiBlaster::init(const QJsonObject &deviceConfig)
{ {
_deviceName = deviceConfig.get("output", "").asString(); _deviceName = deviceConfig["output"].toString("").toStdString();
Json::Value gpioMapping = deviceConfig.get("gpiomap", Json::nullValue); QJsonArray gpioMapping = deviceConfig["gpiomap"].toArray();
if (gpioMapping.isNull()) if (gpioMapping.isEmpty())
{ {
throw std::runtime_error("Piblaster: no gpiomap defined."); throw std::runtime_error("Piblaster: no gpiomap defined.");
} }
// walk through the json config and populate the mapping tables // walk through the json config and populate the mapping tables
for (const Json::Value& gpioMap : gpioMapping) for(QJsonArray::const_iterator gpioArray = gpioMapping.begin(); gpioArray != gpioMapping.end(); ++gpioArray)
{ {
const int gpio = gpioMap.get("gpio",-1).asInt(); const QJsonObject value = (*gpioArray).toObject();
const int ledindex = gpioMap.get("ledindex",-1).asInt(); const int gpio = value["gpio"].toInt(-1);
const std::string ledcolor = gpioMap.get("ledcolor","z").asString(); const int ledindex = value["ledindex"].toInt(-1);
const std::string ledcolor = value["ledcolor"].toString("z").toStdString();
// ignore missing/invalid settings // ignore missing/invalid settings
if ( (gpio >= 0) && (gpio < signed(TABLE_SZ)) && (ledindex >= 0) ){ if ( (gpio >= 0) && (gpio < signed(TABLE_SZ)) && (ledindex >= 0) ){
@ -69,7 +70,7 @@ bool LedDevicePiBlaster::init(const Json::Value &deviceConfig)
return true; return true;
} }
LedDevice* LedDevicePiBlaster::construct(const Json::Value &deviceConfig) LedDevice* LedDevicePiBlaster::construct(const QJsonObject &deviceConfig)
{ {
return new LedDevicePiBlaster(deviceConfig); return new LedDevicePiBlaster(deviceConfig);
} }
@ -153,4 +154,3 @@ int LedDevicePiBlaster::write(const std::vector<ColorRgb> & ledValues)
return 0; return 0;
} }

6
libsrc/leddevice/LedDevicePiBlaster.h
View File

@ -15,7 +15,7 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDevicePiBlaster(const Json::Value &deviceConfig); LedDevicePiBlaster(const QJsonObject &deviceConfig);
virtual ~LedDevicePiBlaster(); virtual ~LedDevicePiBlaster();
@ -24,10 +24,10 @@ public:
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
bool init(const Json::Value &deviceConfig); bool init(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
/// ///
/// Attempts to open the piblaster-device. This will only succeed if the device is not yet open /// Attempts to open the piblaster-device. This will only succeed if the device is not yet open

4
libsrc/leddevice/LedDeviceRawHID.cpp
View File

@ -1,7 +1,7 @@
#include "LedDeviceRawHID.h" #include "LedDeviceRawHID.h"
// Use feature report HID device // Use feature report HID device
LedDeviceRawHID::LedDeviceRawHID(const Json::Value &deviceConfig) LedDeviceRawHID::LedDeviceRawHID(const QJsonObject &deviceConfig)
: ProviderHID() : ProviderHID()
, _timer() , _timer()
{ {
@ -18,7 +18,7 @@ LedDeviceRawHID::LedDeviceRawHID(const Json::Value &deviceConfig)
_timer.start(); _timer.start();
} }
LedDevice* LedDeviceRawHID::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceRawHID::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceRawHID(deviceConfig); return new LedDeviceRawHID(deviceConfig);
} }

4
libsrc/leddevice/LedDeviceRawHID.h
View File

@ -19,10 +19,10 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceRawHID(const Json::Value &deviceConfig); LedDeviceRawHID(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
private slots: private slots:
/// Write the last data to the leds again /// Write the last data to the leds again

6
libsrc/leddevice/LedDeviceSedu.cpp
View File

@ -6,18 +6,18 @@ struct FrameSpec
size_t size; size_t size;
}; };
LedDeviceSedu::LedDeviceSedu(const Json::Value &deviceConfig) LedDeviceSedu::LedDeviceSedu(const QJsonObject &deviceConfig)
: ProviderRs232() : ProviderRs232()
{ {
_deviceReady = init(deviceConfig); _deviceReady = init(deviceConfig);
} }
LedDevice* LedDeviceSedu::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceSedu::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceSedu(deviceConfig); return new LedDeviceSedu(deviceConfig);
} }
bool LedDeviceSedu::init(const Json::Value &deviceConfig) bool LedDeviceSedu::init(const QJsonObject &deviceConfig)
{ {
ProviderRs232::init(deviceConfig); ProviderRs232::init(deviceConfig);

6
libsrc/leddevice/LedDeviceSedu.h
View File

@ -14,12 +14,12 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceSedu(const Json::Value &deviceConfig); LedDeviceSedu(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
virtual bool init(const Json::Value &deviceConfig); virtual bool init(const QJsonObject &deviceConfig);
private: private:
/// ///

8
libsrc/leddevice/LedDeviceSk6812SPI.cpp
View File

@ -1,6 +1,6 @@
#include "LedDeviceSk6812SPI.h" #include "LedDeviceSk6812SPI.h"
LedDeviceSk6812SPI::LedDeviceSk6812SPI(const Json::Value &deviceConfig) LedDeviceSk6812SPI::LedDeviceSk6812SPI(const QJsonObject &deviceConfig)
: ProviderSpi() : ProviderSpi()
, _whiteAlgorithm(RGBW::INVALID) , _whiteAlgorithm(RGBW::INVALID)
, bitpair_to_byte { , bitpair_to_byte {
@ -13,14 +13,14 @@ LedDeviceSk6812SPI::LedDeviceSk6812SPI(const Json::Value &deviceConfig)
_deviceReady = init(deviceConfig); _deviceReady = init(deviceConfig);
} }
LedDevice* LedDeviceSk6812SPI::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceSk6812SPI::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceSk6812SPI(deviceConfig); return new LedDeviceSk6812SPI(deviceConfig);
} }
bool LedDeviceSk6812SPI::init(const Json::Value &deviceConfig) bool LedDeviceSk6812SPI::init(const QJsonObject &deviceConfig)
{ {
std::string whiteAlgorithm = deviceConfig.get("white_algorithm","white_off").asString(); std::string whiteAlgorithm = deviceConfig["white_algorithm"].toString("white_off").toStdString();
_whiteAlgorithm = RGBW::stringToWhiteAlgorithm(whiteAlgorithm); _whiteAlgorithm = RGBW::stringToWhiteAlgorithm(whiteAlgorithm);
if (_whiteAlgorithm == RGBW::INVALID) if (_whiteAlgorithm == RGBW::INVALID)

6
libsrc/leddevice/LedDeviceSk6812SPI.h
View File

@ -14,17 +14,17 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceSk6812SPI(const Json::Value &deviceConfig); LedDeviceSk6812SPI(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
/// ///
/// Sets configuration /// Sets configuration
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
bool init(const Json::Value &deviceConfig); bool init(const QJsonObject &deviceConfig);
private: private:
/// ///

14
libsrc/leddevice/LedDeviceTinkerforge.cpp
View File

@ -9,7 +9,7 @@
static const unsigned MAX_NUM_LEDS = 320; static const unsigned MAX_NUM_LEDS = 320;
static const unsigned MAX_NUM_LEDS_SETTABLE = 16; static const unsigned MAX_NUM_LEDS_SETTABLE = 16;
LedDeviceTinkerforge::LedDeviceTinkerforge(const Json::Value &deviceConfig) LedDeviceTinkerforge::LedDeviceTinkerforge(const QJsonObject &deviceConfig)
: LedDevice() : LedDevice()
, _ipConnection(nullptr) , _ipConnection(nullptr)
, _ledStrip(nullptr) , _ledStrip(nullptr)
@ -31,12 +31,12 @@ LedDeviceTinkerforge::~LedDeviceTinkerforge()
delete _ledStrip; delete _ledStrip;
} }
bool LedDeviceTinkerforge::init(const Json::Value &deviceConfig) bool LedDeviceTinkerforge::init(const QJsonObject &deviceConfig)
{ {
_host = deviceConfig.get("output", "127.0.0.1").asString(); _host = deviceConfig["output"].toString("127.0.0.1").toStdString();
_port = deviceConfig.get("port", 4223).asInt(); _port = deviceConfig["port"].toInt(4223);
_uid = deviceConfig["uid"].asString(); _uid = deviceConfig["uid"].toString().toStdString();
_interval = deviceConfig["rate"].asInt(); _interval = deviceConfig["rate"].toInt();
if ((unsigned)_ledCount > MAX_NUM_LEDS) if ((unsigned)_ledCount > MAX_NUM_LEDS)
{ {
@ -55,7 +55,7 @@ bool LedDeviceTinkerforge::init(const Json::Value &deviceConfig)
return true; return true;
} }
LedDevice* LedDeviceTinkerforge::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceTinkerforge::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceTinkerforge(deviceConfig); return new LedDeviceTinkerforge(deviceConfig);
} }

6
libsrc/leddevice/LedDeviceTinkerforge.h
View File

@ -20,7 +20,7 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceTinkerforge(const Json::Value &deviceConfig); LedDeviceTinkerforge(const QJsonObject &deviceConfig);
virtual ~LedDeviceTinkerforge(); virtual ~LedDeviceTinkerforge();
@ -29,10 +29,10 @@ public:
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
bool init(const Json::Value &deviceConfig); bool init(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
/// ///
/// Attempts to open a connection to the master bricklet and the led strip bricklet. /// Attempts to open a connection to the master bricklet and the led strip bricklet.

6
libsrc/leddevice/LedDeviceTpm2.cpp
View File

@ -1,18 +1,18 @@
#include "LedDeviceTpm2.h" #include "LedDeviceTpm2.h"
LedDeviceTpm2::LedDeviceTpm2(const Json::Value &deviceConfig) LedDeviceTpm2::LedDeviceTpm2(const QJsonObject &deviceConfig)
: ProviderRs232() : ProviderRs232()
{ {
_deviceReady = init(deviceConfig); _deviceReady = init(deviceConfig);
} }
LedDevice* LedDeviceTpm2::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceTpm2::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceTpm2(deviceConfig); return new LedDeviceTpm2(deviceConfig);
} }
bool LedDeviceTpm2::init(const Json::Value &deviceConfig) bool LedDeviceTpm2::init(const QJsonObject &deviceConfig)
{ {
ProviderRs232::init(deviceConfig); ProviderRs232::init(deviceConfig);

6
libsrc/leddevice/LedDeviceTpm2.h
View File

@ -14,12 +14,12 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceTpm2(const Json::Value &deviceConfig); LedDeviceTpm2(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
virtual bool init(const Json::Value &deviceConfig); virtual bool init(const QJsonObject &deviceConfig);
private: private:
/// ///

8
libsrc/leddevice/LedDeviceTpm2net.cpp
View File

@ -1,24 +1,24 @@
#include "LedDeviceTpm2net.h" #include "LedDeviceTpm2net.h"
LedDeviceTpm2net::LedDeviceTpm2net(const Json::Value &deviceConfig) LedDeviceTpm2net::LedDeviceTpm2net(const QJsonObject &deviceConfig)
: ProviderUdp() : ProviderUdp()
{ {
_deviceReady = init(deviceConfig); _deviceReady = init(deviceConfig);
} }
bool LedDeviceTpm2net::init(const Json::Value &deviceConfig) bool LedDeviceTpm2net::init(const QJsonObject &deviceConfig)
{ {
_LatchTime_ns = 104000; _LatchTime_ns = 104000;
_port = TPM2_DEFAULT_PORT; _port = TPM2_DEFAULT_PORT;
ProviderUdp::init(deviceConfig); ProviderUdp::init(deviceConfig);
_tpm2_max = deviceConfig.get("max-packet", 170).asInt(); _tpm2_max = deviceConfig["max-packet"].toInt(170);
_tpm2ByteCount = 3 * _ledCount; _tpm2ByteCount = 3 * _ledCount;
_tpm2TotalPackets = 1 + _tpm2ByteCount / _tpm2_max; _tpm2TotalPackets = 1 + _tpm2ByteCount / _tpm2_max;
return true; return true;
} }
LedDevice* LedDeviceTpm2net::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceTpm2net::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceTpm2net(deviceConfig); return new LedDeviceTpm2net(deviceConfig);
} }

6
libsrc/leddevice/LedDeviceTpm2net.h
View File

@ -16,17 +16,17 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceTpm2net(const Json::Value &deviceConfig); LedDeviceTpm2net(const QJsonObject &deviceConfig);
/// ///
/// Sets configuration /// Sets configuration
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
virtual bool init(const Json::Value &deviceConfig); virtual bool init(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
private: private:
/// ///

12
libsrc/leddevice/LedDeviceUdpE131.cpp
View File

@ -4,20 +4,20 @@
// hyperion local includes // hyperion local includes
#include "LedDeviceUdpE131.h" #include "LedDeviceUdpE131.h"
LedDeviceUdpE131::LedDeviceUdpE131(const Json::Value &deviceConfig) LedDeviceUdpE131::LedDeviceUdpE131(const QJsonObject &deviceConfig)
: ProviderUdp() : ProviderUdp()
{ {
_deviceReady = init(deviceConfig); _deviceReady = init(deviceConfig);
} }
bool LedDeviceUdpE131::init(const Json::Value &deviceConfig) bool LedDeviceUdpE131::init(const QJsonObject &deviceConfig)
{ {
_LatchTime_ns = 104000; _LatchTime_ns = 104000;
_port = 5568; _port = 5568;
ProviderUdp::init(deviceConfig); ProviderUdp::init(deviceConfig);
_e131_universe = deviceConfig.get("universe",1).asInt(); _e131_universe = deviceConfig["universe"].toInt(1);
_e131_source_name = deviceConfig.get("source-name","hyperion on "+QHostInfo::localHostName().toStdString()).asString(); _e131_source_name = deviceConfig["source-name"].toString("hyperion on "+QHostInfo::localHostName()).toStdString();
QString _json_cid = QString::fromStdString(deviceConfig.get("cid","").asString()); QString _json_cid = deviceConfig["cid"].toString("");
if (_json_cid.isEmpty()) if (_json_cid.isEmpty())
{ {
@ -31,7 +31,7 @@ bool LedDeviceUdpE131::init(const Json::Value &deviceConfig)
return true; return true;
} }
LedDevice* LedDeviceUdpE131::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceUdpE131::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceUdpE131(deviceConfig); return new LedDeviceUdpE131(deviceConfig);
} }

6
libsrc/leddevice/LedDeviceUdpE131.h
View File

@ -105,17 +105,17 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceUdpE131(const Json::Value &deviceConfig); LedDeviceUdpE131(const QJsonObject &deviceConfig);
/// ///
/// Sets configuration /// Sets configuration
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
bool init(const Json::Value &deviceConfig); bool init(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
private: private:

11
libsrc/leddevice/LedDeviceUdpH801.cpp
View File

@ -1,12 +1,12 @@
#include "LedDeviceUdpH801.h" #include "LedDeviceUdpH801.h"
LedDeviceUdpH801::LedDeviceUdpH801(const Json::Value &deviceConfig) LedDeviceUdpH801::LedDeviceUdpH801(const QJsonObject &deviceConfig)
: ProviderUdp() : ProviderUdp()
{ {
_deviceReady = init(deviceConfig); _deviceReady = init(deviceConfig);
} }
bool LedDeviceUdpH801::init(const Json::Value &deviceConfig) bool LedDeviceUdpH801::init(const QJsonObject &deviceConfig)
{ {
/* The H801 port is fixed */ /* The H801 port is fixed */
_LatchTime_ns = 10000000; _LatchTime_ns = 10000000;
@ -14,9 +14,10 @@ bool LedDeviceUdpH801::init(const Json::Value &deviceConfig)
ProviderUdp::init(deviceConfig, "255.255.255.255"); ProviderUdp::init(deviceConfig, "255.255.255.255");
_ids.clear(); _ids.clear();
for (Json::Value::ArrayIndex i = 0; i < deviceConfig["lightIds"].size(); i++) QJsonArray lArray = deviceConfig["lightIds"].toArray();
for (int i = 0; i < lArray.size(); i++)
{ {
QString id(deviceConfig["lightIds"][i].asCString()); QString id = lArray[i].toString();
_ids.push_back(id.toInt(nullptr, 16)); _ids.push_back(id.toInt(nullptr, 16));
} }
@ -35,7 +36,7 @@ bool LedDeviceUdpH801::init(const Json::Value &deviceConfig)
return true; return true;
} }
LedDevice* LedDeviceUdpH801::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceUdpH801::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceUdpH801(deviceConfig); return new LedDeviceUdpH801(deviceConfig);
} }

6
libsrc/leddevice/LedDeviceUdpH801.h
View File

@ -22,17 +22,17 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceUdpH801(const Json::Value &deviceConfig); LedDeviceUdpH801(const QJsonObject &deviceConfig);
/// ///
/// Sets configuration /// Sets configuration
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
bool init(const Json::Value &deviceConfig); bool init(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
private: private:
/// ///

4
libsrc/leddevice/LedDeviceUdpRaw.cpp
View File

@ -1,6 +1,6 @@
#include "LedDeviceUdpRaw.h" #include "LedDeviceUdpRaw.h"
LedDeviceUdpRaw::LedDeviceUdpRaw(const Json::Value &deviceConfig) LedDeviceUdpRaw::LedDeviceUdpRaw(const QJsonObject &deviceConfig)
: ProviderUdp() : ProviderUdp()
{ {
_LatchTime_ns = 500000; _LatchTime_ns = 500000;
@ -8,7 +8,7 @@ LedDeviceUdpRaw::LedDeviceUdpRaw(const Json::Value &deviceConfig)
init(deviceConfig); init(deviceConfig);
} }
LedDevice* LedDeviceUdpRaw::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceUdpRaw::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceUdpRaw(deviceConfig); return new LedDeviceUdpRaw(deviceConfig);
} }

4
libsrc/leddevice/LedDeviceUdpRaw.h
View File

@ -14,10 +14,10 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceUdpRaw(const Json::Value &deviceConfig); LedDeviceUdpRaw(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
/// ///
/// Writes the led color values to the led-device /// Writes the led color values to the led-device

2
libsrc/leddevice/LedDeviceWS2812b.cpp
View File

@ -258,7 +258,7 @@ LedDeviceWS2812b::LedDeviceWS2812b()
printf("WS2812b init finished \n"); printf("WS2812b init finished \n");
} }
LedDevice* LedDeviceWS2812b::construct(const Json::Value &) LedDevice* LedDeviceWS2812b::construct(const QJsonObject &)
{ {
return new LedDeviceWS2812b(); return new LedDeviceWS2812b();
} }

4
libsrc/leddevice/LedDeviceWS2812b.h
View File

@ -146,10 +146,10 @@ public:
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
bool init(const Json::Value&) {return true;}; bool init(const QJsonObject&) {return true;};
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &); static LedDevice* construct(const QJsonObject &);
private: private:
/// ///

23
libsrc/leddevice/LedDeviceWS281x.cpp
View File

@ -2,7 +2,7 @@
#include "LedDeviceWS281x.h" #include "LedDeviceWS281x.h"
LedDeviceWS281x::LedDeviceWS281x(const Json::Value &deviceConfig) LedDeviceWS281x::LedDeviceWS281x(const QJsonObject &deviceConfig)
: LedDevice() : LedDevice()
{ {
_deviceReady = init(deviceConfig); _deviceReady = init(deviceConfig);
@ -16,9 +16,9 @@ LedDeviceWS281x::~LedDeviceWS281x()
} }
} }
bool LedDeviceWS281x::init(const Json::Value &deviceConfig) bool LedDeviceWS281x::init(const QJsonObject &deviceConfig)
{ {
std::string whiteAlgorithm = deviceConfig.get("white_algorithm","white_off").asString(); std::string whiteAlgorithm = deviceConfig["white_algorithm"].toString("white_off").toStdString();
_whiteAlgorithm = RGBW::stringToWhiteAlgorithm(whiteAlgorithm); _whiteAlgorithm = RGBW::stringToWhiteAlgorithm(whiteAlgorithm);
Debug( _log, "whiteAlgorithm : %s", whiteAlgorithm.c_str()); Debug( _log, "whiteAlgorithm : %s", whiteAlgorithm.c_str());
if (_whiteAlgorithm == RGBW::INVALID) if (_whiteAlgorithm == RGBW::INVALID)
@ -27,18 +27,18 @@ bool LedDeviceWS281x::init(const Json::Value &deviceConfig)
return false; return false;
} }
_channel = deviceConfig.get("pwmchannel", 0).asInt(); _channel = deviceConfig["pwmchannel"].toInt(0);
if (_channel != 0 && _channel != 1) if (_channel != 0 && _channel != 1)
{ {
throw std::runtime_error("WS281x: invalid PWM channel; must be 0 or 1."); throw std::runtime_error("WS281x: invalid PWM channel; must be 0 or 1.");
} }
_led_string.freq = deviceConfig.get("freq", (Json::UInt)800000ul).asInt(); _led_string.freq = deviceConfig["freq"].toInt(800000ul);
_led_string.dmanum = deviceConfig.get("dmanum", 5).asInt(); _led_string.dmanum = deviceConfig["dmanum"].toInt(5);
_led_string.channel[_channel].gpionum = deviceConfig.get("gpio", 18).asInt(); _led_string.channel[_channel].gpionum = deviceConfig["gpio"].toInt(18);
_led_string.channel[_channel].count = deviceConfig.get("leds", 256).asInt(); _led_string.channel[_channel].count = deviceConfig["leds"].toInt(256);
_led_string.channel[_channel].invert = deviceConfig.get("invert", 0).asInt(); _led_string.channel[_channel].invert = deviceConfig["invert"].toInt(0);
_led_string.channel[_channel].strip_type = ((deviceConfig.get("rgbw", 0).asInt() == 1) ? SK6812_STRIP_GRBW : WS2811_STRIP_RGB); _led_string.channel[_channel].strip_type = ((deviceConfig["rgbw"].toInt(0) == 1) ? SK6812_STRIP_GRBW : WS2811_STRIP_RGB);
_led_string.channel[_channel].brightness = 255; _led_string.channel[_channel].brightness = 255;
_led_string.channel[!_channel].gpionum = 0; _led_string.channel[!_channel].gpionum = 0;
@ -56,7 +56,7 @@ bool LedDeviceWS281x::init(const Json::Value &deviceConfig)
return true; return true;
} }
LedDevice* LedDeviceWS281x::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceWS281x::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceWS281x(deviceConfig); return new LedDeviceWS281x(deviceConfig);
} }
@ -93,4 +93,3 @@ int LedDeviceWS281x::write(const std::vector<ColorRgb> &ledValues)
return ws2811_render(&_led_string) ? -1 : 0; return ws2811_render(&_led_string) ? -1 : 0;
} }

6
libsrc/leddevice/LedDeviceWS281x.h
View File

@ -14,7 +14,7 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceWS281x(const Json::Value &deviceConfig); LedDeviceWS281x(const QJsonObject &deviceConfig);
/// ///
/// Destructor of the LedDevice, waits for DMA to complete and then cleans up /// Destructor of the LedDevice, waits for DMA to complete and then cleans up
@ -26,10 +26,10 @@ public:
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
bool init(const Json::Value &deviceConfig); bool init(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
private: private:
/// ///

5
libsrc/leddevice/LedDeviceWs2801.cpp
View File

@ -1,12 +1,12 @@
#include "LedDeviceWs2801.h" #include "LedDeviceWs2801.h"
LedDeviceWs2801::LedDeviceWs2801(const Json::Value &deviceConfig) LedDeviceWs2801::LedDeviceWs2801(const QJsonObject &deviceConfig)
: ProviderSpi() : ProviderSpi()
{ {
_deviceReady = ProviderSpi::init(deviceConfig); _deviceReady = ProviderSpi::init(deviceConfig);
} }
LedDevice* LedDeviceWs2801::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceWs2801::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceWs2801(deviceConfig); return new LedDeviceWs2801(deviceConfig);
} }
@ -18,4 +18,3 @@ int LedDeviceWs2801::write(const std::vector<ColorRgb> &ledValues)
return writeBytes(dataLen, dataPtr); return writeBytes(dataLen, dataPtr);
} }

4
libsrc/leddevice/LedDeviceWs2801.h
View File

@ -13,10 +13,10 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceWs2801(const Json::Value &deviceConfig); LedDeviceWs2801(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
protected: protected:
/// ///

6
libsrc/leddevice/LedDeviceWs2812SPI.cpp
View File

@ -1,6 +1,6 @@
#include "LedDeviceWs2812SPI.h" #include "LedDeviceWs2812SPI.h"
LedDeviceWs2812SPI::LedDeviceWs2812SPI(const Json::Value &deviceConfig) LedDeviceWs2812SPI::LedDeviceWs2812SPI(const QJsonObject &deviceConfig)
: ProviderSpi() : ProviderSpi()
, bitpair_to_byte { , bitpair_to_byte {
0b10001000, 0b10001000,
@ -12,12 +12,12 @@ LedDeviceWs2812SPI::LedDeviceWs2812SPI(const Json::Value &deviceConfig)
_deviceReady = init(deviceConfig); _deviceReady = init(deviceConfig);
} }
LedDevice* LedDeviceWs2812SPI::construct(const Json::Value &deviceConfig) LedDevice* LedDeviceWs2812SPI::construct(const QJsonObject &deviceConfig)
{ {
return new LedDeviceWs2812SPI(deviceConfig); return new LedDeviceWs2812SPI(deviceConfig);
} }
bool LedDeviceWs2812SPI::init(const Json::Value &deviceConfig) bool LedDeviceWs2812SPI::init(const QJsonObject &deviceConfig)
{ {
_baudRate_Hz = 3000000; _baudRate_Hz = 3000000;
ProviderSpi::init(deviceConfig); ProviderSpi::init(deviceConfig);

6
libsrc/leddevice/LedDeviceWs2812SPI.h
View File

@ -14,17 +14,17 @@ public:
/// ///
/// @param deviceConfig json device config /// @param deviceConfig json device config
/// ///
LedDeviceWs2812SPI(const Json::Value &deviceConfig); LedDeviceWs2812SPI(const QJsonObject &deviceConfig);
/// constructs leddevice /// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig); static LedDevice* construct(const QJsonObject &deviceConfig);
/// ///
/// Sets configuration /// Sets configuration
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
virtual bool init(const Json::Value &deviceConfig); virtual bool init(const QJsonObject &deviceConfig);
private: private:
/// ///

8
libsrc/leddevice/ProviderHID.cpp
View File

@ -27,11 +27,11 @@ ProviderHID::~ProviderHID()
hid_exit(); hid_exit();
} }
bool ProviderHID::init(const Json::Value &deviceConfig) bool ProviderHID::init(const QJsonObject &deviceConfig)
{ {
_delayAfterConnect_ms = deviceConfig.get("delayAfterConnect", 0 ).asInt(); _delayAfterConnect_ms = deviceConfig["delayAfterConnect"].toInt(0);
auto VendorIdString = deviceConfig.get("VID", "0x2341").asString(); auto VendorIdString = deviceConfig["VID"].toString("0x2341").toStdString();
auto ProductIdString = deviceConfig.get("PID", "0x8036").asString(); auto ProductIdString = deviceConfig["PID"].toString("0x8036").toStdString();
// Convert HEX values to integer // Convert HEX values to integer
_VendorId = std::stoul(VendorIdString, nullptr, 16); _VendorId = std::stoul(VendorIdString, nullptr, 16);

6
libsrc/leddevice/ProviderHID.h
View File

@ -19,8 +19,6 @@ public:
/// ///
/// Constructs specific LedDevice /// Constructs specific LedDevice
/// ///
/// @param deviceConfig json device config
///
ProviderHID(); ProviderHID();
/// ///
@ -33,7 +31,7 @@ public:
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
virtual bool init(const Json::Value &deviceConfig); virtual bool init(const QJsonObject &deviceConfig);
/// ///
/// Opens and configures the output device /// Opens and configures the output device
@ -45,7 +43,7 @@ protected:
/** /**
* Writes the given bytes to the HID-device and * Writes the given bytes to the HID-device and
* *
* @param[in[ size The length of the data * @param[in] size The length of the data
* @param[in] data The data * @param[in] data The data
* *
* @return Zero on succes else negative * @return Zero on succes else negative

10
libsrc/leddevice/ProviderRs232.cpp
View File

@ -32,13 +32,13 @@ ProviderRs232::ProviderRs232()
connect(&_rs232Port, SIGNAL(readyRead()), this, SLOT(readyRead())); connect(&_rs232Port, SIGNAL(readyRead()), this, SLOT(readyRead()));
} }
bool ProviderRs232::init(const Json::Value &deviceConfig) bool ProviderRs232::init(const QJsonObject &deviceConfig)
{ {
closeDevice(); closeDevice();
_deviceName = deviceConfig["output"].asString(); _deviceName = deviceConfig["output"].toString().toStdString();
_baudRate_Hz = deviceConfig["rate"].asInt(); _baudRate_Hz = deviceConfig["rate"].toInt();
_delayAfterConnect_ms = deviceConfig.get("delayAfterConnect",250).asInt(); _delayAfterConnect_ms = deviceConfig["delayAfterConnect"].toInt(250);
_timer.setInterval ( deviceConfig.get("rewriteTime",5000).asInt() ); _timer.setInterval ( deviceConfig["rewriteTime"].toInt(5000) );
return true; return true;
} }

2
libsrc/leddevice/ProviderRs232.h
View File

@ -25,7 +25,7 @@ public:
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
virtual bool init(const Json::Value &deviceConfig); virtual bool init(const QJsonObject &deviceConfig);
/// ///
/// Destructor of the LedDevice; closes the output device if it is open /// Destructor of the LedDevice; closes the output device if it is open

12
libsrc/leddevice/ProviderSpi.cpp
View File

@ -31,13 +31,13 @@ ProviderSpi::~ProviderSpi()
// close(_fid); // close(_fid);
} }
bool ProviderSpi::init(const Json::Value &deviceConfig) bool ProviderSpi::init(const QJsonObject &deviceConfig)
{ {
_deviceName = deviceConfig.get("output",_deviceName).asString(); _deviceName = deviceConfig["output"].toString(QString::fromStdString(_deviceName)).toStdString();
_baudRate_Hz = deviceConfig.get("rate",_baudRate_Hz).asInt(); _baudRate_Hz = deviceConfig["rate"].toInt(_baudRate_Hz);
_latchTime_ns = deviceConfig.get("latchtime",_latchTime_ns).asInt(); _latchTime_ns = deviceConfig["latchtime"].toInt(_latchTime_ns);
_spiMode = deviceConfig.get("spimode",_spiMode).asInt(); _spiMode = deviceConfig["spimode"].toInt(_spiMode);
_spiDataInvert = deviceConfig.get("invert",_spiDataInvert).asBool(); _spiDataInvert = deviceConfig["invert"].toBool(_spiDataInvert);
return true; return true;
} }

2
libsrc/leddevice/ProviderSpi.h
View File

@ -22,7 +22,7 @@ public:
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
virtual bool init(const Json::Value &deviceConfig); virtual bool init(const QJsonObject &deviceConfig);
/// ///
/// Destructor of the LedDevice; closes the output device if it is open /// Destructor of the LedDevice; closes the output device if it is open

17
libsrc/leddevice/ProviderUdp.cpp
View File

@ -28,28 +28,28 @@ ProviderUdp::~ProviderUdp()
_udpSocket->close(); _udpSocket->close();
} }
bool ProviderUdp::init(const Json::Value &deviceConfig, std::string defaultHost) bool ProviderUdp::init(const QJsonObject &deviceConfig, std::string defaultHost)
{ {
QString host = QString::fromStdString(deviceConfig.get("host",defaultHost).asString()); QString host = deviceConfig["host"].toString(QString::fromStdString(defaultHost));
if (_address.setAddress(host) ) if (_address.setAddress(host) )
{ {
Debug( _log, "Successfully parsed %s as an ip address.", deviceConfig["host"].asString().c_str()); Debug( _log, "Successfully parsed %s as an ip address.", deviceConfig["host"].toString().toStdString().c_str());
} }
else else
{ {
Debug( _log, "Failed to parse %s as an ip address.", deviceConfig["host"].asString().c_str()); Debug( _log, "Failed to parse %s as an ip address.", deviceConfig["host"].toString().toStdString().c_str());
QHostInfo info = QHostInfo::fromName(host); QHostInfo info = QHostInfo::fromName(host);
if (info.addresses().isEmpty()) if (info.addresses().isEmpty())
{ {
Debug( _log, "Failed to parse %s as a hostname.", deviceConfig["host"].asString().c_str()); Debug( _log, "Failed to parse %s as a hostname.", deviceConfig["host"].toString().toStdString().c_str());
throw std::runtime_error("invalid target address"); throw std::runtime_error("invalid target address");
} }
Debug( _log, "Successfully parsed %s as a hostname.", deviceConfig["host"].asString().c_str()); Debug( _log, "Successfully parsed %s as a hostname.", deviceConfig["host"].toString().toStdString().c_str());
_address = info.addresses().first(); _address = info.addresses().first();
} }
_port = deviceConfig.get("port", _port).asUInt(); _port = deviceConfig["port"].toInt(_port);
if ( _port<=0 || _port > 65535) if ( _port<=0 || _port > 65535)
{ {
throw std::runtime_error("invalid target port"); throw std::runtime_error("invalid target port");
@ -57,7 +57,7 @@ bool ProviderUdp::init(const Json::Value &deviceConfig, std::string defaultHost)
Debug( _log, "UDP using %s:%d", _address.toString().toStdString().c_str() , _port ); Debug( _log, "UDP using %s:%d", _address.toString().toStdString().c_str() , _port );
_LatchTime_ns = deviceConfig.get("latchtime", _LatchTime_ns).asInt(); _LatchTime_ns = deviceConfig["latchtime"].toInt(_LatchTime_ns);
return true; return true;
} }
@ -94,4 +94,3 @@ int ProviderUdp::writeBytes(const unsigned size, const uint8_t * data)
return retVal; return retVal;
} }

3
libsrc/leddevice/ProviderUdp.h
View File

@ -27,7 +27,7 @@ public:
/// ///
/// @param deviceConfig the json device config /// @param deviceConfig the json device config
/// @return true if success /// @return true if success
bool init(const Json::Value &deviceConfig, std::string defaultHost="127.0.0.1"); bool init(const QJsonObject &deviceConfig, std::string defaultHost="127.0.0.1");
/// ///
/// Opens and configures the output device /// Opens and configures the output device
@ -56,4 +56,3 @@ protected:
QHostAddress _address; QHostAddress _address;
quint16 _port; quint16 _port;
}; };

1
libsrc/utils/CMakeLists.txt
View File

@ -54,5 +54,4 @@ add_library(hyperion-utils
qt5_use_modules(hyperion-utils Core) qt5_use_modules(hyperion-utils Core)
target_link_libraries(hyperion-utils target_link_libraries(hyperion-utils
jsoncpp
${QT_LIBRARIES}) ${QT_LIBRARIES})

22
src/hyperiond/hyperiond.cpp
View File

@ -53,7 +53,7 @@ HyperionDaemon::HyperionDaemon(QString configFile, QObject *parent)
{ {
loadConfig(configFile); loadConfig(configFile);
_hyperion = Hyperion::initInstance(_config, _qconfig, configFile.toStdString()); _hyperion = Hyperion::initInstance(_qconfig, configFile.toStdString());
if (Logger::getLogLevel() == Logger::WARNING) if (Logger::getLogLevel() == Logger::WARNING)
@ -162,24 +162,6 @@ void HyperionDaemon::loadConfig(const QString & configFile)
QJsonSchemaChecker schemaChecker; QJsonSchemaChecker schemaChecker;
schemaChecker.setSchema(schemaJson.object()); schemaChecker.setSchema(schemaJson.object());
// ----------------- DEPRECATED BEGIN -----------------
// NOTE: Remove this code block when the conversion have been completed from JsonCpp to QTJson
std::ifstream ifs(configFile.toStdString().c_str());
Json::Reader reader;
if (! reader.parse(ifs, _config, false))
{
// report to the user the failure and their locations in the document.
std::stringstream sstream;
sstream << "Failed to parse configuration: " << reader.getFormattedErrorMessages().c_str();
throw std::runtime_error(sstream.str());
}
// ----------------- DEPRECATED END -----------------
_qconfig = QJsonFactory::readJson(configFile); _qconfig = QJsonFactory::readJson(configFile);
if (!schemaChecker.validate(_qconfig)) if (!schemaChecker.validate(_qconfig))
{ {
@ -200,7 +182,7 @@ void HyperionDaemon::startInitialEffect()
Hyperion *hyperion = Hyperion::getInstance(); Hyperion *hyperion = Hyperion::getInstance();
// create boot sequence if the configuration is present // create boot sequence if the configuration is present
if (_config.isMember("initialEffect")) if (_qconfig.contains("initialEffect"))
{ {
const QJsonObject & effectConfig = _qconfig["initialEffect"].toObject(); const QJsonObject & effectConfig = _qconfig["initialEffect"].toObject();
const int FG_PRIORITY = 0; const int FG_PRIORITY = 0;

10
src/hyperiond/hyperiond.h
View File

@ -40,15 +40,6 @@
#include <utils/Logger.h> #include <utils/Logger.h>
// ----------------- DEPRECATED BEGIN -----------------
// NOTE: Remove this code block when the conversion have been completed from JsonCpp to QTJson
#include <json/json.h>
#include <istream>
#include <fstream>
// ----------------- DEPRECATED END -----------------
#include <kodivideochecker/KODIVideoChecker.h> #include <kodivideochecker/KODIVideoChecker.h>
#include <jsonserver/JsonServer.h> #include <jsonserver/JsonServer.h>
#include <protoserver/ProtoServer.h> #include <protoserver/ProtoServer.h>
@ -81,7 +72,6 @@ private:
void createGrabberX11(const QJsonObject & grabberConfig); void createGrabberX11(const QJsonObject & grabberConfig);
Logger* _log; Logger* _log;
Json::Value _config; // DEPRECATED | Remove this only when the conversion have been completed from JsonCpp to QTJson
QJsonObject _qconfig; QJsonObject _qconfig;
KODIVideoChecker* _kodiVideoChecker; KODIVideoChecker* _kodiVideoChecker;
JsonServer* _jsonServer; JsonServer* _jsonServer;

Some files were not shown because too many files have changed in this diff Show More