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

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

Revision: 721
          http://scstudio.svn.sourceforge.net/scstudio/?rev=721&view=rev
Author:   obouda
Date:     2010-04-20 08:53:24 +0000 (Tue, 20 Apr 2010)

Log Message:
-----------
Messsage Sequence function - GUI almost done

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/instancesfielddlg.cpp
    trunk/src/view/visio/addon/instancesfielddlg.h
    trunk/src/view/visio/addon/pageutils.h
    trunk/src/view/visio/addon/resource.h
    trunk/src/view/visio/addon/scstudio.vcproj

Added Paths:
-----------
    trunk/src/view/visio/addon/messagesequencedlg.cpp
    trunk/src/view/visio/addon/messagesequencedlg.h

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

--- trunk/src/view/visio/addon/addon.cpp	2010-04-14 21:29:03 UTC (rev 720)
+++ trunk/src/view/visio/addon/addon.cpp	2010-04-20 08:53:24 UTC (rev 721)
@@ -94,11 +94,13 @@
       else
         if (!SUCCEEDED(vsoApp.GetActiveObject(Visio::CLSID_Application)))
           vsoApp.CreateInstance(Visio::CLSID_Application);
+
+      if (!vsoApp.GetInterfacePtr())
+        return VAORC_FAILURE;
+
+      ResetState(vsoApp);
     }
 
-    if (!vsoApp.GetInterfacePtr())
-      return VAORC_FAILURE;
-
     // get the major version number for Visio
     int majorVersion = 0;
     BSTR bstrVersion = NULL;
@@ -457,10 +459,15 @@
         break;
 
       case Visio::visEvtCodeMouseMove:
-        TRACE("CStudioAddon::HandleVisioEvent() visEvtCodeMouseMove");
+        //TRACE("CStudioAddon::HandleVisioEvent() visEvtCodeMouseMove");
         HandleMouseMove(pSubjectObj, pSourceObj);
         break;
 
+      case Visio::visEvtCodeWinSelChange:
+        TRACE("CStudioAddon::HandleVisioEvent() visEvtCodeWinSelChange");
+        HandleWinSelChange(pSourceObj);
+        break;
+
       default:
         TRACE("CStudioAddon::HandleVisioEvent() unexpected event id="
           << std::ios::hex << event);
@@ -561,6 +568,12 @@
 
 void CStudioAddon::HandleKeyUp(Visio::IVKeyboardEventPtr vsoKeyboardEvent, Visio::IVApplicationPtr vsoApp)
 {
+  if (vsoKeyboardEvent->KeyCode == VK_ESCAPE)
+  {
+    ResetState(vsoApp);
+  }
+
+  // buttons state
   long oldState = m_keyButtonState;
   m_keyButtonState = vsoKeyboardEvent->KeyButtonState;
 
@@ -577,6 +590,18 @@
   m_mousePosY = vsoMouseEvent->y;
 }
 
+void CStudioAddon::HandleWinSelChange(Visio::IVApplicationPtr vsoApp)
+{
+  m_oldSelections[vsoApp] = m_curSelections[vsoApp];
+  m_curSelections[vsoApp] = vsoApp->ActiveWindow->Selection;
+
+  if (GetState(vsoApp) == STATE_MESSAGE_SEQUENCE_WAITING_FOR_SEL_CHANGE)
+  {
+    CDocumentMonitor* docMon = GetDocumentMonitor(vsoApp, vsoApp->ActiveDocument);
+    docMon->OnMenuMessageSequence(vsoApp, m_oldSelections[vsoApp]);
+  }
+}
+
 void CStudioAddon::RegisterPersistentEvents(Visio::IVDocumentPtr vsoDocument)
 {
   Visio::IVEventPtr vsoDocumentCreateEvent = NULL;
@@ -649,6 +674,8 @@
       vsoApp->EventList->AddAdvise(Visio::visEvtCodeKeyUp, varSink, _T(""), _T("KeyUp"));
       vsoApp->EventList->AddAdvise(Visio::visEvtCodeMouseMove, varSink, _T(""), _T("MouseMove"));
 
+      vsoApp->EventList->AddAdvise(visEvtCodeWinSelChange, varSink, _T(""), _T("SelectionChanges"));
+
       // Create a monitor class to keep track of this document and the Events 
       // being monitored for this document.  
       pDocumentMonitor = new CDocumentMonitor(this, vsoApp, vsoDocument);
@@ -693,4 +720,23 @@
   }
 }
 
