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

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

Revision: 186
          http://scstudio.svn.sourceforge.net/scstudio/?rev=186&view=rev
Author:   gotthardp
Date:     2009-02-02 20:35:18 +0000 (Mon, 02 Feb 2009)

Log Message:
-----------
Fixed zoom when displaying a counter-example. Improved reporting. Getting ready for release 0.2.0.

Modified Paths:
--------------
    trunk/src/view/visio/addon/dllmodule.rc
    trunk/src/view/visio/addon/document.cpp
    trunk/src/view/visio/addon/visualize.cpp

Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc	2009-02-01 22:43:49 UTC (rev 185)
+++ trunk/src/view/visio/addon/dllmodule.rc	2009-02-02 20:35:18 UTC (rev 186)
@@ -72,8 +72,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,6,0
- PRODUCTVERSION 0,1,6,0
+ FILEVERSION 0,2,0,0
+ PRODUCTVERSION 0,2,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x9L
@@ -90,13 +90,13 @@
         BEGIN
             VALUE "CompanyName", "Masaryk University Brno"
             VALUE "FileDescription", "Microsoft Visio add-on for design and verification of Message Sequence Charts (MSC)."
-            VALUE "FileVersion", "0.1.6"
+            VALUE "FileVersion", "0.2.0"
             VALUE "InternalName", "scstudio.vsl"
             VALUE "LegalCopyright", "(c) Petr Gotthard. All rights reserved."
             VALUE "OriginalFilename", "scstudio.vsl"
             VALUE "PrivateBuild", "$Revision$"
             VALUE "ProductName", "Sequence Chart Studio"
-            VALUE "ProductVersion", "0.1.6"
+            VALUE "ProductVersion", "0.2.0"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp	2009-02-01 22:43:49 UTC (rev 185)
+++ trunk/src/view/visio/addon/document.cpp	2009-02-02 20:35:18 UTC (rev 186)
@@ -300,13 +300,13 @@
         BMscPtr result = bmsc_checker->check(bmsc, srm);
         if(result != NULL)
         {
-          m_reportView->Print(RS_ERROR, stringize()
+          m_reportView->Print(RS_ERROR, stringize() << vsoPage->Name << ": "
             << (*cpos)->get_description() << " violated.", result);
           violated_count++;
         }
         else
         {
-          m_reportView->Print(RS_NOTICE, stringize()
+          m_reportView->Print(RS_NOTICE, stringize() << vsoPage->Name << ": "
             << (*cpos)->get_description() << " satisfied.");
           satisfied_count++;
         }
@@ -317,13 +317,13 @@
         HMscPtr result = hmsc_checker->check(hmsc, srm);
         if(result != NULL)
         {
-          m_reportView->Print(RS_ERROR, stringize()
+          m_reportView->Print(RS_ERROR, stringize() << vsoPage->Name << ": "
             << (*cpos)->get_description() << " violated.", result);
           violated_count++;
         }
         else
         {
-          m_reportView->Print(RS_NOTICE, stringize()
+          m_reportView->Print(RS_NOTICE, stringize() << vsoPage->Name << ": "
             << (*cpos)->get_description() << " satisfied.");
           satisfied_count++;
         }
@@ -334,7 +334,7 @@
 
     if(satisfied_count == 0 && violated_count == 0)
     {
-      m_reportView->Print(RS_NOTICE, stringize()
+      m_reportView->Print(RS_NOTICE, stringize() << vsoPage->Name << ": "
         << "No verification algorithms applicable. No properties verified.");
     }
 
@@ -342,8 +342,8 @@
   }
   else
   {
-    m_reportView->Print(RS_NOTICE,
-      stringize() << "Graphical error(s) in drawing '" << vsoPage->Name << "'");
+    m_reportView->Print(RS_NOTICE, stringize()  << vsoPage->Name << ": "
+      << "Graphical error(s) in drawing. No properties verified.");
     return VAORC_FAILURE;
   }
 }

Modified: trunk/src/view/visio/addon/visualize.cpp
===================================================================
--- trunk/src/view/visio/addon/visualize.cpp	2009-02-01 22:43:49 UTC (rev 185)
+++ trunk/src/view/visio/addon/visualize.cpp	2009-02-02 20:35:18 UTC (rev 186)
@@ -63,6 +63,13 @@
   if(hmsc != NULL)
     visualize_hmsc(vsoPage, hmsc);
 
+  m_vsoApp->ActiveWindow->Page = (IDispatch *)vsoPage;
+  double left, bottom, right, top;
+  vsoPage->BoundingBox(visTypePage, &left, &bottom, &right, &top);
+  // scroll to view the drawing
+  m_vsoApp->ActiveWindow->Zoom = 1;
+  m_vsoApp->ActiveWindow->ScrollViewTo((left+right)/2.0, (top+bottom)/2.0);
+
   // the last dropped shape would be selected
   m_vsoApp->ActiveWindow->DeselectAll();
 }


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