Thread: [Scstudio-commits] SF.net SVN: scstudio:[858] trunk/src/view/visio/addon (Page 3)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 858
          http://scstudio.svn.sourceforge.net/scstudio/?rev=858&view=rev
Author:   mbezdeka
Date:     2010-08-23 15:53:29 +0000 (Mon, 23 Aug 2010)

Log Message:
-----------
- resnap improved
- Message jumping added
- instances can be now only straight (oblique ones will be straighten)

Modified Paths:
--------------
    trunk/src/view/visio/addon/addon.cpp
    trunk/src/view/visio/addon/addon.h
    trunk/src/view/visio/addon/dllmodule.rc
    trunk/src/view/visio/addon/document.cpp
    trunk/src/view/visio/addon/document.h
    trunk/src/view/visio/addon/enums.h
    trunk/src/view/visio/addon/messageSnapping.cpp
    trunk/src/view/visio/addon/messageSnapping.h
    trunk/src/view/visio/addon/resource.h
    trunk/src/view/visio/addon/scstudio.vcproj
    trunk/src/view/visio/addon/shapeutils.cpp
    trunk/src/view/visio/addon/shapeutils.h
    trunk/src/view/visio/addon/snapGlobalDlg.cpp
    trunk/src/view/visio/addon/snapGlobalDlg.h

Added Paths:
-----------
    trunk/src/view/visio/addon/icon_jump_left_messages.ico
    trunk/src/view/visio/addon/icon_jump_right_messages.ico
    trunk/src/view/visio/addon/messageJump.cpp
    trunk/src/view/visio/addon/messageJump.h

Modified: trunk/src/view/visio/addon/addon.cpp
===================================================================

--- trunk/src/view/visio/addon/addon.cpp	2010-08-23 13:16:17 UTC (rev 857)
+++ trunk/src/view/visio/addon/addon.cpp	2010-08-23 15:53:29 UTC (rev 858)
@@ -29,6 +29,7 @@
 #include "resource.h"
 #include "pageutils.h"
 #include "messageSnapping.h"
+#include "messageJump.h"
 
 // include command line parsing library SimpleOpt
 // http://code.jellycan.com/simpleopt
@@ -71,8 +72,10 @@
   m_bBeginChanged = false;
   m_bEndChanged = false;
   m_bCtrlDown = false;
-  m_bUpDownKeyDown = false;
+  m_bArrowKeyDown = false;
   m_bOnDropShape = false;
+  m_bKeyDown = false;
+  m_bAngleChanged = false;
 };
 
 VAORC CStudioAddon::About(LPVAOV2LSTRUCT pV2L)
@@ -337,6 +340,12 @@
       case CDocumentMonitor::MENU_SELECT_ADD_ALL_MESSAGES:
         TRACE("CStudioAddon::Run() add all messages to the current selection");
         return pDocumentMonitor->OnMenuSelectAllMessages(vsoApp, SELECTION_ADD);
+      case CDocumentMonitor::MENU_MESSAGE_JUMP_LEFT:
+        TRACE("CStudioAddon::Run() jump message left");
+        return pDocumentMonitor->OnMenuMessageJump(vsoApp, true);
+      case CDocumentMonitor::MENU_MESSAGE_JUMP_RIGHT:
+        TRACE("CStudioAddon::Run() jump message right");
+        return pDocumentMonitor->OnMenuMessageJump(vsoApp, false);
       case CDocumentMonitor::MENU_ENABLE_MESSAGE_ENUMERATION:
         TRACE("CStudioAddon::Run() enable message enumeration");
         return pDocumentMonitor->OnMenuEnableMessageEnumeration(vsoApp);
@@ -587,6 +596,10 @@
     m_bEndChanged = true;
   if(_tcsicmp(vsoCell->Name,_T("LocPinX")) == 0)
     m_bMoving = true;
+
+  //Detect instance rotation
+  if(_tcsicmp(vsoCell->Name,_T("Angle")) == 0)
+    m_bAngleChanged = true;
 }
 
 void CStudioAddon::HandleConnectionsAdded(Visio::IVConnectsPtr vsoConnects)
@@ -634,6 +647,9 @@
 
 void CStudioAddon::HandleKeyDown(Visio::IVKeyboardEventPtr vsoKeyboardEvent, Visio::IVApplicationPtr vsoApp)
 {
+  m_bKeyDown = true;
+
+  long keyCode = vsoKeyboardEvent->KeyCode;
   long oldState = m_keyButtonState;
   m_keyButtonState = vsoKeyboardEvent->KeyButtonState;
 
@@ -644,12 +660,29 @@
   }
 
   //Keyboard re-snapping - get instances the messages are snapped to
