[GME-commit]
GMESRC/GME/MgaUtil ClosureSmart.cpp,1.1,1.2 ClosureSmart.h,1.1,1.2
MakeClosure.cpp,1.10,1.11 MgaUtil.rc,1.42,1.43 resource.h,1.26,1.27
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Wed Sep 29 17:00:31 CDT 2004
- Previous message: [GME-commit] GMESRC/GME/Parser MgaParserBC.cpp,1.1,1.2
- Next message: [GME-commit]
GMESRC/GME/Parser MgaParser.cpp,1.25,1.26 MgaParser.h,1.10,1.11
MgaParserBC.cpp,1.2,1.3 MgaParserSC.cpp,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/lib/gme/GMESRC/GME/MgaUtil
In directory braindrain:/tmp/cvs-serv26008
Modified Files:
ClosureSmart.cpp ClosureSmart.h MakeClosure.cpp MgaUtil.rc
resource.h
Log Message:
More console messages, better error handling.
CVS User: zolmol
Index: ClosureSmart.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/ClosureSmart.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClosureSmart.cpp 27 Sep 2004 21:50:53 -0000 1.1
--- ClosureSmart.cpp 29 Sep 2004 21:00:27 -0000 1.2
***************
*** 42,45 ****
--- 42,46 ----
BEGIN_MESSAGE_MAP(CClosureSmart, CDialog)
//{{AFX_MSG_MAP(CClosureSmart)
+ ON_BN_CLICKED(IDC_INVERT, OnInvert)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
***************
*** 79,80 ****
--- 80,97 ----
}
+ void CClosureSmart::OnInvert()
+ {
+ UpdateData( TRUE);
+
+ CWnd* w;
+ w = GetDlgItem( IDC_CHECKCONN);
+ if( w && w->IsWindowEnabled()) m_bConns = !m_bConns;
+
+ w = GetDlgItem( IDC_CHECKSET);
+ if( w && w->IsWindowEnabled()) m_bSets = !m_bSets;
+
+ w = GetDlgItem( IDC_CHECKREF);
+ if( w && w->IsWindowEnabled()) m_bRefs = !m_bRefs;
+
+ UpdateData( FALSE);
+ }
\ No newline at end of file
Index: ClosureSmart.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/ClosureSmart.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClosureSmart.h 27 Sep 2004 21:50:53 -0000 1.1
--- ClosureSmart.h 29 Sep 2004 21:00:28 -0000 1.2
***************
*** 45,48 ****
--- 45,49 ----
//{{AFX_MSG(CClosureSmart)
virtual BOOL OnInitDialog();
+ afx_msg void OnInvert();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
Index: MakeClosure.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MakeClosure.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MakeClosure.cpp 28 Sep 2004 22:43:27 -0000 1.10
--- MakeClosure.cpp 29 Sep 2004 21:00:28 -0000 1.11
***************
*** 217,220 ****
--- 217,221 ----
getAccKindsInString( res_str);
if( !res_str.empty()) send2Console( "[Closure Copy] The following kinds may accept the copied data: " + res_str + ".");
+ else send2Console( "[Closure Copy] Possible accepting kind not found based on the meta.");
}
else if ( m_iContainerOption == 2) // as is, no wrapping
***************
*** 226,229 ****
--- 227,231 ----
getAccKindsInString( res_str);
if( !res_str.empty()) send2Console( "[Closure Copy] The following kinds may accept the copied data: " + res_str + ".");
+ else send2Console( "[Closure Copy] Possible accepting kind not found based on the meta.");
}
}
***************
*** 1726,1731 ****
{
// acc kinds already calculated in isValidSelection()
! // shows the acc kinds in the console window
! send2Console( "[Smart Copy] The following kinds may accept the copied data: " + m_accKind + ".");
sort( m_peculiarFcos.begin(), m_peculiarFcos.end(), ConnsLast());
--- 1728,1736 ----
{
// acc kinds already calculated in isValidSelection()
! if( m_peculiarFcos.size() > 0)
! send2Console( "[Smart Copy] The following kinds may accept the copied data: " + m_accKind + ".");
! else //
! send2Console( "[Smart Copy] No data copied.");
!
sort( m_peculiarFcos.begin(), m_peculiarFcos.end(), ConnsLast());
***************
*** 1733,1738 ****
m_selFcos = m_topFcos = m_peculiarFcos;
ASSERT( m_peculiarFolds.size() == 0);
- //m_selFolds = m_topFolds = m_peculiarFolds;
-
}
--- 1738,1741 ----
Index: MgaUtil.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MgaUtil.rc,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** MgaUtil.rc 28 Sep 2004 22:43:27 -0000 1.42
--- MgaUtil.rc 29 Sep 2004 21:00:28 -0000 1.43
***************
*** 436,440 ****
END
! IDD_CLOSUREDLG DIALOG DISCARDABLE 0, 0, 279, 253
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Selective Closure"
--- 436,440 ----
END
! IDD_CLOSUREDLG DIALOG DISCARDABLE 0, 0, 279, 238
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Selective Closure"
***************
*** 442,446 ****
BEGIN
GROUPBOX "Direction, kinds and relations to be considered",
! IDC_STATIC,21,4,237,113
CONTROL "Up",IDC_DIRECTIONUP,"Button",BS_AUTORADIOBUTTON |
WS_GROUP | WS_TABSTOP,25,15,26,8
--- 442,446 ----
BEGIN
GROUPBOX "Direction, kinds and relations to be considered",
! IDC_STATIC,21,4,237,99
CONTROL "Up",IDC_DIRECTIONUP,"Button",BS_AUTORADIOBUTTON |
WS_GROUP | WS_TABSTOP,25,15,26,8
***************
*** 461,502 ****
PUSHBUTTON ">>",IDC_FILTER,225,36,16,9
CONTROL "Refers To",IDC_CHECKREFERSTO,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,69,68,53,8
CONTROL "Referred By",IDC_CHECKREFERREDBY,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,69,79,51,8
CONTROL "Connection",IDC_CHECKCONNECTION,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,69,90,58,8
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
CONTROL "Base Type of This",IDC_CHECKBASETYPES,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,172,90,74,8
CONTROL "Derived Types of This",IDC_CHECKSUBTYPES,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,172,101,85,8
! GROUPBOX "Wrap selected closure",IDC_STATIC,21,122,82,51
CONTROL "Miniproject",IDC_WRAPMINIPROJ,"Button",
! BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,25,135,49,8
CONTROL "Automatic",IDC_WRAPAUTO,"Button",BS_AUTORADIOBUTTON,25,
! 147,49,8
! CONTROL "As is",IDC_WRAPASIS,"Button",BS_AUTORADIOBUTTON,25,159,
32,8
! GROUPBOX "Library element handling",IDC_STATIC,118,122,140,51
CONTROL "Use stubs",IDC_LIBR1,"Button",BS_AUTORADIOBUTTON |
! WS_GROUP | WS_TABSTOP,122,135,61,8
CONTROL "Do not include in closure (stop)",IDC_LIBR2,"Button",
! BS_AUTORADIOBUTTON,122,147,115,8
CONTROL "Include in closure (continue)",IDC_LIBR3,"Button",
! BS_AUTORADIOBUTTON,122,159,116,8
! GROUPBOX "Output to",IDC_STATIC,22,181,236,38
CONTROL "Clipboard",IDC_OUTPUTTOCLIPBOARD,"Button",
! BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,25,192,49,9
CONTROL "File",IDC_OUTPUTTOFILE,"Button",BS_AUTORADIOBUTTON,25,
! 204,25,9
! EDITTEXT IDC_EDIT1,56,202,177,12,ES_AUTOHSCROLL
! PUSHBUTTON " ... ",IDC_BROWSE,237,202,15,12
! DEFPUSHBUTTON "OK",IDOK,63,231,50,14
! PUSHBUTTON "Cancel",IDCANCEL,157,231,50,14
END
--- 461,502 ----
PUSHBUTTON ">>",IDC_FILTER,225,36,16,9
CONTROL "Refers To",IDC_CHECKREFERSTO,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,69,55,53,8
CONTROL "Referred By",IDC_CHECKREFERREDBY,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,69,66,51,8
CONTROL "Connection",IDC_CHECKCONNECTION,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,69,77,58,8
CONTROL "Connection with refports",IDC_CHECKREFPORTCONNECTION,
! "Button",BS_AUTOCHECKBOX | WS_TABSTOP,79,88,89,9
CONTROL "Set Members",IDC_CHECKSETMEMBER,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,172,55,55,8
CONTROL "Member of Sets",IDC_CHECKMEMBEROF,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,172,66,67,8
CONTROL "Base Type of This",IDC_CHECKBASETYPES,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,172,77,74,8
CONTROL "Derived Types of This",IDC_CHECKSUBTYPES,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,172,88,82,8
! GROUPBOX "Wrap selected closure",IDC_STATIC,21,107,82,51
CONTROL "Miniproject",IDC_WRAPMINIPROJ,"Button",
! BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,25,120,49,8
CONTROL "Automatic",IDC_WRAPAUTO,"Button",BS_AUTORADIOBUTTON,25,
! 132,49,8
! CONTROL "As is",IDC_WRAPASIS,"Button",BS_AUTORADIOBUTTON,25,144,
32,8
! GROUPBOX "Library element handling",IDC_STATIC,118,107,140,51
CONTROL "Use stubs",IDC_LIBR1,"Button",BS_AUTORADIOBUTTON |
! WS_GROUP | WS_TABSTOP,122,120,61,8
CONTROL "Do not include in closure (stop)",IDC_LIBR2,"Button",
! BS_AUTORADIOBUTTON,122,132,115,8
CONTROL "Include in closure (continue)",IDC_LIBR3,"Button",
! BS_AUTORADIOBUTTON,122,144,116,8
! GROUPBOX "Output to",IDC_STATIC,22,166,236,38
CONTROL "Clipboard",IDC_OUTPUTTOCLIPBOARD,"Button",
! BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,25,177,49,9
CONTROL "File",IDC_OUTPUTTOFILE,"Button",BS_AUTORADIOBUTTON,25,
! 189,25,9
! EDITTEXT IDC_EDIT1,56,187,177,12,ES_AUTOHSCROLL
! PUSHBUTTON " ... ",IDC_BROWSE,237,187,15,12
! DEFPUSHBUTTON "OK",IDOK,63,216,50,14
! PUSHBUTTON "Cancel",IDCANCEL,157,216,50,14
END
***************
*** 513,517 ****
END
! IDD_CLOSURESMARTCP DIALOG DISCARDABLE 0, 0, 226, 54
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Smart copy dialog"
--- 513,517 ----
END
! IDD_CLOSURESMARTCP DIALOG DISCARDABLE 0, 0, 226, 58
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Smart copy dialog"
***************
*** 521,529 ****
PUSHBUTTON "Cancel",IDCANCEL,169,23,50,14
CONTROL "References",IDC_CHECKREF,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,12,5,73,10
CONTROL "Sets",IDC_CHECKSET,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,12,17,73,10
CONTROL "Connections",IDC_CHECKCONN,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,12,29,73,10
END
--- 521,530 ----
PUSHBUTTON "Cancel",IDCANCEL,169,23,50,14
CONTROL "References",IDC_CHECKREF,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,12,5,138,10
CONTROL "Sets",IDC_CHECKSET,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,12,17,138,10
CONTROL "Connections",IDC_CHECKCONN,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,12,29,138,10
! PUSHBUTTON "Invert",IDC_INVERT,12,41,29,13
END
***************
*** 763,767 ****
RIGHTMARGIN, 272
TOPMARGIN, 7
! BOTTOMMARGIN, 246
END
--- 764,768 ----
RIGHTMARGIN, 272
TOPMARGIN, 7
! BOTTOMMARGIN, 231
END
***************
*** 779,783 ****
RIGHTMARGIN, 219
TOPMARGIN, 7
! BOTTOMMARGIN, 47
END
--- 780,784 ----
RIGHTMARGIN, 219
TOPMARGIN, 7
! BOTTOMMARGIN, 51
END
Index: resource.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/resource.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** resource.h 27 Sep 2004 21:50:53 -0000 1.26
--- resource.h 29 Sep 2004 21:00:28 -0000 1.27
***************
*** 191,194 ****
--- 191,195 ----
#define IDC_FILTER 2257
#define IDC_LABELAVOIDANCE 2258
+ #define IDC_INVERT 2259
#define ID_CNTX_ADDNODE 32774
#define ID_CNTX_CLEARNODE 32775
***************
*** 202,206 ****
#define _APS_NEXT_RESOURCE_VALUE 2070
#define _APS_NEXT_COMMAND_VALUE 32778
! #define _APS_NEXT_CONTROL_VALUE 2259
#define _APS_NEXT_SYMED_VALUE 2091
#endif
--- 203,207 ----
#define _APS_NEXT_RESOURCE_VALUE 2070
#define _APS_NEXT_COMMAND_VALUE 32778
! #define _APS_NEXT_CONTROL_VALUE 2260
#define _APS_NEXT_SYMED_VALUE 2091
#endif
- Previous message: [GME-commit] GMESRC/GME/Parser MgaParserBC.cpp,1.1,1.2
- Next message: [GME-commit]
GMESRC/GME/Parser MgaParser.cpp,1.25,1.26 MgaParser.h,1.10,1.11
MgaParserBC.cpp,1.2,1.3 MgaParserSC.cpp,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the GME-commit
mailing list