+void CStudioAddon::SetState(Visio::IVApplicationPtr vsoApp, TAddonState state, const TCHAR* message)
+{
+  m_states[vsoApp] = state;
+  if (message != NULL) {
+    //MessageBox(GetActiveWindow(), message, _T("Status bar"), MB_OK); // FIXME: set status bar text
+  }
+}
+
+void CStudioAddon::ResetState(Visio::IVApplicationPtr vsoApp)
+{
+  m_states[vsoApp] = STATE_INIT;
+  /* // does not work:
+  CDocumentMonitor* docMon = GetDocumentMonitor(vsoApp, vsoApp->ActiveDocument);
+  Visio::IVUIObjectPtr toolbars = docMon->GetMostCustomToolbars();
+  toolbars->StatusBars->ItemAtID[Visio::visUIObjSetDrawing]->StatusBarItems->Item[1]->Caption = _T("Wheee!");
+  */
+  //MessageBox(GetActiveWindow(), _T("Reseting status bar"), _T("Status bar"), MB_OK); // FIXME: reset status bar
+}
+
 // $Id$

Modified: trunk/src/view/visio/addon/addon.h
===================================================================
--- trunk/src/view/visio/addon/addon.h	2010-04-14 21:29:03 UTC (rev 720)
+++ trunk/src/view/visio/addon/addon.h	2010-04-20 08:53:24 UTC (rev 721)
@@ -54,11 +54,61 @@
   void HandleKeyDown(Visio::IVKeyboardEventPtr vsoKeyboardEvent, Visio::IVApplicationPtr vsoApp);
   void HandleKeyUp(Visio::IVKeyboardEventPtr vsoKeyboardEvent, Visio::IVApplicationPtr vsoApp);
   void HandleMouseMove(Visio::IVMouseEventPtr vsoMouseEvent, Visio::IVApplicationPtr vsoApp);
+  void HandleWinSelChange(Visio::IVApplicationPtr vsoApp);
 
   void RegisterPersistentEvents(Visio::IVDocumentPtr vsoDocument);
   CDocumentMonitor *GetDocumentMonitor(Visio::IVApplicationPtr vsoApp, Visio::IVDocumentPtr vsoDocument);
   void StopDocumentMonitor(Visio::IVApplicationPtr vsoApp, Visio::IVDocumentPtr vsoDocument);
 
+  enum TAddonState
+  {
+    STATE_INIT,
+    STATE_MESSAGE_SEQUENCE_WAITING_FOR_SEL_CHANGE,
+  };
+
+  TAddonState GetState(Visio::IVApplicationPtr vsoApp) { return m_states[vsoApp]; }
+  void SetState(Visio::IVApplicationPtr vsoApp, TAddonState state, const TCHAR* message=NULL);
+  void ResetState(Visio::IVApplicationPtr vsoApp);
+
+  /**
+   * Gets last mouse X-coordinate.
+   * Watch out! It is in units of current page.
+   * @return last X-coordinate of mouse pointer in units of current page
+   */
+  double GetMousePosX() { return m_mousePosX; }
+
+  /**
+   * Gets last mouse Y-coordinate.
+   * Watch out! It is in units of current page.
+   * @return last Y-coordinate of mouse pointer in units of current page
+   */
+  double GetMousePosY() { return m_mousePosY; }
+
+  /**
+   * Saves current mouse position for a later retrieval.
+   * @param vsoApp the app to save the position for
+   */
+  void SaveMousePos(Visio::IVApplicationPtr vsoApp) {
+    m_prevMousePosX[vsoApp] = m_mousePosX;
+    m_prevMousePosY[vsoApp] = m_mousePosY;
+  }
+
+  /**
+   * Retrieves a previously stored mouse position.
+   * It is in units of current page.
+   * @param vsoApp the app it was stored in
+   * @return previously stored X-coordinate of mouse pointer in units of current page
+   */
+  double GetPrevMousePosX(Visio::IVApplicationPtr vsoApp) { return m_prevMousePosX[vsoApp]; }
+
+  /**
+   * Retrieves a previously stored mouse position.
+   * It is in units of current page.
+   * @param vsoApp the app it was stored in
+   * @return previously stored Y-coordinate of mouse pointer in units of current page
+   */
+  double GetPrevMousePosY(Visio::IVApplicationPtr vsoApp) { return m_prevMousePosY[vsoApp]; }
+
 private:
   IUnknown *m_pIAddonSink;
   Visio::IVEventPtr m_vsoMarkerEvent;
@@ -69,6 +119,12 @@
   long m_keyButtonState;
   double m_mousePosX;
   double m_mousePosY;