-  if((vsoKeyboardEvent->KeyCode == VK_UP || vsoKeyboardEvent->KeyCode == VK_DOWN) && m_bUpDownKeyDown == false)
+  //Message jumping
+  if(!m_bArrowKeyDown)
   {
+    m_bArrowKeyDown = true;
     Visio::IVSelectionPtr selection = vsoApp->ActiveWindow->Selection;
-    m_bUpDownKeyDown = true;
-    for(int i=1; i<=selection->Count; i++)
-      snappedInstances.push_back(CMessageSnapping::getConnectedInstances(selection->Item[i]));
+    Visio::IVShapesPtr shapes = vsoApp->ActivePage->Shapes;
+
+    switch(keyCode)
+    {
+    case VK_LEFT:
+    case VK_RIGHT:
+      if(selection->Count == 1 && CMessageSnapping::isArrowKeysEnabled())
+      {
+        instances = CMessageSnapping::getConnectedInstances(selection->Item[1]);
+        break;
+      }
+    case VK_UP:
+    case VK_DOWN:
+      for(int i=1; i<=shapes->Count; i++)
+        if(get_shape_type(shapes->Item[i]) == ST_BMSC_INSTANCE || get_shape_type(shapes->Item[i]) == ST_BMSC_COREGION)
+          instances.push_back(shapes->Item[i]);
+      break;
+    }
   }
 
   if(m_keyButtonState & visKeyControl)
@@ -662,7 +695,9 @@
   {
     ResetState(vsoApp);
   }
-
+    
+  // key code
+  long keyCode = vsoKeyboardEvent->KeyCode;
   // buttons state
   long oldState = m_keyButtonState;
   m_keyButtonState = vsoKeyboardEvent->KeyButtonState;
@@ -674,14 +709,30 @@
   }
 
   //Keyboard re-snapping - resnap disconnected messages
-  if(m_bUpDownKeyDown)
+  if(m_bArrowKeyDown)
   {
-    for(int i=1; i<=vsoApp->ActiveWindow->Selection->Count; i++)
-      CMessageSnapping::resnap(vsoApp->ActiveWindow->Selection->Item[i], snappedInstances.at(i-1));
-    snappedInstances.clear();
-    m_bUpDownKeyDown = false;
+    m_bArrowKeyDown = false;
+    Visio::IVSelectionPtr selection = vsoApp->ActiveWindow->Selection;
+    switch(keyCode)
+    {
+      case VK_LEFT:
+      case VK_RIGHT:
+        if(CMessageSnapping::isArrowKeysEnabled())
+        {
+          Visio::IVShapePtr shape = selection->Item[1];
+          if(!CMessageJump::jump(shape, instances, (keyCode == 0x25) ? MSJUMP_LEFT : MSJUMP_RIGHT))
+            CMessageSnapping::snap(shape, CShapeUtils::getShapeCell(shape, "PinX"), CShapeUtils::getShapeCell(shape, "PinY"), MSSNAP_PRESERVE_VERTICAL);
+          //CMessageSnapping::resnap(shape, instances, 0.1);
+          break;
+        }
+      case VK_UP:
+      case VK_DOWN:
+        for(int i=1; i<=selection->Count; i++)
+          CMessageSnapping::resnap(selection->Item[i], instances);
+        break;
+    }
+    instances.clear();
   }
-
   //Message snapping
   m_bCtrlDown = false;
 }
