[GME-commit] GMESRC/GME/Gme/AutoRoute ArGraph.cpp,1.6,1.7 ArGraph.h,1.3,1.4

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/GME/Gme/AutoRoute
In directory escher:/tmp/cvs-serv31434

Modified Files:
	ArGraph.cpp ArGraph.h 
Log Message:
Previous values (0x10, 0x20, 0x30, 0x40) not suitable for unambiguous OR combinations. Replaced with 0x10, 0x20, 0x40, 0x80.
Similarly for 0x100, 0x200, 0x300, 0x400 replaced with 0x100, 0x200, 0x400, 0x800.


Wrong test in CArPath::GetStartDir() and CArPath::GetEndDir():

A combined value (e.g. ARPATH_StartOnBottom | ARPATH_StartOnRight = 0x600) is never equal to any of the composing values: ARPATH_StartOnBottom or ARPATH_StartOnRight.



CVS User: Zoltan Molnar, ISIS (zolmol)

Index: ArGraph.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/AutoRoute/ArGraph.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ArGraph.h	1 Sep 2001 19:25:00 -0000	1.3
--- ArGraph.h	5 Oct 2006 19:33:11 -0000	1.4
***************
*** 226,231 ****
  #define ARPATH_EndOnTop			0x0010
  #define ARPATH_EndOnRight		0x0020
! #define ARPATH_EndOnBottom		0x0030
! #define ARPATH_EndOnLeft		0x0040
  #define ARPATH_EndMask			(ARPATH_EndOnTop | ARPATH_EndOnRight | ARPATH_EndOnBottom | ARPATH_EndOnLeft)
  
--- 226,231 ----
  #define ARPATH_EndOnTop			0x0010
  #define ARPATH_EndOnRight		0x0020
! #define ARPATH_EndOnBottom		0x0040
! #define ARPATH_EndOnLeft		0x0080
  #define ARPATH_EndMask			(ARPATH_EndOnTop | ARPATH_EndOnRight | ARPATH_EndOnBottom | ARPATH_EndOnLeft)
  
***************
*** 234,239 ****
  #define ARPATH_StartOnTop		0x0100
  #define ARPATH_StartOnRight		0x0200
! #define ARPATH_StartOnBottom	0x0300
! #define ARPATH_StartOnLeft		0x0400
  #define ARPATH_StartMask		(ARPATH_StartOnTop | ARPATH_StartOnRight | ARPATH_StartOnBottom | ARPATH_StartOnLeft)
  
--- 234,239 ----
  #define ARPATH_StartOnTop		0x0100
  #define ARPATH_StartOnRight		0x0200
! #define ARPATH_StartOnBottom	0x0400
! #define ARPATH_StartOnLeft		0x0800
  #define ARPATH_StartMask		(ARPATH_StartOnTop | ARPATH_StartOnRight | ARPATH_StartOnBottom | ARPATH_StartOnLeft)
  

Index: ArGraph.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/AutoRoute/ArGraph.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ArGraph.cpp	26 Jan 2005 17:28:29 -0000	1.6
--- ArGraph.cpp	5 Oct 2006 19:33:10 -0000	1.7
***************
*** 1016,1023 ****
  {
  	unsigned int a = attributes & ARPATH_EndMask;
! 	return a == ARPATH_EndOnTop ? Dir_Top : 
! 	a == ARPATH_EndOnRight ? Dir_Right : 
! 	a == ARPATH_EndOnBottom ? Dir_Bottom :
! 	a == ARPATH_EndOnLeft ? Dir_Left : Dir_None;
  }
  
--- 1016,1023 ----
  {
  	unsigned int a = attributes & ARPATH_EndMask;
! 	return a & ARPATH_EndOnTop ? Dir_Top : 
! 	a & ARPATH_EndOnRight ? Dir_Right : 
! 	a & ARPATH_EndOnBottom ? Dir_Bottom :
! 	a & ARPATH_EndOnLeft ? Dir_Left : Dir_None;
  }
  
***************
*** 1025,1032 ****
  {
  	unsigned int a = attributes & ARPATH_StartMask;
! 	return a == ARPATH_StartOnTop ? Dir_Top : 
! 	a == ARPATH_StartOnRight ? Dir_Right : 
! 	a == ARPATH_StartOnBottom ? Dir_Bottom :
! 	a == ARPATH_StartOnLeft ? Dir_Left : Dir_None;
  }
  
--- 1025,1032 ----
  {
  	unsigned int a = attributes & ARPATH_StartMask;
! 	return a & ARPATH_StartOnTop ? Dir_Top : 
! 	a & ARPATH_StartOnRight ? Dir_Right : 
! 	a & ARPATH_StartOnBottom ? Dir_Bottom :
! 	a & ARPATH_StartOnLeft ? Dir_Left : Dir_None;
  }