+
+  std::map<long, TAddonState> m_states;
+  std::map<long, Visio::IVSelectionPtr> m_oldSelections;
+  std::map<long, Visio::IVSelectionPtr> m_curSelections;
+  std::map<long, double> m_prevMousePosX;
+  std::map<long, double> m_prevMousePosY;
 };
 
 // $Id$

Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc	2010-04-14 21:29:03 UTC (rev 720)
+++ trunk/src/view/visio/addon/dllmodule.rc	2010-04-20 08:53:24 UTC (rev 721)
@@ -34,18 +34,18 @@
     DEFPUSHBUTTON   "OK",IDOK,254,7,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,254,25,50,14
     GROUPBOX        "Direction:",IDC_STATIC,7,7,241,64
-    CONTROL         "Left only",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,13,19,44,10
-    CONTROL         "Right only",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,13,31,48,10
-    CONTROL         "Left, Right",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,13,43,50,10
-    CONTROL         "Right, Left",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,13,55,50,10
+    CONTROL         "Left only",IDC_MS_DIR_LEFT,"Button",BS_AUTORADIOBUTTON,13,19,44,10
+    CONTROL         "Right only",IDC_MS_DIR_RIGHT,"Button",BS_AUTORADIOBUTTON,13,31,48,10
+    CONTROL         "Left, Right",IDC_MS_DIR_LEFT_RIGHT,"Button",BS_AUTORADIOBUTTON,13,43,50,10
+    CONTROL         "Right, Left",IDC_MS_DIR_RIGHT_LEFT,"Button",BS_AUTORADIOBUTTON,13,55,50,10
     LTEXT           "Left Message Captions:",IDC_STATIC,90,19,76,8
-    EDITTEXT        IDC_MC_LEFT_MESSAGE,171,17,67,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_MS_LEFT_MESSAGE,171,17,67,14,ES_AUTOHSCROLL
     LTEXT           "Right Message Captions:",IDC_STATIC,90,43,80,8
     EDITTEXT        IDC_MS_RIGHT_MESSAGE,171,41,67,14,ES_AUTOHSCROLL
     LTEXT           "Starting Y-position:",IDC_STATIC,7,78,62,8
     LTEXT           "Vertical space between messages:",IDC_STATIC,7,94,111,8
-    EDITTEXT        IDC_EDIT2,121,76,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT3,121,92,40,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_MS_START_POS_Y,121,76,40,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_MS_VERTICAL_SPACE,121,92,40,14,ES_AUTOHSCROLL
 END
 
 
@@ -83,22 +83,6 @@
 
 /////////////////////////////////////////////////////////////////////////////
 //
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON_CHECK          ICON                    "icon_check.ico"
-IDI_ICON_FIND_FLOW      ICON                    "icon_findflow.ico"
-IDI_ICON_SELECT_INSTANCES ICON                    "icon_select_instances.ico"
-IDI_ICON_SELECT_MESSAGES ICON                    "icon_select_messages.ico"
-IDI_ICON_SIMULATION_START ICON                    "icon_simulation_start.ico"
-IDI_ICON_SIMULATION_STOP ICON                    "icon_simulation_stop.ico"
-IDI_ICON_SELECT_ADD_INSTANCES ICON                    "icon_select_add_instances.ico"
-IDI_ICON_SELECT_ADD_MESSAGES ICON                    "icon_select_add_messages.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
 // Dialog
 //
 
@@ -183,9 +167,75 @@
 END
 
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
 #ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO 
+BEGIN
+    IDD_CHECK_OPTIONS, DIALOG
+    BEGIN
+        LEFTMARGIN, 5
+        RIGHTMARGIN, 195
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 154
+    END
+
+    IDD_SIMULATOR_OPTIONS, DIALOG
+    BEGIN
+        LEFTMARGIN, 5
+        RIGHTMARGIN, 186
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 47
+    END
+
+    IDD_FIND_FLOW, DIALOG
+    BEGIN
+        LEFTMARGIN, 5
+        RIGHTMARGIN, 270
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 106
+    END
+
+    IDD_INSTANCES_FIELD_OPTIONS, DIALOG
+    BEGIN
+        LEFTMARGIN, 5
+        RIGHTMARGIN, 196
+        VERTGUIDE, 10
+        VERTGUIDE, 19
+        VERTGUIDE, 48
+        VERTGUIDE, 64
+        VERTGUIDE, 123
+        VERTGUIDE, 130
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 122
+        HORZGUIDE, 54
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
 /////////////////////////////////////////////////////////////////////////////
 //
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON_CHECK          ICON                    "icon_check.ico"
+IDI_ICON_FIND_FLOW      ICON                    "icon_findflow.ico"
+IDI_ICON_SELECT_INSTANCES ICON                    "icon_select_instances.ico"
+IDI_ICON_SELECT_MESSAGES ICON                    "icon_select_messages.ico"
+IDI_ICON_SIMULATION_START ICON                    "icon_simulation_start.ico"
+IDI_ICON_SIMULATION_STOP ICON                    "icon_simulation_stop.ico"
+IDI_ICON_SELECT_ADD_INSTANCES ICON                    "icon_select_add_instances.ico"
+IDI_ICON_SELECT_ADD_MESSAGES ICON                    "icon_select_add_messages.ico"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
 // TEXTINCLUDE
 //
 
