[GME-commit]
GMESRC/Paradigms/MetaGME/BonExtension BON2Component.cpp,1.15,1.16
BonExt.dsp,1.7,1.8 Component.rc,1.4,1.5 logger.cpp,1.1,1.2
resource.h,1.2,1.3
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Wed Jun 16 14:35:06 CDT 2004
- Previous message: [GME-commit] GMESRC/GME/Gme MainFrm.h,1.18,1.19
- Next message: [GME-commit]
GMESRC/Paradigms/MetaGME/BonExtension/Rep CodeGenReg.cpp,NONE,1.1
CodeGenTemplate.cpp,NONE,1.1 Any.cpp,1.8,1.9 Any.h,1.5,1.6
AttributeRep.cpp,1.7,1.8 AttributeRep.h,1.4,1.5 CodeGen.cpp,1.4,1.5
CodeGen.h,1.2,1.3 ConnJoint.cpp,1.6,1.7 ConnJoint.h,1.4,1.5
ConnectionRep.cpp,1.4,1.5 Dumper.cpp,1.10,1.11 Dumper.h,1.6,1.7
FCO.cpp,1.13,1.14 FCO.h,1.10,1.11 MakeVisitor.cpp,1.4,1.5
Method.cpp,1.5,1.6 Method.h,1.2,1.3 ModelRep.cpp,1.10,1.11
ModelRep.h,1.4,1.5 ReferenceRep.cpp,1.7,1.8 ReferenceRep.h,1.3,1.4
SetRep.cpp,1.8,1.9 SetRep.h,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension
In directory braindrain:/tmp/cvs-serv25714
Modified Files:
BON2Component.cpp BonExt.dsp Component.rc logger.cpp
resource.h
Log Message:
Corrections:
-implementation inheritance mapping to C++ corrected.
Features:
-Options dialogue added
-template methods can be generated for ordering sets (as the user wishes)
-initialize and finalize generated if wanted
CVS User: zolmol
Index: BON2Component.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/BON2Component.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** BON2Component.cpp 20 May 2004 00:30:33 -0000 1.15
--- BON2Component.cpp 16 Jun 2004 18:35:00 -0000 1.16
***************
*** 938,942 ****
catch(...)
{
! global_vars.err << "Something went wrong in executeSheet\n";
success = false;
}
--- 938,942 ----
catch(...)
{
! global_vars.err << "Something went wrong in executeSheet.\n";
success = false;
}
***************
*** 1209,1213 ****
if ( fco != 0 && attr != 0)
{
! AttributeRep * attr_obj = static_cast< AttributeRep *>( attr); // <?> dynamic cast
fco->addInitialAttribute( attr_obj);
if ( !attr_obj->isGlobal())
--- 1209,1213 ----
if ( fco != 0 && attr != 0)
{
! AttributeRep * attr_obj = dynamic_cast< AttributeRep *>( attr);
fco->addInitialAttribute( attr_obj);
if ( !attr_obj->isGlobal())
Index: BonExt.dsp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/BonExt.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BonExt.dsp 10 Mar 2004 03:00:16 -0000 1.7
--- BonExt.dsp 16 Jun 2004 18:35:00 -0000 1.8
***************
*** 134,137 ****
--- 134,145 ----
# Begin Source File
+ SOURCE=.\Rep\CodeGenReg.cpp
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\Rep\CodeGenTemplate.cpp
+ # End Source File
+ # Begin Source File
+
SOURCE=.\Rep\ConnectionRep.cpp
# End Source File
***************
*** 222,225 ****
--- 230,237 ----
# Begin Source File
+ SOURCE=.\gui\OptionsDlg.cpp
+ # End Source File
+ # Begin Source File
+
SOURCE=.\GUI\SelConf.cpp
# End Source File
***************
*** 467,470 ****
--- 479,486 ----
SOURCE=.\GUI\InPlaceList.h
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\gui\OptionsDlg.h
# End Source File
# Begin Source File
Index: Component.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Component.rc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Component.rc 17 Mar 2004 00:24:13 -0000 1.4
--- Component.rc 16 Jun 2004 18:35:00 -0000 1.5
***************
*** 115,118 ****
--- 115,126 ----
BOTTOMMARGIN, 275
END
+
+ IDD_DIALOG2, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 298
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 227
+ END
END
#endif // APSTUDIO_INVOKED
***************
*** 134,137 ****
--- 142,186 ----
WS_TABSTOP
LTEXT "Select configuration:",IDC_STATIC,14,6,68,10
+ END
+
+ IDD_DIALOG2 DIALOG DISCARDABLE 0, 0, 305, 234
+ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ CAPTION "Options"
+ FONT 8, "MS Sans Serif"
+ BEGIN
+ GROUPBOX "Output header and source files",IDC_STATIC,7,6,291,51
+ EDITTEXT IDC_EDIT1,18,18,261,13,ES_AUTOHSCROLL
+ PUSHBUTTON "...",IDC_BUTTON1,283,18,10,11
+ EDITTEXT IDC_EDIT2,18,35,261,13,ES_AUTOHSCROLL
+ PUSHBUTTON "...",IDC_BUTTON2,283,36,10,11
+ GROUPBOX "",IDC_STATIC,7,59,291,39
+ CONTROL "&Parse header file generated before",IDC_CHECK5,"Button",
+ BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,16,57,123,13
+ EDITTEXT IDC_EDIT5,18,75,261,13,ES_AUTOHSCROLL
+ PUSHBUTTON "...",IDC_BUTTON5,283,76,10,11
+ GROUPBOX "",IDC_STATIC,7,102,291,49
+ CONTROL "&Visitor",IDC_CHECK34,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,16,103,35,10
+ EDITTEXT IDC_EDIT3,18,116,261,13,ES_AUTOHSCROLL
+ PUSHBUTTON "...",IDC_BUTTON3,283,116,10,11
+ EDITTEXT IDC_EDIT4,18,132,261,13,ES_AUTOHSCROLL
+ PUSHBUTTON "...",IDC_BUTTON4,283,133,10,11
+ GROUPBOX "Generate methods",IDC_STATIC,7,154,76,42
+ CONTROL "&initialize()",IDC_CHECK2,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,16,164,44,10
+ CONTROL "&finalize()",IDC_CHECK3,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,16,178,41,10
+ GROUPBOX "Getter style",IDC_STATIC,101,154,195,42
+ CONTROL "&Simple",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON |
+ WS_GROUP | WS_TABSTOP,110,163,39,8
+ CONTROL "&Template method",IDC_RADIO2,"Button",
+ BS_AUTORADIOBUTTON,110,173,72,8
+ CONTROL "&Both",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,110,183,
+ 39,8
+ CONTROL "VC version &greater than 7.1",IDC_CHECKVERS71,"Button",
+ BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,211,173,81,
+ 18
+ DEFPUSHBUTTON "OK",IDOK,32,208,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,233,206,50,14
END
Index: logger.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/logger.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** logger.cpp 4 Dec 2003 16:45:26 -0000 1.1
--- logger.cpp 16 Jun 2004 18:35:00 -0000 1.2
***************
*** 73,86 ****
std::string shortFileName( const std::string& long_name)
{
- std::string short_name;
int pos = long_name.rfind( '\\');
if ( pos != std::string::npos)
{
if ( pos + 1 < long_name.length())
short_name = long_name.substr( pos + 1);
else
short_name = "insert_your_specialized_header_filename_here.h";
}
! return short_name;
}
--- 73,89 ----
std::string shortFileName( const std::string& long_name)
{
int pos = long_name.rfind( '\\');
if ( pos != std::string::npos)
{
+ std::string short_name;
if ( pos + 1 < long_name.length())
short_name = long_name.substr( pos + 1);
else
short_name = "insert_your_specialized_header_filename_here.h";
+
+ return short_name;
}
!
! return long_name;
}
***************
*** 90,93 ****
--- 93,97 ----
if ( p != std::string::npos)
return filename.substr( 0, p);
+
return filename;
}
Index: resource.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/resource.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** resource.h 26 Feb 2004 17:12:46 -0000 1.2
--- resource.h 16 Jun 2004 18:35:00 -0000 1.3
***************
*** 8,12 ****
--- 8,31 ----
#define IDC_TAB1 201
#define IDD_DIALOG1 203
+ #define IDD_DIALOG2 204
#define IDC_COMBO1 205
+ #define IDC_CHECK34 212
+ #define IDC_CHECK2 213
+ #define IDC_CHECK3 214
+ #define IDC_EDIT1 216
+ #define IDC_CHECK5 217
+ #define IDC_EDIT2 218
+ #define IDC_EDIT3 219
+ #define IDC_EDIT4 220
+ #define IDC_EDIT5 221
+ #define IDC_BUTTON1 223
+ #define IDC_BUTTON2 224
+ #define IDC_BUTTON5 225
+ #define IDC_BUTTON3 226
+ #define IDC_BUTTON4 227
+ #define IDC_RADIO1 228
+ #define IDC_RADIO2 229
+ #define IDC_RADIO3 230
+ #define IDC_CHECKVERS71 233
// Next default values for new objects
***************
*** 14,20 ****
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 204
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 212
#define _APS_NEXT_SYMED_VALUE 101
#endif
--- 33,39 ----
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 205
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 234
#define _APS_NEXT_SYMED_VALUE 101
#endif
- Previous message: [GME-commit] GMESRC/GME/Gme MainFrm.h,1.18,1.19
- Next message: [GME-commit]
GMESRC/Paradigms/MetaGME/BonExtension/Rep CodeGenReg.cpp,NONE,1.1
CodeGenTemplate.cpp,NONE,1.1 Any.cpp,1.8,1.9 Any.h,1.5,1.6
AttributeRep.cpp,1.7,1.8 AttributeRep.h,1.4,1.5 CodeGen.cpp,1.4,1.5
CodeGen.h,1.2,1.3 ConnJoint.cpp,1.6,1.7 ConnJoint.h,1.4,1.5
ConnectionRep.cpp,1.4,1.5 Dumper.cpp,1.10,1.11 Dumper.h,1.6,1.7
FCO.cpp,1.13,1.14 FCO.h,1.10,1.11 MakeVisitor.cpp,1.4,1.5
Method.cpp,1.5,1.6 Method.h,1.2,1.3 ModelRep.cpp,1.10,1.11
ModelRep.h,1.4,1.5 ReferenceRep.cpp,1.7,1.8 ReferenceRep.h,1.3,1.4
SetRep.cpp,1.8,1.9 SetRep.h,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the GME-commit
mailing list