[Scstudio-commits] SF.net SVN: scstudio:[1866] trunk/src/view/visio/addon

[<xb...@us...>]

Revision: 1866
          http://sourceforge.net/p/scstudio/code/1866
Author:   xborza
Date:     2013-10-30 00:17:02 +0000 (Wed, 30 Oct 2013)
Log Message:
-----------
message snapping endpoint in coregion area

Modified Paths:
--------------
    trunk/src/view/visio/addon/messageJump.cpp
    trunk/src/view/visio/addon/messageSnapping.cpp

Modified: trunk/src/view/visio/addon/messageJump.cpp
===================================================================
--- trunk/src/view/visio/addon/messageJump.cpp	2013-10-23 12:26:11 UTC (rev 1865)
+++ trunk/src/view/visio/addon/messageJump.cpp	2013-10-30 00:17:02 UTC (rev 1866)
@@ -149,6 +149,10 @@
   {
     if(*it == shape)
       continue;
+
+    //If point lies in coregionarea, return instance immediately
+    if(CShapeUtils::isPointInCoregionArea(pointOnShape,*it))
+      return *it;
   
     boost::shared_ptr<MscPoint> intPoint (CMessageSnapping::getIntersectionWithInstance(MscPoint(pointOnShape.get_x()-1, pointOnShape.get_y()), 
                                                                                 MscPoint(pointOnShape.get_x(), pointOnShape.get_y()), *it));

Modified: trunk/src/view/visio/addon/messageSnapping.cpp
===================================================================
--- trunk/src/view/visio/addon/messageSnapping.cpp	2013-10-23 12:26:11 UTC (rev 1865)
+++ trunk/src/view/visio/addon/messageSnapping.cpp	2013-10-30 00:17:02 UTC (rev 1866)
@@ -530,9 +530,9 @@
     return NULL;
 
   bool isBegin = _tcsicmp(endPointX,_T("BeginX")) == 0;
-  //NOTE: If user snap message by himself (using red rectangle), we are done
-  if(msgShape->GetCells(isBegin ? "BegTrigger" : "EndTrigger")->ResultInt[visNone][visTruncate] == 2)
-    return NULL;
+  //NOTE: If user snap message by himself (using red rectangle), we are done (commented because of possible wrong connections)
+  /*if(msgShape->GetCells(isBegin ? "BegTrigger" : "EndTrigger")->ResultInt[visNone][visTruncate] == 2)
+    return NULL;*/ 
 
   MscPoint endPoint(CShapeUtils::getShapeCell(msgShape,endPointX),
                     CShapeUtils::getShapeCell(msgShape,isBegin ? "BeginY" : "EndY"));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.