@@ -258,56 +308,6 @@
 
 /////////////////////////////////////////////////////////////////////////////
 //
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
-BEGIN
-    IDD_CHECK_OPTIONS, DIALOG
-    BEGIN
-        LEFTMARGIN, 5
-        RIGHTMARGIN, 195
-        TOPMARGIN, 5
-        BOTTOMMARGIN, 154
-    END
-
-    IDD_SIMULATOR_OPTIONS, DIALOG
-    BEGIN
-        LEFTMARGIN, 5
-        RIGHTMARGIN, 186
-        TOPMARGIN, 5
-        BOTTOMMARGIN, 47
-    END
-
-    IDD_FIND_FLOW, DIALOG
-    BEGIN
-        LEFTMARGIN, 5
-        RIGHTMARGIN, 270
-        TOPMARGIN, 5
-        BOTTOMMARGIN, 106
-    END
-
-    IDD_INSTANCES_FIELD_OPTIONS, DIALOG
-    BEGIN
-        LEFTMARGIN, 5
-        RIGHTMARGIN, 196
-        VERTGUIDE, 10
-        VERTGUIDE, 19
-        VERTGUIDE, 48
-        VERTGUIDE, 64
-        VERTGUIDE, 123
-        VERTGUIDE, 130
-        TOPMARGIN, 5
-        BOTTOMMARGIN, 122
-        HORZGUIDE, 54
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
 // Dialog Info
 //
 

Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp	2010-04-14 21:29:03 UTC (rev 720)
+++ trunk/src/view/visio/addon/document.cpp	2010-04-20 08:53:24 UTC (rev 721)
@@ -24,7 +24,9 @@
 #include "extract.h"
 #include "visualize.h"
 #include "finddlg.h"
+#include "messagesequencedlg.h"
 #include <fstream>
+#include "shapeutils.h"
 
 #include "data/msc.h"
 
@@ -607,8 +609,8 @@
     return VAORC_FAILURE;
   }
 
