From: apo Date: Wed, 5 Apr 2006 14:56:55 +0000 (+0000) Subject: Adjust to debug modifications X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d90264b1b1e15d912166ebd5065b1a8c26af5d8c;p=modules%2Fgui.git Adjust to debug modifications --- diff --git a/src/SUIT/SUIT_TreeSync.h b/src/SUIT/SUIT_TreeSync.h index b39b539ae..0b0b59279 100644 --- a/src/SUIT/SUIT_TreeSync.h +++ b/src/SUIT/SUIT_TreeSync.h @@ -63,7 +63,9 @@ TrgItem synchronize( const SrcItem& r1, const TrgItem& r2, const TreeData& td ) if( item.myTrg==td.nullTrg() ) { //to add - lastItem = createSubTree( item.mySrc, r2, lastItem, lastItem==td.nullTrg(), td ); + TrgItem nitem = createSubTree( item.mySrc, r2, lastItem, lastItem==td.nullTrg(), td ); + if( nitem!=td.nullTrg() ) + lastItem = nitem; } else { @@ -74,12 +76,12 @@ TrgItem synchronize( const SrcItem& r1, const TrgItem& r2, const TreeData& td ) } } } - + return r2; } else { - TrgItem new_r2 = createSubTree( r1, td.parent( r2 ), r2, r2==td.nullTrg(), td ); + TrgItem new_r2 = createSubTree( r1, td.parent( r2 ), r2, false, td ); if( r2!=td.nullTrg() ) td.deleteItemWithChildren( r2 ); return new_r2; @@ -104,8 +106,8 @@ void diffSiblings( const SrcItem& src, const TrgItem& trg, QValueList < DiffItem < SrcItem,TrgItem > >& d, const TreeData& td ) { - if( src==td.nullSrc() || trg==td.nullTrg() ) - return; + //if( src==td.nullSrc() || trg==td.nullTrg() ) + // return; QValueList src_ch; QValueList trg_ch;