[GME-commit] GMESRC/Paradigms/MetaGME/BonExtension/Gui OptionsDlg.cpp,1.1,1.2 OptionsDlg.h,1.1,1.2 SelConf.cpp,1.6,1.7 SelConf.h,1.2,1.3

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Fri Sep 22 17:05:49 CDT 2006 

Update of /project/gme-repository/GMESRC/Paradigms/MetaGME/BonExtension/Gui
In directory escher:/tmp/cvs-serv11565/Gui

Modified Files:
	OptionsDlg.cpp OptionsDlg.h SelConf.cpp SelConf.h 
Log Message:
BonX made "namespacish".



CVS User: Zoltan Molnar, ISIS (zolmol)

Index: SelConf.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/BonExtension/Gui/SelConf.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SelConf.cpp	26 Sep 2005 20:26:23 -0000	1.6
--- SelConf.cpp	22 Sep 2006 16:05:47 -0000	1.7
***************
*** 6,9 ****
--- 6,10 ----
  #include "Any.h"
  #include "FCO.h"
+ #include ".\selconf.h"
  
  #ifdef _DEBUG
***************
*** 49,53 ****
--- 50,56 ----
  	ON_CBN_EDITUPDATE(IDC_COMBO1, OnEditupdateCombo1)
  	ON_CBN_CLOSEUP(IDC_COMBO1, OnCloseupCombo1)
+ 	ON_BN_CLICKED(IDC_DESELECTALLBTN, OnBnClickedDeselectallbtn)
  	//}}AFX_MSG_MAP
+ 	ON_BN_CLICKED(IDC_SELECTALLBTN, OnBnClickedSelectallbtn)
  END_MESSAGE_MAP()
  
***************
*** 310,314 ****
  								  )
  								{
! 									list.AddTail( ancestor[i]->getName().c_str());    // put into the option
  									found_same_kind_extd_anc = true;
  								}
--- 313,317 ----
  								  )
  								{
! 									list.AddTail( ancestor[i]->getLStrictName().c_str());    // put into the option
  									found_same_kind_extd_anc = true;
  								}
***************
*** 426,427 ****
--- 429,453 ----
  }
  
+ 
+ void SelConf::selectAll( bool pVal)
+ {
+ 	m_table.DeleteAllItems();
+ 
+ 	POSITION pos = m_entries.GetHeadPosition();
+ 	while( pos) {
+ 		entry *e = m_entries.GetNext(pos);
+ 		e->val = pVal;
+ 		e->resp = "";
+ 	}
+ 	fillUpTable();
+ }
+ 
+ void SelConf::OnBnClickedDeselectallbtn()
+ {
+ 	selectAll( false);
+ }
+ 
+ void SelConf::OnBnClickedSelectallbtn()
+ {
+ 	selectAll( true);
+ }

Index: SelConf.h
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/BonExtension/Gui/SelConf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SelConf.h	26 Sep 2005 20:26:23 -0000	1.2
--- SelConf.h	22 Sep 2006 16:05:47 -0000	1.3
***************
*** 76,79 ****
--- 76,80 ----
  	CEntryList m_entries;
  
+ 	void selectAll( bool pVal);
  	void fillUpTable(); // copies data to
  	void getDataFromTable(); // copies data from m_table
***************
*** 90,93 ****
--- 91,96 ----
  	afx_msg void OnEditupdateCombo1();
  	afx_msg void OnCloseupCombo1();
+ 	afx_msg void OnBnClickedDeselectallbtn();
+ 	afx_msg void OnBnClickedSelectallbtn();
  	//}}AFX_MSG
  	DECLARE_MESSAGE_MAP()

Index: OptionsDlg.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/BonExtension/Gui/OptionsDlg.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OptionsDlg.cpp	16 Jun 2004 18:35:02 -0000	1.1
--- OptionsDlg.cpp	22 Sep 2006 16:05:47 -0000	1.2
***************
*** 5,8 ****
--- 5,9 ----
  #include "OptionsDlg.h"
  #include <afxdlgs.h>
+ #include ".\optionsdlg.h"
  
  #ifdef _DEBUG
***************
*** 25,34 ****
  	m_visitorSourceName = _T("");
  	m_prevHeaderName = _T("");
  	m_bVisitor = FALSE;
  	m_bParse = FALSE;
  	m_bInit = FALSE;
  	m_bFinalize = FALSE;
! 	m_whichStyle = -1;
! 	m_version71 = FALSE;
  	//}}AFX_DATA_INIT
  }
--- 26,41 ----
  	m_visitorSourceName = _T("");
  	m_prevHeaderName = _T("");
+ 	m_namespaceName = _T("");
  	m_bVisitor = FALSE;
  	m_bParse = FALSE;
  	m_bInit = FALSE;
  	m_bFinalize = FALSE;
! 	m_bAcceptTrave = FALSE;
! 	m_bAcceptSpeci = FALSE;
! 	m_whichStyle = 0;
! 	m_version60 = FALSE;
! 	m_visitorSignature = 0;
! 	m_specAcceptRetVal = 0;
! 	m_methodOfOutput = 0;
  	//}}AFX_DATA_INIT
  }
