[GME-commit] GMESRC/GME/Mga MgaCheck.cpp,1.8,1.9 MgaComplexOps.cpp,1.16,1.17

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/GME/Mga
In directory escher:/tmp/cvs-serv30558/Mga

Modified Files:
	MgaCheck.cpp MgaComplexOps.cpp 
Log Message:
Commiting
MGA:
-------
-mga notification sent upon status change from RW2RO or RO2RW (RO-read only, RW-read write)


GMEOLE:
-------
-setworkingdirectory method introd into IGMEOLEApp (will affect the SaveAs dialog's current directory)

-setcompforkind: enable/disable comps also when no model is opened


GME:
-------
-SaveAs dialog offers possibility to save an Mga file with custom extensions also (in the Save as Type dropdown control), however the format is still mga. (feature requested for CAPE project)




CVS User: Zoltan Molnar, ISIS (zolmol)

Index: MgaComplexOps.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Mga/MgaComplexOps.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** MgaComplexOps.cpp	13 Mar 2006 19:08:31 -0000	1.16
--- MgaComplexOps.cpp	1 May 2006 17:20:12 -0000	1.17
***************
*** 285,289 ****
  					ITERATE_THROUGH(collmembers) {
  						CoreObj nchild;
! 						ObjTreeCopy(mgaproject, ITER, nchild, crealist);
  						nchild[ai] = nobj;
  					}
--- 285,289 ----
  					ITERATE_THROUGH(collmembers) {
  						CoreObj nchild;
! 						ObjTreeCopyFoldersToo(mgaproject, ITER, nchild, crealist);
  						nchild[ai] = nobj;
  					}
***************
*** 1493,1497 ****
  					{
  						if( nobj[ai] & INSTANCE_FLAG) //if INSTANCE_FLAG present
! 							nobj[ai] = (orig[ai]) & 0;//then INSTANCE_FLAG removed;
  						break;
  					}
--- 1493,1497 ----
  					{
  						if( nobj[ai] & INSTANCE_FLAG) //if INSTANCE_FLAG present
! 							nobj[ai] = (orig[ai]) & ~INSTANCE_FLAG;//then INSTANCE_FLAG removed;
  						break;
  					}

Index: MgaCheck.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Mga/MgaCheck.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MgaCheck.cpp	13 Mar 2006 19:08:31 -0000	1.8
--- MgaCheck.cpp	1 May 2006 17:20:12 -0000	1.9
***************
*** 356,362 ****
--- 356,368 ----
  {
  	if( ro)
+ 	{
  		obj[ATTRID_PERMISSIONS] = obj[ATTRID_PERMISSIONS] | READONLY_FLAG;
+ 		CoreObjMark( obj, OBJEVENT_MARKEDRO|OBJEVENT_PROPERTIES);
+ 	}
  	else
+ 	{
  		obj[ATTRID_PERMISSIONS] = obj[ATTRID_PERMISSIONS] & ~READONLY_FLAG;
+ 		CoreObjMark( obj, OBJEVENT_MARKEDRW|OBJEVENT_PROPERTIES);
+ 	}
  }
  
***************
*** 382,386 ****
  		COMTHROW(Check());
  
- 		SelfMark(OBJEVENT_PROPERTIES);
  	} COMCATCH_IN_TRANSACTION(;);
  }
--- 388,391 ----
***************
*** 394,398 ****
  		COMTHROW(Check());
  
- 		SelfMark(OBJEVENT_PROPERTIES);
  	} COMCATCH_IN_TRANSACTION(;);
  }
--- 399,402 ----