@@ -725,32 +776,35 @@
 
 void CStudioAddon::HandleNonePending(Visio::IVApplicationPtr vsoApp)
 {
+  Visio::IVSelectionPtr selection = vsoApp->ActiveWindow->Selection;
+
   ////////////////////////////////////////////////////
+  //Block instance rotation
+  if(m_bAngleChanged && (m_bBeginChanged ^ m_bEndChanged) && (get_shape_type(selection->Item[1]) == ST_BMSC_INSTANCE))
+  {
+    m_bAngleChanged = false;
+    if(m_bBeginChanged)
+      selection->Item[1]->Cells["BeginX"]->FormulaForceU = selection->Item[1]->Cells["EndX"]->Formula;
+    if(m_bEndChanged)
+      selection->Item[1]->Cells["EndX"]->FormulaForceU = selection->Item[1]->Cells["BeginX"]->Formula;
+  }
+
+  ////////////////////////////////////////////////////
   //Message snapping
 #define _u(x) CPageUtils::ConvertUnits(vsoApp, x, 0, visPageUnits)
-  if(!m_bOnDropShape && m_bSnap && !m_bUpDownKeyDown && vsoApp->ActiveWindow->Selection->Count && CMessageSnapping::isEnabled())
+  if(!m_bOnDropShape && m_bSnap && !m_bKeyDown && (selection->Count == 1) && CMessageSnapping::isEnabled())
   {    
-    Visio::IVSelectionPtr selection = vsoApp->ActiveWindow->Selection;
     CDocumentMonitor* docMon = GetDocumentMonitor(vsoApp,vsoApp->ActiveDocument);
-    
-    if(selection->Count == 1)
+    Visio::IVShapePtr msgShape = selection->Item[1];
+
+    if(msgShape && m_bBeginChanged && m_bEndChanged && docMon->isMessageShape(msgShape))
     {
-      Visio::IVShapePtr msgShape = selection->Item[1];
-      if(msgShape && m_bBeginChanged && m_bEndChanged && docMon->isMessageShape(msgShape))
-      {
-          //If endpoints movement would be enabled, here would be condition (m_bMoving && (m_bBeginChanged ^ m_bEndChanged))
-
-          //Get relative position of the mouse from the shape Begin
-          double newPosX = CShapeUtils::GetShapeCellProperty(msgShape,"PinX", visPageUnits);
-          double newPosY = CShapeUtils::GetShapeCellProperty(msgShape,"PinY", visPageUnits);
-          newPosX += CPageUtils::ConvertUnits(vsoApp, m_mouseRelPosX, 0, visPageUnits);
-          newPosY += CPageUtils::ConvertUnits(vsoApp, m_mouseRelPosY, 0, visPageUnits);
-          CMessageSnapping::snap(msgShape, newPosX, newPosY,CMessageSnapping::getSnapType()); //Do regular snapping
-      }
+      //Get relative position of the mouse from the shape Begin
+      double newPosX = CShapeUtils::getShapeCell(msgShape,"PinX") + _u(m_mouseRelPosX);;
+      double newPosY = CShapeUtils::getShapeCell(msgShape,"PinY") + _u(m_mouseRelPosY);
+      CMessageSnapping::snap(msgShape, newPosX, newPosY,CMessageSnapping::getSnapType()); //Do regular snapping
     }
-  }
-  //Set variables to false
-  m_bSnap = m_bMoving = m_bBeginChanged = m_bEndChanged = false;
+  }  
 #undef _u
 
   ////////////////////////////////////////////////////
@@ -785,8 +839,12 @@
     m_bShapeDeleted = m_bCellChanged = false;
   }
 
+  //Set variables to false
+  m_bSnap = m_bMoving = m_bBeginChanged = m_bEndChanged = false;
   //Reset OnDropShape state
   m_bOnDropShape = false;
+  //Reset OnKeyDown
+  m_bKeyDown = false;
 }
 
 void CStudioAddon::HandleBeforeTextEdit(Visio::IVShapePtr shapePtr, Visio::IVApplicationPtr vsoApp)

Modified: trunk/src/view/visio/addon/addon.h
===================================================================
--- trunk/src/view/visio/addon/addon.h	2010-08-23 13:16:17 UTC (rev 857)
+++ trunk/src/view/visio/addon/addon.h	2010-08-23 15:53:29 UTC (rev 858)
@@ -135,6 +135,7 @@
   long m_keyButtonState;
   double m_mousePosX;
   double m_mousePosY;
+  bool m_bKeyDown;
   
 
   std::map<long, TAddonState> m_states;
@@ -155,11 +156,12 @@
   bool        m_bEndChanged;
   bool        m_bMoving;
   bool        m_bCtrlDown;
-  bool        m_bUpDownKeyDown;
+  bool        m_bArrowKeyDown;
   bool        m_bOnDropShape;
+  bool        m_bAngleChanged;
   double      m_mouseRelPosX;
   double      m_mouseRelPosY;
-  std::vector< std::vector<Visio::IVShapePtr> > snappedInstances;
+  std::vector<Visio::IVShapePtr> instances;
 };
 
 // $Id$

Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc	2010-08-23 13:16:17 UTC (rev 857)
+++ trunk/src/view/visio/addon/dllmodule.rc	2010-08-23 15:53:29 UTC (rev 858)
@@ -224,17 +224,26 @@
     GROUPBOX        "If no nearest (numbered) message found:",IDC_STATIC,7,65,261,54,WS_GROUP
 END
 
-IDD_SNAP_GLOBAL DIALOGEX 0, 0, 275, 118
+IDD_SNAP_GLOBAL DIALOGEX 0, 0, 275, 186
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Dialog"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    CONTROL         "Message snapping enabled",IDC_SNAP_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,102,10
-    GROUPBOX        "Oblique message options:",IDC_STATIC,7,22,261,61
-    CONTROL         "straighten",IDC_STRAIGHTEN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,37,47,10
+    CONTROL         "mouse control",IDC_SNAP_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,52,61,10
+    GROUPBOX        "Oblique message options:",IDC_STATIC,7,72,261,61
+    CONTROL         "straighten",IDC_STRAIGHTEN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,87,47,10
     CONTROL         "preserve vertical distance between send - receive",IDC_PRESERVE_VERTICAL,
