[GME-commit]
GMESRC/Paradigms/MetaGME/MetaInterpreter2004 iconDN.ico,NONE,1.1
iconUP.ico,NONE,1.1 BON2Component.cpp,1.14,1.15
Component.rc,1.5,1.6 MetaGME2004.dsp,1.9,1.10 resource.h,1.3,1.4
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Wed Jun 16 14:56:54 CDT 2004
Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004
In directory braindrain:/tmp/cvs-serv25910
Modified Files:
BON2Component.cpp Component.rc MetaGME2004.dsp resource.h
Added Files:
iconDN.ico iconUP.ico
Log Message:
Bug corrected: Aspect membership of a Role needs to be derived to roles in the derived models.
Instead of bitmaps icons with transparent background used on the Aspect Order Dialogue buttons.
CVS User: zolmol
--- NEW FILE: iconDN.ico ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: iconUP.ico ---
(This appears to be a binary file; contents omitted.)
Index: BON2Component.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/BON2Component.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** BON2Component.cpp 14 May 2004 00:51:33 -0000 1.14
--- BON2Component.cpp 16 Jun 2004 18:56:51 -0000 1.15
***************
*** 1252,1256 ****
std::string card = Connection( rel_it.getOp3())->getAttribute("Cardinality")->getStringValue();
! ModelRep * model = static_cast<ModelRep*>( m_sheet->findFCO( rel_it.getOp4())); // op4 is the container model
if ( model != 0)
{
--- 1252,1256 ----
std::string card = Connection( rel_it.getOp3())->getAttribute("Cardinality")->getStringValue();
! ModelRep * model = dynamic_cast<ModelRep*>( m_sheet->findFCO( rel_it.getOp4())); // op4 is the container model
if ( model != 0)
{
***************
*** 1294,1298 ****
if ( any != 0 && constraint != 0)
{
! ConstraintRep *constraint_obj = static_cast< ConstraintRep * >(constraint);
if (any && (any->isFCO() || any->getMyKind() == Any::FOLDER))
{
--- 1294,1298 ----
if ( any != 0 && constraint != 0)
{
! ConstraintRep *constraint_obj = dynamic_cast< ConstraintRep * >(constraint);
if (any && (any->isFCO() || any->getMyKind() == Any::FOLDER))
{
***************
*** 1325,1329 ****
if ( fco != 0 && attr != 0)
{
! AttributeRep * attr_obj = static_cast< AttributeRep *>( attr); // <?> dynamic cast
fco->addInitialAttribute( attr_obj);
if ( !attr_obj->isGlobal())
--- 1325,1329 ----
if ( fco != 0 && attr != 0)
{
! AttributeRep * attr_obj = dynamic_cast< AttributeRep *>( attr);
fco->addInitialAttribute( attr_obj);
if ( !attr_obj->isGlobal())
Index: Component.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Component.rc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Component.rc 8 Mar 2004 22:22:58 -0000 1.5
--- Component.rc 16 Jun 2004 18:56:51 -0000 1.6
***************
*** 98,102 ****
--- 98,104 ----
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
+ IDI_ICONDN ICON DISCARDABLE "iconDN.ico"
IDI_COMPICON ICON DISCARDABLE "compicon.ico"
+ IDI_ICONUP ICON DISCARDABLE "iconUP.ico"
/////////////////////////////////////////////////////////////////////////////
***************
*** 147,165 ****
LISTBOX IDC_LIST3,16,20,110,85,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
WS_HSCROLL | WS_TABSTOP
! PUSHBUTTON "Move Up",IDC_BUTTON1,137,36,16,13,BS_BITMAP | BS_CENTER |
BS_VCENTER,WS_EX_TRANSPARENT
- PUSHBUTTON "Move Down",IDC_BUTTON2,137,75,16,13,BS_BITMAP |
- BS_CENTER | BS_VCENTER,WS_EX_TRANSPARENT
LTEXT "Global aspect order",IDC_STATIC,16,10,94,8
END
-
- /////////////////////////////////////////////////////////////////////////////
- //
- // Bitmap
- //
-
- IDB_BITMAPUP BITMAP DISCARDABLE "bitmapUP.bmp"
- IDB_BITMAPDN BITMAP DISCARDABLE "bitmapDN.bmp"
/////////////////////////////////////////////////////////////////////////////
--- 149,159 ----
LISTBOX IDC_LIST3,16,20,110,85,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
WS_HSCROLL | WS_TABSTOP
! PUSHBUTTON "Move Up",IDC_BUTTON1,137,36,16,13,BS_ICON | BS_CENTER |
! BS_VCENTER,WS_EX_TRANSPARENT
! PUSHBUTTON "Move Down",IDC_BUTTON2,137,75,16,13,BS_ICON | BS_CENTER |
BS_VCENTER,WS_EX_TRANSPARENT
LTEXT "Global aspect order",IDC_STATIC,16,10,94,8
END
/////////////////////////////////////////////////////////////////////////////
Index: MetaGME2004.dsp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/MetaGME2004.dsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MetaGME2004.dsp 8 Mar 2004 22:22:58 -0000 1.9
--- MetaGME2004.dsp 16 Jun 2004 18:56:51 -0000 1.10
***************
*** 593,596 ****
--- 593,604 ----
SOURCE=.\CompIcon.ico
# End Source File
+ # Begin Source File
+
+ SOURCE=.\icon2.ico
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\iconUP.ico
+ # End Source File
# End Group
# Begin Source File
Index: resource.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/resource.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** resource.h 8 Mar 2004 22:22:58 -0000 1.3
--- resource.h 16 Jun 2004 18:56:51 -0000 1.4
***************
*** 14,17 ****
--- 14,19 ----
#define IDB_BITMAPUP 219
#define IDB_BITMAPDN 220
+ #define IDI_ICONDN 221
+ #define IDI_ICONUP 222
// Next default values for new objects
***************
*** 19,23 ****
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 221
#define _APS_NEXT_COMMAND_VALUE 32768
#define _APS_NEXT_CONTROL_VALUE 211
--- 21,25 ----
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 223
#define _APS_NEXT_COMMAND_VALUE 32768
#define _APS_NEXT_CONTROL_VALUE 211
More information about the GME-commit
mailing list