Mon Mar 8 16:23:01 CST 2004

Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp
In directory braindrain:/tmp/cvs-serv21053/Asp

Modified Files:
	AspectPage.cpp AspectPage.h AspectSpecDlg.cpp AspectSpecDlg.h 
	AspectSpecTbl.cpp AspectSpecTbl.h GlobalAspOrder.cpp 
	GlobalAspOrder.h 
Removed Files:
	AspectOrder.cpp AspectOrder.h AspectOrderDlg.cpp 
	AspectOrderDlg.h OrderDialog.cpp OrderDialog.h OrderPage.cpp 
	OrderPage.h OrderSpecTbl.cpp OrderSpecTbl.h 
Log Message:
Modified:
-registry handling
-aspect mapping dlg: skip unambiguous cases, put N/A to primary field too if possible
-aspect ordering moved ahead
-kindaspect used only if necessary (in cases of references used always)

Modified Files:
 	Component.rc MetaGME2004.dsp resource.h Asp/AspectPage.cpp 
 	Asp/AspectPage.h Asp/AspectSpecDlg.cpp Asp/AspectSpecDlg.h 
 	Asp/AspectSpecTbl.cpp Asp/AspectSpecTbl.h 
 	Asp/GlobalAspOrder.cpp Asp/GlobalAspOrder.h Rep/Any.cpp 
 	Rep/Any.h Rep/AspectRep.cpp Rep/AspectRep.h Rep/Broker.cpp 
 	Rep/Dumper.cpp Rep/ModelRep.cpp Rep/ModelRep.h 
 	Rep/PointerItem.cpp Rep/ReferenceRep.cpp Rep/RoleRep.cpp 
 	Rep/Sheet.cpp 
Added Files:
 	bitmapDN.bmp bitmapup.bmp 
Removed Files:
 	TokenEx.cpp TokenEx.h Asp/AspectOrder.cpp Asp/AspectOrder.h 
	Asp/AspectOrderDlg.cpp Asp/AspectOrderDlg.h 
 	Asp/OrderDialog.cpp Asp/OrderDialog.h Asp/OrderPage.cpp 
 	Asp/OrderPage.h Asp/OrderSpecTbl.cpp Asp/OrderSpecTbl.h 

CVS User: zolmol

Index: AspectPage.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp/AspectPage.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AspectPage.cpp	4 Dec 2003 16:45:27 -0000	1.1
--- AspectPage.cpp	8 Mar 2004 22:22:59 -0000	1.2
***************
*** 81,85 ****
  }

! void CAspectPage::AddEntry(int rowID, CString roleName, CString kindAspect, bool isPrimary, const void * ptr)
  {
  	entry* newent = new entry;;
--- 81,85 ----
  }

! void CAspectPage::AddEntry(int rowID, CString roleName, CString kindAspect, CString isPrimary, const void * ptr)
  {
  	entry* newent = new entry;;
***************
*** 96,100 ****

! bool CAspectPage::GetEntry(int rowID, CString &roleName, CString& kindAspect, bool &isPrimary, const void * &ptr)
  {
  	bool retval = false;
--- 96,100 ----

! bool CAspectPage::GetEntry(int rowID, CString &roleName, CString& kindAspect, CString& isPrimary, const void * &ptr)
  {
  	bool retval = false;

Index: AspectPage.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp/AspectPage.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AspectPage.h	2 Mar 2004 19:21:12 -0000	1.2
--- AspectPage.h	8 Mar 2004 22:22:59 -0000	1.3
***************
*** 18,22 ****
  	CString roleName;
  	CString kindAspect;
! 	bool isPrimary;
  	const void * ptr;
  } entry;
--- 18,22 ----
  	CString roleName;
  	CString kindAspect;
! 	CString isPrimary;
  	const void * ptr;
  } entry;
***************
*** 35,40 ****
  // Construction
  public:
! 	void AddEntry(int rowID, CString roleName, CString kindAspect, bool isPrimary, const void * ptr);
! 	bool GetEntry(int rowID, CString &roleName, CString& kindAspect, bool &isPrimary, const void * &ptr);
  	void SetAspectName(CString name);
  	CString GetAspectName();
--- 35,40 ----
  // Construction
  public:
! 	void AddEntry(int rowID, CString roleName, CString kindAspect, CString isPrimary, const void * ptr);
! 	bool GetEntry(int rowID, CString &roleName, CString& kindAspect, CString& isPrimary, const void * &ptr);
  	void SetAspectName(CString name);
  	CString GetAspectName();

Index: AspectSpecDlg.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp/AspectSpecDlg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AspectSpecDlg.cpp	2 Mar 2004 19:21:12 -0000	1.3
--- AspectSpecDlg.cpp	8 Mar 2004 22:22:59 -0000	1.4
***************
*** 57,61 ****

! int CAspectSpecDlg::AddEntry(CString aspectName, CString roleName, CString kindAspect, bool isPrimary, const void * ptr)
  {
  	CAspectPage *aspectPage = NULL;
--- 57,61 ----

! int CAspectSpecDlg::AddEntry(CString aspectName, CString roleName, CString kindAspect, CString primaryAsp, const void * ptr)
  {
  	CAspectPage *aspectPage = NULL;
***************
*** 78,86 ****
  	}

! 	aspectPage->AddEntry(lastID, roleName, kindAspect, isPrimary, ptr);
  	return lastID++;
  }

! void CAspectSpecDlg::GetEntry(int rowID, CString &roleName, CString &kindAspect, bool &isPrimary, const void * &ptr)
  {
  	POSITION pos = aspectPages.GetHeadPosition();
--- 78,86 ----
  	}

! 	aspectPage->AddEntry(lastID, roleName, kindAspect, primaryAsp, ptr);
  	return lastID++;
  }