-  float pageWidth = static_cast<float>(CPageUtils::GetPageWidth(vsoApp->ActivePage));
-  float pageHeight = static_cast<float>(CPageUtils::GetPageHeight(vsoApp->ActivePage));
+  double pageWidth = CPageUtils::GetPageWidth(vsoApp->ActivePage);
+  double pageHeight = CPageUtils::GetPageHeight(vsoApp->ActivePage);
 
   if (startX < 0 || startY < 0 || startX > pageWidth || startY > pageHeight)
   {
@@ -987,82 +989,207 @@
 
 std::pair<Visio::IVShapePtr, Visio::IVShapePtr> CDocumentMonitor::getInstancesPair(Visio::IVApplicationPtr vsoApp)
 {
-  // FIXME: does not work quite well
-  Visio::IVSelectionPtr selection = /*CPageUtils::FilterSelection(*/vsoApp->ActiveWindow->Selection/*, ST_BMSC_INSTANCE)*/;
+  Visio::IVSelectionPtr selection = CPageUtils::FilterSelection(vsoApp->ActiveWindow->Selection, ST_BMSC_INSTANCE);
+  if (selection->Count == 0)
+  {
+    selection->SelectAll();
+    selection = CPageUtils::FilterSelection(selection, ST_BMSC_INSTANCE);
+  }
+
   switch (selection->Count)
   {
+  case 0:
+    return std::make_pair<Visio::IVShapePtr, Visio::IVShapePtr>(NULL, NULL);
   case 1:
-    return std::make_pair<Visio::IVShapePtr, Visio::IVShapePtr>(selection->Item[1], selection->Item[1]);
+    return std::make_pair<Visio::IVShapePtr, Visio::IVShapePtr>(selection->Item[1], NULL);
   case 2:
     // NOTE: respects the order in which the items were selected
     return std::make_pair<Visio::IVShapePtr, Visio::IVShapePtr>(selection->Item[1], selection->Item[2]);
-  case 0:
-    selection->SelectAll();
   default:
     Visio::IVShapePtr leftmost = selection->Item[1];
     Visio::IVShapePtr rightmost = selection->Item[1];
     for (int i=2; i<=selection->Count; i++)
     {
-      if (CPageUtils::GetShapeBeginX(selection->Item[i]) < CPageUtils::GetShapeBeginX(leftmost))
-      {
-        leftmost = selection->Item[i];
-      }
-      if (CPageUtils::GetShapeBeginX(selection->Item[i]) > CPageUtils::GetShapeBeginX(rightmost))
-      {
-        rightmost = selection->Item[i];
-      }
+      Visio::IVShapePtr item = selection->Item[i];
+
+      if (get_shape_type(item) != ST_BMSC_INSTANCE) continue;
+
+      if (item < leftmost) leftmost = item;
+      if (item > rightmost) rightmost = item;
     }
     return std::make_pair<Visio::IVShapePtr, Visio::IVShapePtr>(leftmost, rightmost);
   }
 }
 
-std::deque<Visio::IVShapePtr> CDocumentMonitor::getInstancesInBetween(Visio::IVApplicationPtr vsoApp, Visio::IVShapePtr boundaryOne, Visio::IVShapePtr boundaryTwo, float yCoord)
+std::vector<Visio::IVShapePtr> CDocumentMonitor::getInstancesInBetween(Visio::IVApplicationPtr vsoApp, Visio::IVShapePtr boundaryOne, Visio::IVShapePtr boundaryTwo, double yCoord)
 {
-  std::deque<Visio::IVShapePtr> qualified;
-  if (CPageUtils::GetShapeBeginX(boundaryOne) == CPageUtils::GetShapeBeginX(boundaryTwo))
+  std::vector<Visio::IVShapePtr> qualified;
+  double fromX = CShapeUtils::GetShapeBeginX(boundaryOne);
+  double toX   = CShapeUtils::GetShapeBeginX(boundaryTwo);
+
+  if (fabs(fromX - toX) < EPSILON)
+    return qualified;
+  if (fabs(fromX - CShapeUtils::GetShapeEndX(boundaryOne)) > EPSILON)
+    return qualified;
+  if (fabs(toX   - CShapeUtils::GetShapeEndX(boundaryTwo)) > EPSILON)
+    return qualified;
+  if (CShapeUtils::GetShapeBeginY(boundaryOne) < yCoord ||
+      CShapeUtils::GetShapeEndY(boundaryOne)   > yCoord ||
+      CShapeUtils::GetShapeBeginY(boundaryTwo) < yCoord ||
+      CShapeUtils::GetShapeEndY(boundaryTwo)   > yCoord)
   {
+    // some boundary out of yCoord
     return qualified;
   }
 
-  // TODO: implement
+  qualified.push_back(boundaryOne);
+  qualified.push_back(boundaryTwo);
+
+  Visio::IVPagePtr page = boundaryOne->ContainingPage;
+  // push back all qualifying shapes based on X-coord and Y-coord
+  for (int i=1; i <= page->Shapes->Count; i++)
+  {
+    Visio::IVShapePtr shape = page->Shapes->Item[i];
+
+    if (get_shape_type(shape) != ST_BMSC_INSTANCE) continue;
+
+    double bX = CShapeUtils::GetShapeBeginX(shape);
+    double eX = CShapeUtils::GetShapeEndX(shape);
+    double bY = CShapeUtils::GetShapeBeginY(shape);
+    double eY = CShapeUtils::GetShapeEndY(shape);
+
+    if (fabs(bX - eX) > EPSILON) continue; // not vertical
+    if (bY < yCoord || eY > yCoord) continue; // wrong yCoord
+
+    if ((fromX < bX && bX < toX) || (fromX > bX && bX > toX))
+    {
+      qualified.push_back(shape);
+    }
+  }
+
+  CShapeComparator comp((fromX < toX ? ORDER_DESC : ORDER_ASC));
+  std::sort(qualified.begin(), qualified.end(), comp);
   return qualified;
-}
+ }
 
