xml-vym.cpp
changeset 788 78ba80b54bc4
parent 787 c6bb4fdcc55f
child 790 133e2ed6b9c5
     1.1 --- a/xml-vym.cpp	Sat Aug 08 21:58:26 2009 +0000
     1.2 +++ b/xml-vym.cpp	Tue Aug 18 12:39:07 2009 +0000
     1.3 @@ -139,13 +139,12 @@
     1.4  		if (loadMode==NewMap)
     1.5  		{	
     1.6  			// Really use the found mapcenter as MCO in a new map
     1.7 -
     1.8  			lastBranch=model->createMapCenter(); 
     1.9  		} else
    1.10  		{
    1.11  			// Treat the found mapcenter as a branch 
    1.12  			// in an existing map
    1.13 -			BranchItem *bi=model->getSelectedBranch();	//FIXME-3 selection is no longer used here...
    1.14 +			BranchItem *bi=model->getSelectedBranch();	//FIXME-3 selection is no longer used here... //FIXME-2 really? we are adding to a map...
    1.15  			if (bi)
    1.16  			{
    1.17  				lastBranch=bi;
    1.18 @@ -153,10 +152,11 @@
    1.19  				{
    1.20  					lastBranch=model->createBranch(lastBranch);
    1.21  				} //else
    1.22 -					//FIXME-3 lastBranch->clear();
    1.23 +					//lastBranch->clear(); //FIXME-1 clear not really defined!
    1.24  			} else
    1.25 -				return false;
    1.26 -		}
    1.27 +				// add mapCenter without parent
    1.28 +				lastBranch=model->createMapCenter(); 
    1.29 +		}		
    1.30  		readBranchAttr (atts);
    1.31  	} else if ( 
    1.32  		(eName == "standardflag" ||eName == "standardFlag") && 
    1.33 @@ -438,7 +438,7 @@
    1.34  					return false;   // Couldn't read relPos
    1.35  			}           
    1.36  		}           
    1.37 -		if (!a.value( "absPosX").isEmpty() && loadMode==NewMap ) 
    1.38 +		if (!a.value( "absPosX").isEmpty() ) 
    1.39  		{
    1.40  			if (!a.value( "absPosY").isEmpty() ) 
    1.41  			{