-                    "Button",BS_AUTORADIOBUTTON,13,51,176,10
-    CONTROL         "preserve slope",IDC_PRESERVE_SLOPE,"Button",BS_AUTORADIOBUTTON,13,65,63,10
+                    "Button",BS_AUTORADIOBUTTON,13,101,176,10
+    CONTROL         "preserve slope",IDC_PRESERVE_SLOPE,"Button",BS_AUTORADIOBUTTON,13,115,63,10
+    CONTROL         "arrow-keys control",IDC_KEYS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,36,76,10
+    CONTROL         "buttons",IDC_BUTTONS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,13,20,41,10
+    GROUPBOX        "Allow message snapping for:",IDC_STATIC,7,7,261,62
+    GROUPBOX        "Edge instances treatment:",IDC_STATIC,7,135,261,44
+    CONTROL         "preserve message type",IDC_EDGE_PRESERVE_TYPE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,150,149,91,8
+    CONTROL         "change the type to lost/found",IDC_EDGE_CHANGE_TYPE,
+                    "Button",BS_AUTORADIOBUTTON,150,161,112,10
+    CONTROL         "Alow jumping to edge instances and: ",IDC_EDGE_THREATMENT_ENABLED,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,148,132,10
 END
 
 
@@ -308,8 +317,9 @@
         LEFTMARGIN, 7
         RIGHTMARGIN, 268
         VERTGUIDE, 13
+        VERTGUIDE, 150
         TOPMARGIN, 7
-        BOTTOMMARGIN, 111
+        BOTTOMMARGIN, 179
     END
 END
 #endif    // APSTUDIO_INVOKED
@@ -332,6 +342,8 @@
 IDI_ICON_SELECT_ADD_MESSAGES ICON                    "icon_select_add_messages.ico"
 IDI_ICON_ENABLE_MESSAGE_ENUMERATION ICON                    "icon_message_enumeration.ico"
 IDI_ICON_DISABLE_MESSAGE_ENUMERATION ICON                    "icon_message_enumeration_disable.ico"
+IDI_ICON_JUMP_LEFT      ICON                    "icon_jump_left_messages.ico"
+IDI_ICON_JUMP_RIGHT     ICON                    "icon_jump_right_messages.ico"
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////

Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp	2010-08-23 13:16:17 UTC (rev 857)
+++ trunk/src/view/visio/addon/document.cpp	2010-08-23 15:53:29 UTC (rev 858)
@@ -31,6 +31,7 @@
 #include "GlobalSettingsDlg.h"
 
 #include "messageSnapping.h"
+#include "messageJump.h"
 
 #include <fstream>
 