-VAORC CDocumentMonitor::OnMenuMessageSequence(Visio::IVApplicationPtr vsoApp)
+VAORC CDocumentMonitor::OnMenuMessageSequence(Visio::IVApplicationPtr vsoApp, Visio::IVSelectionPtr oldSelection)
 {
+  // step 1: determine the boundary instances between which to draw message sequence
   std::pair<Visio::IVShapePtr, Visio::IVShapePtr> boundaries = getInstancesPair(vsoApp);
-  if (boundaries.first == boundaries.second)
+  if (boundaries.first == NULL)
   {
-    // prompt to select another instance
-    // TODO
-    /*
     MessageBox(GetActiveWindow(),
-      _T("Selected just one instance"), _T("Selected"), MB_OK);
+      _T("There are no instances in the current selection or drawing."), _T("Error"), MB_OK | MB_ICONEXCLAMATION);
     return VAORC_FAILURE;
-    */
   }
-/* DEBUG
-  MessageBox(GetActiveWindow(),
-    boundaries.first->Name,
-    _T("Selected as first"), MB_OK
-    );
-  MessageBox(GetActiveWindow(),
-    boundaries.second->Name,
-    _T("Selected as second"), MB_OK
-    );
-*/
-  MessageBox(GetActiveWindow(),
-    _T("Message Sequence not implemented yet"), _T("Error"), MB_OK | MB_ICONEXCLAMATION);
+
+  double initYPos = m_addon->GetMousePosY();
+
+  if (m_addon->GetState(vsoApp) == CStudioAddon::STATE_MESSAGE_SEQUENCE_WAITING_FOR_SEL_CHANGE)
+  {
+    // was waiting for selecting another instance
+    // continue only if the user selected exactly one instance both before and now
+    m_addon->ResetState(vsoApp);
+    if (boundaries.second != NULL || oldSelection->Count != 1)
+    {
+      return VAORC_FAILURE;
+    }
+    boundaries.second = boundaries.first;
+    boundaries.first = oldSelection->Item[1];
+    initYPos = m_addon->GetPrevMousePosY(vsoApp);
+  }
+  else
+  {
+    if (boundaries.second == NULL)
+    {
+      // selected just one instance, prompt to select another
+      this->m_addon->SetState(vsoApp, CStudioAddon::STATE_MESSAGE_SEQUENCE_WAITING_FOR_SEL_CHANGE,
+        _T("Select another instance to draw a message sequence to."));
+      this->m_addon->SaveMousePos(vsoApp);
+      return VAORC_SUCCESS;
+    }
+  }
+
+  // step 2: basic validation - intersect the two instances in their y-coords?
+  if (CShapeUtils::GetShapeBeginY(boundaries.first) < CShapeUtils::GetShapeEndY(boundaries.second) ||
+      CShapeUtils::GetShapeBeginY(boundaries.second) < CShapeUtils::GetShapeEndY(boundaries.first))
+  {
+    MessageBox(GetActiveWindow(),
+      _T("The instances are in wrong positions to make\na message sequence between them."),
+      _T("Error"), MB_OK | MB_ICONEXCLAMATION);
+    return VAORC_FAILURE;
+  }
+
+  // step 3: dialog
+  MsgSeqDirection origDir = (boundaries.first < boundaries.second ? MSDIR_RIGHT : MSDIR_LEFT);
+  CMessageSequenceDlg dlg(vsoApp, initYPos, origDir);
+  // TODO: during filling the dialog, mark all the instances taken into account (depends on the y-coord)
+  if (!dlg.DoModal()) return VAORC_FAILURE;
+
+  MsgSeqDirection direction = dlg.m_direction;
+  double startPosY = CPageUtils::ConvertUnits(vsoApp->ActivePage, dlg.m_start_pos_y);
+  double verticalSpace = CPageUtils::ConvertUnits(vsoApp->ActivePage, dlg.m_vertical_space);
+  CString leftMessage = dlg.m_left_msg_captions;
+  CString rightMessage = dlg.m_right_msg_captions;
+
+  // step 4: make an ordered list of instances being subject of message sequence drawing
+  std::pair<Visio::IVShapePtr, Visio::IVShapePtr> orderedBoundaries = std::make_pair<Visio::IVShapePtr, Visio::IVShapePtr>(boundaries.first, boundaries.second);
+  if (orderedBoundaries.first > orderedBoundaries.second)
+  {
+    swap(orderedBoundaries);
+  }
+  // order the pair so that we get the right direction by iterating the resulting list
+  if (direction == MSDIR_RIGHT || direction == MSDIR_RIGHT_LEFT)
+  {
+    swap(orderedBoundaries);
+  }
+  // get the ordered list
+  std::vector<Visio::IVShapePtr> instList = getInstancesInBetween(vsoApp, orderedBoundaries.first, orderedBoundaries.second, startPosY);
+
+  if (instList.size() == 0)
+  {
+    MessageBox(GetActiveWindow(),
+      _T("No instances matching the criteria.\nMaybe the Y-start (mouse position) is wrong?"),
+      _T("Error"), MB_OK | MB_ICONEXCLAMATION);
+    return VAORC_FAILURE;
+  }
+  
+  // step 5: draw the message sequence along the list
+  double yPos = startPosY;
+  std::vector<Visio::IVShapePtr>::iterator from = instList.begin();
+  std::vector<Visio::IVShapePtr>::iterator to = instList.begin();
+  ++to;
+  for ( ; to != instList.end(); ++from, ++to, yPos+=verticalSpace)
+  {
+    TRACE("Drawing from " << (*from)->Name << " to " << (*to)->Name << " at y=" << yPos);
+    DrawMessage(*from, *to, yPos, (*from < *to ? rightMessage : leftMessage));
+  }
+  if (direction == MSDIR_LEFT_RIGHT || direction == MSDIR_RIGHT_LEFT)
+  {
+    std::vector<Visio::IVShapePtr>::reverse_iterator rfrom = instList.rbegin();
+    std::vector<Visio::IVShapePtr>::reverse_iterator rto = instList.rbegin();
+    ++rto;
+    for ( ; rto != instList.rend(); ++rfrom, ++rto, yPos+=verticalSpace)
+    {
+      TRACE("Drawing from " << (*rfrom)->Name << " to " << (*rto)->Name << " at y=" << yPos);
+      DrawMessage(*rfrom, *rto, yPos, (*rfrom < *rto ? rightMessage : leftMessage));
+    }
+  }
+
   return VAORC_SUCCESS;
-  // TODO: validation - are the two instances chosen compatible for message sequence? (i.e. intersect in their y-coords?)
-  // TODO: show an options dialog
-  // TODO: during filling the dialog, mark all the instances taken into account (depends on the y-coord)
-  // TODO: make a list of instances being subject of message sequence drawing
-  float yCoord;
-  std::deque<Visio::IVShapePtr> subjectInstances = getInstancesInBetween(vsoApp, boundaries.first, boundaries.second, yCoord);
-  // TODO: draw the message sequence
 }
 
