[ismrmrd] 20/177: minor edits.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag v1.1.0.beta.1
in repository ismrmrd.

commit 6fce4f1b63c314beda4d29d8e37c03fad54100b4
Author: Souheil Inati <souheil.inati at nih.gov>
Date:   Mon Aug 25 11:47:41 2014 -0400

    minor edits.
---
 examples/c++/test_create_dataset.cpp |  7 ++++---
 examples/c/main.c                    |  6 ------
 ismrmrd.h                            |  1 +
 ismrmrd.hpp                          | 20 +++++++++++++++++++-
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/examples/c++/test_create_dataset.cpp b/examples/c++/test_create_dataset.cpp
index c684245..7d39ca2 100644
--- a/examples/c++/test_create_dataset.cpp
+++ b/examples/c++/test_create_dataset.cpp
@@ -2,13 +2,14 @@
  * test_create_dataset.cpp
  *
  *  Created on: Sep 4, 2012
- *      Author: Michael S. Hansen (michael.hansen at nih.gov)
+ *      Authors: Michael S. Hansen (michael.hansen at nih.gov)
+ *               Souheil J. Inati  (souheil.inati at nih.gov)
  */
 
 #include <iostream>
-#include "ismrmrd_hdf5.h"
+#include "ismrmrd.h"
+#include "ismrmrd_dataset.h"
 #include "fftw3.h"
-#include "ismrmrd.hxx"
 
 //Utility function for appending different sizes of arrays, used for testing here
 template <typename T, int size_x, int size_y> int appendImageArray(ISMRMRD::IsmrmrdDataset& d, const char* varname)
diff --git a/examples/c/main.c b/examples/c/main.c
index 9c91102..ab16e0d 100644
--- a/examples/c/main.c
+++ b/examples/c/main.c
@@ -94,12 +94,6 @@ int main(void)
     /* Close the dataset */
     status = ismrmrd_close_dataset(&dataset2);
 
-    //printf("Acq Version: %d\n", acq.head.version);
-    //printf("Flags: %llu\n", acq.head.flags);
-    //printf("ACQ_FIRST_IN_SLICE: %d\n", ismrmrd_is_flag_set(acq.head.flags, ISMRMRD_ACQ_FIRST_IN_SLICE));
-    //printf("Flags: %llu\n", acq.head.flags);
-    //printf("ACQ_FIRST_IN_SLICE: %d\n", ismrmrd_is_flag_set(acq.head.flags, ISMRMRD_ACQ_FIRST_IN_SLICE));
-
     //   Image im;
     //initImage(&im);
     //printf("Image Version: %d\n", im.head.version);
diff --git a/ismrmrd.h b/ismrmrd.h
index 9cf558d..b6c04d8 100644
--- a/ismrmrd.h
+++ b/ismrmrd.h
@@ -300,6 +300,7 @@ void ismrmrd_set_flag(uint64_t *flags, const uint64_t val);
 void ismrmrd_clear_flag(uint64_t *flags, const uint64_t val);
 void ismrmrd_clear_all_flags(uint64_t *flags);
 
+/* TODO add helper functions for channel mask */
 
 /******************/
 /* Error Handling */
diff --git a/ismrmrd.hpp b/ismrmrd.hpp
index 182aa06..2d07460 100644
--- a/ismrmrd.hpp
+++ b/ismrmrd.hpp
@@ -205,7 +205,25 @@ protected:
     ISMRMRD_Image image_;
 };
 
-class NDArray : protected ISMRMRD_NDArray {
+class NDArray {
+public:
+    // Constructors
+    NDArray();
+    NDArray(NDArray &arr);
+    NDArray(ISMRMRD_NDArray *arr);
+
+    // Accessors and mutators
+    const uint16_t &version();
+    const uint16_t &data_type();
+    void data_type(const uint16_t dtype);
+    const uint16_t &ndim();
+    void ndim(const uint16_t numdim);
+    uint16_t dims[ISMRMRD_NDARRAY_MAXDIM];
+    void *data;
+
+    
+protected:
+    ISMRMRD_NDArray;
 };
 
 } // namespace ISMRMRD

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git