From 4daaaede3d19f9cf948dc5b3252de941a7b3a4a7 Mon Sep 17 00:00:00 2001 From: Sergey Belash Date: Mon, 31 Mar 2014 14:15:20 +0400 Subject: [PATCH] All the git "*.orig" files removed and will be ignored since this commit. --- .gitignore | 3 +- CMakeLists.txt.orig | 20 --- src/Config/Config_XMLReader.cpp.orig | 201 --------------------------- 3 files changed, 2 insertions(+), 222 deletions(-) delete mode 100644 CMakeLists.txt.orig delete mode 100644 src/Config/Config_XMLReader.cpp.orig diff --git a/.gitignore b/.gitignore index 26f8ecedc..bffde48c5 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,5 @@ resources !src/*/resources doc/html *_log.txt -start.bat \ No newline at end of file +start.bat +*.orig \ No newline at end of file diff --git a/CMakeLists.txt.orig b/CMakeLists.txt.orig deleted file mode 100644 index bec6bea0a..000000000 --- a/CMakeLists.txt.orig +++ /dev/null @@ -1,20 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11) - -PROJECT (NewGEOM) - -SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH}) - -INCLUDE(Common) -INCLUDE(FindQt5) - -ADD_SUBDIRECTORY (src/Event) -<<<<<<< Updated upstream -ADD_SUBDIRECTORY (src/Config) -#ADD_SUBDIRECTORY (src/ModelAPI) -#ADD_SUBDIRECTORY (src/Model) -ADD_SUBDIRECTORY (src/PartSet) -======= -ADD_SUBDIRECTORY (src/ModelAPI) -ADD_SUBDIRECTORY (src/Model) ->>>>>>> Stashed changes -ADD_SUBDIRECTORY (src/XGUI) diff --git a/src/Config/Config_XMLReader.cpp.orig b/src/Config/Config_XMLReader.cpp.orig deleted file mode 100644 index a0ee3aa7f..000000000 --- a/src/Config/Config_XMLReader.cpp.orig +++ /dev/null @@ -1,201 +0,0 @@ -/* - * Config_XMLReader.cpp - * - * Created on: Mar 14, 2014 - * Author: sbh - */ - -#include - -#include -#include -#include - -#ifdef WIN32 -//For GetModuleFileNameW -#include -#endif - -#ifdef _DEBUG -#include -#endif - - -Config_XMLReader::Config_XMLReader(const std::string& theXmlFileName) -{ - std::string prefix; - //Get path to *.xml files (typically ./bin/../plugins/) -#ifdef WIN32 - HMODULE hModule = GetModuleHandleW(NULL); - WCHAR wchar_path[MAX_PATH]; - GetModuleFileNameW(hModule, wchar_path, MAX_PATH); - char char_path[MAX_PATH]; - char DefChar = ' '; - WideCharToMultiByte(CP_ACP, 0, wchar_path, -1, char_path, MAX_PATH, &DefChar, NULL); - prefix = std::string(char_path); - //chop "bin\XGUI.exe" - unsigned found = prefix.rfind("bin"); - if(found != std::string::npos) - prefix.replace(found, prefix.length(), "plugins\\"); -#else - //TODO(sbh): Find full path to binary on linux - prefix = "../plugins/"; -#endif - - m_DocumentPath = prefix + theXmlFileName; -} - - -Config_XMLReader::~Config_XMLReader() -{ -} - -/* - * Read all nodes (recursively if processChildren() is true - * for a node). For each read node the processNode will be - * called. - */ -void Config_XMLReader::readAll() -{ - xmlNodePtr aRoot = findRoot(); - readRecursively(aRoot); -} - -/* - * Allows to customize reader's behavior for a node. Virtual. - * The default implementation does nothing. (In debug mode prints - * some info) - */ -void Config_XMLReader::processNode(xmlNodePtr aNode) -{ - #ifdef _DEBUG - std::cout << "Config_XMLReader::processNode: " - << aNode->name << " content: " - << aNode->content << std::endl; - #endif -} - -/* - * Defines which nodes should be processed recursively. Virtual. - * The default implementation to read all nodes. - */ -bool Config_XMLReader::processChildren(xmlNodePtr aNode) -{ - return true; -} - -xmlNodePtr Config_XMLReader::findRoot() -{ - xmlDocPtr aDoc; - aDoc = xmlParseFile(m_DocumentPath.c_str()); - if(aDoc == NULL) { - #ifdef _DEBUG - std::cout << "Config_XMLReader::import: " << "Document " << m_DocumentPath - << " is not parsed successfully." << std::endl; - #endif - return NULL; - } - xmlNodePtr aRoot = xmlDocGetRootElement(aDoc); - #ifdef _DEBUG - if(aRoot == NULL) { - std::cout << "Config_XMLReader::import: " << "Error: empty document"; - } - #endif - return aRoot; -} - -/* - * Calls processNode() for each child (for some - recursively) - * of the given node. - * \sa ReadAll() - */ -void Config_XMLReader::readRecursively(xmlNodePtr theParent) -{ -<<<<<<< Updated upstream - if(!theParent) - return; - xmlNodePtr aNode = theParent->xmlChildrenNode; - for(; aNode; aNode = aNode->next) { - processNode(aNode); - if(processChildren(aNode)) { - readRecursively(aNode); -======= - static Event_ID aFeatureEvent = Event_Loop::EventByName("Feature"); - - xmlNodePtr aGroupNode = (static_cast(theRoot))->xmlChildrenNode; - Event_Loop* aEvLoop = Event_Loop::Loop(); - if(!aEvLoop) { - #ifdef _DEBUG - std::cout << "Config_XMLReader::importWorkbench: " - << "No event loop registered" << std::endl; - #endif - return false; - } - for(; aGroupNode; aGroupNode = aGroupNode->next) { // searching for record - if(!IsNode(aGroupNode, "group")) - continue; - std::string aGroupName = getProperty(aGroupNode, FEATURE_GROUP_NAME); - if(aGroupName.empty()) - continue; - xmlNodePtr aFtNode = aGroupNode->xmlChildrenNode; - for(; aFtNode; aFtNode = aFtNode->next) { - if(!IsNode(aFtNode, "feature")) - continue; - //Create feature... - Config_FeatureMessage aMessage(aFeatureEvent, this); - fillFeature(aFtNode, aMessage); - aMessage.m_group = aGroupName; - aEvLoop->Send(aMessage); ->>>>>>> Stashed changes - } - } -} - -/* - * void* -> xmlNodePtr - */ -xmlNodePtr Config_XMLReader::node(void* theNode) -{ - return static_cast(theNode); -} - -/* - * Returns named property for a given node as std::string. - */ -std::string Config_XMLReader::getProperty(xmlNodePtr theNode, const char* name) -{ - std::string result = ""; - char* aPropChars = (char*) xmlGetProp(theNode, BAD_CAST name); - if(!aPropChars || aPropChars[0] == 0) - return result; - result = std::string(aPropChars); - return result; -} - -/* - * Returns true if theNode is XML node with a given name. - */ -bool Config_XMLReader::isNode(xmlNodePtr theNode, const char* theNodeName, ...) -{ - bool result = false; - const xmlChar* aName = theNode->name; - if(!aName || theNode->type != XML_ELEMENT_NODE) - return false; - - if(!xmlStrcmp(aName, (const xmlChar *) theNodeName)) - return true; - - va_list args; // define argument list variable - va_start (args, theNodeName); // init list; point to last defined argument - while(true) { - char *anArg = va_arg (args, char *); // get next argument - if(anArg == NULL) - break; - if(!xmlStrcmp(aName, (const xmlChar *) anArg)) { - va_end (args); // cleanup the system stack - return true; - } - } - va_end (args); // cleanup the system stack - return false; -} -- 2.39.2