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

[<got...@us...>]

Revision: 385
          http://scstudio.svn.sourceforge.net/scstudio/?rev=385&view=rev
Author:   gotthardp
Date:     2009-09-28 13:40:41 +0000 (Mon, 28 Sep 2009)

Log Message:
-----------
Put the beautify functionality back. Call both Beautify and LayoutOptimizer.

Modified Paths:
--------------
    trunk/src/view/visio/addon/document.cpp
    trunk/src/view/visio/addon/document.h

Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp	2009-09-28 13:18:35 UTC (rev 384)
+++ trunk/src/view/visio/addon/document.cpp	2009-09-28 13:40:41 UTC (rev 385)
@@ -27,6 +27,7 @@
 #include <fstream>
 
 #include "data/msc.h"
+#include "data/beautify.h"
 #include "data/layout_optimizer.h"
 
 // Include libraries from the Windows Template Library (WTL).
@@ -1033,21 +1034,8 @@
   if(msc == NULL)
     return VAORC_FAILURE;
 
-  LayoutOptimizer beautify;
-  beautify.m_instance_head_distance =
-    (float)GetRegistryDWORD(SCSTUDIO_REGISTRY_ROOT, _T("InstanceHeadDistance"), 5);
-  beautify.m_successor_distance =
-    (float)GetRegistryDWORD(SCSTUDIO_REGISTRY_ROOT, _T("SuccessorDistance"), 5);
-  beautify.m_send_receive_distance =
-    (float)GetRegistryDWORD(SCSTUDIO_REGISTRY_ROOT, _T("SendReceiveDistance"), 0);
-
   // generate graphical layout information
-  if(!beautify.process(msc))
-  {
-    m_reportView->Print(RS_WARNING,
-      stringize() << "Optimized layout not found.");
-  }
-
+  OptimizeLayout(msc);
   // delete all MSC symbols, preserve ignored shapes
   RemoveKnownSymbols(vsoPage);
 
@@ -1104,6 +1092,27 @@
   m_reportVisible = false;
 }
 
+void CDocumentMonitor::OptimizeLayout(const MscPtr& msc)
+{
+  Beautify beautify;
+  beautify.process(msc);
+
+  LayoutOptimizer optimizer;
+  optimizer.m_instance_head_distance =
+    (float)GetRegistryDWORD(SCSTUDIO_REGISTRY_ROOT, _T("InstanceHeadDistance"), 5);
+  optimizer.m_successor_distance =
+    (float)GetRegistryDWORD(SCSTUDIO_REGISTRY_ROOT, _T("SuccessorDistance"), 5);
+  optimizer.m_send_receive_distance =
+    (float)GetRegistryDWORD(SCSTUDIO_REGISTRY_ROOT, _T("SendReceiveDistance"), 0);
+
+  // generate graphical layout information
+  if(!optimizer.process(msc))
+  {
+    m_reportView->Print(RS_WARNING,
+      stringize() << "Optimized layout not found.");
+  }
+}
+
 void CDocumentMonitor::ImportDocument(const ImportFormatterPtr& formatter, const std::string& filename)
 {
   std::vector<MscPtr> drawing = formatter->load_msc(filename);
@@ -1145,9 +1154,8 @@
       }
     }
 
-    LayoutOptimizer beautify;
     // generate graphical layout information
-    beautify.process(*dpos);
+    OptimizeLayout(*dpos);
 
     CDrawingVisualizer visualizer(m_vsoApp);
     visualizer.visualize_msc(page, *dpos);

Modified: trunk/src/view/visio/addon/document.h
===================================================================
--- trunk/src/view/visio/addon/document.h	2009-09-28 13:18:35 UTC (rev 384)
+++ trunk/src/view/visio/addon/document.h	2009-09-28 13:40:41 UTC (rev 385)
@@ -53,6 +53,7 @@
   void ShowReportView();
   void OnHideReportView();
 
+  void OptimizeLayout(const MscPtr& msc);
   void ImportDocument(const ImportFormatterPtr& formatter, const std::string& filename);
   void ExportActiveDocument(const ExportFormatterPtr& formatter, std::ostream& stream);
 


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