[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp AspectSpecDlg.cpp,1.8,1.9 AspectSpecTbl.cpp,1.5,1.6

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

Update of /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp
In directory escher:/tmp/cvs-serv25812/Asp

Modified Files:
	AspectSpecDlg.cpp AspectSpecTbl.cpp 
Log Message:
ModelReferences allowed to have as kindaspect the "Not specified" value in the Configure Aspect Mapping dialog.
In such a case no kindaspect value is dumped to xmp, and no registry value is stored, moreover, old registry value is cleared.



CVS User: Zoltan Molnar, ISIS (zolmol)

Index: AspectSpecDlg.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp/AspectSpecDlg.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AspectSpecDlg.cpp	15 Sep 2004 19:48:34 -0000	1.8
--- AspectSpecDlg.cpp	30 Oct 2006 22:35:59 -0000	1.9
***************
*** 12,15 ****
--- 12,19 ----
  extern Globals global_vars;
  
+ // keep in sync with Dumper.cpp's DUMPER_NOT_SPECIFIED_STR
+ #define DUMPER_NOT_SPECIFIED_STR      "Not specified"
+ 
+ 
  #ifdef _DEBUG
  #define new DEBUG_NEW
***************
*** 123,126 ****
--- 127,131 ----
  		else if (fco_ptr->getMyKind() == Any::REF)
  		{
+ 			aspects.AddTail( DUMPER_NOT_SPECIFIED_STR);
  			const ReferenceRep * r_ptr = static_cast< const ReferenceRep *>(ptr);
  			std::vector< AspectRep *> asps = r_ptr->getAspectsIntersection();

Index: AspectSpecTbl.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp/AspectSpecTbl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AspectSpecTbl.cpp	27 Oct 2006 21:17:45 -0000	1.5
--- AspectSpecTbl.cpp	30 Oct 2006 22:35:59 -0000	1.6
***************
*** 299,303 ****
  				item.pszText = buff;
  				item.cchTextMax = 63;
! 				if (GetItem(&item) && CString(item.pszText) != "N/A" && CString(item.pszText) != "No aspect") {
  					CStringList lstItems;
  					int rowID = GetItemData( index);
--- 299,303 ----
  				item.pszText = buff;
  				item.cchTextMax = 63;
! 				if (GetItem(&item) && CString(item.pszText) != "N/A") {
  					CStringList lstItems;
  					int rowID = GetItemData( index);