+void CDocumentMonitor::DrawMessage(Visio::IVShapePtr from, Visio::IVShapePtr to, double yCoord, const TCHAR* caption)
+{
+  // DEBUG:
+  CString fromName((const char*)from->Name);
+  CString toName((const char*)to->Name);
+  CString msg;
+  msg.Format(_T("Drawing from\n%s\nto\n%s"), fromName, toName);
+  MessageBox(GetActiveWindow(), msg, _T("INFO"), MB_OK | MB_ICONINFORMATION);
+  // TODO: implement
+}
+
 VAORC CDocumentMonitor::OnMenuWindowsReporter(Visio::IVApplicationPtr vsoApp)
 {
   if(m_reportVisible)

Modified: trunk/src/view/visio/addon/document.h
===================================================================
--- trunk/src/view/visio/addon/document.h	2010-04-14 21:29:03 UTC (rev 720)
+++ trunk/src/view/visio/addon/document.h	2010-04-20 08:53:24 UTC (rev 721)
@@ -17,6 +17,7 @@
  */
 
 #pragma once
+#include "stdafx.h"
 #include "reportview.h"
 #include "data/formatter.h"
 #include "data/checker.h"
@@ -24,16 +25,25 @@
 #include "data/simulator.h"
 #include "data/transformer.h"
 #include "pageutils.h"
+#include "addon.h"
 
 //! template used to create new documents
 static const _bstr_t VST_FILE_NAME = _T("MSC.vtx");
 
-class CStudioAddon;
-
 typedef std::vector<FormatterPtr> FormatterPtrList;
 typedef std::vector<CheckerPtr> CheckerPtrList;
 typedef std::vector<TransformerPtr> TransformerPtrList;
 
+const double EPSILON = 1e-10;
+
+template <typename T1, typename T2>
+void swap(std::pair<T1,T2> &p)
+{
+  T1 t = p.first;
+  p.first = p.second;
+  p.second = t;
+}
+
 class CDocumentMonitor : public SimulationListener
 {
 public:
@@ -76,7 +86,7 @@
   VAORC OnMenuTransform(Visio::IVApplicationPtr vsoApp, int index);
   VAORC OnMenuSelectAllInstances(Visio::IVApplicationPtr vsoApp, bool add); // FIXME: refactor: define enum types
   VAORC OnMenuSelectAllMessages(Visio::IVApplicationPtr vsoApp, bool add); // FIXME: refactor: define enum types
-  VAORC OnMenuMessageSequence(Visio::IVApplicationPtr vsoApp);
+  VAORC OnMenuMessageSequence(Visio::IVApplicationPtr vsoApp, Visio::IVSelectionPtr oldSelection=NULL);
   VAORC OnMenuFindFlow(Visio::IVApplicationPtr vsoApp);
   VAORC OnMenuSimulationStart(Visio::IVApplicationPtr vsoApp);
   VAORC OnMenuSimulationStop(Visio::IVApplicationPtr vsoApp);
@@ -224,11 +234,13 @@
    * If there are no instances selected in the application, the instances returned
    * are the leftmost and the rightmost of all instances on the active page.
    * If there is exactly 1 instance selected, it puts it into the returned pair both at first
-   * and second position.
+   * and NULL at second position.
    * If there are exactly 2 instances selected, these two are returned in the order of
    * their selection.
    * If more than 2 instances are selected, returned are the leftmost and the rightmost
    * of the selected instances.
+   * Anyway, if there are no instances available, a pair of two NULL pointers is returned,
+   * or if there is just one instance, a pair with a pointer to it and NULL is returned.
    *
    * @param vsoApp           the application to get the instances from
    * @return a pair of instances chosen using rules mentioned above
@@ -246,15 +258,32 @@
    * all instances returned are ordered by the x-coords in the ascending direction; otherwise,
    * they are returned in a descending order.
    * In the special case both boundaries are of same x-coords, an empty list is returned.
+   * An empty list is also returned if any of the boundaries is not strictly vertical.
+   * Those other instances which would qualify to the resulting list, but are not vertical,
+   * are filtered out.
    *
+   * The yCoord is an absolute coordinate (i.e. relative to the page); if any of the boundary
+   * instances do not intersect a line at yCoord, an empty list is returned.
+   *
    * @param vsoApp          application to get the instances in
    * @param boundaryOne     an instances serving as one of boundaries
    * @param boundaryTwo     another instance serving as a boundary
    * @param yCoord          height of an imaginary line which all returned instances must intersect
    * @return a list of instances meeting above criteria according to boundaries and yCoord given
    */
-  std::deque<Visio::IVShapePtr> getInstancesInBetween(Visio::IVApplicationPtr vsoApp, Visio::IVShapePtr boundaryOne, Visio::IVShapePtr boundaryTwo, float yCoord);
+  std::vector<Visio::IVShapePtr> getInstancesInBetween(Visio::IVApplicationPtr vsoApp, Visio::IVShapePtr boundaryOne, Visio::IVShapePtr boundaryTwo, double yCoord);
 
+  /**
+   * Draws a message between the given instances at yCoord.
+   * 
+   * @param from    from which instance
+   * @param to      to which instance
+   * @param yCoord  the y-coordinate at which to draw the message; relative to the page
+   * @param caption caption of the message
+   */
+  void DrawMessage(Visio::IVShapePtr from, Visio::IVShapePtr to, double yCoord, const TCHAR* caption);
+
+public:
   Visio::IVUIObjectPtr GetMostCustomMenus();
   Visio::IVUIObjectPtr GetMostCustomToolbars();
 };

Modified: trunk/src/view/visio/addon/instancesfielddlg.cpp
===================================================================
--- trunk/src/view/visio/addon/instancesfielddlg.cpp	2010-04-14 21:29:03 UTC (rev 720)
+++ trunk/src/view/visio/addon/instancesfielddlg.cpp	2010-04-20 08:53:24 UTC (rev 721)
@@ -29,11 +29,11 @@
   Visio::IVPagePtr page = vsoApp->ActivePage;
 
   // we got the mouse coordinates in the internal units
-  m_mousePosX  = static_cast<float>(CPageUtils::ConvertUnits(page, mousePosX, 0, visPageUnits));
-  m_mousePosY  = static_cast<float>(CPageUtils::ConvertUnits(page, mousePosY, 0, visPageUnits));
+  m_mousePosX  = CPageUtils::ConvertUnits(page, mousePosX, 0, visPageUnits);
+  m_mousePosY  = CPageUtils::ConvertUnits(page, mousePosY, 0, visPageUnits);
 
-  m_pageWidth  = static_cast<float>(CPageUtils::GetPageWidth(page));
-  m_pageHeight = static_cast<float>(CPageUtils::GetPageHeight(page));
+  m_pageWidth  = CPageUtils::GetPageWidth(page);
+  m_pageHeight = CPageUtils::GetPageHeight(page);
 }
 
 void CInstancesFieldDlg::OnDa...
 
[truncated message content]

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

scstudio-commits