#3472 merge vtk8itk5wx3-mingw64

diff --git a/kernel/cmake/BBTKBuildAllOption.cmake b/kernel/cmake/BBTKBuildAllOption.cmake
index ce1b10f0dc82c99d9795a6d73d87a787909ee6c7..ca0cd9f5768ade518f40a2377a5d81d65dce019c 100644 (file)
--- a/kernel/cmake/BBTKBuildAllOption.cmake
+++ b/kernel/cmake/BBTKBuildAllOption.cmake
@@ -25,29 +25,41 @@
 
 
 #-----------------------------------------------------------------------------
-# If --BUILD_ALL is set to ON then all options 
+# If 0-BUILD_ALL is set to ON then all options 
 # for which the macro SWITCH_ON_IF_BUILD_ALL have been used are set to ON
-# The -- prepended to the options ensure that it will appear as the 
+# The 0- prepended to the options ensure that it will appear as the 
 # first option when running ccmake/CMakeSetup
 IF (BBTK_CORE_PACKAGE)
-  OPTION(--BUILD_ALL "Build all ?" OFF)
+
+  OPTION(0-BUILD_ALL "Build all ?" OFF)
+#EED2021-08-26 OPTION(--BUILD_ALL "Build all ?" OFF)
+
   #OPTION(--SET_BUILD_ALL_OFF "Build all ?" OFF)
   #MARK_AS_ADVANCED(--SET_BUILD_ALL_OFF)
 
   MACRO(SWITCH_ON_IF_BUILD_ALL VAR)
     #OPTION(--${VAR}_SET_BUILD_ALL_OFF "Build all ?" OFF)
     #MARK_AS_ADVANCED(--${VAR}_SET_BUILD_ALL_OFF)
-    IF (--BUILD_ALL)
+
+    IF (0-BUILD_ALL)
+#EED2021-08-26    IF (--BUILD_ALL)
+
       #  IF (--${VAR}_SET_BUILD_ALL_OFF)
       #    MESSAGE(ERROR "${VAR} -> Build All OFF")
       #    SET(--BUILD_ALL OFF CACHE BOOL "Build all ?" FORCE)  
       #    SET(--${VAR}_SET_BUILD_ALL_OFF OFF CACHE BOOL "" FORCE)  
       #  ELSE (--${VAR}_SET_BUILD_ALL_OFF)
-      SET(${VAR} ON CACHE BOOL "Forced to ON by --BUILD_ALL" FORCE)
+
+      SET(${VAR} ON CACHE BOOL "Forced to ON by 0-BUILD_ALL" FORCE)
+#EED2021-08-26      SET(${VAR} ON CACHE BOOL "Forced to ON by --BUILD_ALL" FORCE)
+
       #    SET(--${VAR}_SET_BUILD_ALL_OFF ON CACHE BOOL "" FORCE)  
       #    MESSAGE(ERROR "Build All -> ${VAR}")
       #  ENDIF (--${VAR}_SET_BUILD_ALL_OFF)
-    ENDIF(--BUILD_ALL)
+
+    ENDIF(0-BUILD_ALL)
+#EED2021-08-26    ENDIF(--BUILD_ALL)
+
   ENDMACRO(SWITCH_ON_IF_BUILD_ALL)
 ELSE (BBTK_CORE_PACKAGE)
   MACRO(SWITCH_ON_IF_BUILD_ALL VAR)

diff --git a/kernel/src/bbtkConnection.cxx b/kernel/src/bbtkConnection.cxx
index e6ee23851e7288d08e4cfc37a460528bb797867d..9624cea27f25ffe92f4c73ab2389f6d998a8ea4b 100644 (file)
--- a/kernel/src/bbtkConnection.cxx
+++ b/kernel/src/bbtkConnection.cxx
@@ -119,12 +119,14 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
        bbtkError("The input \""<<input<<"\" of the box \""<<to->bbGetName()
                  <<"\" is already connected");
       }