@@ -266,8 +267,8 @@
         
       if(CMessageSnapping::isEnabled() && (m_vsoApp->ActiveWindow->Selection->Count == 1)) //Check whether snapping is enabled
       {
-        double posX = CShapeUtils::GetShapeCellProperty(vsoShape,"PinX",visPageUnits);
-        double posY = CShapeUtils::GetShapeCellProperty(vsoShape,"PinY",visPageUnits);
+        double posX = CShapeUtils::getShapeCell(vsoShape,"PinX");
+        double posY = CShapeUtils::getShapeCell(vsoShape,"PinY");
         if(m_addon->GetCtrlKeyDown())
           posX += CPageUtils::ConvertUnits(m_vsoApp, m_addon->GetRelMousePosX(), 0, visPageUnits);
 
@@ -606,6 +607,30 @@
   m_selAddMessagesToolbarItem->IconFileName(vslIconFile.c_str());
   m_selAddMessagesToolbarItem->Visible = false;
 
+  m_selAddMessagesToolbarItem = m_toolbar->ToolbarItems->Add();
+  m_selAddMessagesToolbarItem->Caption = "Add All Messages To Selection";
+  m_selAddMessagesToolbarItem->AddOnName = ADDON_NAME;
+  m_selAddMessagesToolbarItem->AddOnArgs = stringize() << L"/event=" << MENU_SELECT_ADD_ALL_MESSAGES;
+  vslIconFile = vslFileName+_T(",7");
+  m_selAddMessagesToolbarItem->IconFileName(vslIconFile.c_str());
+  m_selAddMessagesToolbarItem->Visible = false;
+
+  //Message Jumping Left
+  m_msgJumpLeftToolbarItem = m_toolbar->ToolbarItems->Add();
+  m_msgJumpLeftToolbarItem->BeginGroup = true;
+  m_msgJumpLeftToolbarItem->Caption = "Jump Left";
+  m_msgJumpLeftToolbarItem->AddOnName = ADDON_NAME;
+  m_msgJumpLeftToolbarItem->AddOnArgs = stringize() << L"/event=" << MENU_MESSAGE_JUMP_LEFT;
+  vslIconFile = vslFileName+_T(",10");
+  m_msgJumpLeftToolbarItem->IconFileName(vslIconFile.c_str());
+  //Message Jumping Right
+  m_msgJumpRightToolbarItem = m_toolbar->ToolbarItems->Add();
+  m_msgJumpRightToolbarItem->Caption = "Jump Right";
+  m_msgJumpRightToolbarItem->AddOnName = ADDON_NAME;
+  m_msgJumpRightToolbarItem->AddOnArgs = stringize() << L"/event=" << MENU_MESSAGE_JUMP_RIGHT;
+  vslIconFile = vslFileName+_T(",11");
+  m_msgJumpRightToolbarItem->IconFileName(vslIconFile.c_str());
+
   Visio::IVToolbarItemPtr itemFindFlow = m_toolbar->ToolbarItems->Add();
   itemFindFlow->BeginGroup = true;
   itemFindFlow->Caption = "Find Flow";
@@ -637,7 +662,7 @@
 
   m_enableMessageEnumerationToolbarItem = m_toolbar->ToolbarItems->Add();
   m_enableMessageEnumerationToolbarItem->BeginGroup = true;
-  m_enableMessageEnumerationToolbarItem->Caption = "Message numbering";
+  m_enableMessageEnumerationToolbarItem->Caption = "Message Numbering";
   m_enableMessageEnumerationToolbarItem->AddOnName = ADDON_NAME;
   m_enableMessageEnumerationToolbarItem->AddOnArgs = stringize() << L"/event=" << MENU_ENABLE_MESSAGE_ENUMERATION;
   m_enableMessageEnumerationToolbarItem->Visible = true;
@@ -646,7 +671,7 @@
   m_enableMessageEnumerationToolbarItem->IconFileName(vslIconFile.c_str());
 
   m_disableMessageEnumerationToolbarItem = m_toolbar->ToolbarItems->Add();
-  m_disableMessageEnumerationToolbarItem->Caption = "Delete numbering";
+  m_disableMessageEnumerationToolbarItem->Caption = "Delete Numbering";
   m_disableMessageEnumerationToolbarItem->AddOnName = ADDON_NAME;
   m_disableMessageEnumerationToolbarItem->AddOnArgs = stringize() << L"/event=" << MENU_DISABLE_MESSAGE_ENUMERATION;
   m_disableMessageEnumerationToolbarItem->Visible = true;
@@ -1100,6 +1125,23 @@
   return VAORC_SUCCESS;
 }
 
+VAORC CDocumentMonitor::OnMenuMessageJump(Visio::IVApplicationPtr vsoApp, bool left)
+{
+  Visio::IVSelectionPtr selection = vsoApp->ActiveWindow->Selection;
+
+  if(selection->Count > 1 || !selection->Count)
+    return VAORC_FAILURE;
+
+  Visio::IVShapePtr shape = selection->Item[1];
+  if(!isMessageShape(shape))
+    return VAORC_FAILURE;
+
+  if(!CMessageJump::jump(shape, CMessageSnapping::getConnectedInstances(shape), (MsgJumpDirection)left))
+    CMessageSnapping::snap(shape, CShapeUtils::getShapeCell(shape, "PinX"), CShapeUtils::getShapeCell(shape, "PinY"), MSSNAP_PRESERVE_VERTICAL);
+
+  return VAORC_SUCCESS;
+}
+
 std::pair<Visio::IVShapePtr, Visio::IVShapePtr> CDocumentMonitor::getInstancesPair(Visio::IVApplicationPtr vsoApp)
 {
   Visio::IVSelectionPtr selection = CPageUtils::FilterSelection(vsoApp->ActiveWindow->Selection, ST_BMSC_INSTANCE);
@@ -1210,6 +1252,9 @@
 
 VAORC CDocumentMonitor::OnMenuMessageSequence(Visio::IVApplicationPtr vsoApp, Visio::IVSelectionPtr oldSelection)
 {
+  // step 0: turn off message snapping
+  bool snapStatus = CMessageSnapping::isEnabled();
+  CMessageSnapping::setEnabled(false);
   // step 1: determine the boundary instances between which to draw message sequence
   std::pair<Visio::IVShapePtr, Visio::IVShapePtr> boundaries = getInstancesPair(vsoApp);
   if (boundaries.first == NULL)
@@ -1344,6 +1389,9 @@
     }
   }
 
+  //Turn message snapping back on
+  CMessageSnapping::setEnabled(snapStatus);
+
   vsoApp->EndUndoScope(undoScope, true);
   vsoApp->ActiveWindow->Selection = selection;
 

