X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2Fbash%2FConfig.h.in;h=059ba1e779eabb51fa1e2a2199b798b8bcbe28b8;hb=a52d42076db836c8af9106109b7f899d928de397;hp=09eb4170633fe98fc6b30fb8e131b926050428e4;hpb=24d5c00294fc95f6f0d858a35799b77d97055745;p=cpPlugins.git

diff --git a/appli/bash/Config.h.in b/appli/bash/Config.h.in
index 09eb417..059ba1e 100644
--- a/appli/bash/Config.h.in
+++ b/appli/bash/Config.h.in
@@ -13,15 +13,10 @@
 #include <string>
 
 // -------------------------------------------------------------------------
-#define cpPlugins_CONFIG_BOOLEAN_TYPES      "@cpPlugins_CONFIG_BOOLEAN_TYPES@"
-#define cpPlugins_CONFIG_INTEGER_TYPES      "@cpPlugins_CONFIG_INTEGER_TYPES@"
-#define cpPlugins_CONFIG_REAL_TYPES         "@cpPlugins_CONFIG_REAL_TYPES@"
 #define cpPlugins_CONFIG_PROCESS_DIMENSIONS "@cpPlugins_CONFIG_PROCESS_DIMENSIONS@"
 #define cpPlugins_CONFIG_VISUAL_DIMENSIONS  "@cpPlugins_CONFIG_VISUAL_DIMENSIONS@"
 #define cpPlugins_CONFIG_COLOR_PIXELS       "@cpPlugins_CONFIG_COLOR_PIXELS@"
-#define cpPlugins_CONFIG_VECTORS            "@cpPlugins_CONFIG_VECTORS@"
-#define cpPlugins_CONFIG_DIFFUSIONTENSORS   "@cpPlugins_CONFIG_DIFFUSIONTENSORS@"
-#define cpPlugins_CONFIG_MATRICES           "@cpPlugins_CONFIG_MATRICES@"
+#define cpPlugins_CONFIG_VECTOR_PIXELS      "@cpPlugins_CONFIG_VECTOR_PIXELS@"
 #define cpPlugins_ALL_CONFIGS               "@cpPlugins_ALL_CONFIGS@"
 #define cpPlugins_CONFIG_NUMBER_OF_FILES    @cpPlugins_CONFIG_NUMBER_OF_FILES@
 
@@ -134,45 +129,32 @@ namespace cpPlugins_bash
   // -----------------------------------------------------------------------
   inline void LoadDefinitions( TCommands& commands )
   {
+    // Dimensions
     commands[ "define" ].push_back(
-      std::string( "int_types=" ) +
-      std::string( cpPlugins_CONFIG_INTEGER_TYPES )
-      );
-    commands[ "define" ].push_back(
-      std::string( "real_types=" ) +
-      std::string( cpPlugins_CONFIG_REAL_TYPES )
-      );
-    commands[ "define" ].push_back(
-      std::string( "process_dims=" ) +
+      std::string( "pdims=" ) +
       std::string( cpPlugins_CONFIG_PROCESS_DIMENSIONS )
       );
     commands[ "define" ].push_back(
-      std::string( "visual_dims=" ) +
+      std::string( "vdims=" ) +
       std::string( cpPlugins_CONFIG_VISUAL_DIMENSIONS )
       );
+
+    // Base c++ types
     commands[ "define" ].push_back(
-      std::string( "color_pixels=" ) +
-      std::string( cpPlugins_CONFIG_COLOR_PIXELS )
+      std::string( "int_types=char;short;int;long" )
       );
     commands[ "define" ].push_back(
-      std::string( "vectors=" ) +
-      std::string( cpPlugins_CONFIG_VECTORS )
+      std::string( "uint_types=unsigned #int_types#" )
       );
     commands[ "define" ].push_back(
-      std::string( "diff_tensors=" ) +
-      std::string( cpPlugins_CONFIG_DIFFUSIONTENSORS )
+      std::string( "sint_types=signed char" )
       );
     commands[ "define" ].push_back(
-      std::string( "matrices=" ) +
-      std::string( cpPlugins_CONFIG_MATRICES )
+      std::string( "real_types=float;double" )
       );
-    if( std::string( cpPlugins_CONFIG_INTEGER_TYPES ) != "" )
-      commands[ "define" ].push_back(
-        std::string( "uint_types=unsigned #int_types#" )
-        );
     commands[ "define" ].push_back(
       std::string(
-        "scalar_pixels=#int_types#;#uint_types#;#real_types#"
+        "scalar_types=#int_types#;#uint_types#;#real_types#"
         )
       );
   }