[GME-commit]
GMESRC/GME/Gme GMEStd.h,1.27,1.28 GUIObject.cpp,1.53,1.54
GraphicsUtil.cpp,1.14,1.15 GraphicsUtil.h,1.7,1.8
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Wed Mar 15 20:05:21 CST 2006
Update of /project/gme-repository/GMESRC/GME/Gme
In directory escher:/tmp/cvs-serv28235
Modified Files:
GMEStd.h GUIObject.cpp GraphicsUtil.cpp GraphicsUtil.h
Log Message:
Left and Right Half Arrows introduced as possible connection end styles.
CVS User: Zoltan Molnar, ISIS (zolmol)
Index: GraphicsUtil.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GraphicsUtil.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GraphicsUtil.h 31 Aug 2005 19:38:41 -0000 1.7
--- GraphicsUtil.h 15 Mar 2006 20:05:19 -0000 1.8
***************
*** 30,37 ****
CFontList allFonts; // for destruction only
CArrowHead *arrows[GME_DIRECTION_NUM];
- CArrowHead *bonds[GME_DIRECTION_NUM];
CArrowHead *diamonds[GME_DIRECTION_NUM];
CArrowHead *apexes[GME_DIRECTION_NUM];
CArrowHead *bullets[GME_DIRECTION_NUM];
public:
--- 30,38 ----
CFontList allFonts; // for destruction only
CArrowHead *arrows[GME_DIRECTION_NUM];
CArrowHead *diamonds[GME_DIRECTION_NUM];
CArrowHead *apexes[GME_DIRECTION_NUM];
CArrowHead *bullets[GME_DIRECTION_NUM];
+ CArrowHead *leftHalfArrows[GME_DIRECTION_NUM];
+ CArrowHead *rightHalfArrows[GME_DIRECTION_NUM];
public:
Index: GUIObject.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GUIObject.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** GUIObject.cpp 31 Aug 2005 19:38:41 -0000 1.53
--- GUIObject.cpp 15 Mar 2006 20:05:19 -0000 1.54
***************
*** 2043,2048 ****
if ( pref == "arrow" )
srcStyle = GME_ARROW_END;
- else if ( pref == "bond" )
- srcStyle = GME_BOND_END;
else if ( pref == "diamond" )
srcStyle = GME_DIAMOND_END;
--- 2043,2046 ----
***************
*** 2057,2060 ****
--- 2055,2062 ----
else if ( pref == "empty bullet" )
srcStyle = GME_EMPTYBULLET_END;
+ else if ( pref == "left half arrow" )
+ srcStyle = GME_HALFARROWLEFT_END;
+ else if ( pref == "right half arrow" )
+ srcStyle = GME_HALFARROWRIGHT_END;
else
srcStyle = GME_BUTT_END;
***************
*** 2065,2070 ****
if ( pref == "arrow" )
dstStyle = GME_ARROW_END;
- else if ( pref == "bond" )
- dstStyle = GME_BOND_END;
else if ( pref == "diamond" )
dstStyle = GME_DIAMOND_END;
--- 2067,2070 ----
***************
*** 2079,2082 ****
--- 2079,2086 ----
else if ( pref == "empty bullet" )
dstStyle = GME_EMPTYBULLET_END;
+ else if ( pref == "left half arrow" )
+ dstStyle = GME_HALFARROWLEFT_END;
+ else if ( pref == "right half arrow" )
+ dstStyle = GME_HALFARROWRIGHT_END;
else
dstStyle = GME_BUTT_END;
Index: GMEStd.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEStd.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** GMEStd.h 30 Jan 2006 20:47:54 -0000 1.27
--- GMEStd.h 15 Mar 2006 20:05:19 -0000 1.28
***************
*** 63,67 ****
#define GME_EMPTYAPEX_END 6
#define GME_EMPTYBULLET_END 7
! #define GME_BOND_END 8
--- 63,68 ----
#define GME_EMPTYAPEX_END 6
#define GME_EMPTYBULLET_END 7
! #define GME_HALFARROWLEFT_END 8
! #define GME_HALFARROWRIGHT_END 9
Index: GraphicsUtil.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GraphicsUtil.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** GraphicsUtil.cpp 31 Aug 2005 19:38:41 -0000 1.14
--- GraphicsUtil.cpp 15 Mar 2006 20:05:19 -0000 1.15
***************
*** 11,16 ****
static int arrowXCoords[] = {-5, -7, -1, -7};
static int arrowYCoords[] = {0, -3, 0, 3};
! static int bondXCoords[] = {-1, -10};
! static int bondYCoords[] = {0, -5};
static int diamondXCoords[] = {-11, -6, -1, -6};
static int diamondYCoords[] = {0, -3, 0, 3};
--- 11,18 ----
static int arrowXCoords[] = {-5, -7, -1, -7};
static int arrowYCoords[] = {0, -3, 0, 3};
! static int leftHalfXCoords[] = {-1, -10};
! static int leftHalfYCoords[] = {0, -5};
! static int rightHalfXCoords[] = {-1, -10 };
! static int rightHalfYCoords[] = {0, 5};
static int diamondXCoords[] = {-11, -6, -1, -6};
static int diamondYCoords[] = {0, -3, 0, 3};
***************
*** 127,134 ****
for(int i = 0; i < GME_DIRECTION_NUM; i++) {
arrows[i] = new CArrowHead( i, arrowXCoords, arrowYCoords, 4 );
- bonds[i] = new CArrowHead( i, bondXCoords, bondYCoords, 2 );
diamonds[i] = new CArrowHead( i, diamondXCoords, diamondYCoords, 4 );
apexes[i] = new CArrowHead( i, apexXCoords, apexYCoords, 3 );
bullets[i] = new CArrowHead( i, bulletXCoords, bulletYCoords, 12 );
}
}
--- 129,137 ----
for(int i = 0; i < GME_DIRECTION_NUM; i++) {
arrows[i] = new CArrowHead( i, arrowXCoords, arrowYCoords, 4 );
diamonds[i] = new CArrowHead( i, diamondXCoords, diamondYCoords, 4 );
apexes[i] = new CArrowHead( i, apexXCoords, apexYCoords, 3 );
bullets[i] = new CArrowHead( i, bulletXCoords, bulletYCoords, 12 );
+ leftHalfArrows[i] = new CArrowHead( i, leftHalfXCoords, leftHalfYCoords, 2);
+ rightHalfArrows[i] = new CArrowHead( i, rightHalfXCoords, rightHalfYCoords, 2);
}
}
***************
*** 148,155 ****
for(int i = 0; i < GME_DIRECTION_NUM; i++) {
delete arrows[i];
- delete bonds[i];
delete diamonds[i];
delete apexes[i];
delete bullets[i];
}
}
--- 151,159 ----
for(int i = 0; i < GME_DIRECTION_NUM; i++) {
delete arrows[i];
delete diamonds[i];
delete apexes[i];
delete bullets[i];
+ delete leftHalfArrows[i];
+ delete rightHalfArrows[i];
}
}
***************
*** 316,322 ****
arrows[ dir ]->Draw( pDC, last, false );
break;
- case GME_BOND_END :
- bonds[ dir ]->Draw( pDC, last, true );
- break;
case GME_DIAMOND_END :
case GME_EMPTYDIAMOND_END :
--- 320,323 ----
***************
*** 330,333 ****
--- 331,340 ----
case GME_EMPTYBULLET_END :
bullets[ dir ]->Draw( pDC, last, iEnd == GME_EMPTYBULLET_END );
+ break;
+ case GME_HALFARROWLEFT_END :
+ leftHalfArrows[ dir ]->Draw( pDC, last, true );
+ break;
+ case GME_HALFARROWRIGHT_END :
+ rightHalfArrows[ dir ]->Draw( pDC, last, true );
break;
}
More information about the GME-commit
mailing list