Modified: trunk/src/view/visio/addon/document.h
===================================================================
--- trunk/src/view/visio/addon/document.h	2010-08-23 13:16:17 UTC (rev 857)
+++ trunk/src/view/visio/addon/document.h	2010-08-23 15:53:29 UTC (rev 858)
@@ -65,7 +65,7 @@
     // context menu items
     MENU_ADD_INSTANCES = 102,
     MENU_MESSAGE_SEQUENCE,
-	MENU_SELECT_NUMBERED_GROUP,
+    MENU_SELECT_NUMBERED_GROUP,
     // standard Check menu items
     MENU_WINDOWS_REPORTER = 200,
     MENU_IMPORT,
@@ -81,9 +81,11 @@
     MENU_SELECT_ALL_MESSAGES,
     MENU_SELECT_ADD_ALL_INSTANCES,
     MENU_SELECT_ADD_ALL_MESSAGES,
-	MENU_ENABLE_MESSAGE_ENUMERATION,
-	MENU_DISABLE_MESSAGE_ENUMERATION,
-	MENU_GLOBAL_SETTINGS,
+    MENU_MESSAGE_JUMP_LEFT,
+    MENU_MESSAGE_JUMP_RIGHT,
+    MENU_ENABLE_MESSAGE_ENUMERATION,
+    MENU_DISABLE_MESSAGE_ENUMERATION,
+    MENU_GLOBAL_SETTINGS,
   };
 
   VAORC OnMenuWindowsReporter(Visio::IVApplicationPtr vsoApp);
@@ -93,6 +95,7 @@
   VAORC OnMenuTransform(Visio::IVApplicationPtr vsoApp, int index);
   VAORC OnMenuSelectAllInstances(Visio::IVApplicationPtr vsoApp, SelectionType selType);
   VAORC OnMenuSelectAllMessages(Visio::IVApplicationPtr vsoApp, SelectionType selType);
+  VAORC OnMenuMessageJump(Visio::IVApplicationPtr vsoApp, bool left);
   VAORC OnMenuMessageSequence(Visio::IVApplicationPtr vsoApp, Visio::IVSelectionPtr oldSelection=NULL);
   VAORC OnMenuFindFlow(Visio::IVApplicationPtr vsoApp);
   VAORC OnMenuSimulationStart(Visio::IVApplicationPtr vsoApp);
@@ -231,6 +234,9 @@
   //Message enumeration
   Visio::IVToolbarItemPtr m_enableMessageEnumerationToolbarItem;
   Visio::IVToolbarItemPtr m_disableMessageEnumerationToolbarItem;
