[commit] r1533 - trunk/GME/Gme

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Sep 14 15:56:01 2011
New Revision: 1533

Log:
CPoints contains longs, not ints

Modified:
   trunk/GME/Gme/GMEView.h
   trunk/GME/Gme/GUIObject.cpp
   trunk/GME/Gme/GUIObject.h

Modified: trunk/GME/Gme/GMEView.h
==============================================================================
--- trunk/GME/Gme/GMEView.h	Wed Sep 14 09:31:28 2011	(r1532)
+++ trunk/GME/Gme/GMEView.h	Wed Sep 14 15:56:01 2011	(r1533)
@@ -118,10 +118,10 @@
 	CPoint					customizeConnectionEdgeStartPoint;
 	CPoint					customizeConnectionEdgeEndPoint;
 	CPoint					customizeConnectionEdgeThirdPoint;
-	int						customizeConnectionEdgeXMinLimit;
-	int						customizeConnectionEdgeXMaxLimit;
-	int						customizeConnectionEdgeYMinLimit;
-	int						customizeConnectionEdgeYMaxLimit;
+	long						customizeConnectionEdgeXMinLimit;
+	long						customizeConnectionEdgeXMaxLimit;
+	long						customizeConnectionEdgeYMinLimit;
+	long						customizeConnectionEdgeYMaxLimit;
 	CPoint					customizeConnectionOrigCursor;
 	CPoint					customizeConnectionCurrCursor;
 	bool					isCursorChangedByEdgeCustomize;

Modified: trunk/GME/Gme/GUIObject.cpp
==============================================================================
--- trunk/GME/Gme/GUIObject.cpp	Wed Sep 14 09:31:28 2011	(r1532)
+++ trunk/GME/Gme/GUIObject.cpp	Wed Sep 14 15:56:01 2011	(r1533)
@@ -2973,7 +2973,7 @@
 }
 
 bool CGuiConnection::AdjustCoordLimits(CPointList& points, int edgeIndex, bool isPathEnd, bool xOrY, POSITION pos,
-									   int ptCoord, int lastlastCoord, int& coordMinLimit, int& coordMaxLimit) const
+									   int ptCoord, int lastlastCoord, long& coordMinLimit, long& coordMaxLimit) const
 {
 	if (!isPathEnd) {
 		// Internal edge
@@ -3024,7 +3024,7 @@
 
 int CGuiConnection::GetEdgeIndex(const CPoint& point, CPoint& startPoint, CPoint& endPoint, CPoint& thirdPoint,
 								 ConnectionPartMoveType& connectionMoveMethod, bool& horizontalOrVerticalEdge,
-								 bool& isPartFixed, int& xMinLimit, int& xMaxLimit, int& yMinLimit, int& yMaxLimit,
+								 bool& isPartFixed, long& xMinLimit, long& xMaxLimit, long& yMinLimit, long& yMaxLimit,
 								 bool checkPointOnEdge) const
 {
 	CPointList points;
@@ -3179,10 +3179,10 @@
 	CPoint customizeConnectionEdgeStartPoint;
 	CPoint customizeConnectionEdgeEndPoint;
 	CPoint customizeConnectionEdgeThirdPoint;
-	int customizeConnectionEdgeXMinLimit;
-	int customizeConnectionEdgeXMaxLimit;
-	int customizeConnectionEdgeYMinLimit;
-	int customizeConnectionEdgeYMaxLimit;
+	long customizeConnectionEdgeXMinLimit;
+	long customizeConnectionEdgeXMaxLimit;
+	long customizeConnectionEdgeYMinLimit;
+	long customizeConnectionEdgeYMaxLimit;
 
 	return GetEdgeIndex(point, customizeConnectionEdgeStartPoint, customizeConnectionEdgeEndPoint, customizeConnectionEdgeThirdPoint,
 						connectionMoveMethod, horizontalOrVerticalEdge,

Modified: trunk/GME/Gme/GUIObject.h
==============================================================================
--- trunk/GME/Gme/GUIObject.h	Wed Sep 14 09:31:28 2011	(r1532)
+++ trunk/GME/Gme/GUIObject.h	Wed Sep 14 15:56:01 2011	(r1533)
@@ -451,11 +451,11 @@
 	CRect GetBounds(void) const;
 	CPoint GetCenter(void) const;
 	bool AdjustCoordLimits(CPointList& points, int edgeIndex, bool isPathEnd, bool xOrY, POSITION pos,
-						   int ptCoord, int lastlastCoord, int& coordMinLimit, int& coordMaxLimit) const;
+						   int ptCoord, int lastlastCoord, long& coordMinLimit, long& coordMaxLimit) const;
 	int GetEdgeIndex(const CPoint& point, CPoint& startPoint, CPoint& endPoint, CPoint& thirdPoint,
 					 ConnectionPartMoveType& connectionMoveMethod, bool& horizontalOrVerticalEdge,
-					 bool& isPartFixed, int& xMinLimit, int& xMaxLimit,
-					 int& yMinLimit, int& yMaxLimit, bool checkPointOnEdge = true) const;
+					 bool& isPartFixed, long& xMinLimit, long& xMaxLimit,
+					 long& yMinLimit, long& yMaxLimit, bool checkPointOnEdge = true) const;
 	int IsPathAt(const CPoint& point, ConnectionPartMoveType& connectionMoveMethod, bool& horizontalOrVerticalEdge,
 				 bool& isPartFixed) const;
 	long IsPointOnSectionAndDeletable(long edgeIndex, const CPoint& point);