[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004
BON2Component.cpp,1.24,1.25 Component.rc,1.8,1.9 Globals.h,1.4,1.5
MetaGME2004.dsp,1.15,1.16 resource.h,1.5,1.6
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Fri Nov 5 15:25:11 CST 2004
- Previous message: [GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp
EventsDial.cpp,NONE,1.1 EventsDial.h,NONE,1.1 Options.cpp,NONE,1.1
options.h,NONE,1.1
- Next message: [GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep
ConnJoint.cpp,1.9,1.10 Dumper.cpp,1.26,1.27 Dumper.h,1.8,1.9
FolderRep.cpp,1.8,1.9 ModelRep.cpp,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004
In directory braindrain:/tmp/cvs-serv6256
Modified Files:
BON2Component.cpp Component.rc Globals.h MetaGME2004.dsp
resource.h
Log Message:
The user can edit upon interpretation the eventmasks and priorities for the cardinality-based contstraints.
CVS User: zolmol
Index: BON2Component.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/BON2Component.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** BON2Component.cpp 15 Sep 2004 19:48:33 -0000 1.24
--- BON2Component.cpp 5 Nov 2004 21:25:07 -0000 1.25
***************
*** 340,344 ****
}
-
// ====================================================
// This is the main component method for Interpereters and Plugins.
--- 340,343 ----
***************
*** 348,361 ****
// ======================
// Insert application specific code here
-
global_vars.silent_mode = (lParam == GME_SILENT_MODE);
!
initMembers( project);
! if ( Dumper::selectOutputFiles( m_projectName, m_dir) > 1)
{
project->consoleMsg("[MetaInterpreter] Output file name selection cancelled by the user or other file operation failed.", MSG_NORMAL);
return;
}
global_vars.err.m_proj = project;
--- 347,361 ----
// ======================
// Insert application specific code here
global_vars.silent_mode = (lParam == GME_SILENT_MODE);
! //global_vars.silent_mode = true;
initMembers( project);
! if ( Dumper::selectOutputFiles( project, m_projectName, m_dir) > 1)
{
project->consoleMsg("[MetaInterpreter] Output file name selection cancelled by the user or other file operation failed.", MSG_NORMAL);
return;
}
+
+ Dumper::selectOptions( project);
global_vars.err.m_proj = project;
Index: Component.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Component.rc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Component.rc 30 Jul 2004 23:03:04 -0000 1.8
--- Component.rc 5 Nov 2004 21:25:08 -0000 1.9
***************
*** 133,136 ****
--- 133,152 ----
BOTTOMMARGIN, 219
END
+
+ IDD_OPTIONS, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 237
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 144
+ END
+
+ IDD_EVENTSDLG, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 295
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 151
+ END
END
#endif // APSTUDIO_INVOKED
***************
*** 151,155 ****
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Global Aspect Order Dialogue"
! FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "OK",IDOK,15,120,50,14
--- 167,171 ----
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Global Aspect Order Dialogue"
! FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,15,120,50,14
***************
*** 174,177 ****
--- 190,261 ----
IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,7,3,180,
8
+ END
+
+ IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 244, 151
+ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ CAPTION "Options"
+ FONT 8, "MS Sans Serif"
+ BEGIN
+ GROUPBOX "Options for constraints generated from cardinalities",
+ IDC_STATIC,12,10,221,97
+ LTEXT "Check Containment On:",IDC_STATIC,21,27,94,8
+ EDITTEXT IDC_EDIT1,123,25,52,12,ES_AUTOHSCROLL
+ PUSHBUTTON "Events",IDC_BUTTON1,185,25,38,13
+ LTEXT "Check Folder Containment On:",IDC_STATIC,21,48,98,8
+ EDITTEXT IDC_EDIT2,123,46,52,12,ES_AUTOHSCROLL
+ PUSHBUTTON "Events",IDC_BUTTON2,185,46,37,13
+ LTEXT "Check Connections On:",IDC_STATIC,21,69,94,8
+ EDITTEXT IDC_EDIT3,123,67,52,12,ES_AUTOHSCROLL
+ PUSHBUTTON "Events",IDC_BUTTON3,185,67,38,13
+ LTEXT "Priority",IDC_STATIC,21,89,91,11
+ EDITTEXT IDC_EDIT4,123,87,30,12,ES_AUTOHSCROLL
+ CONTROL "Spin1",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT |
+ UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,159,87,11,
+ 12
+ CONTROL "Do not ask these any more",IDC_CHECK1,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,21,112,111,10
+ DEFPUSHBUTTON "OK",IDOK,53,129,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,142,129,50,14
+ END
+
+ IDD_EVENTSDLG DIALOG DISCARDABLE 0, 0, 302, 158
+ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ CAPTION "Events"
+ FONT 8, "MS Sans Serif"
+ BEGIN
+ CONTROL "On create",IDC_CHECK1,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,9,9,123,10
+ CONTROL "On close model",IDC_CHECK15,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,168,9,123,10
+ CONTROL "On new child",IDC_CHECK5,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,9,24,123,10
+ CONTROL "On lost child",IDC_CHECK12,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,168,24,123,10
+ CONTROL "On delete",IDC_CHECK2,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,9,39,123,10
+ CONTROL "On move",IDC_CHECK11,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,168,39,123,10
+ CONTROL "On refer",IDC_CHECK13,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,9,54,123,10
+ CONTROL "On unreferred",IDC_CHECK18,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,168,54,123,10
+ CONTROL "On include in set",IDC_CHECK16,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,9,69,123,10
+ CONTROL "On exclude from set",IDC_CHECK19,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,168,69,123,10
+ CONTROL "On connect",IDC_CHECK14,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,9,84,123,10
+ CONTROL "On disconnect",IDC_CHECK17,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,168,84,123,10
+ CONTROL "On derive",IDC_CHECK8,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,9,99,123,10
+ CONTROL "On change association",IDC_CHECK6,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,168,99,123,10
+ CONTROL "On change property",IDC_CHECK7,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,9,114,123,10
+ CONTROL "On change attribute",IDC_CHECK3,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,168,114,123,10
+ DEFPUSHBUTTON "OK",IDOK,85,135,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,162,135,50,14
END
Index: Globals.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Globals.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Globals.h 30 Jul 2004 00:10:22 -0000 1.4
--- Globals.h 5 Nov 2004 21:25:08 -0000 1.5
***************
*** 9,18 ****
{
public:
! Globals():
! xmp_file_name("\\Paradigm.xmp"),
! err_file_name("\\Paradigm.xmp.log")
! { }
- //std::ofstream err;
LogStream err;
std::ofstream dmp;
--- 9,19 ----
{
public:
! Globals()
! : xmp_file_name("\\Paradigm.xmp")
! , err_file_name("\\Paradigm.xmp.log")
! , silent_mode ( false)
! , genConstr()
! { }
LogStream err;
std::ofstream dmp;
***************
*** 22,25 ****
--- 23,43 ----
bool silent_mode;
+
+ class GeneratedConstraints
+ {
+ public:
+ GeneratedConstraints( )
+ : reg_cont_mask( 0)
+ , fol_cont_mask( 0)
+ , connect_mask ( 0)
+ , priority ( 1)
+ { }
+
+ int reg_cont_mask;
+ int fol_cont_mask;
+ int connect_mask;
+ int priority;
+
+ } genConstr;
};
Index: MetaGME2004.dsp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/MetaGME2004.dsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** MetaGME2004.dsp 20 Oct 2004 20:46:40 -0000 1.15
--- MetaGME2004.dsp 5 Nov 2004 21:25:08 -0000 1.16
***************
*** 274,277 ****
--- 274,282 ----
# Begin Source File
+ SOURCE=.\Asp\EventsDial.cpp
+ # ADD CPP /I ".."
+ # End Source File
+ # Begin Source File
+
SOURCE=.\Asp\GlobalAspOrder.cpp
# End Source File
***************
*** 292,295 ****
--- 297,304 ----
SOURCE=.\Asp\NameSpecTbl.cpp
# End Source File
+ # Begin Source File
+
+ SOURCE=.\Asp\Options.cpp
+ # End Source File
# End Group
# Begin Source File
***************
*** 579,582 ****
--- 588,595 ----
# Begin Source File
+ SOURCE=.\Asp\EventsDial.h
+ # End Source File
+ # Begin Source File
+
SOURCE=.\Asp\GlobalAspOrder.h
# End Source File
***************
*** 596,599 ****
--- 609,616 ----
SOURCE=.\Asp\NameSpecTbl.h
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\Asp\Options.h
# End Source File
# End Group
Index: resource.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/resource.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** resource.h 30 Jul 2004 00:10:22 -0000 1.5
--- resource.h 5 Nov 2004 21:25:08 -0000 1.6
***************
*** 12,20 ****
--- 12,45 ----
#define IDC_BUTTON2 205
#define IDC_LIST3 206
+ #define IDC_EDIT1 216
+ #define IDC_EDIT2 217
+ #define IDC_EDIT3 218
#define IDB_BITMAPUP 219
+ #define IDC_BUTTON3 219
#define IDB_BITMAPDN 220
#define IDI_ICONDN 221
+ #define IDC_CHECK1 221
#define IDI_ICONUP 222
+ #define IDC_CHECK2 222
+ #define IDC_CHECK3 223
#define IDD_EQUIVDIALOG 224
+ #define IDD_OPTIONS 225
+ #define IDC_CHECK5 225
+ #define IDD_EVENTSDLG 226
+ #define IDC_CHECK6 226
+ #define IDC_CHECK7 227
+ #define IDC_CHECK8 228
+ #define IDC_CHECK10 230
+ #define IDC_CHECK11 231
+ #define IDC_CHECK12 232
+ #define IDC_CHECK13 233
+ #define IDC_CHECK14 234
+ #define IDC_CHECK15 235
+ #define IDC_CHECK16 238
+ #define IDC_CHECK17 239
+ #define IDC_CHECK18 240
+ #define IDC_CHECK19 241
+ #define IDC_SPIN1 243
+ #define IDC_EDIT4 244
// Next default values for new objects
***************
*** 22,28 ****
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 225
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 216
#define _APS_NEXT_SYMED_VALUE 101
#endif
--- 47,53 ----
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 227
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 245
#define _APS_NEXT_SYMED_VALUE 101
#endif
- Previous message: [GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp
EventsDial.cpp,NONE,1.1 EventsDial.h,NONE,1.1 Options.cpp,NONE,1.1
options.h,NONE,1.1
- Next message: [GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep
ConnJoint.cpp,1.9,1.10 Dumper.cpp,1.26,1.27 Dumper.h,1.8,1.9
FolderRep.cpp,1.8,1.9 ModelRep.cpp,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the GME-commit
mailing list