+  //Message jumping
+  Visio::IVToolbarItemPtr m_msgJumpLeftToolbarItem;
+  Visio::IVToolbarItemPtr m_msgJumpRightToolbarItem;
 
   /**
    * Selects all instances or all messages on the active page.

Modified: trunk/src/view/visio/addon/enums.h
===================================================================
--- trunk/src/view/visio/addon/enums.h	2010-08-23 13:16:17 UTC (rev 857)
+++ trunk/src/view/visio/addon/enums.h	2010-08-23 15:53:29 UTC (rev 858)
@@ -52,4 +52,10 @@
   MSSNAP_PRESERVE_SLOPE,
 };
 
+enum MsgJumpDirection
+{
+  MSJUMP_RIGHT = 0,
+  MSJUMP_LEFT,
+};
+
 // $Id$

Added: trunk/src/view/visio/addon/icon_jump_left_messages.ico
===================================================================
(Binary files differ)


Property changes on: trunk/src/view/visio/addon/icon_jump_left_messages.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/src/view/visio/addon/icon_jump_right_messages.ico
===================================================================
(Binary files differ)


Property changes on: trunk/src/view/visio/addon/icon_jump_right_messages.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/src/view/visio/addon/messageJump.cpp
===================================================================
--- trunk/src/view/visio/addon/messageJump.cpp	                        (rev 0)
+++ trunk/src/view/visio/addon/messageJump.cpp	2010-08-23 15:53:29 UTC (rev 858)
@@ -0,0 +1,181 @@
+/*
+* scstudio - Sequence Chart Studio
+* http://scstudio.sourceforge.net
+*
+*      This library is free software; you can redistribute it and/or
+*      modify it under the terms of the GNU Lesser General Public
+*      License version 2.1, as published by the Free Software Foundation.
+*
+*      This library is distributed in the hope that it will be useful,
+*      but WITHOUT ANY WARRANTY; without even the implied warranty of
+*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+*      Lesser General Public License for more details.
+*
+* Copyright (c) 2010 Martin Bezdeka <mbe...@se...>
+*
+* $Id$
+*/
+
+#include "stdafx.h"
+#include "dllmodule.h"
+#include "messageJump.h"
+
+#define SNAP_REG_PATH _T("Software\\Sequence Chart Studio\\MessageSnapping")
+
+bool CMessageJump::isEnabled()
+{
+  return GetRegistry<bool>(SNAP_REG_PATH,  NULL, _T("EdgeTreatmentEnabled"), false);
+}
+int CMessageJump::getEdgeInstanceTreatment()
+{
+  return GetRegistry<int>(SNAP_REG_PATH,  NULL, _T("EdgeTreatmentType"), 0);
+}
+
+bool CMessageJump::jump(Visio::IVShapePtr msgShape, std::vector<Visio::IVShapePtr> connectedInstances, MsgJumpDirection direction)
+{
+  if(!msgShape || !connectedInstances.size())
+    return false;
+
+  long scopeId = msgShape->Application->BeginUndoScope("Jump");
+
+  std::vector<Visio::IVShapePtr> instances = connectedInstances;
+  bool left = (CMessageSnapping::getMsgDirection(msgShape) == MSDIR_LEFT);
+  
+  Visio::IVShapePtr origIntsLeft = NULL;
+  Visio::IVShapePtr origIntsRight = NULL;
+
+  switch(instances.size())
+  {
+  case 1:
+    {
+    PVEC2 intPoint = CMessageSnapping::getIntersectionWithInstance(msgShape, instances.at(0));
+    if(intPoint && (CShapeUtils::getShapeCell(msgShape, "PinX") < intPoint->x))
+      origIntsRight = instances.at(0);
+    else
+      origIntsLeft = instances.at(0);
+    delete intPoint;
+    }
+    break;
+
+  case 2:
+    origIntsLeft = instances.at(0);
+    origIntsRight = instances.at(1);
+    if(left)
+      CShapeUtils::swapShape(origIntsLeft, origIntsRight);
+    break;
+
+  default:
+    return false;
+  }
+
+  std::vector<Visio::IVShapePtr> intersIntsBegin, intersIntsEnd;
+  intersIntsBegin = CMessageSnapping::getIntersectInstances(msgShape, CShapeUtils::getShapeCell(msgShape,left ? "EndY" : "BeginY"), MSSNAP_STRAIGHTEN);
+  intersIntsEnd = CMessageSnapping::getIntersectInstances(msgShape, CShapeUtils::getShapeCell(msgShape,left ? "BeginY" : "EndY"), MSSNAP_STRAIGHTEN);
+
+#define _s(x) CShapeUtils::getShapeCell(msgShape,x)
+  Visio::IVShapePtr closestLeft = getClosestInstanceFromShape(left ? VEC2(_s("EndX"),_s("EndY")) : VEC2(_s("BeginX"),_s("BeginY")), 
+    origIntsLeft, intersIntsBegin, direction);
+  Visio::IVShapePtr closestRight = getClosestInstanceFromShape(left ? VEC2(_s("BeginX"),_s("BeginY")) : VEC2(_s("EndX"),_s("EndY")), 
+    origIntsRight, intersIntsEnd, direction);
+#undef _s
+
+  VEC2 msgVec;
+  CMessageSnapping::getMsgVector(msgShape, &msgVec);
+  
+  if(left)
+    CShapeUtils::swapShape(closestLeft, closestRight);
+
+  //FIXME: Move to separate function
+  double PinY = CShapeUtils::getShapeCell(msgShape, "PinY");
+  if((closestLeft ^ closestRight) && origIntsLeft && origIntsRight) //NOTE: new instance is only one, previous instances were two
+  {
+    if(!isEnabled()) // If Edge treatment isn't enabled we are done
+      return true;
+
+    
+    bool snapStatus = CMessageSnapping::isEnabled();
+    CMessageSnapping::setEnabled(false);
+
+    //Change message to lost/found
+    Visio::IVPagePtr page = msgShape->Application->ActivePage;
+    CDrawingVisualizer visualizer(msgShape->Application);
+    TShapeType shapeType = (TShapeType)(left ? ((direction == MSJUMP_LEFT) ? 2 : 3) : ((direction == MSJUMP_LEFT) ? 3 : 2));
+    Visio::IVShapePtr newMsg = page->Drop(visualizer.find_master((getEdgeInstanceTreatment() == 1) ? shapeType : ST_BMSC_MESSAGE),0,0);
+    newMsg->Text = msgShape->Text;
+    newMsg->Data1 = msgShape->Data1;
+    newMsg->Data2 = msgShape->Data2;
+    newMsg->Data3 = msgShape->Data3;
+    msgShape->Application->EventsEnabled = false;
+    newMsg->Cells["BeginX"]->FormulaU = stringize() << msgShape->Cells["BeginX"]->Result[""];
+    newMsg->Cells["BeginY"]->FormulaU = stringize() << msgShape->Cells["BeginY"]->Result[""];
+    newMsg->Cells["EndX"]->FormulaU = stringize() << msgShape->Cells["EndX"]->Result[""];
+    newMsg->Cells["EndY"]->FormulaU = stringize() << msgShape->Cells["EndY"]->Result[""];
+    msgShape->Application->EventsEnabled = true;
+    msgShape->Delete();
+    msgShape = newMsg;
+
+    CMessageSnapping::setEnabled(snapStatus);
+  }
+
+  CMessageSnapping::glueMsgToInstancesPair(msgShape, closestLeft, closestRight, PinY, MSSNAP_PRESERVE_VERTICAL);
+
+  if(closestLeft ^ closestRight)
+  {    
+    //If message is snapped only to one instance, preserve its length
+    msgShape->Application->EventsEnabled = false;
+    if(closestLeft) //LEFT point is snapped, adjust right point
+    {
+      msgShape->Cells["EndX"]->FormulaU = stringize() << msgShape->Cells["BeginX"]->Result[""] + msgVec.x;
+      msgShape->Cells["EndY"]->FormulaU = stringize() << msgShape->Cells["BeginY"]->Result[""] + msgVec.y;
+    }
+    if(closestRight) //RIGHT point is snapped, adjust left point
+    {
+      msgShape->Cells["BeginX"]->FormulaU = stringize() << msgShape->Cells["EndX"]->Result[""] - msgVec.x;
+      msgShape->Cells["BeginY"]->FormulaU = stringize() << msgShape->Cells["EndY"]->Result[""] - msgVec.y;
+    }
+    msgShape->Application->EventsEnabled = true;
+  }
+  msgShape->Application->EndUndoScope(scopeId, true);
+
+  return true;
+}
+
+Visio::IVShapePtr CMessageJump::getClosestInstanceFromShape(VEC2 pointOnShape, Visio::IVShapePtr shape, std::vector<Visio::IVShapePtr> instances, MsgJumpDirection direction)
+{
+  if(!shape)
+    return NULL;
+
+  if(get_shape_type(shape) == ST_BMSC_COREGION)
+    shape = shape->Connects->ToSheet;
+    
+  Visio::IVShapePtr closestInstance = NULL;
+  double closestDistance = 0;
+  for(std::vector<Visio::IVShapePtr>::iterator it = instances.begin(); it != instances.end(); it++)
+  {
+    if(*it == shape)
+      continue;
+  
+    PVEC2 intPoint = CMessageSnapping::getIntersectionWithInstance(VEC2(pointOnShape.x-1, pointOnShape.y), 
+                                                                   VEC2(pointOnShape.x, pointOnShape.y), *it);
+    if(!intPoint || !CMessageSnapping::isPointOnInstancesLine(*intPoint, *it))
+    { delete intPoint; continue; }
+
+    double xVector = pointOnShape.x - intPoint->x;
+    if((xVector * ((direction == MSJUMP_LEFT) ? 1 : -1)) < 0)
+      continue;
+
+    double distance = sqrt(pow(xVector,2) + pow((pointOnShape.y - intPoint->y),2));    
+
+    if(!closestInstance || distance < closestDistance)
+    {
+      closestDistance = distance;
+      closestInstance = *it;
+    }
+    delete intPoint;
+  }
+
+  return closestInstance;
+}
+
+
+// $Id$
\ No newline at end of file


