diff -r 008e72977ab8 -r edb78a44240b vymmodel.cpp
--- a/vymmodel.cpp	Thu Mar 26 07:50:32 2009 +0000
+++ b/vymmodel.cpp	Tue Mar 31 15:36:10 2009 +0000
@@ -2227,31 +2227,43 @@
 	if (!ix.isValid() ) return;
 
 	QModelIndex parentIndex=parent(ix);
-	if (!parentIndex.isValid()) return;
+/*
+	if (!parentIndex.isValid()) 
+	{
+	cout << "VM::delete no valid parent ix\n";
+	return;
+	}
+*/	
 	TreeItem *ti=bo->getTreeItem();
 	
-	if (selectionType()==TreeItem::MapCenter)		//FIXME-1 VM still missing
+	if (selectionType()==TreeItem::MapCenter)	
 	{
 	//	BranchObj* par=(BranchObj*)(bo->getParObj());
 		//selection.unselect();
 		/* FIXME-1 VM Note:  does saveStateRemovingPart work for MCO? (No parent!)
 		saveStateRemovingPart (bo, QString ("Delete %1").arg(getObjectName(bo)));
-		*/
-		/*
+		*/	
+		emit (layoutAboutToBeChanged() );
+
+		parentIndex=parent(index(ti));
+		cout << "VM::delete  ti="<<ti<<"  row="<<ix.row()<<"  parIndex.valid="<<parentIndex.isValid()<<endl;
+		int n=ix.row();
+		beginRemoveRows (parentIndex,n,n);
+		removeRows (n,1,parentIndex);
 		bo=removeMapCenter ((MapCenterObj*)bo);
+		endRemoveRows();
 		if (bo) 
 		{
-			selection.select (bo);
+			select (bo);
 			ensureSelectionVisible();
-			selection.update();
+			ensureSelectionVisible();
+			reposition();
 		}	
-		reposition();
-		return;
-		*/
+
+		emit (layoutChanged() );
 	}
 	if (selectionType()==TreeItem::Branch)
 	{
-		int n=ti->branchCount();
 
 		BranchObj* par=(BranchObj*)bo->getParObj();
 		unselect();
@@ -2261,11 +2273,11 @@
 
 		cout << "VM::delete  ti="<<ti<<"  row="<<ix.row()<<endl;
 		parentIndex=parent(index(ti));
-		cout << "            valid parentIndex="<<parentIndex.isValid()<<endl;
+		int n=ix.row();
 		beginRemoveRows (parentIndex,n,n);
-		removeRows (ix.row(),1,parentIndex);
+		removeRows (n,1,parentIndex);
+		par->removeBranch(bo);	// remove from BranchObj lists...
 		endRemoveRows();
-		par->removeBranch(bo);
 		select (par);
 		ensureSelectionVisible();
 		reposition();
@@ -2275,6 +2287,7 @@
 	}
 	FloatImageObj *fio=selection.getFloatImage(); 	//FIXME-1 VM still missing
 
+/*
 	if (fio)
 	{
 		BranchObj* par=(BranchObj*)fio->getParObj();
@@ -2291,6 +2304,7 @@
 		ensureSelectionVisible();
 		return;
 	}
+	*/
 }
 
 void VymModel::deleteKeepChildren()		//FIXME-1 VM still missing