# HG changeset patch
# User insilmaril
# Date 1200498320 0
# Node ID d0e047b8d412ef51324ee53190087bd211e48fbf
# Parent  b582bba9e312b0f880e8200a14cb55f3da204699
Fixed missing MapCenter

diff -r b582bba9e312 -r d0e047b8d412 demos/vym-projectplan.vym
Binary file demos/vym-projectplan.vym has changed
diff -r b582bba9e312 -r d0e047b8d412 vymmodel.cpp
--- a/vymmodel.cpp	Wed Jan 16 15:45:19 2008 +0000
+++ b/vymmodel.cpp	Wed Jan 16 15:45:20 2008 +0000
@@ -23,6 +23,7 @@
 
 void VymModel::init () 
 {
+	addMapCenter();
 }
 
 void VymModel::setMapEditor(MapEditor *me)
diff -r b582bba9e312 -r d0e047b8d412 xml-freemind.cpp
--- a/xml-freemind.cpp	Wed Jan 16 15:45:19 2008 +0000
+++ b/xml-freemind.cpp	Wed Jan 16 15:45:20 2008 +0000
@@ -46,11 +46,11 @@
 {
     QColor col;
 	/* Testing
-	cout << "startElement <"<< eName.ascii()
+	cout << "startElement <"<< qPrintable(eName)
 		<<">  state="<<state 
 		<<"  laststate="<<stateStack.last()
 		<<"   loadMode="<<loadMode
-	//	<<"       line="<<QXmlDefaultHandler::lineNumber().ascii()
+	//	<<"       line="<<qPrintable (QXmlDefaultHandler::lineNumber())
 		<<endl;
 	*/	
 	stateStack.append (state);	
@@ -202,7 +202,7 @@
 bool parseFreemindHandler::endElement  ( const QString&, const QString&, const QString &eName)
 {
 	/* Testing
-	cout << "endElement </" <<eName.ascii()
+	cout << "endElement </" <<qPrintable(eName)
 		<<">  state=" <<state 
 		<<"  laststate=" <<laststate
 		<<"  stateStack="<<stateStack.last() 
@@ -222,7 +222,7 @@
 
 bool parseFreemindHandler::characters   ( const QString& ch)
 {
-	//cout << "characters \""<<ch.ascii()<<"\"  state="<<state <<"  laststate="<<laststate<<endl;
+	//cout << "characters \""<<qPrintable(ch)<<"\"  state="<<state <<"  laststate="<<laststate<<endl;
 
 	QString ch_org=quotemeta (ch);
     QString ch_simplified=ch.simplifyWhiteSpace();
diff -r b582bba9e312 -r d0e047b8d412 xml-vym.cpp
--- a/xml-vym.cpp	Wed Jan 16 15:45:19 2008 +0000
+++ b/xml-vym.cpp	Wed Jan 16 15:45:20 2008 +0000
@@ -56,7 +56,7 @@
 {
     QColor col;
 	/* Testing
-	cout << "startElement <"<< eName.ascii()
+	cout << "startElement <"<< qPrintable(eName)
 		<<">  state="<<state 
 		<<"  laststate="<<stateStack.last()
 		<<"   loadMode="<<loadMode
@@ -68,6 +68,9 @@
 	{
         state = StateMap;
 
+		if (loadMode==NewMap)
+			model->clear();	// remove existing mapCenter
+
 		// Check version
 		if (!atts.value( "version").isEmpty() ) 
 		{
@@ -276,7 +279,7 @@
 bool parseVYMHandler::endElement  ( const QString&, const QString&, const QString &eName)
 {
 	/* Testing
-	cout << "endElement </" <<eName.ascii()
+	cout << "endElement </" <<qPrintable(eName)
 		<<">  state=" <<state 
 		<<"  laststate=" <<laststate
 		<<"  stateStack="<<stateStack.last() 
diff -r b582bba9e312 -r d0e047b8d412 xsltproc.cpp
--- a/xsltproc.cpp	Wed Jan 16 15:45:19 2008 +0000
+++ b/xsltproc.cpp	Wed Jan 16 15:45:20 2008 +0000
@@ -68,7 +68,7 @@
 	args << xslFile;
 	args << inputFile;
 	QString com=xsltprocessor+" "+args.join(" "); 
-	if (debug) cout <<"xsltproc executing:\n"<<com.ascii()<<endl;
+	if (debug) cout <<"xsltproc executing:\n"<<qPrintable(com)<<endl;
 	dia.append ("vym is executing: \n" + com );	
 	xsltProc->start(xsltprocessor,args);
 	if (!xsltProc->waitForStarted() )