Property changes on: trunk/src/view/visio/addon/messageJump.cpp
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/src/view/visio/addon/messageJump.h
===================================================================
--- trunk/src/view/visio/addon/messageJump.h	                        (rev 0)
+++ trunk/src/view/visio/addon/messageJump.h	2010-08-23 15:53:29 UTC (rev 858)
@@ -0,0 +1,41 @@
+/*
+* scstudio - Sequence Chart Studio
+* http://scstudio.sourceforge.net
+*
+*      This library is free software; you can redistribute it and/or
+*      modify it under the terms of the GNU Lesser General Public
+*      License version 2.1, as published by the Free Software Foundation.
+*
+*      This library is distributed in the hope that it will be useful,
+*      but WITHOUT ANY WARRANTY; without even the implied warranty of
+*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+*      Lesser General Public License for more details.
+*
+* Copyright (c) 2010 Martin Bezdeka <mbe...@se...>
+*
+* $Id$
+*/
+
+#pragma once
+
+#include "enums.h"
+#include "shapeUtils.h"
+#include "messageSnapping.h"
+#include "visualize.h"
+
+
+class CMessageJump
+{
+public:
+  static bool isEnabled();
+  static int getEdgeInstanceTreatment();
+  
+  static bool jump(Visio::IVShapePtr msgShape, std::vector<Visio::IVShapePtr> connectedInstances, MsgJumpDirection di...
 
[truncated message content]

Thread: [Scstudio-commits] SF.net SVN: scstudio:[858] trunk/src/view/visio/addon (Page 3)

scstudio-commits