***************
*** 39,43 ****
  	CDialog::DoDataExchange(pDX);
  	//{{AFX_DATA_MAP(OptionsDlg)
! 	DDX_Control(pDX, IDC_CHECKVERS71, m_ctrlVersion71);
  	DDX_Control(pDX, IDC_BUTTON3, m_ctrlButton3);
  	DDX_Control(pDX, IDC_BUTTON4, m_ctrlButton4);
--- 46,50 ----
  	CDialog::DoDataExchange(pDX);
  	//{{AFX_DATA_MAP(OptionsDlg)
! 	DDX_Control(pDX, IDC_CHECKVERS60, m_ctrlVersion60);
  	DDX_Control(pDX, IDC_BUTTON3, m_ctrlButton3);
  	DDX_Control(pDX, IDC_BUTTON4, m_ctrlButton4);
***************
*** 46,49 ****
--- 53,58 ----
  	DDX_Control(pDX, IDC_BUTTON5, m_ctrlButton5);
  	DDX_Control(pDX, IDC_EDIT5, m_ctrlPrevHeaderName);
+ 	DDX_Control(pDX, IDC_RADIOSPACCRETURNSVOID, m_ctrlSpAccRetVoid);
+ 	DDX_Control(pDX, IDC_RADIOSPACCRETURNSBOOL, m_ctrlSpAccRetBool);
  	DDX_Text(pDX, IDC_EDIT1, m_headerName);
  	DDX_Text(pDX, IDC_EDIT2, m_sourceName);
***************
*** 51,60 ****
  	DDX_Text(pDX, IDC_EDIT4, m_visitorSourceName);
  	DDX_Text(pDX, IDC_EDIT5, m_prevHeaderName);
  	DDX_Check(pDX, IDC_CHECK34, m_bVisitor);
  	DDX_Check(pDX, IDC_CHECK5, m_bParse);
  	DDX_Check(pDX, IDC_CHECK2, m_bInit);
  	DDX_Check(pDX, IDC_CHECK3, m_bFinalize);
  	DDX_Radio(pDX, IDC_RADIO1, m_whichStyle);
! 	DDX_Check(pDX, IDC_CHECKVERS71, m_version71);
  	//}}AFX_DATA_MAP
  }
--- 60,75 ----
  	DDX_Text(pDX, IDC_EDIT4, m_visitorSourceName);
  	DDX_Text(pDX, IDC_EDIT5, m_prevHeaderName);
+ 	DDX_Text(pDX, IDC_EDIT6, m_namespaceName);
  	DDX_Check(pDX, IDC_CHECK34, m_bVisitor);
  	DDX_Check(pDX, IDC_CHECK5, m_bParse);
  	DDX_Check(pDX, IDC_CHECK2, m_bInit);
  	DDX_Check(pDX, IDC_CHECK3, m_bFinalize);
+ 	DDX_Check(pDX, IDC_CHECK4, m_bAcceptTrave);
+ 	DDX_Check(pDX, IDC_CHECK6, m_bAcceptSpeci);
  	DDX_Radio(pDX, IDC_RADIO1, m_whichStyle);
! 	DDX_Check(pDX, IDC_CHECKVERS60, m_version60);
! 	DDX_Radio(pDX, IDC_RADIOVISITSIGN1, m_visitorSignature);
! 	DDX_Radio(pDX, IDC_RADIOSPACCRETURNSVOID, m_specAcceptRetVal);
! 	DDX_Radio(pDX, IDC_RADIOSAMEFILE, m_methodOfOutput);
  	//}}AFX_DATA_MAP
  }
***************
*** 74,77 ****
--- 89,93 ----
  	ON_BN_CLICKED(IDC_RADIO3, OnRadio3)
  	//}}AFX_MSG_MAP
+ 	ON_BN_CLICKED(IDC_CHECK6, OnBnClickedCheck6)
  END_MESSAGE_MAP()
  
***************
*** 83,108 ****
  	CDialog::OnInitDialog();
  	
- 	m_headerName = m_defName + "BonX.h";
- 	m_sourceName = m_defName + "BonX.cpp";
- 	m_prevHeaderName = m_headerName + ".copy";
- 
- 	//global_vars.output_directory_name = "";
- 	//global_vars.err_file_name = proj_name + "BONExt.log";
- 
- 	m_visitorHeaderName = m_defName + "Visitor.h";
- 	m_visitorSourceName = m_defName + "Visitor.cpp";
- 
- 	m_whichStyle = 0;
- 	m_version71 = 0;
- 
  	m_ctrlPrevHeaderName.EnableWindow( FALSE);
  	m_ctrlButton5.EnableWindow( FALSE);
  
! 	m_ctrlVisitorHeader.EnableWindow( FALSE);
! 	m_ctrlVisitorSource.EnableWindow( FALSE);
! 	m_ctrlButton3.EnableWindow( FALSE);
! 	m_ctrlButton4.EnableWindow( FALSE);
  
! 	m_ctrlVersion71.EnableWindow( FALSE);
  
  	UpdateData( FALSE);
