removed unnecessary const attribute in sink

thorbenk · Mar 20, 2014 · cfc0781 · cfc0781
1 parent 89da0e3
commit cfc0781
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 42 deletions.
diff --git a/blockedarray/adapters.py b/blockedarray/adapters.py
@@ -1,4 +1,6 @@
 
+import vigra
+
 import numpy as np
 from _blockedarray import Source3U8 as _Source
 from _blockedarray import Sink3 as _Sink
@@ -117,7 +119,8 @@ def __init__(self):
     def pyWriteBlock(self, roi, block):
         assert len(roi) == 2
         if self.vol is None:
-            shape = _v2tup(self.shape)
+            shape = self.shape
+            shape = _v2tup(shape)
             self.vol = np.zeros(shape, dtype=np.uint8)
         s = _roi2slice(roi[0], roi[1])
         self.vol[s] = block

diff --git a/blockedarray/adapters_py.cxx b/blockedarray/adapters_py.cxx
@@ -171,13 +171,13 @@ void exposeSink(const char* exposedName) {
 
     class_<PySinkABC<N,T>, boost::noncopyable>(exposedName)
         .def("pyWriteBlock", pure_virtual(&PySinkABC<N,T>::pyWriteBlock))
-        .add_property("shape", &PySinkABC<N,T>::getShape, &PySinkABC<N,T>::setShape)
-        .add_property("blockShape", &PySinkABC<N,T>::getBlockShape, &PySinkABC<N,T>::setBlockShape)
+        //.add_property("shape", &PySinkABC<N,T>::getShape, &PySinkABC<N,T>::setShape)
+        //.add_property("blockShape", &PySinkABC<N,T>::getBlockShape, &PySinkABC<N,T>::setBlockShape)
         ;
 }
 
 void export_adapters() {
     exposeSource<3,vigra::UInt8>("Source3U8");
     exposeSink<3,ConnectedComponents<3>::LabelType>("Sink3");
-    registerConverters();
+//     registerConverters();
 }
diff --git a/blockedarray/blockwisecc_py.cxx b/blockedarray/blockwisecc_py.cxx
@@ -48,42 +48,6 @@
 
 using namespace BW;
 
-template<int N>
-struct PyConnectedComponents {
-    typedef ConnectedComponents<N> BCC;
-};
-
-template<int N, class V>
-struct ExportV {
-    static void export_();
-};
-
-template<class V>
-struct ExportV<2, V> {
-    static void export_() {
-        using namespace boost::python;
-        class_<V>("V", init<int, int>());
-    }
-};
-
-
-template<class V>
-struct ExportV<3, V> {
-    static void export_() {
-        using namespace boost::python;
-        class_<V>("V", init<int, int, int>());
-    }
-};
-
-template<class V>
-struct ExportV<4, V> {
-    static void export_() {
-        using namespace boost::python;
-        class_<V>("V", init<int, int, int, int>());
-    }
-};
-
-
 template <int N, class T>
 void exportSpecificSource(std::string suffix)
 {
@@ -110,6 +74,7 @@ void exportSourceForDim()
     exportSpecificSource<N,double>("D");
 }
 
+
 template <int N>
 void exportAllForDim()
 {
@@ -132,6 +97,7 @@ void exportAllForDim()
     exportSourceForDim<N>();
 
 
+    // connected components class
     typedef ConnectedComponents<N> BCC;
     class_<BCC>("ConnectedComponents",
                 init<Source<N, vigra::UInt8>*, typename BCC::V>())
@@ -141,6 +107,15 @@ void exportAllForDim()
          (arg("sink")))
     ;
 
+
+    // ROI
+    typedef typename Roi<N>::V V;
+
+    class_< Roi<N> >("Roi", init<V,V>())
+    .def_readonly("p", &Roi<N>::p)
+    .def_readonly("q", &Roi<N>::p)
+    ;
+
 }
 
 

diff --git a/include/bw/sink.h b/include/bw/sink.h
@@ -57,8 +57,8 @@ class Sink {
         blockShape_ = shape;
     }
 
-    V shape() const { return shape_; };
-    V blockShape() const { return blockShape_; };
+    V shape() { return shape_; };
+    V blockShape() { return blockShape_; };
 
     virtual bool writeBlock(Roi<N> roi, const vigra::MultiArrayView<N,T>& block) { return true; };