[GME-commit] GMESRC/GME/MgaUtil ClosureDlg.cpp,1.4,1.5 MakeClosure.cpp,1.9,1.10 MakeClosure.h,1.5,1.6 MgaUtil.rc,1.41,1.42

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

Update of /var/lib/gme/GMESRC/GME/MgaUtil
In directory braindrain:/tmp/cvs-serv20879

Modified Files:
	ClosureDlg.cpp MakeClosure.cpp MakeClosure.h MgaUtil.rc 
Log Message:
Correction to the Up direction copyclosure.



CVS User: zolmol

Index: ClosureDlg.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/ClosureDlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ClosureDlg.cpp	27 Sep 2004 21:50:53 -0000	1.4
--- ClosureDlg.cpp	28 Sep 2004 22:43:27 -0000	1.5
***************
*** 210,218 ****
  	m_ctrlPartOfModels.EnableWindow( TRUE);
  
- 	m_wrappingOption = 0;
- 	m_ctrlRadio1.EnableWindow( TRUE);
- 	m_ctrlRadio2.EnableWindow( FALSE);
- 	m_ctrlRadio3.EnableWindow( FALSE);
- 
  	m_ctrlIncludeAll.EnableWindow( FALSE);
  	m_ctrlIncludeSome.EnableWindow( FALSE);
--- 210,213 ----
***************
*** 220,225 ****
  
  	UpdateData( FALSE);
- 
- 	OnWrapMiniProj();
  }
  
--- 215,218 ----
***************
*** 234,240 ****
  	m_ctrlPartOfFolders.EnableWindow( FALSE);
  	m_ctrlPartOfModels.EnableWindow( FALSE);
- 	m_ctrlRadio1.EnableWindow( TRUE);
- 	m_ctrlRadio2.EnableWindow( TRUE);
- 	m_ctrlRadio3.EnableWindow( TRUE);
  
  	m_ctrlIncludeAll.EnableWindow(m_bContainment || m_bFolderContainment);
--- 227,230 ----
***************
*** 257,261 ****
  {
  	OnCheckcontainment();
- 	
  }
  
--- 247,250 ----

Index: MakeClosure.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MakeClosure.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MakeClosure.cpp	27 Sep 2004 21:50:53 -0000	1.9
--- MakeClosure.cpp	28 Sep 2004 22:43:27 -0000	1.10
***************
*** 176,179 ****
--- 176,180 ----
  	if ( m_bDirection) // down
  	{
+ 		preProcess();
  		processFolders();
  		processFCOs();
***************
*** 183,192 ****
--- 184,200 ----
  	else // up -> so first process the fcos
  	{
+ 		preProcess();
  		processFCOs();
  		processFolders();
  		postValidateSelection();
+ 		postProcess();
  	}
  }
  
+ void CMakeClosure::preProcess()
+ {
+ 	send2Console("[Closure Copy] Working...");
+ }
+ 
  void CMakeClosure::postProcess()
  {
***************
*** 1708,1711 ****
--- 1716,1724 ----
  {
  	return true;
+ }
+ 
+ void CKindSelectClosure::preProcess()
+ {
+ 	send2Console("[Smart Copy] Working...");
  }
  

Index: MakeClosure.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MakeClosure.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MakeClosure.h	27 Sep 2004 21:50:53 -0000	1.5
--- MakeClosure.h	28 Sep 2004 22:43:27 -0000	1.6
***************
*** 107,110 ****
--- 107,111 ----
  	void processFCOs();
  
+ 	virtual void preProcess();
  	virtual void postProcess();
  	void selectTop();
***************
*** 294,297 ****
--- 295,299 ----
  	/*virtual*/ bool isValidSelection();
  	/*virtual*/ bool postValidateSelection();
+ 	/*virtual*/ void preProcess();
  	/*virtual*/ void postProcess();
  	string m_iniSelPath;

Index: MgaUtil.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MgaUtil.rc,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** MgaUtil.rc	27 Sep 2004 21:50:53 -0000	1.41
--- MgaUtil.rc	28 Sep 2004 22:43:27 -0000	1.42
***************
*** 455,460 ****
      CONTROL         "Containment",IDC_CHECKCONTAINMENT,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,69,37,52,8
!     CONTROL         "Include all kinds",IDC_INCLUDEALL,"Button",
!                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,172,26,67,8
      CONTROL         "Include only",IDC_INCLUDESOME,"Button",
                      BS_AUTORADIOBUTTON,172,37,52,8
--- 455,460 ----
      CONTROL         "Containment",IDC_CHECKCONTAINMENT,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,69,37,52,8
!     CONTROL         "Include all",IDC_INCLUDEALL,"Button",BS_AUTORADIOBUTTON | 
!                     WS_GROUP | WS_TABSTOP,172,26,67,8
      CONTROL         "Include only",IDC_INCLUDESOME,"Button",
                      BS_AUTORADIOBUTTON,172,37,52,8
***************
*** 468,473 ****
      CONTROL         "Connection with refports",IDC_CHECKREFPORTCONNECTION,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,79,101,89,9
!     CONTROL         "Set Member",IDC_CHECKSETMEMBER,"Button",BS_AUTOCHECKBOX | 
!                     WS_TABSTOP,172,68,55,8
      CONTROL         "Member of Sets",IDC_CHECKMEMBEROF,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,172,79,67,8
--- 468,473 ----
      CONTROL         "Connection with refports",IDC_CHECKREFPORTCONNECTION,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,79,101,89,9
!     CONTROL         "Set Members",IDC_CHECKSETMEMBER,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,172,68,55,8
      CONTROL         "Member of Sets",IDC_CHECKMEMBEROF,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,172,79,67,8
***************
*** 528,538 ****
  END
  
- IDD_CLOSUREPROPPAGE DIALOG DISCARDABLE  0, 0, 235, 156
- STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
- CAPTION "Property Page"
- FONT 8, "MS Sans Serif"
- BEGIN
- END
- 
  IDD_CLOSUREKINDSEL DIALOG DISCARDABLE  0, 0, 186, 95
  STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
--- 528,531 ----
***************
*** 787,798 ****
          TOPMARGIN, 7
          BOTTOMMARGIN, 47
-     END
- 
-     IDD_CLOSUREPROPPAGE, DIALOG
-     BEGIN
-         LEFTMARGIN, 7
-         RIGHTMARGIN, 228
-         TOPMARGIN, 7
-         BOTTOMMARGIN, 149
      END
  
--- 780,783 ----