--- 99,114 ----
  	CDialog::OnInitDialog();
  	
  	m_ctrlPrevHeaderName.EnableWindow( FALSE);
  	m_ctrlButton5.EnableWindow( FALSE);
  
! 	m_ctrlVisitorHeader.EnableWindow( m_bVisitor);
! 	m_ctrlVisitorSource.EnableWindow( m_bVisitor);
! 	m_ctrlButton3.EnableWindow( m_bVisitor);
! 	m_ctrlButton4.EnableWindow( m_bVisitor);
  
! 	m_ctrlSpAccRetVoid.EnableWindow( m_bAcceptSpeci);
! 	m_ctrlSpAccRetBool.EnableWindow( m_bAcceptSpeci);
! 
! 	m_ctrlVersion60.EnableWindow( m_whichStyle >= 1);
  
  	UpdateData( FALSE);
***************
*** 112,115 ****
--- 118,133 ----
  }
  
+ void OptionsDlg::doInit()
+ {
+ 	//m_headerName = m_defName + "BonX.h";
+ 	//m_sourceName = m_defName + "BonX.cpp";
+ 	//m_prevHeaderName = m_headerName + ".bak";
+ 
+ 	////global_vars.output_directory_name = "";
+ 	////global_vars.err_file_name = proj_name + "BONExt.log";
+ 
+ 	//m_visitorHeaderName = m_defName + "Visitor.h";
+ 	//m_visitorSourceName = m_defName + "Visitor.cpp";
+ }
  
  void OptionsDlg::OnButton1()
***************
*** 275,288 ****
  void OptionsDlg::OnRadio1() 
  {
! 	m_ctrlVersion71.EnableWindow( FALSE);
  }
  
  void OptionsDlg::OnRadio2() 
  {
! 	m_ctrlVersion71.EnableWindow( TRUE);
  }
  
  void OptionsDlg::OnRadio3() 
  {
! 	m_ctrlVersion71.EnableWindow( TRUE);
  }
--- 293,314 ----
  void OptionsDlg::OnRadio1() 
  {
! 	m_ctrlVersion60.EnableWindow( FALSE);
  }
  
  void OptionsDlg::OnRadio2() 
  {
! 	m_ctrlVersion60.EnableWindow( TRUE);
  }
  
  void OptionsDlg::OnRadio3() 
  {
! 	m_ctrlVersion60.EnableWindow( TRUE);
! }
! 
! void OptionsDlg::OnBnClickedCheck6()
! {
! 	UpdateData( TRUE);
! 	m_ctrlSpAccRetVoid.EnableWindow( m_bAcceptSpeci);
! 	m_ctrlSpAccRetBool.EnableWindow( m_bAcceptSpeci);
! 	UpdateData( FALSE);
  }

Index: OptionsDlg.h
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/BonExtension/Gui/OptionsDlg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OptionsDlg.h	16 Jun 2004 18:35:02 -0000	1.1
--- OptionsDlg.h	22 Sep 2006 16:05:47 -0000	1.2
***************
*** 17,26 ****
  public:
  	OptionsDlg(CWnd* pParent = NULL);   // standard constructor
! 	CString m_defName;
  
  // Dialog Data
  	//{{AFX_DATA(OptionsDlg)
  	enum { IDD = IDD_DIALOG2 };
! 	CButton	m_ctrlVersion71;
  	CButton	m_ctrlButton3;
  	CButton	m_ctrlButton4;
--- 17,27 ----
  public:
  	OptionsDlg(CWnd* pParent = NULL);   // standard constructor
! 	//CString m_defName;
! 	void doInit();
  
  // Dialog Data
  	//{{AFX_DATA(OptionsDlg)
  	enum { IDD = IDD_DIALOG2 };
! 	CButton	m_ctrlVersion60;
  	CButton	m_ctrlButton3;
  	CButton	m_ctrlButton4;
***************
*** 34,43 ****
  	CString	m_visitorSourceName;
  	CString	m_prevHeaderName;
  	BOOL	m_bVisitor;
  	BOOL	m_bParse;
  	BOOL	m_bInit;
  	BOOL	m_bFinalize;
  	int		m_whichStyle;
! 	BOOL	m_version71;
  	//}}AFX_DATA
  
--- 35,52 ----
  	CString	m_visitorSourceName;
  	CString	m_prevHeaderName;
+ 	CString m_namespaceName;
  	BOOL	m_bVisitor;
  	BOOL	m_bParse;
  	BOOL	m_bInit;
  	BOOL	m_bFinalize;
+ 	BOOL	m_bAcceptTrave;
+ 	BOOL	m_bAcceptSpeci;
  	int		m_whichStyle;
! 	BOOL	m_version60;
! 	int		m_visitorSignature;
! 	CButton m_ctrlSpAccRetVoid;
! 	CButton m_ctrlSpAccRetBool;
! 	int		m_specAcceptRetVal;
! 	int		m_methodOfOutput;
  	//}}AFX_DATA
  
***************
*** 68,71 ****
--- 77,82 ----
  	//}}AFX_MSG
  	DECLARE_MESSAGE_MAP()
+ public:
+ 	afx_msg void OnBnClickedCheck6();
  };

More information about the GME-commit mailing list