diff --git a/.travis.yml b/.travis.yml index 0ba7a965f8558c2d82adb2e1fa4ff31dfc4419d1..86d811229860711bdd99f47bfae00d34f56106de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,15 @@ sudo: required -dist: trusty language: cpp -compiler: - - gcc - - clang os: - linux + - osx branches: only: - master - chamcham - - chennapoda + - chhennapoda notifications: email: @@ -20,34 +17,12 @@ notifications: - dilawar.s.rajput@gmail.com - bhalla@ncbs.res.in - hrani@ncbs.res.in - on_success: change on_failure: always -env: - - CTEST_MODEL=Nightly - -cache: apt before_script: - - sudo apt-get update -qq - - sudo apt-get install libxml2-dev libbz2-dev wget - - sudo apt-get install libhdf5-serial-dev - - sudo apt-get install python-numpy python-setuptools python-networkx python-pip - - sudo apt-get install cmake cdbs - - sudo apt-get install python-suds python-matplotlib python-nose - - sudo apt-get install python-qt4-dev python-qt4-gl python-sip-dev libqt4-dev libopenscenegraph-dev - - sudo apt-get install doxygen python-sphinx python-lxml - - sudo apt-get install git-buildpackage - -install: - - wget http://ftp.debian.org/debian/pool/main/g/gsl/libgsl0ldbl_1.16+dfsg-2_amd64.deb -O gsl_1.16.deb - - sudo dpkg -i gsl_1.16.deb - - wget http://ftp.debian.org/debian/pool/main/g/gsl/libgsl0-dev_1.16+dfsg-2_amd64.deb -O gsl_1.16-dev.deb - - sudo dpkg -i gsl_1.16-dev.deb - - sudo apt-get install -f - - sudo ldconfig /usr/lib64 + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./.travis_prepare_linux.sh; fi script: - - ./.travis_build.sh - - sudo dpkg -i ../moose*.deb - - /usr/bin/python -c 'import moose;print(moose.version());print(moose.__file__)' + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./.travis_build_linux.sh; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./.travis_build_osx.sh; fi diff --git a/.travis_build.sh b/.travis_build.sh deleted file mode 100755 index 8d92cd1fa250ecd35699aa86aef02bfce8b72c54..0000000000000000000000000000000000000000 --- a/.travis_build.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -#=============================================================================== -# -# FILE: .travis_build.sh -# -# USAGE: ./.travis_build.sh -# -# DESCRIPTION: -# -# OPTIONS: --- -# REQUIREMENTS: --- -# BUGS: --- -# NOTES: --- -# AUTHOR: Dilawar Singh (), dilawars@ncbs.res.in -# ORGANIZATION: NCBS Bangalore -# CREATED: 03/05/2018 03:49:35 PM -# REVISION: --- -#=============================================================================== - -set -o nounset # Treat unset variables as an error -set -e -x -PATH=/usr/bin:/usr/local/bin:$PATH -gbp buildpackage --git-ignore-branch --git-ignore-new -uc -us -d | tee _gbp.log -pwd diff --git a/.travis_build_linux.sh b/.travis_build_linux.sh new file mode 100755 index 0000000000000000000000000000000000000000..a9397370877b9b6c252b916035575925aad23b25 --- /dev/null +++ b/.travis_build_linux.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -o nounset # Treat unset variables as an error +set -e -x +PATH=/usr/bin:/usr/local/bin:$PATH +gbp buildpackage --git-ignore-branch --git-ignore-new -uc -us -d | tee _gbp.log +pwd diff --git a/.travis_build_osx.sh b/.travis_build_osx.sh new file mode 100755 index 0000000000000000000000000000000000000000..3f08edd1c586f72efd1b3264c8a1d8ba033c7d01 --- /dev/null +++ b/.travis_build_osx.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +brew tap BhallaLab/moose +brew install --HEAD moose-nightly +python -m pip install networkx python-libsbml pyNeuroML matplotlib +python -c 'import moose; print( moose.__version__ )' +python -c 'import moose; print( moose.test() )' diff --git a/.travis_prepare_linux.sh b/.travis_prepare_linux.sh new file mode 100755 index 0000000000000000000000000000000000000000..defd44aaea082f50694439a20b038d0d094a4b87 --- /dev/null +++ b/.travis_prepare_linux.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +sudo apt-get update -qq +sudo apt-get -y install libxml2-dev libbz2-dev wget +sudo apt-get -y install libhdf5-serial-dev +sudo apt-get -y install python-numpy python-setuptools python-networkx python-pip +sudo apt-get -y install cmake cdbs +sudo apt-get -y install libgsl0-dev +sudo apt-get -y install python-suds python-matplotlib +sudo apt-get -y install python-qt4-dev python-qt4-gl python-sip-dev libqt4-dev libopenscenegraph-dev +sudo apt-get -y install doxygen python-sphinx python-lxml +sudo apt-get -y install git-buildpackage +sudo apt-get -y install -f +sudo ldconfig /usr/lib64 diff --git a/debian/changelog b/debian/changelog index bd52b2950921cc03ea6ee5dc7099e67dad7765d0..705cba43afaf77ae279fe9c489098bfda604e3ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +moose (3.2.0.3ubuntu1) experimental; urgency=medium + + * Version bumped. + + -- Dilawar Singh <dilawars@ncbs.res.in> Tue, 11 Sep 2018 12:26:15 +0530 + moose (3.1.3ubuntu1) experimental; urgency=medium * Version bumped. diff --git a/debian/rules b/debian/rules index 5967cc8de394431aa56450beed10571c916bdddd..455987b8c494e9fdbcbe7bfd09bd7d8d5c949d21 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ export DH_VERBOSE=1 dh "$@" --buildsystem=cmake --with-python2 override_dh_auto_configure: - dh_auto_configure -- -DVERSION_MOOSE=3.1.3 -DCMAKE_SKIP_RPATH=ON + dh_auto_configure -- -DVERSION_MOOSE=3.2.0-dev -DCMAKE_SKIP_RPATH=ON override_dh_python2: dh_numpy diff --git a/moose-core/.travis/travis_build_linux.sh b/moose-core/.travis/travis_build_linux.sh index 3352c2f08c1e029257f95c0af3dc7c7aef95fad4..f715e6c4e1209d0d4f6883d01e0fa449c65afa3d 100755 --- a/moose-core/.travis/travis_build_linux.sh +++ b/moose-core/.travis/travis_build_linux.sh @@ -40,32 +40,20 @@ unset PYTHONPATH $PYTHON2 -m compileall -q . if type $PYTHON3 > /dev/null; then $PYTHON3 -m compileall -q . ; fi -echo "Currently in `pwd`" -( - mkdir -p _GSL_BUILD && cd _GSL_BUILD - cmake -DDEBUG=ON -DPYTHON_EXECUTABLE="$PYTHON2" .. - $MAKE && ctest --output-on-failure - sudo make install && cd /tmp - $PYTHON2 -c 'import moose;print(moose.__file__);print(moose.version())' -) - -( - # Now with boost. - mkdir -p _BOOST_BUILD && cd _BOOST_BUILD && \ - cmake -DWITH_BOOST_ODE=ON -DDEBUG=ON -DPYTHON_EXECUTABLE="$PYTHON2" .. - $MAKE && ctest --output-on-failure -) - # This is only applicable on linux build. echo "Python3: Removed python2-networkx and install python3" if type $PYTHON3 > /dev/null; then sudo apt-get remove -qq python-networkx || echo "Error with apt" sudo apt-get install -qq python3-networkx || echo "Error with apt" + + # GSL. ( mkdir -p _GSL_BUILD2 && cd _GSL_BUILD2 && \ - cmake -DPYTHON_EXECUTABLE="$PYTHON3" .. + cmake -DPYTHON_EXECUTABLE="$PYTHON3" -DDEBUG=ON .. $MAKE && ctest --output-on-failure ) + + # BOOST ( mkdir -p _BOOST_BUILD2 && cd _BOOST_BUILD2 && \ cmake -DWITH_BOOST_ODE=ON -DPYTHON_EXECUTABLE="$PYTHON3" .. @@ -75,3 +63,13 @@ if type $PYTHON3 > /dev/null; then else echo "Python3 is not found. Build disabled" fi + +# PYTHON2. Soon to be deprecated. +echo "Currently in `pwd`" +( + mkdir -p _GSL_BUILD && cd _GSL_BUILD + cmake -DDEBUG=OFF -DPYTHON_EXECUTABLE="$PYTHON2" .. + $MAKE && ctest --output-on-failure + sudo make install && cd /tmp + $PYTHON2 -c 'import moose;print(moose.__file__);print(moose.version())' +) diff --git a/moose-core/CMakeLists.txt b/moose-core/CMakeLists.txt index 3bfb7fc880fb3247884fde732a3022f8e08bae08..9bf8255c1dc2d3f3cafe068ef33daa5b84392b5f 100644 --- a/moose-core/CMakeLists.txt +++ b/moose-core/CMakeLists.txt @@ -226,7 +226,7 @@ if(HDF5_FOUND) endif(NOT HDF5_HL_LIBRARIES) list(APPEND HDF5_LIBRARIES ${HDF5_HL_LIBRARIES}) - message(STATUS "MOOSE will use following HDF5 ${HDF5_LIBRARIES}" ) + # message(STATUS "MOOSE will use following HDF5 ${HDF5_LIBRARIES}" ) foreach(HDF5_LIB ${HDF5_LIBRARIES}) if(HDF5_LIB) get_filename_component( HDF5_LIB_EXT ${HDF5_LIB} EXT ) @@ -280,7 +280,7 @@ if(WITH_GSL) message( STATUS "Using static libraries ${GSL_STATIC_LIBRARIES}" ) list(APPEND STATIC_LIBRARIES ${GSL_STATIC_LIBRARIES}) else( ) - message(STATUS "Using gsl libraries: ${GSL_LIBRARIES}") + # message(DEBUG "Using gsl libraries: ${GSL_LIBRARIES}") foreach(GSL_LIB ${GSL_LIBRARIES} ) if(GSL_LIB) get_filename_component( GSL_LIB_EXT ${GSL_LIB} EXT ) @@ -356,7 +356,7 @@ if(SYSTEM_SHARED_LIBS) endif( ) # MAC linker does not understand many of gnu-ld options. -message( STATUS "Shared libs: ${SYSTEM_SHARED_LIBS}") +# message( DEBUG "Shared libs: ${SYSTEM_SHARED_LIBS}") if(MACOSX) target_link_libraries(libmoose "-Wl,-all_load" @@ -430,10 +430,11 @@ set(PYMOOSE_BDIST_FILE ${PYMOOSE_BDIST_DIR}/pymoose-${VERSION_MOOSE}.${_platform message(STATUS "binary distribution file ${PYMOOSE_BDIST_FILE}") add_custom_target(bdist ALL DEPENDS ${PYMOOSE_BDIST_FILE} ) -# Any command using setup.cmake.py must run in the same directory. +# Any command using setup.cmake.py must run in the same directory. Use option +# `--relative` to prefix is aways fixed. add_custom_command( OUTPUT ${PYMOOSE_BDIST_FILE} COMMAND ${PYTHON_EXECUTABLE} setup.cmake.py bdist_dumb -p ${_platform} - -d ${PYMOOSE_BDIST_DIR} + -d ${PYMOOSE_BDIST_DIR} --relative WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/python COMMENT "bdist is saved to ${PYMOOSE_BDIST_DIR}" VERBATIM @@ -462,8 +463,8 @@ add_dependencies( copy_pymoose _moose ) install(TARGETS moose.bin DESTINATION bin CONFIGURATIONS Debug) install(TARGETS libmoose DESTINATION lib CONFIGURATIONS Debug) -# install pymoose bdist. The bdist comes with predefined /usr; remove it. -install(DIRECTORY ${PYMOOSE_BDIST_INSTALL_DIR}/usr/ +# install pymoose bdist. +install(DIRECTORY ${PYMOOSE_BDIST_INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} CONFIGURATIONS Release Debug ) diff --git a/moose-core/basecode/CMakeLists.txt b/moose-core/basecode/CMakeLists.txt index 7fb64829196bf87e075d5cee056eaed0e1ab758f..c166bfd267ec3dab3d5404010fc83972dc2f2dc4 100644 --- a/moose-core/basecode/CMakeLists.txt +++ b/moose-core/basecode/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 2.6) -include_directories(../msg) +cmake_minimum_required(VERSION 2.8) +include( ${CMAKE_CURRENT_SOURCE_DIR}/../CheckCXXCompiler.cmake ) add_library(basecode consts.cpp Element.cpp diff --git a/moose-core/basecode/Conv.h b/moose-core/basecode/Conv.h index 1f14ad709e39387bdbbeeee166d10a9b08c638fc..e19fccabc36ceeac8811dd75c3ce486927fc5f2c 100644 --- a/moose-core/basecode/Conv.h +++ b/moose-core/basecode/Conv.h @@ -9,7 +9,7 @@ #ifndef _CONV_H #define _CONV_H -#include <string> +#include <cstring> /** * This set of templates defines converters. The conversions are from diff --git a/moose-core/basecode/header.h b/moose-core/basecode/header.h index 595b7f26b6424a3619a3d06812e458c86b81658d..22cb6fc28c11963c8f2e8e23c1bf2f5c4027657b 100644 --- a/moose-core/basecode/header.h +++ b/moose-core/basecode/header.h @@ -20,20 +20,11 @@ #include <iostream> #include <sstream> #include <typeinfo> // used in Conv.h to extract compiler independent typeid -#include <climits> // Required for g++ 4.3.2 -#include <cstring> // Required for g++ 4.3.2 -#include <cstdlib> // Required for g++ 4.3.2 -// Used for INT_MAX and UINT_MAX, but may be done within the compiler -// #include <limits.h> -// #include <cassert> using namespace std; -#ifndef MOOSE_VERSION -#define MOOSE_VERSION "3.0.2" -#endif /** * Looks up and uniquely identifies functions, on a per-Cinfo basis. diff --git a/moose-core/cmake_modules/FindNumPy.cmake b/moose-core/cmake_modules/FindNumPy.cmake index 5de7901e56780d191dcbc218685c0204f696c22e..285b4730cad4259d4a368d933d2d1bebc3b489ea 100644 --- a/moose-core/cmake_modules/FindNumPy.cmake +++ b/moose-core/cmake_modules/FindNumPy.cmake @@ -40,7 +40,7 @@ # Finding NumPy involves calling the Python interpreter -message( STATUS "Using python ${PYTHON_EXECUTABLE} to locate numpy" ) +message( STATUS "Using ${PYTHON_EXECUTABLE} to locate numpy" ) execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import numpy as n; print(n.__version__); print(n.get_include());" RESULT_VARIABLE _NUMPY_SEARCH_SUCCESS diff --git a/moose-core/external/tinyxml/CMakeLists.txt b/moose-core/external/tinyxml/CMakeLists.txt deleted file mode 100644 index 566992539a73ff0e5f0fd590825c8f30914a469d..0000000000000000000000000000000000000000 --- a/moose-core/external/tinyxml/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -cmake_minimum_required(VERSION 2.6) -add_library(tinyxml tinyxml2.cpp) diff --git a/moose-core/external/tinyxml/tinyxml2.cpp b/moose-core/external/tinyxml/tinyxml2.cpp deleted file mode 100644 index df52a91a31f5db29507943d657b05baca53626e4..0000000000000000000000000000000000000000 --- a/moose-core/external/tinyxml/tinyxml2.cpp +++ /dev/null @@ -1,2186 +0,0 @@ -/* -Original code by Lee Thomason (www.grinninglizard.com) - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any -damages arising from the use of this software. - -Permission is granted to anyone to use this software for any -purpose, including commercial applications, and to alter it and -redistribute it freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must -not claim that you wrote the original software. If you use this -software in a product, an acknowledgment in the product documentation -would be appreciated but is not required. - -2. Altered source versions must be plainly marked as such, and -must not be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source -distribution. -*/ - -#include "tinyxml2.h" - -#include <new> // yes, this one new style header, is in the Android SDK. -# ifdef ANDROID_NDK -# include <stddef.h> -#else -# include <cstddef> -#endif - -static const char LINE_FEED = (char)0x0a; // all line endings are normalized to LF -static const char LF = LINE_FEED; -static const char CARRIAGE_RETURN = (char)0x0d; // CR gets filtered out -static const char CR = CARRIAGE_RETURN; -static const char SINGLE_QUOTE = '\''; -static const char DOUBLE_QUOTE = '\"'; - -// Bunch of unicode info at: -// http://www.unicode.org/faq/utf_bom.html -// ef bb bf (Microsoft "lead bytes") - designates UTF-8 - -static const unsigned char TIXML_UTF_LEAD_0 = 0xefU; -static const unsigned char TIXML_UTF_LEAD_1 = 0xbbU; -static const unsigned char TIXML_UTF_LEAD_2 = 0xbfU; - - -#define DELETE_NODE( node ) { \ - if ( node ) { \ - MemPool* pool = node->_memPool; \ - node->~XMLNode(); \ - pool->Free( node ); \ - } \ - } -#define DELETE_ATTRIBUTE( attrib ) { \ - if ( attrib ) { \ - MemPool* pool = attrib->_memPool; \ - attrib->~XMLAttribute(); \ - pool->Free( attrib ); \ - } \ - } - -namespace tinyxml2 -{ - -struct Entity { - const char* pattern; - int length; - char value; -}; - -static const int NUM_ENTITIES = 5; -static const Entity entities[NUM_ENTITIES] = { - { "quot", 4, DOUBLE_QUOTE }, - { "amp", 3, '&' }, - { "apos", 4, SINGLE_QUOTE }, - { "lt", 2, '<' }, - { "gt", 2, '>' } -}; - - -StrPair::~StrPair() -{ - Reset(); -} - - -void StrPair::Reset() -{ - if ( _flags & NEEDS_DELETE ) { - delete [] _start; - } - _flags = 0; - _start = 0; - _end = 0; -} - - -void StrPair::SetStr( const char* str, int flags ) -{ - Reset(); - size_t len = strlen( str ); - _start = new char[ len+1 ]; - memcpy( _start, str, len+1 ); - _end = _start + len; - _flags = flags | NEEDS_DELETE; -} - - -char* StrPair::ParseText( char* p, const char* endTag, int strFlags ) -{ - TIXMLASSERT( endTag && *endTag ); - - char* start = p; // fixme: hides a member - char endChar = *endTag; - size_t length = strlen( endTag ); - - // Inner loop of text parsing. - while ( *p ) { - if ( *p == endChar && strncmp( p, endTag, length ) == 0 ) { - Set( start, p, strFlags ); - return p + length; - } - ++p; - } - return 0; -} - - -char* StrPair::ParseName( char* p ) -{ - char* start = p; - - if ( !start || !(*start) ) { - return 0; - } - - while( *p && ( p == start ? XMLUtil::IsNameStartChar( *p ) : XMLUtil::IsNameChar( *p ) )) { - ++p; - } - - if ( p > start ) { - Set( start, p, 0 ); - return p; - } - return 0; -} - - -void StrPair::CollapseWhitespace() -{ - // Trim leading space. - _start = XMLUtil::SkipWhiteSpace( _start ); - - if ( _start && *_start ) { - char* p = _start; // the read pointer - char* q = _start; // the write pointer - - while( *p ) { - if ( XMLUtil::IsWhiteSpace( *p )) { - p = XMLUtil::SkipWhiteSpace( p ); - if ( *p == 0 ) { - break; // don't write to q; this trims the trailing space. - } - *q = ' '; - ++q; - } - *q = *p; - ++q; - ++p; - } - *q = 0; - } -} - - -const char* StrPair::GetStr() -{ - if ( _flags & NEEDS_FLUSH ) { - *_end = 0; - _flags ^= NEEDS_FLUSH; - - if ( _flags ) { - char* p = _start; // the read pointer - char* q = _start; // the write pointer - - while( p < _end ) { - if ( (_flags & NEEDS_NEWLINE_NORMALIZATION) && *p == CR ) { - // CR-LF pair becomes LF - // CR alone becomes LF - // LF-CR becomes LF - if ( *(p+1) == LF ) { - p += 2; - } - else { - ++p; - } - *q++ = LF; - } - else if ( (_flags & NEEDS_NEWLINE_NORMALIZATION) && *p == LF ) { - if ( *(p+1) == CR ) { - p += 2; - } - else { - ++p; - } - *q++ = LF; - } - else if ( (_flags & NEEDS_ENTITY_PROCESSING) && *p == '&' ) { - // Entities handled by tinyXML2: - // - special entities in the entity table [in/out] - // - numeric character reference [in] - // 中 or 中 - - if ( *(p+1) == '#' ) { - char buf[10] = { 0 }; - int len; - p = const_cast<char*>( XMLUtil::GetCharacterRef( p, buf, &len ) ); - for( int i=0; i<len; ++i ) { - *q++ = buf[i]; - } - TIXMLASSERT( q <= p ); - } - else { - int i=0; - for(; i<NUM_ENTITIES; ++i ) { - if ( strncmp( p+1, entities[i].pattern, entities[i].length ) == 0 - && *(p+entities[i].length+1) == ';' ) { - // Found an entity convert; - *q = entities[i].value; - ++q; - p += entities[i].length + 2; - break; - } - } - if ( i == NUM_ENTITIES ) { - // fixme: treat as error? - ++p; - ++q; - } - } - } - else { - *q = *p; - ++p; - ++q; - } - } - *q = 0; - } - // The loop below has plenty going on, and this - // is a less useful mode. Break it out. - if ( _flags & COLLAPSE_WHITESPACE ) { - CollapseWhitespace(); - } - _flags = (_flags & NEEDS_DELETE); - } - return _start; -} - - - - -// --------- XMLUtil ----------- // - -const char* XMLUtil::ReadBOM( const char* p, bool* bom ) -{ - *bom = false; - const unsigned char* pu = reinterpret_cast<const unsigned char*>(p); - // Check for BOM: - if ( *(pu+0) == TIXML_UTF_LEAD_0 - && *(pu+1) == TIXML_UTF_LEAD_1 - && *(pu+2) == TIXML_UTF_LEAD_2 ) { - *bom = true; - p += 3; - } - return p; -} - - -void XMLUtil::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length ) -{ - const unsigned long BYTE_MASK = 0xBF; - const unsigned long BYTE_MARK = 0x80; - const unsigned long FIRST_BYTE_MARK[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC }; - - if (input < 0x80) { - *length = 1; - } - else if ( input < 0x800 ) { - *length = 2; - } - else if ( input < 0x10000 ) { - *length = 3; - } - else if ( input < 0x200000 ) { - *length = 4; - } - else { - *length = 0; // This code won't covert this correctly anyway. - return; - } - - output += *length; - - // Scary scary fall throughs. - switch (*length) { - case 4: - --output; - *output = (char)((input | BYTE_MARK) & BYTE_MASK); - input >>= 6; - case 3: - --output; - *output = (char)((input | BYTE_MARK) & BYTE_MASK); - input >>= 6; - case 2: - --output; - *output = (char)((input | BYTE_MARK) & BYTE_MASK); - input >>= 6; - case 1: - --output; - *output = (char)(input | FIRST_BYTE_MARK[*length]); - default: - break; - } -} - - -const char* XMLUtil::GetCharacterRef( const char* p, char* value, int* length ) -{ - // Presume an entity, and pull it out. - *length = 0; - - if ( *(p+1) == '#' && *(p+2) ) { - unsigned long ucs = 0; - ptrdiff_t delta = 0; - unsigned mult = 1; - - if ( *(p+2) == 'x' ) { - // Hexadecimal. - if ( !*(p+3) ) { - return 0; - } - - const char* q = p+3; - q = strchr( q, ';' ); - - if ( !q || !*q ) { - return 0; - } - - delta = q-p; - --q; - - while ( *q != 'x' ) { - if ( *q >= '0' && *q <= '9' ) { - ucs += mult * (*q - '0'); - } - else if ( *q >= 'a' && *q <= 'f' ) { - ucs += mult * (*q - 'a' + 10); - } - else if ( *q >= 'A' && *q <= 'F' ) { - ucs += mult * (*q - 'A' + 10 ); - } - else { - return 0; - } - mult *= 16; - --q; - } - } - else { - // Decimal. - if ( !*(p+2) ) { - return 0; - } - - const char* q = p+2; - q = strchr( q, ';' ); - - if ( !q || !*q ) { - return 0; - } - - delta = q-p; - --q; - - while ( *q != '#' ) { - if ( *q >= '0' && *q <= '9' ) { - ucs += mult * (*q - '0'); - } - else { - return 0; - } - mult *= 10; - --q; - } - } - // convert the UCS to UTF-8 - ConvertUTF32ToUTF8( ucs, value, length ); - return p + delta + 1; - } - return p+1; -} - - -void XMLUtil::ToStr( int v, char* buffer, int bufferSize ) -{ - TIXML_SNPRINTF( buffer, bufferSize, "%d", v ); -} - - -void XMLUtil::ToStr( unsigned v, char* buffer, int bufferSize ) -{ - TIXML_SNPRINTF( buffer, bufferSize, "%u", v ); -} - - -void XMLUtil::ToStr( bool v, char* buffer, int bufferSize ) -{ - TIXML_SNPRINTF( buffer, bufferSize, "%d", v ? 1 : 0 ); -} - -/* - ToStr() of a number is a very tricky topic. - https://github.com/leethomason/tinyxml2/issues/106 -*/ -void XMLUtil::ToStr( float v, char* buffer, int bufferSize ) -{ - TIXML_SNPRINTF( buffer, bufferSize, "%.8g", v ); -} - - -void XMLUtil::ToStr( double v, char* buffer, int bufferSize ) -{ - TIXML_SNPRINTF( buffer, bufferSize, "%.17g", v ); -} - - -bool XMLUtil::ToInt( const char* str, int* value ) -{ - if ( TIXML_SSCANF( str, "%d", value ) == 1 ) { - return true; - } - return false; -} - -bool XMLUtil::ToUnsigned( const char* str, unsigned *value ) -{ - if ( TIXML_SSCANF( str, "%u", value ) == 1 ) { - return true; - } - return false; -} - -bool XMLUtil::ToBool( const char* str, bool* value ) -{ - int ival = 0; - if ( ToInt( str, &ival )) { - *value = (ival==0) ? false : true; - return true; - } - if ( StringEqual( str, "true" ) ) { - *value = true; - return true; - } - else if ( StringEqual( str, "false" ) ) { - *value = false; - return true; - } - return false; -} - - -bool XMLUtil::ToFloat( const char* str, float* value ) -{ - if ( TIXML_SSCANF( str, "%f", value ) == 1 ) { - return true; - } - return false; -} - -bool XMLUtil::ToDouble( const char* str, double* value ) -{ - if ( TIXML_SSCANF( str, "%lf", value ) == 1 ) { - return true; - } - return false; -} - - -char* XMLDocument::Identify( char* p, XMLNode** node ) -{ - XMLNode* returnNode = 0; - char* start = p; - p = XMLUtil::SkipWhiteSpace( p ); - if( !p || !*p ) { - return p; - } - - // What is this thing? - // These strings define the matching patters: - static const char* xmlHeader = { "<?" }; - static const char* commentHeader = { "<!--" }; - static const char* dtdHeader = { "<!" }; - static const char* cdataHeader = { "<![CDATA[" }; - static const char* elementHeader = { "<" }; // and a header for everything else; check last. - - static const int xmlHeaderLen = 2; - static const int commentHeaderLen = 4; - static const int dtdHeaderLen = 2; - static const int cdataHeaderLen = 9; - static const int elementHeaderLen = 1; - -#if defined(_MSC_VER) -#pragma warning ( push ) -#pragma warning ( disable : 4127 ) -#endif - TIXMLASSERT( sizeof( XMLComment ) == sizeof( XMLUnknown ) ); // use same memory pool - TIXMLASSERT( sizeof( XMLComment ) == sizeof( XMLDeclaration ) ); // use same memory pool -#if defined(_MSC_VER) -#pragma warning (pop) -#endif - if ( XMLUtil::StringEqual( p, xmlHeader, xmlHeaderLen ) ) { - returnNode = new (_commentPool.Alloc()) XMLDeclaration( this ); - returnNode->_memPool = &_commentPool; - p += xmlHeaderLen; - } - else if ( XMLUtil::StringEqual( p, commentHeader, commentHeaderLen ) ) { - returnNode = new (_commentPool.Alloc()) XMLComment( this ); - returnNode->_memPool = &_commentPool; - p += commentHeaderLen; - } - else if ( XMLUtil::StringEqual( p, cdataHeader, cdataHeaderLen ) ) { - XMLText* text = new (_textPool.Alloc()) XMLText( this ); - returnNode = text; - returnNode->_memPool = &_textPool; - p += cdataHeaderLen; - text->SetCData( true ); - } - else if ( XMLUtil::StringEqual( p, dtdHeader, dtdHeaderLen ) ) { - returnNode = new (_commentPool.Alloc()) XMLUnknown( this ); - returnNode->_memPool = &_commentPool; - p += dtdHeaderLen; - } - else if ( XMLUtil::StringEqual( p, elementHeader, elementHeaderLen ) ) { - returnNode = new (_elementPool.Alloc()) XMLElement( this ); - returnNode->_memPool = &_elementPool; - p += elementHeaderLen; - } - else { - returnNode = new (_textPool.Alloc()) XMLText( this ); - returnNode->_memPool = &_textPool; - p = start; // Back it up, all the text counts. - } - - *node = returnNode; - return p; -} - - -bool XMLDocument::Accept( XMLVisitor* visitor ) const -{ - if ( visitor->VisitEnter( *this ) ) { - for ( const XMLNode* node=FirstChild(); node; node=node->NextSibling() ) { - if ( !node->Accept( visitor ) ) { - break; - } - } - } - return visitor->VisitExit( *this ); -} - - -// --------- XMLNode ----------- // - -XMLNode::XMLNode( XMLDocument* doc ) : - _document( doc ), - _parent( 0 ), - _firstChild( 0 ), _lastChild( 0 ), - _prev( 0 ), _next( 0 ), - _memPool( 0 ) -{ -} - - -XMLNode::~XMLNode() -{ - DeleteChildren(); - if ( _parent ) { - _parent->Unlink( this ); - } -} - -const char* XMLNode::Value() const -{ - return _value.GetStr(); -} - -void XMLNode::SetValue( const char* str, bool staticMem ) -{ - if ( staticMem ) { - _value.SetInternedStr( str ); - } - else { - _value.SetStr( str ); - } -} - - -void XMLNode::DeleteChildren() -{ - while( _firstChild ) { - XMLNode* node = _firstChild; - Unlink( node ); - - DELETE_NODE( node ); - } - _firstChild = _lastChild = 0; -} - - -void XMLNode::Unlink( XMLNode* child ) -{ - if ( child == _firstChild ) { - _firstChild = _firstChild->_next; - } - if ( child == _lastChild ) { - _lastChild = _lastChild->_prev; - } - - if ( child->_prev ) { - child->_prev->_next = child->_next; - } - if ( child->_next ) { - child->_next->_prev = child->_prev; - } - child->_parent = 0; -} - - -void XMLNode::DeleteChild( XMLNode* node ) -{ - TIXMLASSERT( node->_parent == this ); - DELETE_NODE( node ); -} - - -XMLNode* XMLNode::InsertEndChild( XMLNode* addThis ) -{ - if (addThis->_document != _document) - return 0; - - if (addThis->_parent) - addThis->_parent->Unlink( addThis ); - else - addThis->_memPool->SetTracked(); - - if ( _lastChild ) { - TIXMLASSERT( _firstChild ); - TIXMLASSERT( _lastChild->_next == 0 ); - _lastChild->_next = addThis; - addThis->_prev = _lastChild; - _lastChild = addThis; - - addThis->_next = 0; - } - else { - TIXMLASSERT( _firstChild == 0 ); - _firstChild = _lastChild = addThis; - - addThis->_prev = 0; - addThis->_next = 0; - } - addThis->_parent = this; - return addThis; -} - - -XMLNode* XMLNode::InsertFirstChild( XMLNode* addThis ) -{ - if (addThis->_document != _document) - return 0; - - if (addThis->_parent) - addThis->_parent->Unlink( addThis ); - else - addThis->_memPool->SetTracked(); - - if ( _firstChild ) { - TIXMLASSERT( _lastChild ); - TIXMLASSERT( _firstChild->_prev == 0 ); - - _firstChild->_prev = addThis; - addThis->_next = _firstChild; - _firstChild = addThis; - - addThis->_prev = 0; - } - else { - TIXMLASSERT( _lastChild == 0 ); - _firstChild = _lastChild = addThis; - - addThis->_prev = 0; - addThis->_next = 0; - } - addThis->_parent = this; - return addThis; -} - - -XMLNode* XMLNode::InsertAfterChild( XMLNode* afterThis, XMLNode* addThis ) -{ - if (addThis->_document != _document) - return 0; - - TIXMLASSERT( afterThis->_parent == this ); - - if ( afterThis->_parent != this ) { - return 0; - } - - if ( afterThis->_next == 0 ) { - // The last node or the only node. - return InsertEndChild( addThis ); - } - if (addThis->_parent) - addThis->_parent->Unlink( addThis ); - else - addThis->_memPool->SetTracked(); - addThis->_prev = afterThis; - addThis->_next = afterThis->_next; - afterThis->_next->_prev = addThis; - afterThis->_next = addThis; - addThis->_parent = this; - return addThis; -} - - - - -const XMLElement* XMLNode::FirstChildElement( const char* value ) const -{ - for( XMLNode* node=_firstChild; node; node=node->_next ) { - XMLElement* element = node->ToElement(); - if ( element ) { - if ( !value || XMLUtil::StringEqual( element->Name(), value ) ) { - return element; - } - } - } - return 0; -} - - -const XMLElement* XMLNode::LastChildElement( const char* value ) const -{ - for( XMLNode* node=_lastChild; node; node=node->_prev ) { - XMLElement* element = node->ToElement(); - if ( element ) { - if ( !value || XMLUtil::StringEqual( element->Name(), value ) ) { - return element; - } - } - } - return 0; -} - - -const XMLElement* XMLNode::NextSiblingElement( const char* value ) const -{ - for( XMLNode* element=this->_next; element; element = element->_next ) { - if ( element->ToElement() - && (!value || XMLUtil::StringEqual( value, element->Value() ))) { - return element->ToElement(); - } - } - return 0; -} - - -const XMLElement* XMLNode::PreviousSiblingElement( const char* value ) const -{ - for( XMLNode* element=_prev; element; element = element->_prev ) { - if ( element->ToElement() - && (!value || XMLUtil::StringEqual( value, element->Value() ))) { - return element->ToElement(); - } - } - return 0; -} - - -char* XMLNode::ParseDeep( char* p, StrPair* parentEnd ) -{ - // This is a recursive method, but thinking about it "at the current level" - // it is a pretty simple flat list: - // <foo/> - // <!-- comment --> - // - // With a special case: - // <foo> - // </foo> - // <!-- comment --> - // - // Where the closing element (/foo) *must* be the next thing after the opening - // element, and the names must match. BUT the tricky bit is that the closing - // element will be read by the child. - // - // 'endTag' is the end tag for this node, it is returned by a call to a child. - // 'parentEnd' is the end tag for the parent, which is filled in and returned. - - while( p && *p ) { - XMLNode* node = 0; - - p = _document->Identify( p, &node ); - if ( p == 0 || node == 0 ) { - break; - } - - StrPair endTag; - p = node->ParseDeep( p, &endTag ); - if ( !p ) { - DELETE_NODE( node ); - node = 0; - if ( !_document->Error() ) { - _document->SetError( XML_ERROR_PARSING, 0, 0 ); - } - break; - } - - // We read the end tag. Return it to the parent. - if ( node->ToElement() && node->ToElement()->ClosingType() == XMLElement::CLOSING ) { - if ( parentEnd ) { - *parentEnd = static_cast<XMLElement*>(node)->_value; - } - node->_memPool->SetTracked(); // created and then immediately deleted. - DELETE_NODE( node ); - return p; - } - - // Handle an end tag returned to this level. - // And handle a bunch of annoying errors. - XMLElement* ele = node->ToElement(); - if ( ele ) { - if ( endTag.Empty() && ele->ClosingType() == XMLElement::OPEN ) { - _document->SetError( XML_ERROR_MISMATCHED_ELEMENT, node->Value(), 0 ); - p = 0; - } - else if ( !endTag.Empty() && ele->ClosingType() != XMLElement::OPEN ) { - _document->SetError( XML_ERROR_MISMATCHED_ELEMENT, node->Value(), 0 ); - p = 0; - } - else if ( !endTag.Empty() ) { - if ( !XMLUtil::StringEqual( endTag.GetStr(), node->Value() )) { - _document->SetError( XML_ERROR_MISMATCHED_ELEMENT, node->Value(), 0 ); - p = 0; - } - } - } - if ( p == 0 ) { - DELETE_NODE( node ); - node = 0; - } - if ( node ) { - this->InsertEndChild( node ); - } - } - return 0; -} - -// --------- XMLText ---------- // -char* XMLText::ParseDeep( char* p, StrPair* ) -{ - const char* start = p; - if ( this->CData() ) { - p = _value.ParseText( p, "]]>", StrPair::NEEDS_NEWLINE_NORMALIZATION ); - if ( !p ) { - _document->SetError( XML_ERROR_PARSING_CDATA, start, 0 ); - } - return p; - } - else { - int flags = _document->ProcessEntities() ? StrPair::TEXT_ELEMENT : StrPair::TEXT_ELEMENT_LEAVE_ENTITIES; - if ( _document->WhitespaceMode() == COLLAPSE_WHITESPACE ) { - flags |= StrPair::COLLAPSE_WHITESPACE; - } - - p = _value.ParseText( p, "<", flags ); - if ( !p ) { - _document->SetError( XML_ERROR_PARSING_TEXT, start, 0 ); - } - if ( p && *p ) { - return p-1; - } - } - return 0; -} - - -XMLNode* XMLText::ShallowClone( XMLDocument* doc ) const -{ - if ( !doc ) { - doc = _document; - } - XMLText* text = doc->NewText( Value() ); // fixme: this will always allocate memory. Intern? - text->SetCData( this->CData() ); - return text; -} - - -bool XMLText::ShallowEqual( const XMLNode* compare ) const -{ - return ( compare->ToText() && XMLUtil::StringEqual( compare->ToText()->Value(), Value() )); -} - - -bool XMLText::Accept( XMLVisitor* visitor ) const -{ - return visitor->Visit( *this ); -} - - -// --------- XMLComment ---------- // - -XMLComment::XMLComment( XMLDocument* doc ) : XMLNode( doc ) -{ -} - - -XMLComment::~XMLComment() -{ -} - - -char* XMLComment::ParseDeep( char* p, StrPair* ) -{ - // Comment parses as text. - const char* start = p; - p = _value.ParseText( p, "-->", StrPair::COMMENT ); - if ( p == 0 ) { - _document->SetError( XML_ERROR_PARSING_COMMENT, start, 0 ); - } - return p; -} - - -XMLNode* XMLComment::ShallowClone( XMLDocument* doc ) const -{ - if ( !doc ) { - doc = _document; - } - XMLComment* comment = doc->NewComment( Value() ); // fixme: this will always allocate memory. Intern? - return comment; -} - - -bool XMLComment::ShallowEqual( const XMLNode* compare ) const -{ - return ( compare->ToComment() && XMLUtil::StringEqual( compare->ToComment()->Value(), Value() )); -} - - -bool XMLComment::Accept( XMLVisitor* visitor ) const -{ - return visitor->Visit( *this ); -} - - -// --------- XMLDeclaration ---------- // - -XMLDeclaration::XMLDeclaration( XMLDocument* doc ) : XMLNode( doc ) -{ -} - - -XMLDeclaration::~XMLDeclaration() -{ - //printf( "~XMLDeclaration\n" ); -} - - -char* XMLDeclaration::ParseDeep( char* p, StrPair* ) -{ - // Declaration parses as text. - const char* start = p; - p = _value.ParseText( p, "?>", StrPair::NEEDS_NEWLINE_NORMALIZATION ); - if ( p == 0 ) { - _document->SetError( XML_ERROR_PARSING_DECLARATION, start, 0 ); - } - return p; -} - - -XMLNode* XMLDeclaration::ShallowClone( XMLDocument* doc ) const -{ - if ( !doc ) { - doc = _document; - } - XMLDeclaration* dec = doc->NewDeclaration( Value() ); // fixme: this will always allocate memory. Intern? - return dec; -} - - -bool XMLDeclaration::ShallowEqual( const XMLNode* compare ) const -{ - return ( compare->ToDeclaration() && XMLUtil::StringEqual( compare->ToDeclaration()->Value(), Value() )); -} - - - -bool XMLDeclaration::Accept( XMLVisitor* visitor ) const -{ - return visitor->Visit( *this ); -} - -// --------- XMLUnknown ---------- // - -XMLUnknown::XMLUnknown( XMLDocument* doc ) : XMLNode( doc ) -{ -} - - -XMLUnknown::~XMLUnknown() -{ -} - - -char* XMLUnknown::ParseDeep( char* p, StrPair* ) -{ - // Unknown parses as text. - const char* start = p; - - p = _value.ParseText( p, ">", StrPair::NEEDS_NEWLINE_NORMALIZATION ); - if ( !p ) { - _document->SetError( XML_ERROR_PARSING_UNKNOWN, start, 0 ); - } - return p; -} - - -XMLNode* XMLUnknown::ShallowClone( XMLDocument* doc ) const -{ - if ( !doc ) { - doc = _document; - } - XMLUnknown* text = doc->NewUnknown( Value() ); // fixme: this will always allocate memory. Intern? - return text; -} - - -bool XMLUnknown::ShallowEqual( const XMLNode* compare ) const -{ - return ( compare->ToUnknown() && XMLUtil::StringEqual( compare->ToUnknown()->Value(), Value() )); -} - - -bool XMLUnknown::Accept( XMLVisitor* visitor ) const -{ - return visitor->Visit( *this ); -} - -// --------- XMLAttribute ---------- // - -const char* XMLAttribute::Name() const -{ - return _name.GetStr(); -} - -const char* XMLAttribute::Value() const -{ - return _value.GetStr(); -} - -char* XMLAttribute::ParseDeep( char* p, bool processEntities ) -{ - // Parse using the name rules: bug fix, was using ParseText before - p = _name.ParseName( p ); - if ( !p || !*p ) { - return 0; - } - - // Skip white space before = - p = XMLUtil::SkipWhiteSpace( p ); - if ( !p || *p != '=' ) { - return 0; - } - - ++p; // move up to opening quote - p = XMLUtil::SkipWhiteSpace( p ); - if ( *p != '\"' && *p != '\'' ) { - return 0; - } - - char endTag[2] = { *p, 0 }; - ++p; // move past opening quote - - p = _value.ParseText( p, endTag, processEntities ? StrPair::ATTRIBUTE_VALUE : StrPair::ATTRIBUTE_VALUE_LEAVE_ENTITIES ); - return p; -} - - -void XMLAttribute::SetName( const char* n ) -{ - _name.SetStr( n ); -} - - -XMLError XMLAttribute::QueryIntValue( int* value ) const -{ - if ( XMLUtil::ToInt( Value(), value )) { - return XML_NO_ERROR; - } - return XML_WRONG_ATTRIBUTE_TYPE; -} - - -XMLError XMLAttribute::QueryUnsignedValue( unsigned int* value ) const -{ - if ( XMLUtil::ToUnsigned( Value(), value )) { - return XML_NO_ERROR; - } - return XML_WRONG_ATTRIBUTE_TYPE; -} - - -XMLError XMLAttribute::QueryBoolValue( bool* value ) const -{ - if ( XMLUtil::ToBool( Value(), value )) { - return XML_NO_ERROR; - } - return XML_WRONG_ATTRIBUTE_TYPE; -} - - -XMLError XMLAttribute::QueryFloatValue( float* value ) const -{ - if ( XMLUtil::ToFloat( Value(), value )) { - return XML_NO_ERROR; - } - return XML_WRONG_ATTRIBUTE_TYPE; -} - - -XMLError XMLAttribute::QueryDoubleValue( double* value ) const -{ - if ( XMLUtil::ToDouble( Value(), value )) { - return XML_NO_ERROR; - } - return XML_WRONG_ATTRIBUTE_TYPE; -} - - -void XMLAttribute::SetAttribute( const char* v ) -{ - _value.SetStr( v ); -} - - -void XMLAttribute::SetAttribute( int v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - _value.SetStr( buf ); -} - - -void XMLAttribute::SetAttribute( unsigned v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - _value.SetStr( buf ); -} - - -void XMLAttribute::SetAttribute( bool v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - _value.SetStr( buf ); -} - -void XMLAttribute::SetAttribute( double v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - _value.SetStr( buf ); -} - -void XMLAttribute::SetAttribute( float v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - _value.SetStr( buf ); -} - - -// --------- XMLElement ---------- // -XMLElement::XMLElement( XMLDocument* doc ) : XMLNode( doc ), - _closingType( 0 ), - _rootAttribute( 0 ) -{ -} - - -XMLElement::~XMLElement() -{ - while( _rootAttribute ) { - XMLAttribute* next = _rootAttribute->_next; - DELETE_ATTRIBUTE( _rootAttribute ); - _rootAttribute = next; - } -} - - -XMLAttribute* XMLElement::FindAttribute( const char* name ) -{ - XMLAttribute* a = 0; - for( a=_rootAttribute; a; a = a->_next ) { - if ( XMLUtil::StringEqual( a->Name(), name ) ) { - return a; - } - } - return 0; -} - - -const XMLAttribute* XMLElement::FindAttribute( const char* name ) const -{ - XMLAttribute* a = 0; - for( a=_rootAttribute; a; a = a->_next ) { - if ( XMLUtil::StringEqual( a->Name(), name ) ) { - return a; - } - } - return 0; -} - - -const char* XMLElement::Attribute( const char* name, const char* value ) const -{ - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return 0; - } - if ( !value || XMLUtil::StringEqual( a->Value(), value )) { - return a->Value(); - } - return 0; -} - - -const char* XMLElement::GetText() const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - return FirstChild()->ToText()->Value(); - } - return 0; -} - - -void XMLElement::SetText( const char* inText ) -{ - if ( FirstChild() && FirstChild()->ToText() ) - FirstChild()->SetValue( inText ); - else { - XMLText* theText = GetDocument()->NewText( inText ); - InsertFirstChild( theText ); - } -} - - -void XMLElement::SetText( int v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - SetText( buf ); -} - - -void XMLElement::SetText( unsigned v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - SetText( buf ); -} - - -void XMLElement::SetText( bool v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - SetText( buf ); -} - - -void XMLElement::SetText( float v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - SetText( buf ); -} - - -void XMLElement::SetText( double v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - SetText( buf ); -} - - -XMLError XMLElement::QueryIntText( int* ival ) const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - const char* t = FirstChild()->ToText()->Value(); - if ( XMLUtil::ToInt( t, ival ) ) { - return XML_SUCCESS; - } - return XML_CAN_NOT_CONVERT_TEXT; - } - return XML_NO_TEXT_NODE; -} - - -XMLError XMLElement::QueryUnsignedText( unsigned* uval ) const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - const char* t = FirstChild()->ToText()->Value(); - if ( XMLUtil::ToUnsigned( t, uval ) ) { - return XML_SUCCESS; - } - return XML_CAN_NOT_CONVERT_TEXT; - } - return XML_NO_TEXT_NODE; -} - - -XMLError XMLElement::QueryBoolText( bool* bval ) const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - const char* t = FirstChild()->ToText()->Value(); - if ( XMLUtil::ToBool( t, bval ) ) { - return XML_SUCCESS; - } - return XML_CAN_NOT_CONVERT_TEXT; - } - return XML_NO_TEXT_NODE; -} - - -XMLError XMLElement::QueryDoubleText( double* dval ) const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - const char* t = FirstChild()->ToText()->Value(); - if ( XMLUtil::ToDouble( t, dval ) ) { - return XML_SUCCESS; - } - return XML_CAN_NOT_CONVERT_TEXT; - } - return XML_NO_TEXT_NODE; -} - - -XMLError XMLElement::QueryFloatText( float* fval ) const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - const char* t = FirstChild()->ToText()->Value(); - if ( XMLUtil::ToFloat( t, fval ) ) { - return XML_SUCCESS; - } - return XML_CAN_NOT_CONVERT_TEXT; - } - return XML_NO_TEXT_NODE; -} - - - -XMLAttribute* XMLElement::FindOrCreateAttribute( const char* name ) -{ - XMLAttribute* last = 0; - XMLAttribute* attrib = 0; - for( attrib = _rootAttribute; - attrib; - last = attrib, attrib = attrib->_next ) { - if ( XMLUtil::StringEqual( attrib->Name(), name ) ) { - break; - } - } - if ( !attrib ) { - attrib = new (_document->_attributePool.Alloc() ) XMLAttribute(); - attrib->_memPool = &_document->_attributePool; - if ( last ) { - last->_next = attrib; - } - else { - _rootAttribute = attrib; - } - attrib->SetName( name ); - attrib->_memPool->SetTracked(); // always created and linked. - } - return attrib; -} - - -void XMLElement::DeleteAttribute( const char* name ) -{ - XMLAttribute* prev = 0; - for( XMLAttribute* a=_rootAttribute; a; a=a->_next ) { - if ( XMLUtil::StringEqual( name, a->Name() ) ) { - if ( prev ) { - prev->_next = a->_next; - } - else { - _rootAttribute = a->_next; - } - DELETE_ATTRIBUTE( a ); - break; - } - prev = a; - } -} - - -char* XMLElement::ParseAttributes( char* p ) -{ - const char* start = p; - XMLAttribute* prevAttribute = 0; - - // Read the attributes. - while( p ) { - p = XMLUtil::SkipWhiteSpace( p ); - if ( !p || !(*p) ) { - _document->SetError( XML_ERROR_PARSING_ELEMENT, start, Name() ); - return 0; - } - - // attribute. - if (XMLUtil::IsNameStartChar( *p ) ) { - XMLAttribute* attrib = new (_document->_attributePool.Alloc() ) XMLAttribute(); - attrib->_memPool = &_document->_attributePool; - attrib->_memPool->SetTracked(); - - p = attrib->ParseDeep( p, _document->ProcessEntities() ); - if ( !p || Attribute( attrib->Name() ) ) { - DELETE_ATTRIBUTE( attrib ); - _document->SetError( XML_ERROR_PARSING_ATTRIBUTE, start, p ); - return 0; - } - // There is a minor bug here: if the attribute in the source xml - // document is duplicated, it will not be detected and the - // attribute will be doubly added. However, tracking the 'prevAttribute' - // avoids re-scanning the attribute list. Preferring performance for - // now, may reconsider in the future. - if ( prevAttribute ) { - prevAttribute->_next = attrib; - } - else { - _rootAttribute = attrib; - } - prevAttribute = attrib; - } - // end of the tag - else if ( *p == '/' && *(p+1) == '>' ) { - _closingType = CLOSED; - return p+2; // done; sealed element. - } - // end of the tag - else if ( *p == '>' ) { - ++p; - break; - } - else { - _document->SetError( XML_ERROR_PARSING_ELEMENT, start, p ); - return 0; - } - } - return p; -} - - -// -// <ele></ele> -// <ele>foo<b>bar</b></ele> -// -char* XMLElement::ParseDeep( char* p, StrPair* strPair ) -{ - // Read the element name. - p = XMLUtil::SkipWhiteSpace( p ); - if ( !p ) { - return 0; - } - - // The closing element is the </element> form. It is - // parsed just like a regular element then deleted from - // the DOM. - if ( *p == '/' ) { - _closingType = CLOSING; - ++p; - } - - p = _value.ParseName( p ); - if ( _value.Empty() ) { - return 0; - } - - p = ParseAttributes( p ); - if ( !p || !*p || _closingType ) { - return p; - } - - p = XMLNode::ParseDeep( p, strPair ); - return p; -} - - - -XMLNode* XMLElement::ShallowClone( XMLDocument* doc ) const -{ - if ( !doc ) { - doc = _document; - } - XMLElement* element = doc->NewElement( Value() ); // fixme: this will always allocate memory. Intern? - for( const XMLAttribute* a=FirstAttribute(); a; a=a->Next() ) { - element->SetAttribute( a->Name(), a->Value() ); // fixme: this will always allocate memory. Intern? - } - return element; -} - - -bool XMLElement::ShallowEqual( const XMLNode* compare ) const -{ - const XMLElement* other = compare->ToElement(); - if ( other && XMLUtil::StringEqual( other->Value(), Value() )) { - - const XMLAttribute* a=FirstAttribute(); - const XMLAttribute* b=other->FirstAttribute(); - - while ( a && b ) { - if ( !XMLUtil::StringEqual( a->Value(), b->Value() ) ) { - return false; - } - a = a->Next(); - b = b->Next(); - } - if ( a || b ) { - // different count - return false; - } - return true; - } - return false; -} - - -bool XMLElement::Accept( XMLVisitor* visitor ) const -{ - if ( visitor->VisitEnter( *this, _rootAttribute ) ) { - for ( const XMLNode* node=FirstChild(); node; node=node->NextSibling() ) { - if ( !node->Accept( visitor ) ) { - break; - } - } - } - return visitor->VisitExit( *this ); -} - - -// --------- XMLDocument ----------- // -XMLDocument::XMLDocument( bool processEntities, Whitespace whitespace ) : - XMLNode( 0 ), - _writeBOM( false ), - _processEntities( processEntities ), - _errorID( XML_NO_ERROR ), - _whitespace( whitespace ), - _errorStr1( 0 ), - _errorStr2( 0 ), - _charBuffer( 0 ) -{ - _document = this; // avoid warning about 'this' in initializer list -} - - -XMLDocument::~XMLDocument() -{ - DeleteChildren(); - delete [] _charBuffer; - -#if 0 - _textPool.Trace( "text" ); - _elementPool.Trace( "element" ); - _commentPool.Trace( "comment" ); - _attributePool.Trace( "attribute" ); -#endif - -#ifdef DEBUG - if ( Error() == false ) { - TIXMLASSERT( _elementPool.CurrentAllocs() == _elementPool.Untracked() ); - TIXMLASSERT( _attributePool.CurrentAllocs() == _attributePool.Untracked() ); - TIXMLASSERT( _textPool.CurrentAllocs() == _textPool.Untracked() ); - TIXMLASSERT( _commentPool.CurrentAllocs() == _commentPool.Untracked() ); - } -#endif -} - - -void XMLDocument::Clear() -{ - DeleteChildren(); - - _errorID = XML_NO_ERROR; - _errorStr1 = 0; - _errorStr2 = 0; - - delete [] _charBuffer; - _charBuffer = 0; -} - - -XMLElement* XMLDocument::NewElement( const char* name ) -{ - XMLElement* ele = new (_elementPool.Alloc()) XMLElement( this ); - ele->_memPool = &_elementPool; - ele->SetName( name ); - return ele; -} - - -XMLComment* XMLDocument::NewComment( const char* str ) -{ - XMLComment* comment = new (_commentPool.Alloc()) XMLComment( this ); - comment->_memPool = &_commentPool; - comment->SetValue( str ); - return comment; -} - - -XMLText* XMLDocument::NewText( const char* str ) -{ - XMLText* text = new (_textPool.Alloc()) XMLText( this ); - text->_memPool = &_textPool; - text->SetValue( str ); - return text; -} - - -XMLDeclaration* XMLDocument::NewDeclaration( const char* str ) -{ - XMLDeclaration* dec = new (_commentPool.Alloc()) XMLDeclaration( this ); - dec->_memPool = &_commentPool; - dec->SetValue( str ? str : "xml version=\"1.0\" encoding=\"UTF-8\"" ); - return dec; -} - - -XMLUnknown* XMLDocument::NewUnknown( const char* str ) -{ - XMLUnknown* unk = new (_commentPool.Alloc()) XMLUnknown( this ); - unk->_memPool = &_commentPool; - unk->SetValue( str ); - return unk; -} - - -XMLError XMLDocument::LoadFile( const char* filename ) -{ - Clear(); - FILE* fp = 0; - -#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) - errno_t err = fopen_s(&fp, filename, "rb" ); - if ( !fp || err) { -#else - fp = fopen( filename, "rb" ); - if ( !fp) { -#endif - SetError( XML_ERROR_FILE_NOT_FOUND, filename, 0 ); - return _errorID; - } - LoadFile( fp ); - fclose( fp ); - return _errorID; -} - - -XMLError XMLDocument::LoadFile( FILE* fp ) -{ - Clear(); - - fseek( fp, 0, SEEK_SET ); - fgetc( fp ); - if ( ferror( fp ) != 0 ) { - SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); - return _errorID; - } - - fseek( fp, 0, SEEK_END ); - size_t size = ftell( fp ); - fseek( fp, 0, SEEK_SET ); - - if ( size == 0 ) { - SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 ); - return _errorID; - } - - _charBuffer = new char[size+1]; - size_t read = fread( _charBuffer, 1, size, fp ); - if ( read != size ) { - SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); - return _errorID; - } - - _charBuffer[size] = 0; - - const char* p = _charBuffer; - p = XMLUtil::SkipWhiteSpace( p ); - p = XMLUtil::ReadBOM( p, &_writeBOM ); - if ( !p || !*p ) { - SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 ); - return _errorID; - } - - ParseDeep( _charBuffer + (p-_charBuffer), 0 ); - return _errorID; -} - - -XMLError XMLDocument::SaveFile( const char* filename, bool compact ) -{ - FILE* fp = 0; -#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) - errno_t err = fopen_s(&fp, filename, "w" ); - if ( !fp || err) { -#else - fp = fopen( filename, "w" ); - if ( !fp) { -#endif - SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, filename, 0 ); - return _errorID; - } - SaveFile(fp, compact); - fclose( fp ); - return _errorID; -} - - -XMLError XMLDocument::SaveFile( FILE* fp, bool compact ) -{ - XMLPrinter stream( fp, compact ); - Print( &stream ); - return _errorID; -} - - -XMLError XMLDocument::Parse( const char* p, size_t len ) -{ - const char* start = p; - Clear(); - - if ( len == 0 || !p || !*p ) { - SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 ); - return _errorID; - } - if ( len == (size_t)(-1) ) { - len = strlen( p ); - } - _charBuffer = new char[ len+1 ]; - memcpy( _charBuffer, p, len ); - _charBuffer[len] = 0; - - p = XMLUtil::SkipWhiteSpace( p ); - p = XMLUtil::ReadBOM( p, &_writeBOM ); - if ( !p || !*p ) { - SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 ); - return _errorID; - } - - ptrdiff_t delta = p - start; // skip initial whitespace, BOM, etc. - ParseDeep( _charBuffer+delta, 0 ); - return _errorID; -} - - -void XMLDocument::Print( XMLPrinter* streamer ) const -{ - XMLPrinter stdStreamer( stdout ); - if ( !streamer ) { - streamer = &stdStreamer; - } - Accept( streamer ); -} - - -void XMLDocument::SetError( XMLError error, const char* str1, const char* str2 ) -{ - _errorID = error; - _errorStr1 = str1; - _errorStr2 = str2; -} - - -void XMLDocument::PrintError() const -{ - if ( _errorID ) { - static const int LEN = 20; - char buf1[LEN] = { 0 }; - char buf2[LEN] = { 0 }; - - if ( _errorStr1 ) { - TIXML_SNPRINTF( buf1, LEN, "%s", _errorStr1 ); - } - if ( _errorStr2 ) { - TIXML_SNPRINTF( buf2, LEN, "%s", _errorStr2 ); - } - - printf( "XMLDocument error id=%d str1=%s str2=%s\n", - _errorID, buf1, buf2 ); - } -} - - -XMLPrinter::XMLPrinter( FILE* file, bool compact, int depth ) : - _elementJustOpened( false ), - _firstElement( true ), - _fp( file ), - _depth( depth ), - _textDepth( -1 ), - _processEntities( true ), - _compactMode( compact ) -{ - for( int i=0; i<ENTITY_RANGE; ++i ) { - _entityFlag[i] = false; - _restrictedEntityFlag[i] = false; - } - for( int i=0; i<NUM_ENTITIES; ++i ) { - TIXMLASSERT( entities[i].value < ENTITY_RANGE ); - if ( entities[i].value < ENTITY_RANGE ) { - _entityFlag[ (int)entities[i].value ] = true; - } - } - _restrictedEntityFlag[(int)'&'] = true; - _restrictedEntityFlag[(int)'<'] = true; - _restrictedEntityFlag[(int)'>'] = true; // not required, but consistency is nice - _buffer.Push( 0 ); -} - - -void XMLPrinter::Print( const char* format, ... ) -{ - va_list va; - va_start( va, format ); - - if ( _fp ) { - vfprintf( _fp, format, va ); - } - else { -#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) - int len = _vscprintf( format, va ); -#else - int len = vsnprintf( 0, 0, format, va ); -#endif - // Close out and re-start the va-args - va_end( va ); - va_start( va, format ); - char* p = _buffer.PushArr( len ) - 1; // back up over the null terminator. -#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) - vsnprintf_s( p, len+1, _TRUNCATE, format, va ); -#else - vsnprintf( p, len+1, format, va ); -#endif - } - va_end( va ); -} - - -void XMLPrinter::PrintSpace( int depth ) -{ - for( int i=0; i<depth; ++i ) { - Print( " " ); - } -} - - -void XMLPrinter::PrintString( const char* p, bool restricted ) -{ - // Look for runs of bytes between entities to print. - const char* q = p; - const bool* flag = restricted ? _restrictedEntityFlag : _entityFlag; - - if ( _processEntities ) { - while ( *q ) { - // Remember, char is sometimes signed. (How many times has that bitten me?) - if ( *q > 0 && *q < ENTITY_RANGE ) { - // Check for entities. If one is found, flush - // the stream up until the entity, write the - // entity, and keep looking. - if ( flag[(unsigned)(*q)] ) { - while ( p < q ) { - Print( "%c", *p ); - ++p; - } - for( int i=0; i<NUM_ENTITIES; ++i ) { - if ( entities[i].value == *q ) { - Print( "&%s;", entities[i].pattern ); - break; - } - } - ++p; - } - } - ++q; - } - } - // Flush the remaining string. This will be the entire - // string if an entity wasn't found. - if ( !_processEntities || (q-p > 0) ) { - Print( "%s", p ); - } -} - - -void XMLPrinter::PushHeader( bool writeBOM, bool writeDec ) -{ - if ( writeBOM ) { - static const unsigned char bom[] = { TIXML_UTF_LEAD_0, TIXML_UTF_LEAD_1, TIXML_UTF_LEAD_2, 0 }; - Print( "%s", bom ); - } - if ( writeDec ) { - PushDeclaration( "xml version=\"1.0\"" ); - } -} - - -void XMLPrinter::OpenElement( const char* name, bool compactMode ) -{ - if ( _elementJustOpened ) { - SealElement(); - } - _stack.Push( name ); - - if ( _textDepth < 0 && !_firstElement && !compactMode ) { - Print( "\n" ); - } - if ( !compactMode ) { - PrintSpace( _depth ); - } - - Print( "<%s", name ); - _elementJustOpened = true; - _firstElement = false; - ++_depth; -} - - -void XMLPrinter::PushAttribute( const char* name, const char* value ) -{ - TIXMLASSERT( _elementJustOpened ); - Print( " %s=\"", name ); - PrintString( value, false ); - Print( "\"" ); -} - - -void XMLPrinter::PushAttribute( const char* name, int v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - PushAttribute( name, buf ); -} - - -void XMLPrinter::PushAttribute( const char* name, unsigned v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - PushAttribute( name, buf ); -} - - -void XMLPrinter::PushAttribute( const char* name, bool v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - PushAttribute( name, buf ); -} - - -void XMLPrinter::PushAttribute( const char* name, double v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - PushAttribute( name, buf ); -} - - -void XMLPrinter::CloseElement( bool compactMode ) -{ - --_depth; - const char* name = _stack.Pop(); - - if ( _elementJustOpened ) { - Print( "/>" ); - } - else { - if ( _textDepth < 0 && !compactMode) { - Print( "\n" ); - PrintSpace( _depth ); - } - Print( "</%s>", name ); - } - - if ( _textDepth == _depth ) { - _textDepth = -1; - } - if ( _depth == 0 && !compactMode) { - Print( "\n" ); - } - _elementJustOpened = false; -} - - -void XMLPrinter::SealElement() -{ - _elementJustOpened = false; - Print( ">" ); -} - - -void XMLPrinter::PushText( const char* text, bool cdata ) -{ - _textDepth = _depth-1; - - if ( _elementJustOpened ) { - SealElement(); - } - if ( cdata ) { - Print( "<![CDATA[" ); - Print( "%s", text ); - Print( "]]>" ); - } - else { - PrintString( text, true ); - } -} - -void XMLPrinter::PushText( int value ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( value, buf, BUF_SIZE ); - PushText( buf, false ); -} - - -void XMLPrinter::PushText( unsigned value ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( value, buf, BUF_SIZE ); - PushText( buf, false ); -} - - -void XMLPrinter::PushText( bool value ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( value, buf, BUF_SIZE ); - PushText( buf, false ); -} - - -void XMLPrinter::PushText( float value ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( value, buf, BUF_SIZE ); - PushText( buf, false ); -} - - -void XMLPrinter::PushText( double value ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( value, buf, BUF_SIZE ); - PushText( buf, false ); -} - - -void XMLPrinter::PushComment( const char* comment ) -{ - if ( _elementJustOpened ) { - SealElement(); - } - if ( _textDepth < 0 && !_firstElement && !_compactMode) { - Print( "\n" ); - PrintSpace( _depth ); - } - _firstElement = false; - Print( "<!--%s-->", comment ); -} - - -void XMLPrinter::PushDeclaration( const char* value ) -{ - if ( _elementJustOpened ) { - SealElement(); - } - if ( _textDepth < 0 && !_firstElement && !_compactMode) { - Print( "\n" ); - PrintSpace( _depth ); - } - _firstElement = false; - Print( "<?%s?>", value ); -} - - -void XMLPrinter::PushUnknown( const char* value ) -{ - if ( _elementJustOpened ) { - SealElement(); - } - if ( _textDepth < 0 && !_firstElement && !_compactMode) { - Print( "\n" ); - PrintSpace( _depth ); - } - _firstElement = false; - Print( "<!%s>", value ); -} - - -bool XMLPrinter::VisitEnter( const XMLDocument& doc ) -{ - _processEntities = doc.ProcessEntities(); - if ( doc.HasBOM() ) { - PushHeader( true, false ); - } - return true; -} - - -bool XMLPrinter::VisitEnter( const XMLElement& element, const XMLAttribute* attribute ) -{ - const XMLElement* parentElem = element.Parent()->ToElement(); - bool compactMode = parentElem ? CompactMode(*parentElem) : _compactMode; - OpenElement( element.Name(), compactMode ); - while ( attribute ) { - PushAttribute( attribute->Name(), attribute->Value() ); - attribute = attribute->Next(); - } - return true; -} - - -bool XMLPrinter::VisitExit( const XMLElement& element ) -{ - CloseElement( CompactMode(element) ); - return true; -} - - -bool XMLPrinter::Visit( const XMLText& text ) -{ - PushText( text.Value(), text.CData() ); - return true; -} - - -bool XMLPrinter::Visit( const XMLComment& comment ) -{ - PushComment( comment.Value() ); - return true; -} - -bool XMLPrinter::Visit( const XMLDeclaration& declaration ) -{ - PushDeclaration( declaration.Value() ); - return true; -} - - -bool XMLPrinter::Visit( const XMLUnknown& unknown ) -{ - PushUnknown( unknown.Value() ); - return true; -} - -} // namespace tinyxml2 - diff --git a/moose-core/external/tinyxml/tinyxml2.h b/moose-core/external/tinyxml/tinyxml2.h deleted file mode 100644 index 75bf810f60091b13e35ca7c21ec5c640105da4a3..0000000000000000000000000000000000000000 --- a/moose-core/external/tinyxml/tinyxml2.h +++ /dev/null @@ -1,2076 +0,0 @@ -/* -Original code by Lee Thomason (www.grinninglizard.com) - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any -damages arising from the use of this software. - -Permission is granted to anyone to use this software for any -purpose, including commercial applications, and to alter it and -redistribute it freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must -not claim that you wrote the original software. If you use this -software in a product, an acknowledgment in the product documentation -would be appreciated but is not required. - - -2. Altered source versions must be plainly marked as such, and -must not be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source -distribution. -*/ - -#ifndef TINYXML2_INCLUDED -#define TINYXML2_INCLUDED - -#if defined(ANDROID_NDK) || defined(__BORLANDC__) -# include <ctype.h> -# include <limits.h> -# include <stdio.h> -# include <stdlib.h> -# include <string.h> -# include <stdarg.h> -#else -# include <cctype> -# include <climits> -# include <cstdio> -# include <cstdlib> -# include <cstring> -# include <cstdarg> -#endif - -/* - TODO: intern strings instead of allocation. -*/ -/* - gcc: - g++ -Wall -DDEBUG tinyxml2.cpp xmltest.cpp -o gccxmltest.exe - - Formatting, Artistic Style: - AStyle.exe --style=1tbs --indent-switches --break-closing-brackets --indent-preprocessor tinyxml2.cpp tinyxml2.h -*/ - -#if defined( _DEBUG ) || defined( DEBUG ) || defined (__DEBUG__) -# ifndef DEBUG -# define DEBUG -# endif -#endif - -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable: 4251) -#endif - -#ifdef _WIN32 -# ifdef TINYXML2_EXPORT -# define TINYXML2_LIB __declspec(dllexport) -# elif defined(TINYXML2_IMPORT) -# define TINYXML2_LIB __declspec(dllimport) -# else -# define TINYXML2_LIB -# endif -#else -# define TINYXML2_LIB -#endif - - -#if defined(DEBUG) -# if defined(_MSC_VER) -# define TIXMLASSERT( x ) if ( !(x)) { __debugbreak(); } //if ( !(x)) WinDebugBreak() -# elif defined (ANDROID_NDK) -# include <android/log.h> -# define TIXMLASSERT( x ) if ( !(x)) { __android_log_assert( "assert", "grinliz", "ASSERT in '%s' at %d.", __FILE__, __LINE__ ); } -# else -# include <assert.h> -# define TIXMLASSERT assert -# endif -# else -# define TIXMLASSERT( x ) {} -#endif - - -#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) -// Microsoft visual studio, version 2005 and higher. -/*int _snprintf_s( - char *buffer, - size_t sizeOfBuffer, - size_t count, - const char *format [, - argument] ... -);*/ -inline int TIXML_SNPRINTF( char* buffer, size_t size, const char* format, ... ) -{ - va_list va; - va_start( va, format ); - int result = vsnprintf_s( buffer, size, _TRUNCATE, format, va ); - va_end( va ); - return result; -} -#define TIXML_SSCANF sscanf_s -#else -// GCC version 3 and higher -//#warning( "Using sn* functions." ) -#define TIXML_SNPRINTF snprintf -#define TIXML_SSCANF sscanf -#endif - -/* Versioning, past 1.0.14: - http://semver.org/ -*/ -static const int TIXML2_MAJOR_VERSION = 2; -static const int TIXML2_MINOR_VERSION = 1; -static const int TIXML2_PATCH_VERSION = 0; - -namespace tinyxml2 -{ -class XMLDocument; -class XMLElement; -class XMLAttribute; -class XMLComment; -class XMLText; -class XMLDeclaration; -class XMLUnknown; -class XMLPrinter; - -/* - A class that wraps strings. Normally stores the start and end - pointers into the XML file itself, and will apply normalization - and entity translation if actually read. Can also store (and memory - manage) a traditional char[] -*/ -class StrPair -{ -public: - enum { - NEEDS_ENTITY_PROCESSING = 0x01, - NEEDS_NEWLINE_NORMALIZATION = 0x02, - COLLAPSE_WHITESPACE = 0x04, - - TEXT_ELEMENT = NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION, - TEXT_ELEMENT_LEAVE_ENTITIES = NEEDS_NEWLINE_NORMALIZATION, - ATTRIBUTE_NAME = 0, - ATTRIBUTE_VALUE = NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION, - ATTRIBUTE_VALUE_LEAVE_ENTITIES = NEEDS_NEWLINE_NORMALIZATION, - COMMENT = NEEDS_NEWLINE_NORMALIZATION - }; - - StrPair() : _flags( 0 ), _start( 0 ), _end( 0 ) {} - ~StrPair(); - - void Set( char* start, char* end, int flags ) { - Reset(); - _start = start; - _end = end; - _flags = flags | NEEDS_FLUSH; - } - - const char* GetStr(); - - bool Empty() const { - return _start == _end; - } - - void SetInternedStr( const char* str ) { - Reset(); - _start = const_cast<char*>(str); - } - - void SetStr( const char* str, int flags=0 ); - - char* ParseText( char* in, const char* endTag, int strFlags ); - char* ParseName( char* in ); - -private: - void Reset(); - void CollapseWhitespace(); - - enum { - NEEDS_FLUSH = 0x100, - NEEDS_DELETE = 0x200 - }; - - // After parsing, if *_end != 0, it can be set to zero. - int _flags; - char* _start; - char* _end; -}; - - -/* - A dynamic array of Plain Old Data. Doesn't support constructors, etc. - Has a small initial memory pool, so that low or no usage will not - cause a call to new/delete -*/ -template <class T, int INIT> -class DynArray -{ -public: - DynArray< T, INIT >() { - _mem = _pool; - _allocated = INIT; - _size = 0; - } - - ~DynArray() { - if ( _mem != _pool ) { - delete [] _mem; - } - } - - void Clear() { - _size = 0; - } - - void Push( T t ) { - EnsureCapacity( _size+1 ); - _mem[_size++] = t; - } - - T* PushArr( int count ) { - EnsureCapacity( _size+count ); - T* ret = &_mem[_size]; - _size += count; - return ret; - } - - T Pop() { - return _mem[--_size]; - } - - void PopArr( int count ) { - TIXMLASSERT( _size >= count ); - _size -= count; - } - - bool Empty() const { - return _size == 0; - } - - T& operator[](int i) { - TIXMLASSERT( i>= 0 && i < _size ); - return _mem[i]; - } - - const T& operator[](int i) const { - TIXMLASSERT( i>= 0 && i < _size ); - return _mem[i]; - } - - const T& PeekTop() const { - TIXMLASSERT( _size > 0 ); - return _mem[ _size - 1]; - } - - int Size() const { - return _size; - } - - int Capacity() const { - return _allocated; - } - - const T* Mem() const { - return _mem; - } - - T* Mem() { - return _mem; - } - -private: - void EnsureCapacity( int cap ) { - if ( cap > _allocated ) { - int newAllocated = cap * 2; - T* newMem = new T[newAllocated]; - memcpy( newMem, _mem, sizeof(T)*_size ); // warning: not using constructors, only works for PODs - if ( _mem != _pool ) { - delete [] _mem; - } - _mem = newMem; - _allocated = newAllocated; - } - } - - T* _mem; - T _pool[INIT]; - int _allocated; // objects allocated - int _size; // number objects in use -}; - - -/* - Parent virtual class of a pool for fast allocation - and deallocation of objects. -*/ -class MemPool -{ -public: - MemPool() {} - virtual ~MemPool() {} - - virtual int ItemSize() const = 0; - virtual void* Alloc() = 0; - virtual void Free( void* ) = 0; - virtual void SetTracked() = 0; -}; - - -/* - Template child class to create pools of the correct type. -*/ -template< int SIZE > -class MemPoolT : public MemPool -{ -public: - MemPoolT() : _root(0), _currentAllocs(0), _nAllocs(0), _maxAllocs(0), _nUntracked(0) {} - ~MemPoolT() { - // Delete the blocks. - for( int i=0; i<_blockPtrs.Size(); ++i ) { - delete _blockPtrs[i]; - } - } - - virtual int ItemSize() const { - return SIZE; - } - int CurrentAllocs() const { - return _currentAllocs; - } - - virtual void* Alloc() { - if ( !_root ) { - // Need a new block. - Block* block = new Block(); - _blockPtrs.Push( block ); - - for( int i=0; i<COUNT-1; ++i ) { - block->chunk[i].next = &block->chunk[i+1]; - } - block->chunk[COUNT-1].next = 0; - _root = block->chunk; - } - void* result = _root; - _root = _root->next; - - ++_currentAllocs; - if ( _currentAllocs > _maxAllocs ) { - _maxAllocs = _currentAllocs; - } - _nAllocs++; - _nUntracked++; - return result; - } - virtual void Free( void* mem ) { - if ( !mem ) { - return; - } - --_currentAllocs; - Chunk* chunk = (Chunk*)mem; -#ifdef DEBUG - memset( chunk, 0xfe, sizeof(Chunk) ); -#endif - chunk->next = _root; - _root = chunk; - } - void Trace( const char* name ) { - printf( "Mempool %s watermark=%d [%dk] current=%d size=%d nAlloc=%d blocks=%d\n", - name, _maxAllocs, _maxAllocs*SIZE/1024, _currentAllocs, SIZE, _nAllocs, _blockPtrs.Size() ); - } - - void SetTracked() { - _nUntracked--; - } - - int Untracked() const { - return _nUntracked; - } - - // This number is perf sensitive. 4k seems like a good tradeoff on my machine. - // The test file is large, 170k. - // Release: VS2010 gcc(no opt) - // 1k: 4000 - // 2k: 4000 - // 4k: 3900 21000 - // 16k: 5200 - // 32k: 4300 - // 64k: 4000 21000 - enum { COUNT = (4*1024)/SIZE }; // Some compilers do not accept to use COUNT in private part if COUNT is private - -private: - union Chunk { - Chunk* next; - char mem[SIZE]; - }; - struct Block { - Chunk chunk[COUNT]; - }; - DynArray< Block*, 10 > _blockPtrs; - Chunk* _root; - - int _currentAllocs; - int _nAllocs; - int _maxAllocs; - int _nUntracked; -}; - - - -/** - Implements the interface to the "Visitor pattern" (see the Accept() method.) - If you call the Accept() method, it requires being passed a XMLVisitor - class to handle callbacks. For nodes that contain other nodes (Document, Element) - you will get called with a VisitEnter/VisitExit pair. Nodes that are always leafs - are simply called with Visit(). - - If you return 'true' from a Visit method, recursive parsing will continue. If you return - false, <b>no children of this node or its siblings</b> will be visited. - - All flavors of Visit methods have a default implementation that returns 'true' (continue - visiting). You need to only override methods that are interesting to you. - - Generally Accept() is called on the XMLDocument, although all nodes support visiting. - - You should never change the document from a callback. - - @sa XMLNode::Accept() -*/ -class TINYXML2_LIB XMLVisitor -{ -public: - virtual ~XMLVisitor() {} - - /// Visit a document. - virtual bool VisitEnter( const XMLDocument& /*doc*/ ) { - return true; - } - /// Visit a document. - virtual bool VisitExit( const XMLDocument& /*doc*/ ) { - return true; - } - - /// Visit an element. - virtual bool VisitEnter( const XMLElement& /*element*/, const XMLAttribute* /*firstAttribute*/ ) { - return true; - } - /// Visit an element. - virtual bool VisitExit( const XMLElement& /*element*/ ) { - return true; - } - - /// Visit a declaration. - virtual bool Visit( const XMLDeclaration& /*declaration*/ ) { - return true; - } - /// Visit a text node. - virtual bool Visit( const XMLText& /*text*/ ) { - return true; - } - /// Visit a comment node. - virtual bool Visit( const XMLComment& /*comment*/ ) { - return true; - } - /// Visit an unknown node. - virtual bool Visit( const XMLUnknown& /*unknown*/ ) { - return true; - } -}; - - -/* - Utility functionality. -*/ -class XMLUtil -{ -public: - // Anything in the high order range of UTF-8 is assumed to not be whitespace. This isn't - // correct, but simple, and usually works. - static const char* SkipWhiteSpace( const char* p ) { - while( !IsUTF8Continuation(*p) && isspace( *reinterpret_cast<const unsigned char*>(p) ) ) { - ++p; - } - return p; - } - static char* SkipWhiteSpace( char* p ) { - while( !IsUTF8Continuation(*p) && isspace( *reinterpret_cast<unsigned char*>(p) ) ) { - ++p; - } - return p; - } - static bool IsWhiteSpace( char p ) { - return !IsUTF8Continuation(p) && isspace( static_cast<unsigned char>(p) ); - } - - inline static bool IsNameStartChar( unsigned char ch ) { - return ( ( ch < 128 ) ? isalpha( ch ) : 1 ) - || ch == ':' - || ch == '_'; - } - - inline static bool IsNameChar( unsigned char ch ) { - return IsNameStartChar( ch ) - || isdigit( ch ) - || ch == '.' - || ch == '-'; - } - - inline static bool StringEqual( const char* p, const char* q, int nChar=INT_MAX ) { - int n = 0; - if ( p == q ) { - return true; - } - while( *p && *q && *p == *q && n<nChar ) { - ++p; - ++q; - ++n; - } - if ( (n == nChar) || ( *p == 0 && *q == 0 ) ) { - return true; - } - return false; - } - - inline static int IsUTF8Continuation( const char p ) { - return p & 0x80; - } - - static const char* ReadBOM( const char* p, bool* hasBOM ); - // p is the starting location, - // the UTF-8 value of the entity will be placed in value, and length filled in. - static const char* GetCharacterRef( const char* p, char* value, int* length ); - static void ConvertUTF32ToUTF8( unsigned long input, char* output, int* length ); - - // converts primitive types to strings - static void ToStr( int v, char* buffer, int bufferSize ); - static void ToStr( unsigned v, char* buffer, int bufferSize ); - static void ToStr( bool v, char* buffer, int bufferSize ); - static void ToStr( float v, char* buffer, int bufferSize ); - static void ToStr( double v, char* buffer, int bufferSize ); - - // converts strings to primitive types - static bool ToInt( const char* str, int* value ); - static bool ToUnsigned( const char* str, unsigned* value ); - static bool ToBool( const char* str, bool* value ); - static bool ToFloat( const char* str, float* value ); - static bool ToDouble( const char* str, double* value ); -}; - - -/** XMLNode is a base class for every object that is in the - XML Document Object Model (DOM), except XMLAttributes. - Nodes have siblings, a parent, and children which can - be navigated. A node is always in a XMLDocument. - The type of a XMLNode can be queried, and it can - be cast to its more defined type. - - A XMLDocument allocates memory for all its Nodes. - When the XMLDocument gets deleted, all its Nodes - will also be deleted. - - @verbatim - A Document can contain: Element (container or leaf) - Comment (leaf) - Unknown (leaf) - Declaration( leaf ) - - An Element can contain: Element (container or leaf) - Text (leaf) - Attributes (not on tree) - Comment (leaf) - Unknown (leaf) - - @endverbatim -*/ -class TINYXML2_LIB XMLNode -{ - friend class XMLDocument; - friend class XMLElement; -public: - - /// Get the XMLDocument that owns this XMLNode. - const XMLDocument* GetDocument() const { - return _document; - } - /// Get the XMLDocument that owns this XMLNode. - XMLDocument* GetDocument() { - return _document; - } - - /// Safely cast to an Element, or null. - virtual XMLElement* ToElement() { - return 0; - } - /// Safely cast to Text, or null. - virtual XMLText* ToText() { - return 0; - } - /// Safely cast to a Comment, or null. - virtual XMLComment* ToComment() { - return 0; - } - /// Safely cast to a Document, or null. - virtual XMLDocument* ToDocument() { - return 0; - } - /// Safely cast to a Declaration, or null. - virtual XMLDeclaration* ToDeclaration() { - return 0; - } - /// Safely cast to an Unknown, or null. - virtual XMLUnknown* ToUnknown() { - return 0; - } - - virtual const XMLElement* ToElement() const { - return 0; - } - virtual const XMLText* ToText() const { - return 0; - } - virtual const XMLComment* ToComment() const { - return 0; - } - virtual const XMLDocument* ToDocument() const { - return 0; - } - virtual const XMLDeclaration* ToDeclaration() const { - return 0; - } - virtual const XMLUnknown* ToUnknown() const { - return 0; - } - - /** The meaning of 'value' changes for the specific type. - @verbatim - Document: empty - Element: name of the element - Comment: the comment text - Unknown: the tag contents - Text: the text string - @endverbatim - */ - const char* Value() const; - - /** Set the Value of an XML node. - @sa Value() - */ - void SetValue( const char* val, bool staticMem=false ); - - /// Get the parent of this node on the DOM. - const XMLNode* Parent() const { - return _parent; - } - - XMLNode* Parent() { - return _parent; - } - - /// Returns true if this node has no children. - bool NoChildren() const { - return !_firstChild; - } - - /// Get the first child node, or null if none exists. - const XMLNode* FirstChild() const { - return _firstChild; - } - - XMLNode* FirstChild() { - return _firstChild; - } - - /** Get the first child element, or optionally the first child - element with the specified name. - */ - const XMLElement* FirstChildElement( const char* value=0 ) const; - - XMLElement* FirstChildElement( const char* value=0 ) { - return const_cast<XMLElement*>(const_cast<const XMLNode*>(this)->FirstChildElement( value )); - } - - /// Get the last child node, or null if none exists. - const XMLNode* LastChild() const { - return _lastChild; - } - - XMLNode* LastChild() { - return const_cast<XMLNode*>(const_cast<const XMLNode*>(this)->LastChild() ); - } - - /** Get the last child element or optionally the last child - element with the specified name. - */ - const XMLElement* LastChildElement( const char* value=0 ) const; - - XMLElement* LastChildElement( const char* value=0 ) { - return const_cast<XMLElement*>(const_cast<const XMLNode*>(this)->LastChildElement(value) ); - } - - /// Get the previous (left) sibling node of this node. - const XMLNode* PreviousSibling() const { - return _prev; - } - - XMLNode* PreviousSibling() { - return _prev; - } - - /// Get the previous (left) sibling element of this node, with an optionally supplied name. - const XMLElement* PreviousSiblingElement( const char* value=0 ) const ; - - XMLElement* PreviousSiblingElement( const char* value=0 ) { - return const_cast<XMLElement*>(const_cast<const XMLNode*>(this)->PreviousSiblingElement( value ) ); - } - - /// Get the next (right) sibling node of this node. - const XMLNode* NextSibling() const { - return _next; - } - - XMLNode* NextSibling() { - return _next; - } - - /// Get the next (right) sibling element of this node, with an optionally supplied name. - const XMLElement* NextSiblingElement( const char* value=0 ) const; - - XMLElement* NextSiblingElement( const char* value=0 ) { - return const_cast<XMLElement*>(const_cast<const XMLNode*>(this)->NextSiblingElement( value ) ); - } - - /** - Add a child node as the last (right) child. - If the child node is already part of the document, - it is moved from its old location to the new location. - Returns the addThis argument or 0 if the node does not - belong to the same document. - */ - XMLNode* InsertEndChild( XMLNode* addThis ); - - XMLNode* LinkEndChild( XMLNode* addThis ) { - return InsertEndChild( addThis ); - } - /** - Add a child node as the first (left) child. - If the child node is already part of the document, - it is moved from its old location to the new location. - Returns the addThis argument or 0 if the node does not - belong to the same document. - */ - XMLNode* InsertFirstChild( XMLNode* addThis ); - /** - Add a node after the specified child node. - If the child node is already part of the document, - it is moved from its old location to the new location. - Returns the addThis argument or 0 if the afterThis node - is not a child of this node, or if the node does not - belong to the same document. - */ - XMLNode* InsertAfterChild( XMLNode* afterThis, XMLNode* addThis ); - - /** - Delete all the children of this node. - */ - void DeleteChildren(); - - /** - Delete a child of this node. - */ - void DeleteChild( XMLNode* node ); - - /** - Make a copy of this node, but not its children. - You may pass in a Document pointer that will be - the owner of the new Node. If the 'document' is - null, then the node returned will be allocated - from the current Document. (this->GetDocument()) - - Note: if called on a XMLDocument, this will return null. - */ - virtual XMLNode* ShallowClone( XMLDocument* document ) const = 0; - - /** - Test if 2 nodes are the same, but don't test children. - The 2 nodes do not need to be in the same Document. - - Note: if called on a XMLDocument, this will return false. - */ - virtual bool ShallowEqual( const XMLNode* compare ) const = 0; - - /** Accept a hierarchical visit of the nodes in the TinyXML-2 DOM. Every node in the - XML tree will be conditionally visited and the host will be called back - via the XMLVisitor interface. - - This is essentially a SAX interface for TinyXML-2. (Note however it doesn't re-parse - the XML for the callbacks, so the performance of TinyXML-2 is unchanged by using this - interface versus any other.) - - The interface has been based on ideas from: - - - http://www.saxproject.org/ - - http://c2.com/cgi/wiki?HierarchicalVisitorPattern - - Which are both good references for "visiting". - - An example of using Accept(): - @verbatim - XMLPrinter printer; - tinyxmlDoc.Accept( &printer ); - const char* xmlcstr = printer.CStr(); - @endverbatim - */ - virtual bool Accept( XMLVisitor* visitor ) const = 0; - - // internal - virtual char* ParseDeep( char*, StrPair* ); - -protected: - XMLNode( XMLDocument* ); - virtual ~XMLNode(); - XMLNode( const XMLNode& ); // not supported - XMLNode& operator=( const XMLNode& ); // not supported - - XMLDocument* _document; - XMLNode* _parent; - mutable StrPair _value; - - XMLNode* _firstChild; - XMLNode* _lastChild; - - XMLNode* _prev; - XMLNode* _next; - -private: - MemPool* _memPool; - void Unlink( XMLNode* child ); -}; - - -/** XML text. - - Note that a text node can have child element nodes, for example: - @verbatim - <root>This is <b>bold</b></root> - @endverbatim - - A text node can have 2 ways to output the next. "normal" output - and CDATA. It will default to the mode it was parsed from the XML file and - you generally want to leave it alone, but you can change the output mode with - SetCData() and query it with CData(). -*/ -class TINYXML2_LIB XMLText : public XMLNode -{ - friend class XMLBase; - friend class XMLDocument; -public: - virtual bool Accept( XMLVisitor* visitor ) const; - - virtual XMLText* ToText() { - return this; - } - virtual const XMLText* ToText() const { - return this; - } - - /// Declare whether this should be CDATA or standard text. - void SetCData( bool isCData ) { - _isCData = isCData; - } - /// Returns true if this is a CDATA text element. - bool CData() const { - return _isCData; - } - - char* ParseDeep( char*, StrPair* endTag ); - virtual XMLNode* ShallowClone( XMLDocument* document ) const; - virtual bool ShallowEqual( const XMLNode* compare ) const; - -protected: - XMLText( XMLDocument* doc ) : XMLNode( doc ), _isCData( false ) {} - virtual ~XMLText() {} - XMLText( const XMLText& ); // not supported - XMLText& operator=( const XMLText& ); // not supported - -private: - bool _isCData; -}; - - -/** An XML Comment. */ -class TINYXML2_LIB XMLComment : public XMLNode -{ - friend class XMLDocument; -public: - virtual XMLComment* ToComment() { - return this; - } - virtual const XMLComment* ToComment() const { - return this; - } - - virtual bool Accept( XMLVisitor* visitor ) const; - - char* ParseDeep( char*, StrPair* endTag ); - virtual XMLNode* ShallowClone( XMLDocument* document ) const; - virtual bool ShallowEqual( const XMLNode* compare ) const; - -protected: - XMLComment( XMLDocument* doc ); - virtual ~XMLComment(); - XMLComment( const XMLComment& ); // not supported - XMLComment& operator=( const XMLComment& ); // not supported - -private: -}; - - -/** In correct XML the declaration is the first entry in the file. - @verbatim - <?xml version="1.0" standalone="yes"?> - @endverbatim - - TinyXML-2 will happily read or write files without a declaration, - however. - - The text of the declaration isn't interpreted. It is parsed - and written as a string. -*/ -class TINYXML2_LIB XMLDeclaration : public XMLNode -{ - friend class XMLDocument; -public: - virtual XMLDeclaration* ToDeclaration() { - return this; - } - virtual const XMLDeclaration* ToDeclaration() const { - return this; - } - - virtual bool Accept( XMLVisitor* visitor ) const; - - char* ParseDeep( char*, StrPair* endTag ); - virtual XMLNode* ShallowClone( XMLDocument* document ) const; - virtual bool ShallowEqual( const XMLNode* compare ) const; - -protected: - XMLDeclaration( XMLDocument* doc ); - virtual ~XMLDeclaration(); - XMLDeclaration( const XMLDeclaration& ); // not supported - XMLDeclaration& operator=( const XMLDeclaration& ); // not supported -}; - - -/** Any tag that TinyXML-2 doesn't recognize is saved as an - unknown. It is a tag of text, but should not be modified. - It will be written back to the XML, unchanged, when the file - is saved. - - DTD tags get thrown into XMLUnknowns. -*/ -class TINYXML2_LIB XMLUnknown : public XMLNode -{ - friend class XMLDocument; -public: - virtual XMLUnknown* ToUnknown() { - return this; - } - virtual const XMLUnknown* ToUnknown() const { - return this; - } - - virtual bool Accept( XMLVisitor* visitor ) const; - - char* ParseDeep( char*, StrPair* endTag ); - virtual XMLNode* ShallowClone( XMLDocument* document ) const; - virtual bool ShallowEqual( const XMLNode* compare ) const; - -protected: - XMLUnknown( XMLDocument* doc ); - virtual ~XMLUnknown(); - XMLUnknown( const XMLUnknown& ); // not supported - XMLUnknown& operator=( const XMLUnknown& ); // not supported -}; - - -enum XMLError { - XML_NO_ERROR = 0, - XML_SUCCESS = 0, - - XML_NO_ATTRIBUTE, - XML_WRONG_ATTRIBUTE_TYPE, - - XML_ERROR_FILE_NOT_FOUND, - XML_ERROR_FILE_COULD_NOT_BE_OPENED, - XML_ERROR_FILE_READ_ERROR, - XML_ERROR_ELEMENT_MISMATCH, - XML_ERROR_PARSING_ELEMENT, - XML_ERROR_PARSING_ATTRIBUTE, - XML_ERROR_IDENTIFYING_TAG, - XML_ERROR_PARSING_TEXT, - XML_ERROR_PARSING_CDATA, - XML_ERROR_PARSING_COMMENT, - XML_ERROR_PARSING_DECLARATION, - XML_ERROR_PARSING_UNKNOWN, - XML_ERROR_EMPTY_DOCUMENT, - XML_ERROR_MISMATCHED_ELEMENT, - XML_ERROR_PARSING, - - XML_CAN_NOT_CONVERT_TEXT, - XML_NO_TEXT_NODE -}; - - -/** An attribute is a name-value pair. Elements have an arbitrary - number of attributes, each with a unique name. - - @note The attributes are not XMLNodes. You may only query the - Next() attribute in a list. -*/ -class TINYXML2_LIB XMLAttribute -{ - friend class XMLElement; -public: - /// The name of the attribute. - const char* Name() const; - - /// The value of the attribute. - const char* Value() const; - - /// The next attribute in the list. - const XMLAttribute* Next() const { - return _next; - } - - /** IntValue interprets the attribute as an integer, and returns the value. - If the value isn't an integer, 0 will be returned. There is no error checking; - use QueryIntValue() if you need error checking. - */ - int IntValue() const { - int i=0; - QueryIntValue( &i ); - return i; - } - /// Query as an unsigned integer. See IntValue() - unsigned UnsignedValue() const { - unsigned i=0; - QueryUnsignedValue( &i ); - return i; - } - /// Query as a boolean. See IntValue() - bool BoolValue() const { - bool b=false; - QueryBoolValue( &b ); - return b; - } - /// Query as a double. See IntValue() - double DoubleValue() const { - double d=0; - QueryDoubleValue( &d ); - return d; - } - /// Query as a float. See IntValue() - float FloatValue() const { - float f=0; - QueryFloatValue( &f ); - return f; - } - - /** QueryIntValue interprets the attribute as an integer, and returns the value - in the provided parameter. The function will return XML_NO_ERROR on success, - and XML_WRONG_ATTRIBUTE_TYPE if the conversion is not successful. - */ - XMLError QueryIntValue( int* value ) const; - /// See QueryIntValue - XMLError QueryUnsignedValue( unsigned int* value ) const; - /// See QueryIntValue - XMLError QueryBoolValue( bool* value ) const; - /// See QueryIntValue - XMLError QueryDoubleValue( double* value ) const; - /// See QueryIntValue - XMLError QueryFloatValue( float* value ) const; - - /// Set the attribute to a string value. - void SetAttribute( const char* value ); - /// Set the attribute to value. - void SetAttribute( int value ); - /// Set the attribute to value. - void SetAttribute( unsigned value ); - /// Set the attribute to value. - void SetAttribute( bool value ); - /// Set the attribute to value. - void SetAttribute( double value ); - /// Set the attribute to value. - void SetAttribute( float value ); - -private: - enum { BUF_SIZE = 200 }; - - XMLAttribute() : _next( 0 ), _memPool( 0 ) {} - virtual ~XMLAttribute() {} - - XMLAttribute( const XMLAttribute& ); // not supported - void operator=( const XMLAttribute& ); // not supported - void SetName( const char* name ); - - char* ParseDeep( char* p, bool processEntities ); - - mutable StrPair _name; - mutable StrPair _value; - XMLAttribute* _next; - MemPool* _memPool; -}; - - -/** The element is a container class. It has a value, the element name, - and can contain other elements, text, comments, and unknowns. - Elements also contain an arbitrary number of attributes. -*/ -class TINYXML2_LIB XMLElement : public XMLNode -{ - friend class XMLBase; - friend class XMLDocument; -public: - /// Get the name of an element (which is the Value() of the node.) - const char* Name() const { - return Value(); - } - /// Set the name of the element. - void SetName( const char* str, bool staticMem=false ) { - SetValue( str, staticMem ); - } - - virtual XMLElement* ToElement() { - return this; - } - virtual const XMLElement* ToElement() const { - return this; - } - virtual bool Accept( XMLVisitor* visitor ) const; - - /** Given an attribute name, Attribute() returns the value - for the attribute of that name, or null if none - exists. For example: - - @verbatim - const char* value = ele->Attribute( "foo" ); - @endverbatim - - The 'value' parameter is normally null. However, if specified, - the attribute will only be returned if the 'name' and 'value' - match. This allow you to write code: - - @verbatim - if ( ele->Attribute( "foo", "bar" ) ) callFooIsBar(); - @endverbatim - - rather than: - @verbatim - if ( ele->Attribute( "foo" ) ) { - if ( strcmp( ele->Attribute( "foo" ), "bar" ) == 0 ) callFooIsBar(); - } - @endverbatim - */ - const char* Attribute( const char* name, const char* value=0 ) const; - - /** Given an attribute name, IntAttribute() returns the value - of the attribute interpreted as an integer. 0 will be - returned if there is an error. For a method with error - checking, see QueryIntAttribute() - */ - int IntAttribute( const char* name ) const { - int i=0; - QueryIntAttribute( name, &i ); - return i; - } - /// See IntAttribute() - unsigned UnsignedAttribute( const char* name ) const { - unsigned i=0; - QueryUnsignedAttribute( name, &i ); - return i; - } - /// See IntAttribute() - bool BoolAttribute( const char* name ) const { - bool b=false; - QueryBoolAttribute( name, &b ); - return b; - } - /// See IntAttribute() - double DoubleAttribute( const char* name ) const { - double d=0; - QueryDoubleAttribute( name, &d ); - return d; - } - /// See IntAttribute() - float FloatAttribute( const char* name ) const { - float f=0; - QueryFloatAttribute( name, &f ); - return f; - } - - /** Given an attribute name, QueryIntAttribute() returns - XML_NO_ERROR, XML_WRONG_ATTRIBUTE_TYPE if the conversion - can't be performed, or XML_NO_ATTRIBUTE if the attribute - doesn't exist. If successful, the result of the conversion - will be written to 'value'. If not successful, nothing will - be written to 'value'. This allows you to provide default - value: - - @verbatim - int value = 10; - QueryIntAttribute( "foo", &value ); // if "foo" isn't found, value will still be 10 - @endverbatim - */ - XMLError QueryIntAttribute( const char* name, int* value ) const { - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return XML_NO_ATTRIBUTE; - } - return a->QueryIntValue( value ); - } - /// See QueryIntAttribute() - XMLError QueryUnsignedAttribute( const char* name, unsigned int* value ) const { - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return XML_NO_ATTRIBUTE; - } - return a->QueryUnsignedValue( value ); - } - /// See QueryIntAttribute() - XMLError QueryBoolAttribute( const char* name, bool* value ) const { - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return XML_NO_ATTRIBUTE; - } - return a->QueryBoolValue( value ); - } - /// See QueryIntAttribute() - XMLError QueryDoubleAttribute( const char* name, double* value ) const { - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return XML_NO_ATTRIBUTE; - } - return a->QueryDoubleValue( value ); - } - /// See QueryIntAttribute() - XMLError QueryFloatAttribute( const char* name, float* value ) const { - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return XML_NO_ATTRIBUTE; - } - return a->QueryFloatValue( value ); - } - - - /** Given an attribute name, QueryAttribute() returns - XML_NO_ERROR, XML_WRONG_ATTRIBUTE_TYPE if the conversion - can't be performed, or XML_NO_ATTRIBUTE if the attribute - doesn't exist. It is overloaded for the primitive types, - and is a generally more convenient replacement of - QueryIntAttribute() and related functions. - - If successful, the result of the conversion - will be written to 'value'. If not successful, nothing will - be written to 'value'. This allows you to provide default - value: - - @verbatim - int value = 10; - QueryAttribute( "foo", &value ); // if "foo" isn't found, value will still be 10 - @endverbatim - */ - int QueryAttribute( const char* name, int* value ) const { - return QueryIntAttribute( name, value ); - } - - int QueryAttribute( const char* name, unsigned int* value ) const { - return QueryUnsignedAttribute( name, value ); - } - - int QueryAttribute( const char* name, bool* value ) const { - return QueryBoolAttribute( name, value ); - } - - int QueryAttribute( const char* name, double* value ) const { - return QueryDoubleAttribute( name, value ); - } - - int QueryAttribute( const char* name, float* value ) const { - return QueryFloatAttribute( name, value ); - } - - /// Sets the named attribute to value. - void SetAttribute( const char* name, const char* value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - /// Sets the named attribute to value. - void SetAttribute( const char* name, int value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - /// Sets the named attribute to value. - void SetAttribute( const char* name, unsigned value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - /// Sets the named attribute to value. - void SetAttribute( const char* name, bool value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - /// Sets the named attribute to value. - void SetAttribute( const char* name, double value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - /// Sets the named attribute to value. - void SetAttribute( const char* name, float value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - - /** - Delete an attribute. - */ - void DeleteAttribute( const char* name ); - - /// Return the first attribute in the list. - const XMLAttribute* FirstAttribute() const { - return _rootAttribute; - } - /// Query a specific attribute in the list. - const XMLAttribute* FindAttribute( const char* name ) const; - - /** Convenience function for easy access to the text inside an element. Although easy - and concise, GetText() is limited compared to getting the XMLText child - and accessing it directly. - - If the first child of 'this' is a XMLText, the GetText() - returns the character string of the Text node, else null is returned. - - This is a convenient method for getting the text of simple contained text: - @verbatim - <foo>This is text</foo> - const char* str = fooElement->GetText(); - @endverbatim - - 'str' will be a pointer to "This is text". - - Note that this function can be misleading. If the element foo was created from - this XML: - @verbatim - <foo><b>This is text</b></foo> - @endverbatim - - then the value of str would be null. The first child node isn't a text node, it is - another element. From this XML: - @verbatim - <foo>This is <b>text</b></foo> - @endverbatim - GetText() will return "This is ". - */ - const char* GetText() const; - - /** Convenience function for easy access to the text inside an element. Although easy - and concise, SetText() is limited compared to creating an XMLText child - and mutating it directly. - - If the first child of 'this' is a XMLText, SetText() sets its value to - the given string, otherwise it will create a first child that is an XMLText. - - This is a convenient method for setting the text of simple contained text: - @verbatim - <foo>This is text</foo> - fooElement->SetText( "Hullaballoo!" ); - <foo>Hullaballoo!</foo> - @endverbatim - - Note that this function can be misleading. If the element foo was created from - this XML: - @verbatim - <foo><b>This is text</b></foo> - @endverbatim - - then it will not change "This is text", but rather prefix it with a text element: - @verbatim - <foo>Hullaballoo!<b>This is text</b></foo> - @endverbatim - - For this XML: - @verbatim - <foo /> - @endverbatim - SetText() will generate - @verbatim - <foo>Hullaballoo!</foo> - @endverbatim - */ - void SetText( const char* inText ); - /// Convenience method for setting text inside and element. See SetText() for important limitations. - void SetText( int value ); - /// Convenience method for setting text inside and element. See SetText() for important limitations. - void SetText( unsigned value ); - /// Convenience method for setting text inside and element. See SetText() for important limitations. - void SetText( bool value ); - /// Convenience method for setting text inside and element. See SetText() for important limitations. - void SetText( double value ); - /// Convenience method for setting text inside and element. See SetText() for important limitations. - void SetText( float value ); - - /** - Convenience method to query the value of a child text node. This is probably best - shown by example. Given you have a document is this form: - @verbatim - <point> - <x>1</x> - <y>1.4</y> - </point> - @endverbatim - - The QueryIntText() and similar functions provide a safe and easier way to get to the - "value" of x and y. - - @verbatim - int x = 0; - float y = 0; // types of x and y are contrived for example - const XMLElement* xElement = pointElement->FirstChildElement( "x" ); - const XMLElement* yElement = pointElement->FirstChildElement( "y" ); - xElement->QueryIntText( &x ); - yElement->QueryFloatText( &y ); - @endverbatim - - @returns XML_SUCCESS (0) on success, XML_CAN_NOT_CONVERT_TEXT if the text cannot be converted - to the requested type, and XML_NO_TEXT_NODE if there is no child text to query. - - */ - XMLError QueryIntText( int* ival ) const; - /// See QueryIntText() - XMLError QueryUnsignedText( unsigned* uval ) const; - /// See QueryIntText() - XMLError QueryBoolText( bool* bval ) const; - /// See QueryIntText() - XMLError QueryDoubleText( double* dval ) const; - /// See QueryIntText() - XMLError QueryFloatText( float* fval ) const; - - // internal: - enum { - OPEN, // <foo> - CLOSED, // <foo/> - CLOSING // </foo> - }; - int ClosingType() const { - return _closingType; - } - char* ParseDeep( char* p, StrPair* endTag ); - virtual XMLNode* ShallowClone( XMLDocument* document ) const; - virtual bool ShallowEqual( const XMLNode* compare ) const; - -private: - XMLElement( XMLDocument* doc ); - virtual ~XMLElement(); - XMLElement( const XMLElement& ); // not supported - void operator=( const XMLElement& ); // not supported - - XMLAttribute* FindAttribute( const char* name ); - XMLAttribute* FindOrCreateAttribute( const char* name ); - //void LinkAttribute( XMLAttribute* attrib ); - char* ParseAttributes( char* p ); - - enum { BUF_SIZE = 200 }; - int _closingType; - // The attribute list is ordered; there is no 'lastAttribute' - // because the list needs to be scanned for dupes before adding - // a new attribute. - XMLAttribute* _rootAttribute; -}; - - -enum Whitespace { - PRESERVE_WHITESPACE, - COLLAPSE_WHITESPACE -}; - - -/** A Document binds together all the functionality. - It can be saved, loaded, and printed to the screen. - All Nodes are connected and allocated to a Document. - If the Document is deleted, all its Nodes are also deleted. -*/ -class TINYXML2_LIB XMLDocument : public XMLNode -{ - friend class XMLElement; -public: - /// constructor - XMLDocument( bool processEntities = true, Whitespace = PRESERVE_WHITESPACE ); - ~XMLDocument(); - - virtual XMLDocument* ToDocument() { - return this; - } - virtual const XMLDocument* ToDocument() const { - return this; - } - - /** - Parse an XML file from a character string. - Returns XML_NO_ERROR (0) on success, or - an errorID. - - You may optionally pass in the 'nBytes', which is - the number of bytes which will be parsed. If not - specified, TinyXML-2 will assume 'xml' points to a - null terminated string. - */ - XMLError Parse( const char* xml, size_t nBytes=(size_t)(-1) ); - - /** - Load an XML file from disk. - Returns XML_NO_ERROR (0) on success, or - an errorID. - */ - XMLError LoadFile( const char* filename ); - - /** - Load an XML file from disk. You are responsible - for providing and closing the FILE*. - - Returns XML_NO_ERROR (0) on success, or - an errorID. - */ - XMLError LoadFile( FILE* ); - - /** - Save the XML file to disk. - Returns XML_NO_ERROR (0) on success, or - an errorID. - */ - XMLError SaveFile( const char* filename, bool compact = false ); - - /** - Save the XML file to disk. You are responsible - for providing and closing the FILE*. - - Returns XML_NO_ERROR (0) on success, or - an errorID. - */ - XMLError SaveFile( FILE* fp, bool compact = false ); - - bool ProcessEntities() const { - return _processEntities; - } - Whitespace WhitespaceMode() const { - return _whitespace; - } - - /** - Returns true if this document has a leading Byte Order Mark of UTF8. - */ - bool HasBOM() const { - return _writeBOM; - } - /** Sets whether to write the BOM when writing the file. - */ - void SetBOM( bool useBOM ) { - _writeBOM = useBOM; - } - - /** Return the root element of DOM. Equivalent to FirstChildElement(). - To get the first node, use FirstChild(). - */ - XMLElement* RootElement() { - return FirstChildElement(); - } - const XMLElement* RootElement() const { - return FirstChildElement(); - } - - /** Print the Document. If the Printer is not provided, it will - print to stdout. If you provide Printer, this can print to a file: - @verbatim - XMLPrinter printer( fp ); - doc.Print( &printer ); - @endverbatim - - Or you can use a printer to print to memory: - @verbatim - XMLPrinter printer; - doc.Print( &printer ); - // printer.CStr() has a const char* to the XML - @endverbatim - */ - void Print( XMLPrinter* streamer=0 ) const; - virtual bool Accept( XMLVisitor* visitor ) const; - - /** - Create a new Element associated with - this Document. The memory for the Element - is managed by the Document. - */ - XMLElement* NewElement( const char* name ); - /** - Create a new Comment associated with - this Document. The memory for the Comment - is managed by the Document. - */ - XMLComment* NewComment( const char* comment ); - /** - Create a new Text associated with - this Document. The memory for the Text - is managed by the Document. - */ - XMLText* NewText( const char* text ); - /** - Create a new Declaration associated with - this Document. The memory for the object - is managed by the Document. - - If the 'text' param is null, the standard - declaration is used.: - @verbatim - <?xml version="1.0" encoding="UTF-8"?> - @endverbatim - */ - XMLDeclaration* NewDeclaration( const char* text=0 ); - /** - Create a new Unknown associated with - this Document. The memory for the object - is managed by the Document. - */ - XMLUnknown* NewUnknown( const char* text ); - - /** - Delete a node associated with this document. - It will be unlinked from the DOM. - */ - void DeleteNode( XMLNode* node ) { - node->_parent->DeleteChild( node ); - } - - void SetError( XMLError error, const char* str1, const char* str2 ); - - /// Return true if there was an error parsing the document. - bool Error() const { - return _errorID != XML_NO_ERROR; - } - /// Return the errorID. - XMLError ErrorID() const { - return _errorID; - } - /// Return a possibly helpful diagnostic location or string. - const char* GetErrorStr1() const { - return _errorStr1; - } - /// Return a possibly helpful secondary diagnostic location or string. - const char* GetErrorStr2() const { - return _errorStr2; - } - /// If there is an error, print it to stdout. - void PrintError() const; - - /// Clear the document, resetting it to the initial state. - void Clear(); - - // internal - char* Identify( char* p, XMLNode** node ); - - virtual XMLNode* ShallowClone( XMLDocument* /*document*/ ) const { - return 0; - } - virtual bool ShallowEqual( const XMLNode* /*compare*/ ) const { - return false; - } - -private: - XMLDocument( const XMLDocument& ); // not supported - void operator=( const XMLDocument& ); // not supported - - bool _writeBOM; - bool _processEntities; - XMLError _errorID; - Whitespace _whitespace; - const char* _errorStr1; - const char* _errorStr2; - char* _charBuffer; - - MemPoolT< sizeof(XMLElement) > _elementPool; - MemPoolT< sizeof(XMLAttribute) > _attributePool; - MemPoolT< sizeof(XMLText) > _textPool; - MemPoolT< sizeof(XMLComment) > _commentPool; -}; - - -/** - A XMLHandle is a class that wraps a node pointer with null checks; this is - an incredibly useful thing. Note that XMLHandle is not part of the TinyXML-2 - DOM structure. It is a separate utility class. - - Take an example: - @verbatim - <Document> - <Element attributeA = "valueA"> - <Child attributeB = "value1" /> - <Child attributeB = "value2" /> - </Element> - </Document> - @endverbatim - - Assuming you want the value of "attributeB" in the 2nd "Child" element, it's very - easy to write a *lot* of code that looks like: - - @verbatim - XMLElement* root = document.FirstChildElement( "Document" ); - if ( root ) - { - XMLElement* element = root->FirstChildElement( "Element" ); - if ( element ) - { - XMLElement* child = element->FirstChildElement( "Child" ); - if ( child ) - { - XMLElement* child2 = child->NextSiblingElement( "Child" ); - if ( child2 ) - { - // Finally do something useful. - @endverbatim - - And that doesn't even cover "else" cases. XMLHandle addresses the verbosity - of such code. A XMLHandle checks for null pointers so it is perfectly safe - and correct to use: - - @verbatim - XMLHandle docHandle( &document ); - XMLElement* child2 = docHandle.FirstChild( "Document" ).FirstChild( "Element" ).FirstChild().NextSibling().ToElement(); - if ( child2 ) - { - // do something useful - @endverbatim - - Which is MUCH more concise and useful. - - It is also safe to copy handles - internally they are nothing more than node pointers. - @verbatim - XMLHandle handleCopy = handle; - @endverbatim - - See also XMLConstHandle, which is the same as XMLHandle, but operates on const objects. -*/ -class TINYXML2_LIB XMLHandle -{ -public: - /// Create a handle from any node (at any depth of the tree.) This can be a null pointer. - XMLHandle( XMLNode* node ) { - _node = node; - } - /// Create a handle from a node. - XMLHandle( XMLNode& node ) { - _node = &node; - } - /// Copy constructor - XMLHandle( const XMLHandle& ref ) { - _node = ref._node; - } - /// Assignment - XMLHandle& operator=( const XMLHandle& ref ) { - _node = ref._node; - return *this; - } - - /// Get the first child of this handle. - XMLHandle FirstChild() { - return XMLHandle( _node ? _node->FirstChild() : 0 ); - } - /// Get the first child element of this handle. - XMLHandle FirstChildElement( const char* value=0 ) { - return XMLHandle( _node ? _node->FirstChildElement( value ) : 0 ); - } - /// Get the last child of this handle. - XMLHandle LastChild() { - return XMLHandle( _node ? _node->LastChild() : 0 ); - } - /// Get the last child element of this handle. - XMLHandle LastChildElement( const char* _value=0 ) { - return XMLHandle( _node ? _node->LastChildElement( _value ) : 0 ); - } - /// Get the previous sibling of this handle. - XMLHandle PreviousSibling() { - return XMLHandle( _node ? _node->PreviousSibling() : 0 ); - } - /// Get the previous sibling element of this handle. - XMLHandle PreviousSiblingElement( const char* _value=0 ) { - return XMLHandle( _node ? _node->PreviousSiblingElement( _value ) : 0 ); - } - /// Get the next sibling of this handle. - XMLHandle NextSibling() { - return XMLHandle( _node ? _node->NextSibling() : 0 ); - } - /// Get the next sibling element of this handle. - XMLHandle NextSiblingElement( const char* _value=0 ) { - return XMLHandle( _node ? _node->NextSiblingElement( _value ) : 0 ); - } - - /// Safe cast to XMLNode. This can return null. - XMLNode* ToNode() { - return _node; - } - /// Safe cast to XMLElement. This can return null. - XMLElement* ToElement() { - return ( ( _node && _node->ToElement() ) ? _node->ToElement() : 0 ); - } - /// Safe cast to XMLText. This can return null. - XMLText* ToText() { - return ( ( _node && _node->ToText() ) ? _node->ToText() : 0 ); - } - /// Safe cast to XMLUnknown. This can return null. - XMLUnknown* ToUnknown() { - return ( ( _node && _node->ToUnknown() ) ? _node->ToUnknown() : 0 ); - } - /// Safe cast to XMLDeclaration. This can return null. - XMLDeclaration* ToDeclaration() { - return ( ( _node && _node->ToDeclaration() ) ? _node->ToDeclaration() : 0 ); - } - -private: - XMLNode* _node; -}; - - -/** - A variant of the XMLHandle class for working with const XMLNodes and Documents. It is the - same in all regards, except for the 'const' qualifiers. See XMLHandle for API. -*/ -class TINYXML2_LIB XMLConstHandle -{ -public: - XMLConstHandle( const XMLNode* node ) { - _node = node; - } - XMLConstHandle( const XMLNode& node ) { - _node = &node; - } - XMLConstHandle( const XMLConstHandle& ref ) { - _node = ref._node; - } - - XMLConstHandle& operator=( const XMLConstHandle& ref ) { - _node = ref._node; - return *this; - } - - const XMLConstHandle FirstChild() const { - return XMLConstHandle( _node ? _node->FirstChild() : 0 ); - } - const XMLConstHandle FirstChildElement( const char* value=0 ) const { - return XMLConstHandle( _node ? _node->FirstChildElement( value ) : 0 ); - } - const XMLConstHandle LastChild() const { - return XMLConstHandle( _node ? _node->LastChild() : 0 ); - } - const XMLConstHandle LastChildElement( const char* _value=0 ) const { - return XMLConstHandle( _node ? _node->LastChildElement( _value ) : 0 ); - } - const XMLConstHandle PreviousSibling() const { - return XMLConstHandle( _node ? _node->PreviousSibling() : 0 ); - } - const XMLConstHandle PreviousSiblingElement( const char* _value=0 ) const { - return XMLConstHandle( _node ? _node->PreviousSiblingElement( _value ) : 0 ); - } - const XMLConstHandle NextSibling() const { - return XMLConstHandle( _node ? _node->NextSibling() : 0 ); - } - const XMLConstHandle NextSiblingElement( const char* _value=0 ) const { - return XMLConstHandle( _node ? _node->NextSiblingElement( _value ) : 0 ); - } - - - const XMLNode* ToNode() const { - return _node; - } - const XMLElement* ToElement() const { - return ( ( _node && _node->ToElement() ) ? _node->ToElement() : 0 ); - } - const XMLText* ToText() const { - return ( ( _node && _node->ToText() ) ? _node->ToText() : 0 ); - } - const XMLUnknown* ToUnknown() const { - return ( ( _node && _node->ToUnknown() ) ? _node->ToUnknown() : 0 ); - } - const XMLDeclaration* ToDeclaration() const { - return ( ( _node && _node->ToDeclaration() ) ? _node->ToDeclaration() : 0 ); - } - -private: - const XMLNode* _node; -}; - - -/** - Printing functionality. The XMLPrinter gives you more - options than the XMLDocument::Print() method. - - It can: - -# Print to memory. - -# Print to a file you provide. - -# Print XML without a XMLDocument. - - Print to Memory - - @verbatim - XMLPrinter printer; - doc.Print( &printer ); - SomeFunction( printer.CStr() ); - @endverbatim - - Print to a File - - You provide the file pointer. - @verbatim - XMLPrinter printer( fp ); - doc.Print( &printer ); - @endverbatim - - Print without a XMLDocument - - When loading, an XML parser is very useful. However, sometimes - when saving, it just gets in the way. The code is often set up - for streaming, and constructing the DOM is just overhead. - - The Printer supports the streaming case. The following code - prints out a trivially simple XML file without ever creating - an XML document. - - @verbatim - XMLPrinter printer( fp ); - printer.OpenElement( "foo" ); - printer.PushAttribute( "foo", "bar" ); - printer.CloseElement(); - @endverbatim -*/ -class TINYXML2_LIB XMLPrinter : public XMLVisitor -{ -public: - /** Construct the printer. If the FILE* is specified, - this will print to the FILE. Else it will print - to memory, and the result is available in CStr(). - If 'compact' is set to true, then output is created - with only required whitespace and newlines. - */ - XMLPrinter( FILE* file=0, bool compact = false, int depth = 0 ); - virtual ~XMLPrinter() {} - - /** If streaming, write the BOM and declaration. */ - void PushHeader( bool writeBOM, bool writeDeclaration ); - /** If streaming, start writing an element. - The element must be closed with CloseElement() - */ - void OpenElement( const char* name, bool compactMode=false ); - /// If streaming, add an attribute to an open element. - void PushAttribute( const char* name, const char* value ); - void PushAttribute( const char* name, int value ); - void PushAttribute( const char* name, unsigned value ); - void PushAttribute( const char* name, bool value ); - void PushAttribute( const char* name, double value ); - /// If streaming, close the Element. - virtual void CloseElement( bool compactMode=false ); - - /// Add a text node. - void PushText( const char* text, bool cdata=false ); - /// Add a text node from an integer. - void PushText( int value ); - /// Add a text node from an unsigned. - void PushText( unsigned value ); - /// Add a text node from a bool. - void PushText( bool value ); - /// Add a text node from a float. - void PushText( float value ); - /// Add a text node from a double. - void PushText( double value ); - - /// Add a comment - void PushComment( const char* comment ); - - void PushDeclaration( const char* value ); - void PushUnknown( const char* value ); - - virtual bool VisitEnter( const XMLDocument& /*doc*/ ); - virtual bool VisitExit( const XMLDocument& /*doc*/ ) { - return true; - } - - virtual bool VisitEnter( const XMLElement& element, const XMLAttribute* attribute ); - virtual bool VisitExit( const XMLElement& element ); - - virtual bool Visit( const XMLText& text ); - virtual bool Visit( const XMLComment& comment ); - virtual bool Visit( const XMLDeclaration& declaration ); - virtual bool Visit( const XMLUnknown& unknown ); - - /** - If in print to memory mode, return a pointer to - the XML file in memory. - */ - const char* CStr() const { - return _buffer.Mem(); - } - /** - If in print to memory mode, return the size - of the XML file in memory. (Note the size returned - includes the terminating null.) - */ - int CStrSize() const { - return _buffer.Size(); - } - /** - If in print to memory mode, reset the buffer to the - beginning. - */ - void ClearBuffer() { - _buffer.Clear(); - _buffer.Push(0); - } - -protected: - virtual bool CompactMode( const XMLElement& ) { return _compactMode; } - - /** Prints out the space before an element. You may override to change - the space and tabs used. A PrintSpace() override should call Print(). - */ - virtual void PrintSpace( int depth ); - void Print( const char* format, ... ); - - void SealElement(); - bool _elementJustOpened; - DynArray< const char*, 10 > _stack; - -private: - void PrintString( const char*, bool restrictedEntitySet ); // prints out, after detecting entities. - - bool _firstElement; - FILE* _fp; - int _depth; - int _textDepth; - bool _processEntities; - bool _compactMode; - - enum { - ENTITY_RANGE = 64, - BUF_SIZE = 200 - }; - bool _entityFlag[ENTITY_RANGE]; - bool _restrictedEntityFlag[ENTITY_RANGE]; - - DynArray< char, 20 > _buffer; -#ifdef _MSC_VER - DynArray< char, 20 > _accumulator; -#endif -}; - - -} // tinyxml2 - -#if defined(_MSC_VER) -# pragma warning(pop) -#endif - -#endif // TINYXML2_INCLUDED diff --git a/moose-core/hsolve/HSolveActive.cpp b/moose-core/hsolve/HSolveActive.cpp index ebc62b340c7ca12538a0a108f805ff1e2352d09c..bbe70662fea71dedb177b0584797c8023b9c3bfd 100644 --- a/moose-core/hsolve/HSolveActive.cpp +++ b/moose-core/hsolve/HSolveActive.cpp @@ -92,7 +92,8 @@ void HSolveActive::updateMatrix() if ( HJ_.size() != 0 ) memcpy( &HJ_[ 0 ], &HJCopy_[ 0 ], sizeof( double ) * HJ_.size() ); - double GkSum, GkEkSum; vector< CurrentStruct >::iterator icurrent = current_.begin(); + double GkSum, GkEkSum; + vector< CurrentStruct >::iterator icurrent = current_.begin(); vector< currentVecIter >::iterator iboundary = currentBoundary_.begin(); vector< double >::iterator ihs = HS_.begin(); vector< double >::iterator iv = V_.begin(); @@ -232,7 +233,7 @@ void HSolveActive::advanceChannels( double dt ) LookupRow vRow; LookupRow dRow; - double C1, C2; + double C1 = 0.0, C2 = 0.0; for ( iv = V_.begin(); iv != V_.end(); ++iv ) { @@ -258,7 +259,7 @@ void HSolveActive::advanceChannels( double dt ) for ( ; ichan < chanBoundary; ++ichan ) { - caTable_.row( *iextca, dRow ); + caTable_.row( *iextca, dRow ); if ( ichan->Xpower_ > 0.0 ) { @@ -288,7 +289,7 @@ void HSolveActive::advanceChannels( double dt ) double temp = 1.0 + dt / 2.0 * C2; *istate = ( *istate * ( 2.0 - temp ) + dt * C1 ) / temp; -} + } ++icolumn, ++istate; } @@ -301,14 +302,13 @@ void HSolveActive::advanceChannels( double dt ) caTable_.lookup( *icolumn, *caRow, C1, C2 ); } - else if (*iextca >0) - - { - caTable_.lookup( *icolumn, dRow, C1, C2 ); - } - else + else if (*iextca >0) + { + caTable_.lookup( *icolumn, dRow, C1, C2 ); + } + else { - vTable_.lookup( *icolumn, vRow, C1, C2 ); + vTable_.lookup( *icolumn, vRow, C1, C2 ); } @@ -325,7 +325,7 @@ void HSolveActive::advanceChannels( double dt ) ++icolumn, ++istate, ++icarow; } - ++iextca; + ++iextca; } ++ichannelcount, ++icacount; @@ -356,22 +356,24 @@ void HSolveActive::sendValues( ProcPtr info ) { vector< unsigned int >::iterator i; - for ( i = outVm_.begin(); i != outVm_.end(); ++i ) { + for ( i = outVm_.begin(); i != outVm_.end(); ++i ) + { Compartment::VmOut()->send( //~ ZombieCompartment::VmOut()->send( compartmentId_[ *i ].eref(), V_[ *i ] ); - } + } - for ( i = outIk_.begin(); i != outIk_.end(); ++i ){ + for ( i = outIk_.begin(); i != outIk_.end(); ++i ) + { unsigned int comptIndex = chan2compt_[ *i ]; assert( comptIndex < V_.size() ); ChanBase::IkOut()->send(channelId_[*i].eref(), - (current_[ *i ].Ek - V_[ comptIndex ]) * current_[ *i ].Gk); + (current_[ *i ].Ek - V_[ comptIndex ]) * current_[ *i ].Gk); } diff --git a/moose-core/ksolve/Gsolve.h b/moose-core/ksolve/Gsolve.h index 4b09049ccc4e4542da904020f06dfa035251aae6..7eb1275c3bf6d01b79d0c5295fc46fca8d2d9696 100644 --- a/moose-core/ksolve/Gsolve.h +++ b/moose-core/ksolve/Gsolve.h @@ -162,8 +162,6 @@ private: /// Flag: True if atot should be updated every clock tick bool useClockedUpdate_; - - double t1_; }; #endif // _GSOLVE_H diff --git a/moose-core/pymoose/CMakeLists.txt b/moose-core/pymoose/CMakeLists.txt index 3c69dacdc764bede7bb78324b759f653141bde4e..d25a087569756a89e51281835928226820eebe5e 100644 --- a/moose-core/pymoose/CMakeLists.txt +++ b/moose-core/pymoose/CMakeLists.txt @@ -1,64 +1,84 @@ cmake_minimum_required(VERSION 2.8) -set(PYMOOSE_SRCS - moosemodule.cpp - vec.cpp - mfield.cpp - pymooseinit.cpp - melement.cpp - PyRun.cpp - test_moosemodule.cpp - ) - -# Build _moose.so in source directory and them copy everything to -# current binary directory using cmake. -add_library( _moose MODULE ${PYMOOSE_SRCS} ) -set(PYMOOSE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/python/moose") +set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake_modules/") find_package(PythonInterp REQUIRED) + +# Find Numpy +find_package(NumPy REQUIRED) +include_directories(${NUMPY_INCLUDE_DIRS}) +add_definitions( -std=c++11 ) +add_definitions(-DUSE_NUMPY) +add_definitions(-DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION) + +# set module extensiton. default is .so execute_process( COMMAND ${PYTHON_EXECUTABLE} -c - "import importlib.machinery -print(importlib.machinery.EXTENSION_SUFFIXES[-1])" +"import importlib.machinery +print(importlib.machinery.EXTENSION_SUFFIXES[0])" OUTPUT_VARIABLE PYTHON_SO_EXTENSION OUTPUT_STRIP_TRAILING_WHITESPACE ) if(NOT PYTHON_SO_EXTENSION) + message(STATUS "Python so ext could not be determined. Using default .so") set(PYTHON_SO_EXTENSION ".so") endif() -message( STATUS "Python so extension ${PYTHON_SO_EXTENSION}" ) +message(STATUS "Python so extension ${PYTHON_SO_EXTENSION}" ) -find_package(NumPy REQUIRED) -include_directories(${NUMPY_INCLUDE_DIRS}) -add_definitions(-DUSE_NUMPY) +# TARGET +set(PYMOOSE_SRCS + moosemodule.cpp + vec.cpp + mfield.cpp + pymooseinit.cpp + melement.cpp + PyRun.cpp + test_moosemodule.cpp + ) -add_definitions(-DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION) +# Build python module in source directory and them copy everything to +# current binary directory using cmake. +add_library( _moose MODULE ${PYMOOSE_SRCS} ) +set(PYMOOSE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../python/moose") +message(STATUS "Python module will be saved to ${PYMOOSE_OUTPUT_DIRECTORY}" ) # make sure the Python.h is found. -find_package( PythonLibs REQUIRED) -include_directories( ${PYTHON_INCLUDE_DIRS} ) - -#execute_process( COMMAND ${PYTHON_EXECUTABLE}-config --includes -# OUTPUT_VARIABLE PYTHON_INCLUDE_FLAGS -# OUTPUT_STRIP_TRAILING_WHITESPACE -# ) -#execute_process( COMMAND ${PYTHON_EXECUTABLE}-config --libs -# OUTPUT_VARIABLE PYTHON_LIBRARIES -# OUTPUT_STRIP_TRAILING_WHITESPACE -# ) -# message( STATUS "Python include flags: ${PYTHON_INCLUDE_FLAGS}" ) +find_package( PythonLibs) +if(PYTHON_INCLUDE_DIRS) + include_directories( ${PYTHON_INCLUDE_DIRS} ) +else() + # Use python executable to find include paths. For building wheel, we are + # stuck with cmake-2.8 with which PythonLibs module might fail. + message( STATUS "Using ${PYTHON_EXECUTABLE}-config to find Python.h" ) + execute_process( COMMAND ${PYTHON_EXECUTABLE}-config --includes + OUTPUT_VARIABLE PYTHON_INCLUDE_FLAGS + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + execute_process( COMMAND ${PYTHON_EXECUTABLE}-config --libs + OUTPUT_VARIABLE PYTHON_LIBRARIES + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + message( STATUS "Python include flags: ${PYTHON_INCLUDE_FLAGS}" ) + set_target_properties(_moose PROPERTIES + COMPILE_DEFINITIONS "PYMOOSE" + COMPILE_FLAGS "${PYTHON_INCLUDE_FLAGS}" + ) + +endif() +# Remove prefix lib from python module. +if(NOT(PYTHON_SO_EXTENSION STREQUAL "")) + set_target_properties(_moose PROPERTIES SUFFIX ${PYTHON_SO_EXTENSION}) +endif() set_target_properties(_moose PROPERTIES - COMPILE_DEFINITIONS "PYMOOSE" - COMPILE_FLAGS "${PYTHON_INCLUDE_FLAGS}" LIBRARY_OUTPUT_DIRECTORY ${PYMOOSE_OUTPUT_DIRECTORY} PREFIX "" SUFFIX ${PYTHON_SO_EXTENSION} ) -if(NOT(PYTHON_SO_EXTENSION STREQUAL "")) - set_target_properties(_moose PROPERTIES - SUFFIX ${PYTHON_SO_EXTENSION}) +# On OSX+Brew and python2.5; link with libstdc++ +if(MACOSX AND ("${PYTHON_VERSION_MAJOR}" STREQUAL "2")) + add_definitions( -std=c++11 -stdlib=libc++ ) endif() # see issue #80 diff --git a/moose-core/pymoose/moosemodule.cpp b/moose-core/pymoose/moosemodule.cpp index fe70212514086d6d56ae44f1ba813169cb03c184..5e811d0283737874a826f7698da7f5129d3aa4ab 100644 --- a/moose-core/pymoose/moosemodule.cpp +++ b/moose-core/pymoose/moosemodule.cpp @@ -36,9 +36,9 @@ #include "../utility/utility.h" #include "../shell/Shell.h" #include "../shell/Wildcard.h" +#include "../basecode/global.h" #include "moosemodule.h" -#include "global.h" using namespace std; diff --git a/moose-core/pymoose/pymooseinit.cpp b/moose-core/pymoose/pymooseinit.cpp index 29200a673cea316f2590e004f259beb4cbc161a7..add0fee13b002e67784be4a2ef5a547231d87660 100644 --- a/moose-core/pymoose/pymooseinit.cpp +++ b/moose-core/pymoose/pymooseinit.cpp @@ -7,28 +7,23 @@ ** See the file COPYING.LIB for the full notice. **********************************************************************/ -#include "header.h" -#ifndef WIN32 -#include <sys/time.h> -#else +#include "../basecode/header.h" #include <time.h> -#endif #include <math.h> #include <queue> -#ifdef WIN32 -#include "../external/xgetopt/XGetopt.h" -#else #include <unistd.h> // for getopt -#endif #include "../scheduling/Clock.h" -#include "DiagonalMsg.h" -#include "SparseMatrix.h" -#include "SparseMsg.h" +#include "../msg/DiagonalMsg.h" +#include "../basecode/SparseMatrix.h" +#include "../msg/SparseMsg.h" #include "../mpi/PostMaster.h" + #ifdef USE_MPI #include <mpi.h> #endif + #include "../shell/Shell.h" + #ifdef MACOSX #include <sys/sysctl.h> #endif // MACOSX diff --git a/moose-core/python/moose/moose_test.py b/moose-core/python/moose/moose_test.py index 103aba79507dff1e87462907833e07a78c288d90..362a590e1c731d5d6ed8a23c06ee3e2d3e428b50 100644 --- a/moose-core/python/moose/moose_test.py +++ b/moose-core/python/moose/moose_test.py @@ -180,7 +180,7 @@ def test_all( timeout, **kwargs ): _logger.info( 'Total %d valid tests found' % len( scripts ) ) total_ = len( scripts ) for i, s in enumerate( scripts ): - _logger.info( 'Running test : %s' % s ) + _logger.info( 'Running test (timeout=%s) : %s' % (timeout,s)) run_test(i, s, timeout, **kwargs ) diff --git a/moose-core/python/setup.cmake.py b/moose-core/python/setup.cmake.py index d74a52426fa622a500bb935adeb8824c286b1734..e6bbd1a7f749780f16c11b508e8ec0dc4dfbe183 100644 --- a/moose-core/python/setup.cmake.py +++ b/moose-core/python/setup.cmake.py @@ -27,20 +27,20 @@ from distutils.core import setup script_dir = os.path.dirname( os.path.abspath( __file__ ) ) # Version file must be available. It MUST be written by cmake. Or create -# manually. +# it manually before running this script. with open( os.path.join( script_dir, 'VERSION'), 'r' ) as f: version = f.read( ) print( 'Got %s from VERSION file' % version ) - # importlib is available only for python3. suffix = '.so' try: import importlib.machinery - suffix = importlib.machinery.EXTENSION_SUFFIXES[0].split('.')[-1] + suffix = importlib.machinery.EXTENSION_SUFFIXES[0] except Exception as e: print( '[WARN] Failed to determine importlib suffix' ) suffix = '.so' +print( '[INFO] Suffix for python SO: %s' % suffix ) setup( name = 'pymoose', diff --git a/moose-examples/cuda/testHsolve.py b/moose-examples/cuda/testHsolve.py index f8b8b1c56e5b25e9599630cb04a2c85e111f3724..6e1777b5428bba6f4e84a379c9a035f42cd89a39 100644 --- a/moose-examples/cuda/testHsolve.py +++ b/moose-examples/cuda/testHsolve.py @@ -1,11 +1,10 @@ import sys -sys.path.append('../../python') import os -os.environ['NUMPTHREADS'] = '1' import pylab import numpy import math import moose +print( '[INFO] Using moose from %s' % moose.__file__ ) import moose.utils EREST_ACT = -70e-3 @@ -190,7 +189,7 @@ def dump_plots( fname ): pylab.plot( t, x.vector, label=x.name ) pylab.legend() pylab.savefig( fname ) - print('Saved to %s' % fname ) + print('[INFO] Saved to %s' % fname ) pylab.close() def make_spiny_compt(): diff --git a/moose-examples/tutorials/Rdesigneur/rdes_ex10.py b/moose-examples/tutorials/Rdesigneur/rdes_ex10.py deleted file mode 100644 index 634fdaae7cba8529fca7f4f5ededaaa73b6afc24..0000000000000000000000000000000000000000 --- a/moose-examples/tutorials/Rdesigneur/rdes_ex10.py +++ /dev/null @@ -1,41 +0,0 @@ -import moose -import rdesigneur as rd - -library = moose.Neutral( '/library' ) -compt = rd.makeChemOscillator( 'osc' ) -compt.volume = 1e-18 -moose.copy( compt, '/library/osc', 'spine' ) -moose.element( '/library/osc/spine' ).volume = 1e-19 -moose.copy( compt, '/library/osc', 'psd' ) -moose.element( '/library/osc/psd' ).volume = 1e-20 - -rdes = rd.rdesigneur( - turnOffElec = True, - useGssa = False, - cellProto = [[ './cells/h10.CNG.swc', 'elec']], - spineProto = [[ 'makePassiveSpine()', 'spine' ] ], - spineDistrib = [ ["spine", '#apical#,#dend#', '10e-6', '1e-6' ]], - chemProto = [['/library/osc', 'osc']], - chemDistrib =[[ 'osc', '#apical#,#dend#', 'install', 'H(p - 5e-4)' ]], - plotList = [ - ['#', '1', 'psd/a', 'conc', 'conc of a in PSD'], - ['#', '1', 'spine/a', 'conc', 'conc of a in spine'], - ['#', '1', 'dend/a', 'conc', 'conc of a in Dend'] - ] -) - -rdes.buildModel() - -av = moose.vec( '/model/chem/psd/a' ) -av[0].concInit *= 10 - -''' -dv = moose.vec( '/model/chem/dend/a' ) -print len( dv ) -dv[0].concInit *= 2 -''' - -moose.reinit() -moose.start( 100 ) - -rdes.display() diff --git a/moose-gui/mgui.py b/moose-gui/mgui.py index 372fde8fa38b55c3667def740d14552548dbc296..d5a900abe4b3df5e4b6e3ffccfbc847ce342c84f 100644 --- a/moose-gui/mgui.py +++ b/moose-gui/mgui.py @@ -6,7 +6,7 @@ # Maintainer: HarshaRani # Created: Mon Nov 12 09:38:09 2012 (+0530) # Version: -# Last-Updated: Fri Aug 31 14:54:33 2017 (+0530) +# Last-Updated: Fri Sep 7 14:54:33 2017 (+0530) # By: Harsha # Update #: # URL: @@ -44,6 +44,9 @@ # '''' +2018 +Sep 7: popup is closed if exist +2017 Aug 31: Pass file from the command to load into gui : added dsolver in disableModel function is used to unset the solver for the model into moose-gui which are not to be run. @@ -1237,7 +1240,8 @@ class MWindow(QtGui.QMainWindow): by looking into the model file for a regular expression) """ - self.popup.close() + if self.popup: + self.popup.close() activeWindow = None # This to be used later to refresh the current widget with newly loaded model dialog = LoaderDialog(self, self.tr('Load model from file')) @@ -1356,7 +1360,8 @@ class MWindow(QtGui.QMainWindow): def newModelDialogSlot(self): #Harsha: Create a new dialog widget for model building - self.popup.close() + if popup: + self.popup.close() newModelDialog = DialogWidget() if newModelDialog.exec_(): modelPath = str(newModelDialog.modelPathEdit.text()).strip() diff --git a/moose-gui/objectedit.py b/moose-gui/objectedit.py index 08c38bbbae4a49daf6520d833c0c720b5a86027c..cbc8c22bffb77b358b864c094e490aea7372c9d6 100644 --- a/moose-gui/objectedit.py +++ b/moose-gui/objectedit.py @@ -6,7 +6,7 @@ # Maintainer: # Created: Wed Jun 30 11:18:34 2010 (+0530) # Version: -# Last-Updated: Tue Jun 19 11:05:59 2017 (+0530) +# Last-Updated: Mon Sep 10 11:05:59 2017 (+0530) # By: Harsha # Update #: # URL: @@ -43,6 +43,7 @@ # Fri May 17 23:45:59 2017 (+0530) - Harsha added, notes header, # Kd is calculated for the second order reaction and value is displayed # Tue Jun 18 12:10:54 IST 2018 - Harsha now group boundary color can be editable from the object editor +# Mon Sep 10 16:21:00 IST 2018 - When name is edited, the editorTitle gets updated # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -522,7 +523,7 @@ class ObjectEditDockWidget(QtGui.QDockWidget): def emitObjectNameChanged(self, mobj): self.objectNameChanged.emit(mobj) - + self.setWindowTitle('Edit:%s'%(mobj.path)) def main(): app = QtGui.QApplication(sys.argv) mainwin = QtGui.QMainWindow() diff --git a/moose-gui/plugins/default.py b/moose-gui/plugins/default.py index 788e8349a82ca1f7d89b155a3a30eef333072a6e..3cb28409e30272d1b32ca23053170ce354ab081e 100644 --- a/moose-gui/plugins/default.py +++ b/moose-gui/plugins/default.py @@ -6,7 +6,7 @@ # Maintainer: # Created: Tue Nov 13 15:58:31 2012 (+0530) # Version: -# Last-Updated: Thu Oct 5 12:35:00 2013 (+0530) +# Last-Updated: Mon Sep 10 23:35:00 2018 (+0530) # By: Harsha # Update #: # URL: @@ -45,6 +45,9 @@ # Code: ''' +2018 +Sep 10: replace addSolver to mooseAddChemSolver from moose.chemUtil's +2013 Oct 5: could not recreate if object already exist in moose which was allowed earlier now if object exist need to use element which is cleaned here @@ -94,7 +97,9 @@ from matplotlib.backends.backend_qt4agg import NavigationToolbar2QT as Navigatio #from EventBlocker import EventBlocker # from PlotNavigationToolbar import PlotNavigationToolbar from global_constants import preferences -from setsolver import * +#from setsolver import * +from moose.chemUtil.add_Delete_ChemicalSolver import * + ELECTRICAL_MODEL = 0 CHEMICAL_MODEL = 1 @@ -636,7 +641,7 @@ class SchedulingWidget(QtGui.QWidget): if not moose.exists(compt[0].path+'/stoich'): chemPref = self.preferences.getChemicalPreferences() solver = chemPref["simulation"]["solver"] - addSolver(self.modelRoot,solver) + mooseAddChemSolver(self.modelRoot,solver) status = self.solverStatus() #print "status ",status # if status != 0 or status == -1: @@ -731,7 +736,7 @@ class SchedulingWidget(QtGui.QWidget): # print("Status =>", status) if status == 1 or status == 2: - nameRE = "\n\nclassName --> parent --> name " + nameRE = "\n\nclassName --> parentName/groupName --> name " for res in moose.wildcardFind(self.modelRoot+'/##[ISA=ReacBase],'+self.modelRoot+'/##[ISA=EnzBase]'): if not len(res.neighbors["sub"]) or not len(res.neighbors["prd"]): nameRE = nameRE+"\n "+res.className + " --> "+res.parent.name+ " --> "+res.name diff --git a/moose-gui/plugins/kkit.py b/moose-gui/plugins/kkit.py index 692de4b2b8aa286717533f32cf321a03419ff9de..4870a71d167ec86b8370bf493a81a717a17493d2 100644 --- a/moose-gui/plugins/kkit.py +++ b/moose-gui/plugins/kkit.py @@ -6,11 +6,13 @@ __version__ = "1.0.0" __maintainer__ = "HarshaRani" __email__ = "hrani@ncbs.res.in" __status__ = "Development" -__updated__ = "Jun 19 2018" +__updated__ = "Sep 7 2018" #Change log: -# 2018 Jun 18: update the color of the group from objecteditor - +# 2018 +#Jun 18: update the color of the group from objecteditor +#Sep 07: in positionChange all the group's boundingRect is calculated +# and when group is moved the children's position are stored #code import math @@ -346,7 +348,7 @@ class KineticsWidget(EditorWidgetBase): self.positionInfoExist = True self.defaultComptsize = 5 self.srcdesConnection = {} - self.meshEntry = {} + self.meshEntry = {} self.mooseId_GObj = {} self.qGraCompt = {} self.qGraGrp = {} @@ -877,35 +879,35 @@ class KineticsWidget(EditorWidgetBase): self.updateArrow(rectChilditem) elif element(mooseObject).className == 'Neutral': for k,v in self.qGraGrp.items(): - if k.path == element(mooseObject).path: - for grpChilditem in v.childItems(): - if isinstance(grpChilditem, KineticsDisplayItem): - if moose.exists(grpChilditem.mobj.path): - iInfo = grpChilditem.mobj.path+'/info' - anno = moose.Annotator(iInfo) - if moose.Annotator(self.plugin.modelRoot+'/info').modeltype == 'kkit': - x = grpChilditem.scenePos().x()/self.defaultScenewidth - y = grpChilditem.scenePos().y()/self.defaultSceneheight - else: - x = grpChilditem.scenePos().x() - y = grpChilditem.scenePos().y() - anno.x = x - anno.y = y - - if isinstance(moose.element(grpChilditem.mobj.path),PoolBase): - t = moose.element(grpChilditem.mobj.path) - moose.element(t).children - for items in moose.element(t).children: - if isinstance(moose.element(items),Function): - test = moose.element(items.path+'/x') - for i in moose.element(test).neighbors['input']: - j = self.mooseId_GObj[moose.element(i)] - self.updateArrow(j) - self.updateArrow(grpChilditem) - # grpcompt = self.qGraCompt[self.objPar[k]] - # rectcompt = calculateChildBoundingRect(grpcompt) - rectgrp = calculateChildBoundingRect(v) - v.setRect(rectgrp.x()-10,rectgrp.y()-10,(rectgrp.width()+20),(rectgrp.height()+20)) + for grpChilditem in v.childItems(): + if isinstance(grpChilditem, KineticsDisplayItem): + if moose.exists(grpChilditem.mobj.path): + iInfo = grpChilditem.mobj.path+'/info' + anno = moose.Annotator(iInfo) + #storing scenePos back to annotator file for further use + if moose.Annotator(self.plugin.modelRoot+'/info').modeltype == 'kkit': + x = grpChilditem.scenePos().x()/self.defaultScenewidth + y = grpChilditem.scenePos().y()/self.defaultSceneheight + else: + x = grpChilditem.scenePos().x() + y = grpChilditem.scenePos().y() + anno.x = x + anno.y = y + + if isinstance(moose.element(grpChilditem.mobj.path),PoolBase): + t = moose.element(grpChilditem.mobj.path) + moose.element(t).children + for items in moose.element(t).children: + if isinstance(moose.element(items),Function): + test = moose.element(items.path+'/x') + for i in moose.element(test).neighbors['input']: + j = self.mooseId_GObj[moose.element(i)] + self.updateArrow(j) + self.updateArrow(grpChilditem) + # grpcompt = self.qGraCompt[self.objPar[k]] + # rectcompt = calculateChildBoundingRect(grpcompt) + rectgrp = calculateChildBoundingRect(v) + v.setRect(rectgrp.x()-10,rectgrp.y()-10,(rectgrp.width()+20),(rectgrp.height()+20)) else: mobj = self.mooseId_GObj[element(mooseObject)] diff --git a/moose-gui/plugins/kkitViewcontrol.py b/moose-gui/plugins/kkitViewcontrol.py index 91113596c36985dbe53f4a1b589341f6122e0b04..a813bffe41e544d21228295f1b2328f260d18af0 100644 --- a/moose-gui/plugins/kkitViewcontrol.py +++ b/moose-gui/plugins/kkitViewcontrol.py @@ -5,23 +5,25 @@ __version__ = "1.0.0" __maintainer__ = "HarshaRani" __email__ = "hrani@ncbs.res.in" __status__ = "Development" -__updated__ = "Jun 8 2018" +__updated__ = "Sep 7 2018" ''' - -Jun8 : If object is moved from one group or compartment to another group or with in same Compartment, - then both at moose level (group or compartment path is updated ) and qt level the setParentItem is set - -If object is moved to Empty place or not allowed place in the GUI its moved back to origin position - -also some clean up when object is just clicked in QsvgItem and v/s clicked and some action done - -with Rubber selection if object are moved then group size is updated 2018 -Oct 3 : At mousePressEvent, a clean way of checking on what object mouse press Event happened is checked. - This is after group is added where Group Interior and Boundary is checked, with in groupInterior if click in - on COMPARTMENT BOUNDARY is clicked then COMPARTMENT_BOUNDARY is return, else top most group object is returned. -Sep 20: Group related function added - -resolveGroupInteriorAndBoundary, findGraphic_groupcompt, graphicsIsInstance - -@resolveItem,editorMousePressEvent,editorMouseMoveEvent,editorMouseReleaseEvent checks made for group + +Sep 07 : when object qgraphicalparent is changed then connecting arrow's parent also need to be changed +Jun 08 : If object is moved from one group or compartment to another group or with in same Compartment, + then both at moose level (group or compartment path is updated ) and qt level the setParentItem is set + -If object is moved to Empty place or not allowed place in the GUI its moved back to origin position + -also some clean up when object is just clicked in QsvgItem and v/s clicked and some action done + -with Rubber selection if object are moved then group size is updated 2017 +Oct 03 : At mousePressEvent, a clean way of checking on what object mouse press Event happened is checked. + This is after group is added where Group Interior and Boundary is checked, with in groupInterior if click in + on COMPARTMENT BOUNDARY is clicked then COMPARTMENT_BOUNDARY is return, else top most group object is returned. +Sep 20 : Group related function added + -resolveGroupInteriorAndBoundary, findGraphic_groupcompt, graphicsIsInstance + -@resolveItem,editorMousePressEvent,editorMouseMoveEvent,editorMouseReleaseEvent checks made for group + ''' import sys from modelBuild import * @@ -29,7 +31,7 @@ from constants import * from PyQt4.QtGui import QPixmap, QImage, QPen, QGraphicsPixmapItem, QGraphicsLineItem from PyQt4.QtCore import pyqtSignal from kkitUtil import * -from setsolver import * +#from setsolver import * from PyQt4 import QtSvg from moose import utils @@ -257,6 +259,7 @@ class GraphicalView(QtGui.QGraphicsView): self.drawExpectedConnection(event) if itemType == COMPARTMENT_BOUNDARY or itemType == GROUP_BOUNDARY: + '''When Comparement or group is moved from boundary''' initial = self.mapToScene(self.state["press"]["pos"]) final = self.mapToScene(event.pos()) displacement = final - initial @@ -343,98 +346,44 @@ class GraphicalView(QtGui.QGraphicsView): elif clickedItemType == CONNECTOR: actionType = str(self.state["press"]["item"].data(0).toString()) pressItem = self.state["press"]["item"] - + initscenepos = self.state["press"]["scenepos"] + finialscenepos = pressItem.parent().scenePos() + xx = finialscenepos.x()-initscenepos.x() + yy = finialscenepos.y()-initscenepos.y() + movedGraphObj = self.state["press"]["item"].parent() + if actionType == "move": - tobemoved = True - movedGraphObj = self.state["press"]["item"].parent() - if itemType != EMPTY: - item = self.findGraphic_groupcompt(item) - if movedGraphObj.parentItem() != item: - if moose.exists(item.mobj.path+'/'+movedGraphObj.mobj.name): - desObj = item.mobj.className - if desObj == "CubeMesh" or desObj == "CyclMesh": - desObj = "compartment" - elif desObj == "Neutral": - desObj = "group" - tobemoved = False - self.layoutPt.setupDisplay(movedGraphObj.mobj.path+'/info',movedGraphObj,"pool") - self.layoutPt.updateArrow(movedGraphObj) - QtGui.QMessageBox.warning(None,'Could not move the object', "The object name \'%s\' exist in \'%s\' %s" %(movedGraphObj.mobj.name,item.mobj.name,desObj)) - else: - movedGraphObj.setParentItem(item) - moose.move(movedGraphObj.mobj, item.mobj) - if tobemoved: - if isinstance(movedGraphObj,KineticsDisplayItem): - itemPath = movedGraphObj.mobj.path - if moose.exists(itemPath): - iInfo = itemPath+'/info' - anno = moose.Annotator(iInfo) - x = movedGraphObj.scenePos().x()/self.layoutPt.defaultScenewidth - y = movedGraphObj.scenePos().y()/self.layoutPt.defaultSceneheight - anno.x = x - anno.y = y - QtGui.QApplication.setOverrideCursor(QtGui.QCursor(Qt.Qt.ArrowCursor)) - self.layoutPt.positionChange(item.mobj) - self.updateScale(self.iconScale) - ''' - QtGui.QApplication.setOverrideCursor(QtGui.QCursor(Qt.Qt.ArrowCursor)) - #If any case, move is not valide need to move back the object to original position is store and calculation - initscenepos = self.state["press"]["scenepos"] - finialscenepos = pressItem.parent().scenePos() - xx = finialscenepos.x()-initscenepos.x() - yy = finialscenepos.y()-initscenepos.y() - + if itemType == EMPTY: - pressItem.parent().moveBy(-xx,-yy) - self.layoutPt.updateArrow(pressItem.parent()) - QtGui.QMessageBox.warning(None,'Could not move the object', "The object can't be moved to empty space") + self.objectpullback("Empty",item,movedGraphObj,xx,yy) + else: - if isinstance(self.state["press"]["item"], Qt.QGraphicsSvgItem): - pressedItem = self.state["press"]["item"] - releaseItem = self.state["release"]["item"] - sgrp = findGroup(pressItem.parent().mobj) - scmpt = findCompartment(pressItem.parent().mobj) - dgrp = findGroup(releaseItem.mobj) - dcmpt = findCompartment(releaseItem.mobj) - if isinstance(dgrp,Neutral): - # This is obj moved from group to - # - another group - # - into compartment - if sgrp.path != dgrp.path: - if scmpt.volume == dcmpt.volume: - #With in same compartment but different group - moose.move(pressItem.parent().mobj,dgrp) - lKey = self.layoutPt.qGraGrp[dgrp] - pressItem.parent().setParentItem(lKey) - self.layoutPt.positionChange(sgrp) - self.layoutPt.positionChange(dgrp) - else: - #If object is tried to move to diff compartment, - # then object will be pulled back to origin position which it was moved from - pressItem.parent().moveBy(-xx,-yy) - self.layoutPt.updateArrow(pressItem.parent()) - QtGui.QMessageBox.warning(None,'Could not move the object', "The object can't be moved to empty space") - elif isinstance(dcmpt,CubeMesh): - # This is obj moved from group into compartment - if scmpt.path != dcmpt.path: - if scmpt.volume == dcmpt.volume: - moose.move(pressItem.parent().mobj,dcmpt) - lKey = self.layoutPt.qGraCompt[dcmpt] - pressItem.parent().setParentItem(lKey) - self.layoutPt.positionChange(sgrp) - self.layoutPt.positionChange(dgrp) + grpCmpt = self.findGraphic_groupcompt(item) + if movedGraphObj.parentItem() != grpCmpt: + '''Not same compartment/group to which it belonged to ''' + if isinstance(movedGraphObj,(EnzItem,MMEnzItem)): + parentPool = moose.element((movedGraphObj.mobj.neighbors['enzDest'])[0]) + if isinstance(parentPool,PoolBase): + if moose.exists(grpCmpt.mobj.path+'/'+parentPool.name): + if moose.exists(grpCmpt.mobj.path+'/'+parentPool.name+'/'+movedGraphObj.name): + self.objectpullback("Enzyme",grpCmpt,movedGraphObj,xx,yy) + else: + self.moveObjSceneParent(grpCmpt,movedGraphObj,item.pos(),self.mapToScene(event.pos())) else: - #If object is tried to move to diff compartment, - # then object will be pulled back to origin position which it was moved from - pressItem.parent().moveBy(-xx,-yy) - self.layoutPt.updateArrow(pressItem.parent()) - QtGui.QMessageBox.warning(None,'Could not move the object', "The object can't be moved to empty space") + self.objectpullback("Enzymeparent",grpCmpt,movedGraphObj,xx,yy) else: - print " Check what moved when! does it reaches this condition" - - self.layoutPt.positionChange(item.mobj) - self.updateScale(self.iconScale) - ''' + ''' All the other moose object ''' + if moose.exists(grpCmpt.mobj.path+'/'+movedGraphObj.mobj.name): + self.objectpullback("All",grpCmpt,movedGraphObj,xx,yy) + else: + self.moveObjSceneParent(grpCmpt,movedGraphObj,item.pos(),self.mapToScene(event.pos())) + else: + '''Same compt/grp to which it was belong to ''' + if isinstance(grpCmpt,GRPItem): + self.layoutPt.updateGrpSize(movedGraphObj.parentItem()) + elif isinstance(grpCmpt,ComptItem): + self.layoutPt.updateCompartmentSize(movedGraphObj.parentItem()) + QtGui.QApplication.setOverrideCursor(QtGui.QCursor(Qt.Qt.ArrowCursor)) if actionType == "delete": self.removeConnector() pixmap = QtGui.QPixmap(24, 24) @@ -595,6 +544,97 @@ class GraphicalView(QtGui.QGraphicsView): popupmenu.exec_(self.mapToGlobal(event.pos())) self.resetState() + def objectpullback(self,messgtype,item,movedGraphObj,xx,yy): + if messgtype.lower() != "empty": + desObj = item.mobj.className + if desObj == "CubeMesh" or desObj == "CyclMesh": + desObj = "compartment" + elif desObj == "Neutral": + desObj = "group" + + movedGraphObj.moveBy(-xx,-yy) + self.layoutPt.updateArrow(movedGraphObj) + messgstr="" + if messgtype.lower() == "all": + messgstr = "The object name \'{0}\' exist in \'{1}\' {2}".format(movedGraphObj.mobj.name,item.mobj.name,desObj) + elif messgtype.lower() =="enzymeparent": + messgstr = "The Enzyme parent \'{0}\' doesn't exist in \'{2}\' {1} \n If you need to move the enzyme to {1} first parent pool needs to be moved".format(movedGraphObj.mobj.parent.name,desObj,item.mobj.name) + elif messgtype.lower() == "enzyme": + messgstr = "The Enzyme \'{0}\' already exist in \'{2}\' {1}".format(movedGraphObj.mobj.name,desObj,item.mobj.name) + elif messgtype.lower() == "empty": + messgstr = "The object can't be moved to empty space" + QtGui.QMessageBox.warning(None,'Could not move the object', messgstr ) + QtGui.QApplication.setOverrideCursor(QtGui.QCursor(Qt.Qt.ArrowCursor)) + + def moveObjSceneParent(self,item,movedGraphObj,itempos,eventpos): + ''' Scene parent object needs to be updated ''' + prevPar = movedGraphObj.parentItem() + movedGraphObj.setParentItem(item) + + if isinstance(movedGraphObj,ReacItem): + for ll in self.layoutPt.object2line[movedGraphObj]: + ll[0].setParentItem(item) + moose.move(movedGraphObj.mobj, item.mobj) + self.layoutPt.plugin.mainWindow.objectEditSlot(movedGraphObj.mobj, True) + + if isinstance(movedGraphObj ,PoolItem): + ''' if pool is moved, a check is made to see if this pool is parent of a enzyme + if yes then Graphicalparent is changed, and + not moose path since it will be taken care while we move pool + ''' + pl = (movedGraphObj.mobj).neighbors['nOut'] + for es in pl: + if isinstance(moose.element(es), EnzBase): + if moose.element(moose.element(es).neighbors['enzDest'][0]) == movedGraphObj.mobj: + enzGrapObj = self.layoutPt.mooseId_GObj[moose.element(es)] + testx = enzGrapObj.scenePos().x() + testy = enzGrapObj.scenePos().y() + enzGrapObj.setParentItem(item) + enzGrapObj.setGeometry(testx,testy, + enzGrapObj.gobj.boundingRect().width(), + enzGrapObj.gobj.boundingRect().height()) + for ll in self.layoutPt.object2line[enzGrapObj]: + ll[0].setParentItem(item) + self.layoutPt.updateArrow(enzGrapObj) + #enzGrapObj.setGeometry(testx,testy, + # enzGrapObj.gobj.boundingRect().width(), + # enzGrapObj.gobj.boundingRect().height()) + ''' Re-calculting the group size after the movement ''' + if isinstance(prevPar,GRPItem): + if item != prevPar: + self.layoutPt.updateGrpSize(prevPar) + self.layoutPt.updateGrpSize(item) + self.setnewPostion(movedGraphObj,itempos,eventpos) + self.layoutPt.updateArrow(movedGraphObj) + + def setnewPostion(self,movedGraphObj,itempos,eventpos): + if isinstance(movedGraphObj,KineticsDisplayItem): + itemPath = movedGraphObj.mobj.path + if moose.exists(itemPath): + iInfo = itemPath+'/info' + anno = moose.Annotator(iInfo) + # eventpos = self.mapToScene(event.pos()) + # itempos = item.pos() + x = eventpos.x()+(15/2)-itempos.x() + y = eventpos.y()+(2/2)-itempos.y() + if moose.Annotator(self.layoutPt.plugin.modelRoot+'/info').modeltype == 'kkit': + anno.x = x/self.layoutPt.defaultScenewidth + anno.y = y/self.layoutPt.defaultSceneheight + else: + anno.x = x + anno.y = y + #item = movedGraphObj + if isinstance(movedGraphObj,ReacItem) or isinstance(movedGraphObj,EnzItem) or isinstance(movedGraphObj,MMEnzItem): + movedGraphObj.setGeometry(x,y, + movedGraphObj.gobj.boundingRect().width(), + movedGraphObj.gobj.boundingRect().height()) + elif isinstance(movedGraphObj,PoolItem): + movedGraphObj.setGeometry(x, y,movedGraphObj.gobj.boundingRect().width() + +PoolItem.fontMetrics.width(' '), + movedGraphObj.gobj.boundingRect().height()) + movedGraphObj.bg.setRect(0, 0, movedGraphObj.gobj.boundingRect().width()+PoolItem.fontMetrics.width(' '), movedGraphObj.gobj.boundingRect().height()) + QtGui.QApplication.setOverrideCursor(QtGui.QCursor(Qt.Qt.ArrowCursor)) + def deleteGroup(self,item,layoutPt): reply = QtGui.QMessageBox.question(self, "Deleting Object",'Do want to delete group \'{groupname}\' and its children and connections'.format(groupname=item.mobj.name), QtGui.QMessageBox.Yes | QtGui.QMessageBox.No) @@ -882,21 +922,27 @@ class GraphicalView(QtGui.QGraphicsView): if unselectitem.isSelected() == True: unselectitem.setSelected(0) self.rubberbandlist_qpolygon = self.sceneContainerPt.items(self.mapToScene(QtCore.QRect(x0, y0, x1 - x0, y1 - y0)).boundingRect(), Qt.Qt.IntersectsItemShape) - self.deleteObj(self.rubberbandlist) + for item in self.rubberbandlist_qpolygon: + ''' in RubberbandSelection if entire group object contains then group is removed,if partly selected then group is retained''' + if isinstance(item,GRPItem): + if not (self.mapToScene(QtCore.QRect(x0, y0, x1 - x0, y1 - y0)).boundingRect()).contains(item.sceneBoundingRect()): + self.rubberbandlist_qpolygon.remove(item) + + self.deleteObj(self.rubberbandlist_qpolygon) self.selections = [] def deleteObj(self,item): self.rubberbandlist = item mooseDeleteChemSolver(self.layoutPt.modelRoot) - self.Enz_cplxlist = [ i for i in self.rubberbandlist if (isinstance(i,MMEnzItem) or isinstance(i,EnzItem) or isinstance(i,CplxItem) )] - self.PFRSlist = [ i for i in self.rubberbandlist if (isinstance(i,PoolItem) or isinstance(i,TableItem) or isinstance(i,ReacItem) or isinstance(i,FuncItem) )] - self.grp = [ i for i in self.rubberbandlist if isinstance(i,GRPItem)] - for item in self.Enz_cplxlist: + self.list_EnzReccplx = [ i for i in self.rubberbandlist if (isinstance(i,MMEnzItem) or isinstance(i,EnzItem) or isinstance(i,CplxItem) or isinstance(i,ReacItem) )] + self.list_PFS = [ i for i in self.rubberbandlist if (isinstance(i,PoolItem) or isinstance(i,TableItem) or isinstance(i,FuncItem) )] + self.grp = [ i for i in self.rubberbandlist if isinstance(i,GRPItem)] + for item in self.list_EnzReccplx: #First Loop to remove all the enz b'cos if parent (which is a Pool) is removed, #then it will created problem at qgraphicalitem not having parent. - #So first delete enz and then delete pool + #So first delete enz, then Reac and then delete pool self.deleteItem(item) - for item in self.PFRSlist: + for item in self.list_PFS: if isinstance(item,PoolItem) or isinstance(item,BufPool): plot = moose.wildcardFind(self.layoutPt.modelRoot+'/data/graph#/#') for p in plot: @@ -907,6 +953,12 @@ class GraphicalView(QtGui.QGraphicsView): self.layoutPt.plugin.view.getCentralWidget().plotWidgetContainer.plotAllData() self.deleteItem(item) for item in self.grp: + key = [k for k,v in self.layoutPt.qGraGrp.items() if v == item] + if key[0] in self.layoutPt.qGraGrp: + self.layoutPt.qGraGrp.pop(key[0]) + self.groupItemlist1 = item.childItems() + self.groupItemlist = [ i for i in self.groupItemlist1 if not isinstance(i,QtGui.QGraphicsPolygonItem)] + self.deleteObj(self.groupItemlist) self.deleteItem(item) def deleteObject2line(self,qpolygonline,src,des,endt): diff --git a/scripts/pull_subtree.sh b/scripts/pull_subtree.sh index 4836384b41cf659d537b3f2c357f6bd66419f410..71d70c29dacf513748eb3a5140bf4c7d433c3d9f 100755 --- a/scripts/pull_subtree.sh +++ b/scripts/pull_subtree.sh @@ -24,11 +24,11 @@ set -x if [[ `pwd` == *"/moose" ]]; then git subtree pull --prefix moose-core \ - https://github.com/BhallaLab/moose-core master --squash + https://github.com/BhallaLab/moose-core chhennapoda --squash git subtree pull --prefix moose-examples \ - https://github.com/BhallaLab/moose-examples master --squash + https://github.com/BhallaLab/moose-examples chhennapoda --squash git subtree pull --prefix moose-gui \ - https://github.com/BhallaLab/moose-gui master --squash + https://github.com/BhallaLab/moose-gui chhennapoda --squash else echo "Run this script from top-level git directory."