[CHANGE] re-added some modules, adjusted grid ctor calls

src/modules/atlasCreator/WMAtlasCreator.cpp

@@ -225,8 +225,13 @@ void WMAtlasCreator::updateOutDataset()
         boost::shared_ptr< WValueSet< unsigned char > >( new WValueSet< unsigned char >(
         0, 1, boost::shared_ptr< std::vector< uint8_t > >( new std::vector< uint8_t >( m_volume ) ), W_DT_UINT8 ) );
 
+    wmath::WMatrix< double > mat( 4, 4 );
+    mat.makeIdentity();
+    mat( 0, 0 ) = 0.1;
+    mat( 2, 2 ) = 0.1;
+
     boost::shared_ptr<WGridRegular3D> grid = boost::shared_ptr<WGridRegular3D>( new WGridRegular3D( m_xDim, m_yDim, m_zDim,
-                0.0, 0.0, 0.0, 0.1, 1.0, 0.1 ) );
+                WGridTransformOrtho( mat ) ) );
 
     boost::shared_ptr< WDataSetScalar >outData = boost::shared_ptr< WDataSetScalar >( new WDataSetScalar( vs, grid ) );
     m_output->updateData( outData );

src/modules/atlasCreator/WMAtlasCreator.h

@@ -38,7 +38,7 @@
 #include "../../dataHandler/WValueSet.h"
 
 
-/** 
+/**
  * Someone should add some documentation here.
  * Probably the best person would be the module's
  * creator, i.e. "schurade".

src/modules/modules-base.toolbox

 # mostly modules from our default whitelist
 
-#ADD_SUBDIRECTORY( clusterDisplayVoxels )
-#ADD_SUBDIRECTORY( overlayAtlas )
+ADD_SUBDIRECTORY( clusterDisplayVoxels )
+ADD_SUBDIRECTORY( overlayAtlas )
 ADD_SUBDIRECTORY( arbitraryRois )
 ADD_SUBDIRECTORY( coordinateHUD )
 ADD_SUBDIRECTORY( coordinateSystem )

src/modules/modules-others.toolbox

 ADD_SUBDIRECTORY( applyMask )
 ADD_SUBDIRECTORY( arbitraryPlane )
-#ADD_SUBDIRECTORY( atlasCreator )
+ADD_SUBDIRECTORY( atlasCreator )
 ADD_SUBDIRECTORY( atlasSurfaces )
 ADD_SUBDIRECTORY( calculateGFA )
 ADD_SUBDIRECTORY( clusterDisplay )
-ADD_SUBDIRECTORY( clusterDisplayVoxels )
 ADD_SUBDIRECTORY( clusterParamDisplay )
 ADD_SUBDIRECTORY( clusterSlicer )
 ADD_SUBDIRECTORY( contourTree )

src/modules/overlayAtlas/WAtlasSlice.cpp

@@ -113,9 +113,17 @@ void WAtlasSlice::createGridCoronal()
     float sizeX = ( m_right - m_left ) / m_image->s();
     float sizeY = ( m_top - m_bottom ) / m_image->t();
 
-    m_grid = boost::shared_ptr<WGridRegular3D>( new WGridRegular3D( m_newImage->s(), m_newImage->t(), m_newImage->r(),
-            m_left, m_position, m_bottom, sizeX, 2.0, sizeY ) );
-
+    wmath::WMatrix< double > mat( 4, 4 );
+    mat.makeIdentity();
+    mat( 0, 0 ) = sizeX;
+    mat( 1, 1 ) = 2.0;
+    mat( 2, 2 ) = sizeY;
+    mat( 0, 3 ) = m_left;
+    mat( 1, 3 ) = m_position;
+    mat( 2, 3 ) = m_bottom;
+    
+    m_grid = boost::shared_ptr<WGridRegular3D>( new WGridRegular3D( m_newImage->s(), m_newImage->t(), m_newImage->r(), WGridTransformOrtho( mat ) ) );
+    
     m_dirty = false;
 }
 

src/modules/paintTexture/WMPaintTexture.cpp

@@ -368,6 +368,8 @@ void WMPaintTexture::doPaint()
     m_queueAdded->set( false );
 
     m_texture->dirtyTextureObject();
+
+    updateOutDataset();
 }
 
 void WMPaintTexture::queuePaint( WPickInfo pickInfo )
@@ -441,6 +443,7 @@ void WMPaintTexture::updateOutDataset()
         boost::shared_ptr< WValueSet< unsigned char > >( new WValueSet< unsigned char >( 0, 1, values, W_DT_UINT8 ) );
 
     m_outData = boost::shared_ptr< WDataSetScalar >( new WDataSetScalar( vs, m_grid ) );
+    m_outData->getTexture2()->interpolation()->set( false );
     m_output->updateData( m_outData );
 }