Merge from V6_4_0_BR 05/12/2011 (V6_4_0rc2)

diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx
index 7993d9f9472032c8cdc5ff35280c2098b040e97b..8aa677e3cc3d87c5be2154bc24852360392797a8 100755 (executable)
--- a/src/CAM/CAM_Application.cxx
+++ b/src/CAM/CAM_Application.cxx
@@ -45,6 +45,8 @@
 
 #include <cstdio>
 
+namespace
+{
 class BusyLocker
 {
 public:
@@ -54,6 +56,7 @@ private:
   bool  myPrev;
   bool& myBusy;
 };
+}
 
 /*!
   \brief Create new instance of CAM_Application.
@@ -361,10 +364,10 @@ CAM_Module* CAM_Application::loadModule( const QString& modName, const bool show
   if(version) {    
     for ( ModuleInfoList::iterator it = myInfoList.begin(); it != myInfoList.end(); ++it ) {
       if ( (*it).title == modName ) {
-       if( (*it).version.isEmpty() ) {
-         (*it).version = QString(version);
-       }
-       break;
+        if( (*it).version.isEmpty() ) {
+          (*it).version = QString(version);
+        }
+        break;
       }
     }
   }

diff --git a/src/VTKViewer/VTKViewer_TransformFilter.cxx b/src/VTKViewer/VTKViewer_TransformFilter.cxx
index dc2bc83cc003ab175d0602ba26d8a5a7783181a8..eec36008afa1bc8a63fc83ef575bcd88c749a483 100755 (executable)
--- a/src/VTKViewer/VTKViewer_TransformFilter.cxx
+++ b/src/VTKViewer/VTKViewer_TransformFilter.cxx
@@ -79,6 +79,7 @@ int VTKViewer_TransformFilter::RequestData(
   }
   outPD->PassData(pd);
   outCD->PassData(cd);
+  InvokeEvent("VTKViewer_TransformFilter::TransformationFinished");
   
   return 1;
 }