Changeset - 121f7720db62
[Not reviewed]
default
1 4 0
Michael Guravage - 15 years ago 2010-06-15 14:17:41
michael.guravage@cwi.nl
Removed references to XMLWriteLeafSourceCode and XMLWriteReactionsCode.

--
user: Michael Guravage <michael.guravage@cwi.nl>
branch 'default'

changed src/ChangeLog
changed src/VirtualLeaf.pro
changed src/xmlwrite.cpp
changed src/xmlwrite.h
removed src/xmlwritecode.cpp
5 files changed with 6 insertions and 42 deletions:
0 comments (0 inline, 0 general)
src/ChangeLog
Show inline comments
 
2010-06-15    <guravage@caterpie.sen.cwi.nl>
 

	
 
	* VirtualLeaf.pro: Removed xmlwritecode.cpp from SOURCES list.
 

	
 
	* xmlwrite.cpp (XMLSave): Removed references to XMLWriteLeafSourceCode and XMLWriteReactionsCode.
 
	* xmlwrite.h (XMLIO): Ditto!
 

	
 
	* mesh.cpp (findNextBoundaryNode): Initialize Node *next_boundary_node = NULL;
 

	
 
	* xmlwrite.cpp (XMLReadSimtime): Removed unused variable cur
 
	(XMLReadWalls): viz_flux need not be declared twice; default value of 0.0.
 
	(XMLReadCells): Removed unused count variable.
 
	(XMLReadSimtime): Removed unused cur variable.
 
	(XMLRead): Removed unused v_str variable.
 

	
 
	* simitembase.cpp (userMove): Use assignment merely to obviate compilation warning.
 
	(SimItemBase) Ditto.
 

	
 
	* qcanvasarrow.h (QGraphicsLineItem): Use assignment merely to obviate compilation warning.
src/VirtualLeaf.pro
Show inline comments
 
@@ -154,25 +154,24 @@ SOURCES += \
 
 pardialog.cpp \
 
 parse.cpp \
 
 random.cpp \
 
 rungekutta.cpp \
 
 simitembase.cpp \
 
 transporterdialog.cpp \
 
 UniqueMessage.cpp \
 
 vector.cpp \
 
 wallbase.cpp \
 
 wall.cpp \
 
 wallitem.cpp \
 
 warning.cpp \
 
 xmlwritecode.cpp \
 
 xmlwrite.cpp \
 
 $$MAINSRC
 

	
 
contains( TARGET, leaf_fleming ) {
 
 DEFINES += FLEMING	
 
}
 

	
 
contains(GRAPHICS, qwt) {
 
 #macx:LIBS += -L$$QWTDIR/lib -lqwt
 
 #win32:LIBS += -L$$QWTDIR/lib -lqwt5
 
 #LIBS += -L$$QWTDIR/lib -lqwt
 
 INCLUDEPATH += $$QWTDIR/include
src/xmlwrite.cpp
Show inline comments
 
@@ -762,27 +762,25 @@ void Mesh::XMLSave(const char *docname, 
 
	
 
	xmlNewProp(root_node, BAD_CAST "date", BAD_CAST tstring);
 
	free(tstring);
 
	
 
	
 
	QString simtime = QString("%1").arg(time);
 
	xmlNewProp(root_node, BAD_CAST "simtime", BAD_CAST simtime.toStdString().c_str()); 
 
	/*
 
	 * Creates a DTD declaration. Isn't mandatory. 
 
	 */
 
	//dtd = xmlCreateIntSubset(doc, BAD_CAST "root", NULL, BAD_CAST "tree2.dtd");
 
	par.XMLAdd(root_node);
 
	XMLIO::XMLWriteLeafSourceCode(root_node);
 
	XMLIO::XMLWriteReactionsCode(root_node);
 
	
 

	
 
	xmlNodePtr xmlnodes = xmlNewChild(root_node, NULL, BAD_CAST "nodes",NULL);
 
	{ ostringstream text;
 
		text << NNodes();
 
		xmlNewProp(xmlnodes, BAD_CAST "n", BAD_CAST text.str().c_str());
 
	}
 
	
 
	{ ostringstream text;
 
		text << Node::target_length;
 
		xmlNewProp(xmlnodes, BAD_CAST "target_length", BAD_CAST text.str().c_str());
 
	}
 
	
 
	
src/xmlwrite.h
Show inline comments
 
@@ -23,26 +23,24 @@
 

	
 

	
 
#ifndef _XML_WRITE_H_
 
#define _XML_WRITE_H_
 

	
 
#include <vector>
 
#include <libxml/tree.h>
 
#include <cstring>
 

	
 
namespace XMLIO {
 

	
 
	std::vector <double> XMLReadValArray(xmlNode *cur);
 
  void XMLWriteLeafSourceCode(xmlNode *parent);
 
  void XMLWriteReactionsCode(xmlNode *parent);
 
  template<class For, class E> long list_index (For beg, For end, E *elem) {
 
    
 
    long n = 0;
 
    for (For i=beg;
 
	 i!=end;
 
	 i++) {
 
      if (*i == elem) {
 
	return n;
 
      }
 
      n++;
 
    }
 
    return -1;
src/xmlwritecode.cpp
Show inline comments
 
deleted file
0 comments (0 inline, 0 general)