! void CAspectSpecDlg::GetEntry(int rowID, CString &roleName, CString &kindAspect, CString &isPrimary, const void * &ptr)
  {
  	POSITION pos = aspectPages.GetHeadPosition();
***************
*** 101,106 ****
  {
  	aspects.RemoveAll();
! 	CString role_name = "N/A", kind_asp = "N/A";
! 	bool is_prim;void * ptr;
  	GetEntry( rowID, role_name, kind_asp, is_prim, ptr);
  	if ( role_name == "N/A") TO("ERROR");
--- 101,106 ----
  {
  	aspects.RemoveAll();
! 	CString role_name = "N/A", kind_asp = "N/A", is_prim;
! 	void * ptr;
  	GetEntry( rowID, role_name, kind_asp, is_prim, ptr);
  	if ( role_name == "N/A") TO("ERROR");

Index: AspectSpecDlg.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp/AspectSpecDlg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AspectSpecDlg.h	2 Mar 2004 19:21:12 -0000	1.2
--- AspectSpecDlg.h	8 Mar 2004 22:22:59 -0000	1.3
***************
*** 52,57 ****
  // Implementation
  public:
! 	void GetEntry(int entryNum, CString &roleName, CString &kindAspect, bool &isPrimary, const void * &ptr);
! 	int AddEntry(CString aspectName, CString roleName, CString  kindAspect, bool isPrimary, const void * ptr);
  	void GetAspects(CStringList& aspects);
  	void GetAspects( int rowID, CStringList& aspects);
--- 52,57 ----
  // Implementation
  public:
! 	void GetEntry(int entryNum, CString &roleName, CString &kindAspect, CString &isPrimary, const void * &ptr);
! 	int AddEntry(CString aspectName, CString roleName, CString  kindAspect, CString primaryAspect, const void * ptr);
  	void GetAspects(CStringList& aspects);
  	void GetAspects( int rowID, CStringList& aspects);

Index: AspectSpecTbl.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp/AspectSpecTbl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AspectSpecTbl.cpp	26 Feb 2004 20:03:46 -0000	1.2
--- AspectSpecTbl.cpp	8 Mar 2004 22:22:59 -0000	1.3
***************
*** 293,297 ****
  				item.pszText = buff;
  				item.cchTextMax = 63;
! 				if (GetItem(&item) &&  CString(item.pszText) != "N/A") {
  					CStringList lstItems;
  					int rowID = GetItemData( index);
--- 293,297 ----
  				item.pszText = buff;
  				item.cchTextMax = 63;
! 				if (GetItem(&item) && CString(item.pszText) != "N/A") {
  					CStringList lstItems;
  					int rowID = GetItemData( index);
***************
*** 303,310 ****
  			if(colnum==2)
  			{
! 				CStringList lstItems;
! 				lstItems.AddTail("yes");
! 				lstItems.AddTail("no");
! 				ShowInPlaceList( index, colnum, lstItems, 0 );
  			}

--- 303,319 ----
  			if(colnum==2)
  			{
! 				char buff[64];
! 				LVITEM item;
! 				item.mask = LVIF_TEXT;
! 				item.iItem = index;
! 				item.iSubItem = 2;
! 				item.pszText = buff;
! 				item.cchTextMax = 63;
! 				if (GetItem(&item) && CString(item.pszText) != "N/A") {
! 					CStringList lstItems;
! 					lstItems.AddTail("yes");
! 					lstItems.AddTail("no");
! 					ShowInPlaceList( index, colnum, lstItems, 0 );
! 				}
  			}

***************
*** 318,322 ****

! void CAspectSpecTbl::AddRow(int rowID, CString& role, CString& kindAspect, bool isPrimary)
  {
  	LV_ITEM lvItem;
--- 327,331 ----

! void CAspectSpecTbl::AddRow(int rowID, CString& role, CString& kindAspect, CString& isPrimary)
  {
  	LV_ITEM lvItem;
***************
*** 329,337 ****

  	lvItem.iSubItem = 1;
! 	lvItem.pszText = kindAspect.GetBuffer(kindAspect.GetLength()); // modif role.getl
  	SetItem(&lvItem);

  	lvItem.iSubItem = 2;
! 	lvItem.pszText = isPrimary ? _T("yes"): _T("no");
  	// lvItem.stateMask = LVIS_STATEIMAGEMASK;
  	// lvItem.state = INDEXTOSTATEIMAGEMASK(isPrimary ? 0 : 1);
--- 338,346 ----

  	lvItem.iSubItem = 1;
! 	lvItem.pszText = kindAspect.GetBuffer( kindAspect.GetLength()); // modif role.getl
  	SetItem(&lvItem);

  	lvItem.iSubItem = 2;
! 	lvItem.pszText = isPrimary.GetBuffer( isPrimary.GetLength());// ? _T("yes"): _T("no");
  	// lvItem.stateMask = LVIS_STATEIMAGEMASK;
  	// lvItem.state = INDEXTOSTATEIMAGEMASK(isPrimary ? 0 : 1);
***************
*** 379,383 ****
  }

! bool CAspectSpecTbl::GetRow(int rowID, CString &role, CString &kindAspect, bool &isPrimary)
  {

--- 388,392 ----
  }

! bool CAspectSpecTbl::GetRow(int rowID, CString &role, CString &kindAspect, CString& isPrimary)
  {

***************
*** 395,399 ****
  	lvItem.iItem = idx;
  	lvItem.pszText = role.GetBuffer(255);
! 	lvItem.cchTextMax = 255;
  	lvItem.iSubItem = 0;
  	GetItem(&lvItem);
--- 404,408 ----
  	lvItem.iItem = idx;
  	lvItem.pszText = role.GetBuffer(255);
! 	lvItem.cchTextMax = 254;
  	lvItem.iSubItem = 0;
  	GetItem(&lvItem);
***************
*** 403,416 ****
  	lvItem.iSubItem = 1;
  	lvItem.pszText = kindAspect.GetBuffer(255);
! 	lvItem.cchTextMax = 255;
  	GetItem(&lvItem);

! 	CString tmpStr;
! 	lvItem.pszText = tmpStr.GetBuffer(10);
! 	lvItem.cchTextMax = 10;
  	lvItem.iSubItem = 2;
  	GetItem(&lvItem);
! 	isPrimary = (tmpStr == "yes");

  	return true;
--- 412,425 ----
  	lvItem.iSubItem = 1;
  	lvItem.pszText = kindAspect.GetBuffer(255);
! 	lvItem.cchTextMax = 254;
  	GetItem(&lvItem);

! 	//CString tmpStr;
! 	lvItem.pszText = isPrimary.GetBuffer(10); //tmpStr
! 	lvItem.cchTextMax = 9;
  	lvItem.iSubItem = 2;
  	GetItem(&lvItem);
! 	//isPrimary = (tmpStr == "yes");

  	return true;

Index: AspectSpecTbl.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp/AspectSpecTbl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AspectSpecTbl.h	2 Mar 2004 19:21:12 -0000	1.2
--- AspectSpecTbl.h	8 Mar 2004 22:22:59 -0000	1.3
***************
*** 34,39 ****
  public:
  	CImageList m_checkImages;
! 	bool GetRow(int rowID, CString &role, CString& kindAspect, bool &isPrimary);
! 	void AddRow(int rowID, CString& role, CString& kindAspect, bool isPrimary);
  	virtual ~CAspectSpecTbl();
  	int HitTestEx(CPoint &point, int *col) const;
--- 34,39 ----
  public:
  	CImageList m_checkImages;
! 	bool GetRow(int rowID, CString &role, CString& kindAspect, CString& isPrimary);
! 	void AddRow(int rowID, CString& role, CString& kindAspect, CString& isPrimary);
  	virtual ~CAspectSpecTbl();
  	int HitTestEx(CPoint &point, int *col) const;

Index: GlobalAspOrder.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp/GlobalAspOrder.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GlobalAspOrder.cpp	2 Mar 2004 19:21:12 -0000	1.1
--- GlobalAspOrder.cpp	8 Mar 2004 22:22:59 -0000	1.2
***************
*** 27,31 ****
  	CDialog::DoDataExchange(pDX);
  	//{{AFX_DATA_MAP(GlobalAspOrder)
! 	DDX_Control(pDX, IDC_LIST3, m_src);
  	//}}AFX_DATA_MAP
  }
--- 27,33 ----
  	CDialog::DoDataExchange(pDX);
  	//{{AFX_DATA_MAP(GlobalAspOrder)
! 	DDX_Control(pDX, IDC_BUTTON2, m_down);
! 	DDX_Control(pDX, IDC_BUTTON1, m_up);
! 	DDX_Control(pDX, IDC_LIST3, m_list);
  	//}}AFX_DATA_MAP
  }
***************
*** 34,39 ****
  BEGIN_MESSAGE_MAP(GlobalAspOrder, CDialog)
  	//{{AFX_MSG_MAP(GlobalAspOrder)
! 	ON_BN_CLICKED(IDC_BUTTON1, OnAddButton)
! 	ON_BN_CLICKED(IDC_BUTTON2, OnRemoveButton)
  	//}}AFX_MSG_MAP
  END_MESSAGE_MAP()
--- 36,41 ----
  BEGIN_MESSAGE_MAP(GlobalAspOrder, CDialog)
  	//{{AFX_MSG_MAP(GlobalAspOrder)
! 	ON_BN_CLICKED(IDC_BUTTON1, OnMoveUp)
! 	ON_BN_CLICKED(IDC_BUTTON2, OnMoveDown)
  	//}}AFX_MSG_MAP
  END_MESSAGE_MAP()
***************
*** 42,76 ****
  // GlobalAspOrder message handlers

! void GlobalAspOrder::OnAddButton() 
  {
  	CString text; 
! 	int idx = m_src.GetCurSel();
  	if (LB_ERR != idx && idx > 0)
  	{
! 		int data = m_src.GetItemData( idx);
! 		m_src.GetText( idx, text);

! 		m_src.DeleteString( idx);

! 		m_src.InsertString( idx - 1, text);
! 		m_src.SetItemData( idx - 1, data);
! 		m_src.SetCurSel( idx - 1);
  	}
  }

! void GlobalAspOrder::OnRemoveButton() 
  {
  	CString text; 
! 	int idx = m_src.GetCurSel();
! 	if (LB_ERR != idx && idx + 1 < m_src.GetCount())
  	{
! 		int data = m_src.GetItemData( idx);
! 		m_src.GetText( idx, text);

! 		m_src.DeleteString( idx);

! 		m_src.InsertString( idx + 1, text);
! 		m_src.SetItemData( idx + 1, data);
! 		m_src.SetCurSel( idx + 1);
  	}
  }
--- 44,78 ----
  // GlobalAspOrder message handlers

! void GlobalAspOrder::OnMoveUp() 
  {
  	CString text; 
! 	int idx = m_list.GetCurSel();
  	if (LB_ERR != idx && idx > 0)
  	{
! 		int data = m_list.GetItemData( idx);
! 		m_list.GetText( idx, text);

! 		m_list.DeleteString( idx);

! 		m_list.InsertString( idx - 1, text);
! 		m_list.SetItemData( idx - 1, data);
! 		m_list.SetCurSel( idx - 1);
  	}
  }

! void GlobalAspOrder::OnMoveDown() 
  {
  	CString text; 
! 	int idx = m_list.GetCurSel();
! 	if (LB_ERR != idx && idx + 1 < m_list.GetCount())
  	{
! 		int data = m_list.GetItemData( idx);
! 		m_list.GetText( idx, text);

! 		m_list.DeleteString( idx);

! 		m_list.InsertString( idx + 1, text);
! 		m_list.SetItemData( idx + 1, data);
! 		m_list.SetCurSel( idx + 1);
  	}
  }
***************
*** 83,90 ****
--- 85,97 ----

+ /*
+ Presumes that the addAspects has been called!
+ */
  BOOL GlobalAspOrder::OnInitDialog() 
  {
  	CDialog::OnInitDialog();

+ 	m_down.SetBitmap( ::LoadBitmap(AfxGetApp()->m_hInstance, MAKEINTRESOURCE(IDB_BITMAPDN)));
+ 	m_up.SetBitmap( ::LoadBitmap(AfxGetApp()->m_hInstance, MAKEINTRESOURCE(IDB_BITMAPUP)));

  	std::vector< AspectRep *>::const_iterator i;
***************
*** 94,100 ****
  	{
  		CString asp_name = (*i)->getName().c_str();
! 		m_src.AddString( asp_name);
! 		m_src.SetItemData( k, k);
! 		//m_src.SetItemDataPtr( k, *i);
  	}	
  	return TRUE;  // return TRUE unless you set the focus to a control
--- 101,106 ----
  	{
  		CString asp_name = (*i)->getName().c_str();
! 		m_list.AddString( asp_name);
! 		m_list.SetItemData( k, k);
  	}	
  	return TRUE;  // return TRUE unless you set the focus to a control
***************
*** 106,114 ****
  	//std::string mmm;

! 	int howmany = m_src.GetCount();

  	for( int k = 0; k < howmany; ++k)
  	{
! 		unsigned int data = m_src.GetItemData( k);
  		if ( data < m_aspects.size())
  		{
--- 112,120 ----
  	//std::string mmm;

! 	int howmany = m_list.GetCount();

  	for( int k = 0; k < howmany; ++k)
  	{
! 		unsigned int data = m_list.GetItemData( k);
  		if ( data < m_aspects.size())
  		{

Index: GlobalAspOrder.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp/GlobalAspOrder.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GlobalAspOrder.h	2 Mar 2004 19:21:12 -0000	1.1
--- GlobalAspOrder.h	8 Mar 2004 22:22:59 -0000	1.2
***************
*** 11,14 ****
--- 11,15 ----
  #include "resource.h"
  #include <afxcmn.h>
+ #include <afxext.h>
  #include "AspectRep.h"
  #include "vector"
***************
*** 29,34 ****
  	//{{AFX_DATA(GlobalAspOrder)
  	enum { IDD = IDD_ASPECTORDER_DLG };
! 	CListBox	m_dst;
! 	CListBox	m_src;
  	//}}AFX_DATA

--- 30,36 ----
  	//{{AFX_DATA(GlobalAspOrder)
  	enum { IDD = IDD_ASPECTORDER_DLG };
! 	CButton	m_down;
! 	CButton	m_up;
! 	CListBox	m_list;
  	//}}AFX_DATA

***************
*** 47,52 ****
  	// Generated message map functions
  	//{{AFX_MSG(GlobalAspOrder)
! 	afx_msg void OnAddButton();
! 	afx_msg void OnRemoveButton();
  	virtual BOOL OnInitDialog();
  	virtual void OnOK();
--- 49,54 ----
  	// Generated message map functions
  	//{{AFX_MSG(GlobalAspOrder)
! 	afx_msg void OnMoveUp();
! 	afx_msg void OnMoveDown();
  	virtual BOOL OnInitDialog();
  	virtual void OnOK();

--- AspectOrder.cpp DELETED ---

--- AspectOrder.h DELETED ---

--- AspectOrderDlg.cpp DELETED ---

--- AspectOrderDlg.h DELETED ---

--- OrderDialog.cpp DELETED ---

--- OrderDialog.h DELETED ---

--- OrderPage.cpp DELETED ---

--- OrderPage.h DELETED ---

--- OrderSpecTbl.cpp DELETED ---

--- OrderSpecTbl.h DELETED ---