[Scstudio-commits] SF.net SVN: scstudio:[1890] trunk

[<xf...@us...>]

Revision: 1890
          http://sourceforge.net/p/scstudio/code/1890
Author:   xfarmad
Date:     2014-01-22 10:26:17 +0000 (Wed, 22 Jan 2014)
Log Message:
-----------
Hmsc condition repaint fix + new doxygen configuration

Modified Paths:
--------------
    trunk/doc/doxygen/doxygen.config
    trunk/src/view/visio/addon/visualize.cpp

Modified: trunk/doc/doxygen/doxygen.config
===================================================================
--- trunk/doc/doxygen/doxygen.config	2014-01-20 18:35:07 UTC (rev 1889)
+++ trunk/doc/doxygen/doxygen.config	2014-01-22 10:26:17 UTC (rev 1890)
@@ -612,7 +612,11 @@
 # against the file with absolute path, so to exclude all test directories
 # for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       =
+EXCLUDE_PATTERNS       = */doc/*
+EXCLUDE_PATTERNS       += */tests/*
+EXCLUDE_PATTERNS       += */third-party-sw/*
+EXCLUDE_PATTERNS       += */tools/*
+EXCLUDE_PATTERNS       += */.svn/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the

Modified: trunk/src/view/visio/addon/visualize.cpp
===================================================================
--- trunk/src/view/visio/addon/visualize.cpp	2014-01-20 18:35:07 UTC (rev 1889)
+++ trunk/src/view/visio/addon/visualize.cpp	2014-01-22 10:26:17 UTC (rev 1890)
@@ -683,16 +683,7 @@
   ConditionNodePtr condition_node = boost::dynamic_pointer_cast<ConditionNode>(node);
   if(condition_node != NULL)
   {
-    //to support same master for HMSC and BMSC, condition muss have special drop
-    double page_height = get_page_height(vsoPage);
-    // drop the master to bottom-left corner
-    // note: drop coordinates are in Visio internal units
-    shape = vsoPage->Drop(find_master(ST_MSC_CONDITION), 0, 0);
-    // move shape to the right position
-    shape->CellsSRC[visSectionObject][visRowXForm1D][vis1DBeginX]->Result[visMillimeters] = condition_node->get_position().get_x();
-    shape->CellsSRC[visSectionObject][visRowXForm1D][vis1DBeginY]->Result[visMillimeters] = page_height - condition_node->get_position().get_y() + 5;
-    shape->CellsSRC[visSectionObject][visRowXForm1D][vis1DEndX]->Result[visMillimeters] = condition_node->get_position().get_x();
-    shape->CellsSRC[visSectionObject][visRowXForm1D][vis1DEndY]->Result[visMillimeters] = page_height - condition_node->get_position().get_y() - 5;
+    shape = DropMaster(vsoPage, find_master(ST_MSC_CONDITION), condition_node->get_position());
     shape->Text = condition_node->get_label().c_str();
   }
 
@@ -836,24 +827,12 @@
           CShapeUtils::ChangeShapeColor(connector, (*spos)->get_color());
         }
         Visio::IVCellPtr from_cell = connector->CellsSRC[visSectionObject][visRowXForm1D][vis1DBeginX];
-        if(get_shape_type(shape) == ST_MSC_CONDITION)
-        {
-          from_cell->GlueToPos(shape, 1.0, 0.5);
-        }
-        else
-        {
-          from_cell->GlueToPos(shape, 0.5, 0.0);
-        }
+        from_cell->GlueToPos(shape, 0.5, 0.0);
+
         Visio::IVCellPtr to_cell = connector->CellsSRC[visSectionObject][visRowXForm1D][vis1DEndX];
-        if(get_shape_type(successor_shape) == ST_MSC_CONDITION)
-        {
-          to_cell->GlueToPos(successor_shape, 0.0, 0.5);
-        }
-        else
-        {
-          to_cell->GlueToPos(successor_shape, 0.5, 1.0);
-        }
+        to_cell->GlueToPos(successor_shape, 0.5, 1.0);
         
+        
         // add successors of this node to the stack
         // note: std::list<>::push_back doesn't invalidate iterators
         push_back_if_unique<HMscNodePtr>(node_stack, successor_node);

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