Changeset 800

Timestamp:

01/08/06 16:35:04 (6 years ago)

Author:

pfp

Message:

Added ability to do compression.

Location:

trunk/applications/NXtranslate

Files:

• nexus_util.cpp (modified) (2 diffs)
• node.cpp (modified) (2 diffs)
• node.h (modified) (3 diffs)
• xml_parser.cpp (modified) (6 diffs)

trunk/applications/NXtranslate/nexus_util.cpp

@@ -81 +81 @@
 
       // create the data
-      if(node.compress_type()==Node::COMP_NONE){
+      int comp_type=node.compress_type();
+      if(comp_type==Node::COMP_NONE){
         //std::cout << "in open: " << node.type() << " " << *(node.dims().begin()) << std::endl; // REMOVE
         if(NXmakedata(*handle,name,type,rank,dims)!=NX_OK){
@@ -88 +89 @@
         }
       }else{
-        int comp_type=node.compress_type();
-        // warn that this is not supported
-        std::cout << "WARN: do not currently support compression (type=" << comp_type << ")" << std::endl;
-        return;
-        /* TAKEN FROM <napi.h>
-           NX_EXTERNAL  NXstatus CALLING_STYLE NXcompmakedata (NXhandle handle, CONSTCHAR* label, int datatype, int rank, int dim[], int comp_typ, int bufsize[]);
-        */
+        vector<int> buff_size_vec=node.comp_buffer_dims();
+        int *buff_size=new int[rank];
+        for( size_t i=0 ; i<rank ; i++ ){
+          buff_size[i]=buff_size_vec[i];
+        }
+
+        buff_size[rank-1]=dims[rank-1];
+        if(NXcompmakedata(*handle,name,type,rank,dims,comp_type,buff_size)!=NX_OK){
+          std::cout << "NXcompmakedata failed" << std::endl;
+          throw runtime_error("NXcompmakedata failed");
+        }
+        delete buff_size; // FIXME - is this the correct form?
       }
     }

trunk/applications/NXtranslate/node.cpp

@@ -167 +167 @@
 }
 
+const std::vector<int> Node::comp_buffer_dims() const{
+  return __comp_buffer_dims;
+}
+
 void* Node::data() const{
   return __value;
@@ -202 +206 @@
     throw out_of_range("asked for attribute with higher index than size");
   return (*(__attrs.begin()+attr_num));
+}
+
+const void Node::set_comp(const string &comp_type){
+  if(string_util::starts_with(comp_type,"NONE")){
+    __comp_type=COMP_NONE;
+  }else if(string_util::starts_with(comp_type,"LZW")){
+    __comp_type=COMP_LZW;
+  }else if(string_util::starts_with(comp_type,"RLE")){
+    __comp_type=COMP_RLE;
+  }else if(string_util::starts_with(comp_type,"HUF")){
+    __comp_type=COMP_HUF;
+  }else{
+    throw invalid_argument("Do not understand compression type: "+comp_type);
+  }
+
+  // work with user specified dimension information
+  vector<string> temp=string_util::split(comp_type,":");
+  if(temp.size()==2){
+    __comp_buffer_dims=string_util::str_to_intVec(*(temp.rbegin()));
+  }
+
+  // use default if anything is wrong
+  if(__comp_buffer_dims.size()!=__dims.size()){
+    __comp_buffer_dims=__dims;
+    for( size_t i=0 ; i<__comp_buffer_dims.size()-1 ; ++i ){
+      __comp_buffer_dims[i]=1;
+    }
+  }
 }
 

trunk/applications/NXtranslate/node.h

@@ -32 +32 @@
   const int rank() const;
   const std::vector<int> dims() const;
+  const std::vector<int> comp_buffer_dims() const;
   const NXtype int_type() const;
   const NXcompress compress_type() const;
@@ -40 +41 @@
 
   // mutator methods
+  const void set_comp(const std::string &comp_type);
   const void set_name(const std::string &name);
   const void set_data(void *&data,const int rank,const int* dims,const int type);
@@ -53 +55 @@
   bool __is_data;
   std::vector<int> __dims;
+  std::vector<int> __comp_buffer_dims;
   void *__value;
   std::vector<Attr> __attrs;

trunk/applications/NXtranslate/xml_parser.cpp

@@ -40 +40 @@
 typedef NodeVector* NodeVectorP;
 typedef Ptr<Retriever> RetrieverPtr;
+typedef tree<Node> NodeTree;
 
 static const int    GROUP_STRING_LEN  = 128;
@@ -47 +48 @@
 static const string SOURCE            = "NXS:source";
 static const string LOCATION          = "NXS:location";
+static const string COMPRESSION       = "NXS:compression";
 static const string LINK              = "NAPIlink";
 static const string TARGET            = "target";
@@ -190 +192 @@
 
   // check for "name", "type", "source", "mime_type", "location",
-  // "target" attributes
+  // "target", "compression" attributes
   string source;
   string mime_type;
   string location;
+  string compression;
   string type;
   bool update_dims=false;
@@ -199 +202 @@
   for( StrVector::iterator it=str_attrs.begin() ; it!=str_attrs.end() ; it+=2){
     if( (*it==SOURCE) || (*it==MIME_TYPE) || (*it==LOCATION) || (*it==TYPE)
-             || ((*it==TARGET) && (is_link)) || (*it==NAME) ){
+        || ((*it==TARGET) && (is_link)) || (*it==NAME) || (*it==COMPRESSION) ){
       if(*it==SOURCE){
         source=*(it+1);
@@ -206 +209 @@
       }else if(*it==LOCATION){
         location=*(it+1);
+      }else if(*it==COMPRESSION){
+        compression=*(it+1);
       }else if(*it==NAME){
         type=str_name;
@@ -316 +321 @@
   }
 
+  // set the compression flag
+  if(!compression.empty()){
+    if(node_from_retriever){
+      for( NodeTree::iterator it=tree.begin() ; it!=tree.end() ; ++it ){
+        it->set_comp(compression);
+      }
+    }else{
+      node.set_comp(compression);
+    }
+  }
+
   // mutate the attributes if necessary
   if(node_attrs.size()>0)