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

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

Revision: 154
          http://scstudio.svn.sourceforge.net/scstudio/?rev=154&view=rev
Author:   gotthardp
Date:     2009-01-06 21:16:29 +0000 (Tue, 06 Jan 2009)

Log Message:
-----------
- Fixed DLL registration path.
- Added explanation when no algorithms are executed.

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

Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp	2009-01-06 19:49:01 UTC (rev 153)
+++ trunk/src/view/visio/addon/document.cpp	2009-01-06 21:16:29 UTC (rev 154)
@@ -217,6 +217,8 @@
   menuItem3->AddOnName = ADDON_NAME;
   menuItem3->AddOnArgs = "/event=203";
   menuItem3->BeginGroup = true;
+  // enable only if some formatters are available
+  menuItem3->Enabled = m_formatters.size() > 0;
 
   vsoDocument->SetCustomMenus(vsoMenus);
 }
@@ -240,6 +242,9 @@
 
     SRChannelMapperPtr srm = SRChannelMapper::instance();
 
+    int satisfied_count = 0;
+    int violated_count = 0;
+
     for(CheckerPtrList::const_iterator cpos = m_checkers.begin();
       cpos != m_checkers.end(); cpos++)
     {
@@ -253,11 +258,13 @@
         {
           m_reportView->Print(RS_ERROR, stringize()
             << (*cpos)->get_description() << " violated.");
+          violated_count++;
         }
         else
         {
           m_reportView->Print(RS_NOTICE, stringize()
             << (*cpos)->get_description() << " satisfied.");
+          satisfied_count++;
         }
       }
 
@@ -268,15 +275,23 @@
         {
           m_reportView->Print(RS_ERROR, stringize()
             << (*cpos)->get_description() << " violated.");
+          violated_count++;
         }
         else
         {
           m_reportView->Print(RS_NOTICE, stringize()
             << (*cpos)->get_description() << " satisfied.");
+          satisfied_count++;
         }
       }
     }
 
+    if(satisfied_count == 0 && violated_count == 0)
+    {
+      m_reportView->Print(RS_NOTICE, stringize()
+        << "No verification algorithms applicable. No properties verified.");
+    }
+
     return VAORC_SUCCESS;
   }
   else

Modified: trunk/src/view/visio/scstudio.nsi
===================================================================
--- trunk/src/view/visio/scstudio.nsi	2009-01-06 19:49:01 UTC (rev 153)
+++ trunk/src/view/visio/scstudio.nsi	2009-01-06 21:16:29 UTC (rev 154)
@@ -96,10 +96,10 @@
   ${AppendRegStr} ${VisioRegPath} "StencilPath" "$INSTDIR\stencils"
   ${AppendRegStr} ${VisioRegPath} "TemplatePath" "$INSTDIR\stencils"
   ; register modules
-  WriteRegStr HKCU '${ModuleRegPath}' 'init_liveness' 'scliveness.dll'
-  WriteRegStr HKCU '${ModuleRegPath}' 'init_order' 'scorder.dll'
-  WriteRegStr HKCU '${ModuleRegPath}' 'init_race' 'scrace.dll'
-  WriteRegStr HKCU '${ModuleRegPath}' 'init_z120' 'scZ120.dll'
+  WriteRegStr HKCU '${ModuleRegPath}' 'liveness' '$INSTDIR\bin\scliveness.dll'
+  WriteRegStr HKCU '${ModuleRegPath}' 'order' '$INSTDIR\bin\scorder.dll'
+  WriteRegStr HKCU '${ModuleRegPath}' 'race' '$INSTDIR\bin\scrace.dll'
+  WriteRegStr HKCU '${ModuleRegPath}' 'z120' '$INSTDIR\bin\scZ120.dll'
 
   ;Create uninstaller
   WriteUninstaller "$INSTDIR\Uninstall.exe"


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