[Scstudio-commits] SF.net SVN: scstudio:[1827] branches/conditions/src/view/visio/addon

[<ob...@us...>]

Revision: 1827
          http://sourceforge.net/p/scstudio/code/1827
Author:   obouda
Date:     2013-06-17 10:18:59 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
fixed some compilation errors

Modified Paths:
--------------
    branches/conditions/src/view/visio/addon/extract.cpp
    branches/conditions/src/view/visio/addon/visualize.cpp
    branches/conditions/src/view/visio/addon/visualize.h

Modified: branches/conditions/src/view/visio/addon/extract.cpp
===================================================================
--- branches/conditions/src/view/visio/addon/extract.cpp	2013-05-27 04:00:30 UTC (rev 1826)
+++ branches/conditions/src/view/visio/addon/extract.cpp	2013-06-17 10:18:59 UTC (rev 1827)
@@ -1005,7 +1005,7 @@
                 
                 LocalActionEventPtr event = strict_area->add_event(new LocalActionEvent());
                 event->set_position(ConvertEventPoint(instance, epos->event_pos));
-                act->glue_event(event);
+                act->glue_event(event.get());
                 
                 events.insert(std::make_pair<SPoint,EventPtr>(point_to_page(instance, epos->event_pos), event));
                 break;
@@ -1033,7 +1033,7 @@
                 
                 ConditionEventPtr event = strict_area->add_event(new ConditionEvent());
                 event->set_position(ConvertEventPoint(instance, epos->event_pos));
-                cond->glue_event(event);
+                cond->glue_event(event.get());
                 
                 events.insert(std::make_pair<SPoint,EventPtr>(point_to_page(instance, epos->event_pos), event));
                 break;
@@ -1101,9 +1101,9 @@
   }
 
   // walk through detected elements: check all gluable elements are connected
-  for(MscElementMap::const_iterator epos = elements.begin(); epos != elements.end(); mpos++)
+  for(MscElementMap::const_iterator epos = elements.begin(); epos != elements.end(); epos++)
   {
-    Visio::IVShapePtr shape = vsoPage->Shapes->ItemFromID[mpos->first];
+    Visio::IVShapePtr shape = vsoPage->Shapes->ItemFromID[epos->first];
     MscElementPtr el = epos->second;
     
     MscMessagePtr msg_el = boost::dynamic_pointer_cast<MscMessage>(el);

Modified: branches/conditions/src/view/visio/addon/visualize.cpp
===================================================================
--- branches/conditions/src/view/visio/addon/visualize.cpp	2013-05-27 04:00:30 UTC (rev 1826)
+++ branches/conditions/src/view/visio/addon/visualize.cpp	2013-06-17 10:18:59 UTC (rev 1827)
@@ -288,8 +288,8 @@
     default: throw std::runtime_error("Error: unexpected behaviour");
   }
 
-  if (boost::dynamic_pointer_cast<Message>(element) != NULL)
-    shape->Text = boost::dynamic_pointer_cast<Message>(element)->get_label().c_str();
+  if (boost::dynamic_pointer_cast<MscMessage>(element) != NULL)
+    shape->Text = boost::dynamic_pointer_cast<MscMessage>(element)->get_label().c_str();
   else if (boost::dynamic_pointer_cast<LocalAction>(element) != NULL)
     shape->Text = boost::dynamic_pointer_cast<LocalAction>(element)->get_statement().c_str();
   else if (boost::dynamic_pointer_cast<Condition>(element) != NULL)

Modified: branches/conditions/src/view/visio/addon/visualize.h
===================================================================
--- branches/conditions/src/view/visio/addon/visualize.h	2013-05-27 04:00:30 UTC (rev 1826)
+++ branches/conditions/src/view/visio/addon/visualize.h	2013-06-17 10:18:59 UTC (rev 1827)
@@ -65,7 +65,7 @@
   void SetControlPos(Visio::IVShapePtr shape, const wchar_t* row, Coordinate pos);
 
   Visio::IVShapePtr drop_shape(Visio::IVPagePtr vsoPage, ElementPtrMap& shapes,
-    MscMessagePtr element, Visio::IVMasterPtr master);
+    MscElementPtr element, Visio::IVMasterPtr master);
   void show_event(Visio::IVPagePtr vsoPage, ElementPtrMap& shapes,
     Visio::IVShapePtr parent, EventPtr event);
   Visio::IVShapePtr connect_events(Visio::IVPagePtr vsoPage,

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