-    
+
+
+      //EED2021-09-06  dlopen  flags for == !=    ->  bbtkDynamicLibraryHandling.h
+
     //  std::string t1 ( from->bbGetOutputType(output).name() );
     //   std::string t2 ( to->bbGetInputType(input).name() );
-    // if  //( t1 != t2 ) 
-    if ( from->bbGetOutputType(output) !=
-        to->bbGetInputType(input) )
+    // if  //( t1 != t2 )
+      if ( from->bbGetOutputType(output) != to->bbGetInputType(input) )
       {
        if ( from->bbGetOutputType(output) == typeid(Data) )
          {
@@ -136,16 +138,12 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
                        <<"' will be resolved at run time"
                        );
            mFromAny = true;
-         }
-       else if (  to->bbGetInputType(input) == typeid(Data) )
-         {   
+         } else if (  to->bbGetInputType(input) == typeid(Data) ) {
            bbtkDebugMessage("kernel",8," -> '"<<input<<"' type is "
                             <<TypeName<Data>()<<" : can receive any data"
                             <<std::endl);
            mToAny = true;
-         }
-       else 
-         {
+         }     else  {
            //   std::cout << "Adaptive connection "<<std::endl;
            std::string name;
            name = from->bbGetName() + "." + output + "-" 
@@ -511,7 +509,6 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
        // LG : Connection Update does not set mTo as modified
        mTo->bbSetInput(mInput, mFrom->bbGetOutput(mOutput),false);
       }
-
   }
   //==================================================================
 

diff --git a/kernel/src/bbtkDynamicLibraryHandling.h b/kernel/src/bbtkDynamicLibraryHandling.h
index 9118e9b8226b5d784b69bde6fc646a7e676c15cc..bfb05a9ea3f589dd8ccbacaf78ac86dac934a9d7 100644 (file)
--- a/kernel/src/bbtkDynamicLibraryHandling.h
+++ b/kernel/src/bbtkDynamicLibraryHandling.h
@@ -64,11 +64,15 @@
 // http://gcc.gnu.org/ml/gcc/2003-04/msg00256.html
 // http://gcc.gnu.org/ml/gcc-bugs/2003-10/msg02771.html
 
-#define BBTK_RTLD_LOCAL
+//EED2021-09-04
+#ifdef __APPLE__
+#else
+    #define BBTK_RTLD_LOCAL
+#endif
 
 #ifndef BBTK_RTLD_LOCAL
 #  define BBTK_RTLD_SCOPE RTLD_GLOBAL
-#else 
+#else
 #  define BBTK_RTLD_SCOPE RTLD_LOCAL
 #endif
 

diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx
index a55fce1c41ede5eb012bd5ff065387725465b55c..79380c4271072db6ca5671156e5cecdfae5ca706 100644 (file)
--- a/kernel/src/bbtkExecuter.cxx
+++ b/kernel/src/bbtkExecuter.cxx
@@ -426,7 +426,7 @@ namespace bbtk
                       const std::string &input,
                       const std::string &value)
   {
-    BlackBox::Pointer b = GetCurrentDescriptor()->GetPrototype()->bbGetBlackBox(box);
+      BlackBox::Pointer b = GetCurrentDescriptor()->GetPrototype()->bbGetBlackBox(box);
     // Looks for the adaptor
 
     if ( ( b->bbGetInputType(input) != typeid(bbtk::any<bbtk::thing>) )&&
@@ -447,9 +447,7 @@ namespace bbtk
          a->bbExecute();
          b->bbSetInput(input,a->bbGetOutput("Out"));
         //         a->Delete();
-      }
-    else 
-      {
+      } else {
       std::string v(value);
       b->bbSetInput(input,v);
       }
@@ -487,9 +485,7 @@ namespace bbtk
        //b->bbSetInput(input,a->bbGetOutput("Out"));
        //        a->bbDelete();
         return r;
-      }
-    else
-      {
+      } else  {
        b->bbExecute();
        return b->bbGetOutput(output).unsafe_get<std::string>();
        // std::string v = *((std::string*)b->bbGetOutput(output)) ;

diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index d240eedbafacb8461a79c6a635b090cd7e7a9ad0..368275afb8d5c07af52361ac09576621246b9300 100644 (file)
--- a/kernel/src/bbtkFactory.cxx
+++ b/kernel/src/bbtkFactory.cxx
@@ -154,9 +154,7 @@ namespace bbtk
   //          same for Windows, with      c:, d: ...
   //
   // lastname : string before the last / (if any), or user supplied name
-         
-        
-         
+                 
        if(name != ""){
                bbtkDebugMessageInc("kernel",7,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
                bbtkMessage("debug",1,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
@@ -183,7 +181,6 @@ namespace bbtk
 //                     std::cout << (*it).first << " ";
 //             std::cout << std::endl;
 
-               
                if (iUnload != mPackageMap.end())
                {
                  bbtkMessage("output",2,"["<< pkgname <<"] already loaded" << std::endl);
@@ -210,7 +207,7 @@ namespace bbtk
                          return;
                   }
 
-                 // std::string path = Utilities::ExpandLibName(upath, false);
+        // std::string path = Utilities::ExpandLibName(upath, false);
 
                   std::string path = Utilities::ExpandLibName(name,false); // keep last item, here.
                   if (path != "")
@@ -236,7 +233,7 @@ namespace bbtk
                } else     // ----------------------------------------------------- iterate on the paths  
                {
 
-               std::string path = ".";
+        std::string path = ".";
                package_paths = ConfigurationFile::GetInstance().Get_package_paths();
                std::vector<std::string>::iterator i;
                for (i=package_paths.begin();i!=package_paths.end();++i)
@@ -278,7 +275,6 @@ namespace bbtk
                        }
                break; // we stop iterating even if error : have to signal it to user
                } //------------------ // end for ( package_paths.begin();i!=package_paths.end() )
-
        }
 
                if( !ok )  // nothing was loaded
@@ -661,7 +657,7 @@ namespace bbtk
       } 
     
     bbtkDebugDecTab("kernel",7);
-    return b; 
+    return b;
   }
   //===================================================================
 

diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index f33d84e8f1dd7349a682d6968ed468388208a6e5..bcb83089a34c8c5ff3898cc58779cfa822dc22d3 100644 (file)
--- a/kernel/src/bbtkPackage.cxx
+++ b/kernel/src/bbtkPackage.cxx
@@ -371,7 +371,6 @@ printf("EED Package::OpenDynamicLibrary  %s   %s \n", libname.c_str(), package_n
     void *handler;
     handler = dlopen(libname.c_str(), BBTK_RTLD_TIME | BBTK_RTLD_SCOPE );
 //     handler = dlopen(libname.c_str(), RTLD_LAZY | RTLD_LOCAL );
-         
     if (!handler)
       {
        bbtkMessage("package",0,
@@ -723,7 +722,7 @@ printf("EED Package::OpenDynamicLibrary  %s   %s \n", libname.c_str(), package_n
                                const DataInfo& typeout,
                                const std::string& name) const
   {
-    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()<<
+      bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()<<
                        ">::NewAdaptor("
                        <<typein<<","
                        <<typeout<<",\""
@@ -739,8 +738,7 @@ printf("EED Package::OpenDynamicLibrary  %s   %s \n", libname.c_str(), package_n
       }
     BlackBox::Pointer bb =i->second.lock()->NewBlackBox(name);
     bbtkDebugDecTab("kernel",8);
-    return bb;   
-
+    return bb;
   }
   //==========================================================================
 

diff --git a/kernel/src/bbtkWt.h b/kernel/src/bbtkWt.h
index 360260f85e0c96cedff0f004a12d3218e3f7e224..011f5980a8f1d4a014c56afb81c67e0a009f5441 100644 (file)
--- a/kernel/src/bbtkWt.h
+++ b/kernel/src/bbtkWt.h
@@ -150,9 +150,10 @@ namespace bbtk
     // The keyword 'signals' is also a macro in qt
     //    typedef boost::signals::trackable SignalObserver;
 
+//EED 2020-04-21
 //    typedef boost::signals::trackable SignalObserver;
 //    typedef boost::signal<void ()>  Signal_type;
-
+      
     typedef boost::signals2::trackable SignalObserver;
     typedef boost::signals2::signal<void ()>  Signal_type;
 

diff --git a/packages/vtk/src/bbvtkMagnitud.cxx b/packages/vtk/src/bbvtkMagnitud.cxx
index b6205e12e12491b6f3014f419bab7e9652c21f3f..96e7726fca33dcabc07bbd2f88601770dec60df1 100644 (file)
--- a/packages/vtk/src/bbvtkMagnitud.cxx
+++ b/packages/vtk/src/bbvtkMagnitud.cxx
@@ -2,7 +2,7 @@
  # ---------------------------------------------------------------------
  #
  # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
- #                        pour la Santé)
+ #                        pour la Santé©
  # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
  # Previous Authors : Laurent Guigues, Jean-Pierre Roux
  # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
@@ -154,7 +154,8 @@ printf("EED Magnitud::Process Start\n");
    //Glyph Mapper
    vGlyphMapper->SetLookupTable(vGreenToRedLut);
    vGlyphMapper->SetScalarRange(range1);
-   vGlyphMapper->ImmediateModeRenderingOn();
+//EED 2020-04-21 vtk8 deprecated
+//   vGlyphMapper->ImmediateModeRenderingOn();
  
    //Outline Grid
 //EED 2017-01-01 Migration VTK7
@@ -272,7 +273,7 @@ printf("EED Magnitud::Process Start\n");
    vPlaneWidget->SetResolution(1);
    vPlaneWidget->SetRepresentationToOutline();
    //vPlaneWidget->SetInteractor(vIren);
-   vPlaneWidget->SetPlaceFactor(1); //défini zoom initial
+   vPlaneWidget->SetPlaceFactor(1); //déæini zoom initial
    vPlaneWidget->PlaceWidget();
    vPlaneWidget->On();
 

diff --git a/packages/vtk/src/bbvtkPolyDataToActor.cxx b/packages/vtk/src/bbvtkPolyDataToActor.cxx
index 0002d6c097da8fa273ae7dbd89099e41b5fa8359..1ec9ff2cd7c62fa3cb42c76e7607a2ad88479175 100644 (file)
--- a/packages/vtk/src/bbvtkPolyDataToActor.cxx
+++ b/packages/vtk/src/bbvtkPolyDataToActor.cxx
@@ -85,10 +85,10 @@ namespace bbvtk
    {    
      polydatamapper = vtkPolyDataMapper::New();
      vtkactor       = vtkActor::New();
-
 //     polydatamapper->SetInput(marchingcubes->GetOutput());
      vtkactor->SetMapper(polydatamapper);
 
+//EED 2020-04-21 vtk8 deprecated
 //     polydatamapper->ImmediateModeRenderingOn();
    }
 

diff --git a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx
index 2e25383433759e0d7950c4ef2e0051f0f9cc4f9c..e661cc558c450aa1b72b113956e8d60594943126 100644 (file)
--- a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx
+++ b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx
@@ -144,7 +144,8 @@ BBTK_BLACK_BOX_IMPLEMENTATION(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox);
                        vtkactor->SetMapper(polydatamapper);
 
                        polydatamapper->ScalarVisibilityOff();
-                       polydatamapper->ImmediateModeRenderingOn();
+//EED 2020-04-21 vtk8 deprecated
+//                     polydatamapper->ImmediateModeRenderingOn();
 
                        VecMarchingcubes.push_back(marchingcubes);
                        VecPolydatamapper.push_back(polydatamapper);