mevislabmodules-svn Mailing List for MeVisLab Community (Page 7)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 279
          http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=279&view=rev
Author:   bartdedobbelaer
Date:     2010-06-17 06:45:57 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
- Added WEM in- and output

Modified Paths:
--------------
    trunk/Community/General/Modules/ML/MLMatlabScriptWrapper/MLMatlabScriptWrapper.def
    trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/MLMatlabScriptWrapper.pro
    trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp
    trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.h

Modified: trunk/Community/General/Modules/ML/MLMatlabScriptWrapper/MLMatlabScriptWrapper.def
===================================================================

--- trunk/Community/General/Modules/ML/MLMatlabScriptWrapper/MLMatlabScriptWrapper.def	2010-06-14 08:15:30 UTC (rev 278)
+++ trunk/Community/General/Modules/ML/MLMatlabScriptWrapper/MLMatlabScriptWrapper.def	2010-06-17 06:45:57 UTC (rev 279)
@@ -62,9 +62,19 @@
             }
           }
         }
-        Box "XMarker names" {
-          Field inXMarkerName {title = "Input name:" expandX = yes}
-          Field outXMarkerName {title = "Output name:" expandX = yes}
+        Horizontal {
+          Vertical {
+            Box "XMarker names" {
+              Field inXMarkerName {title = "Input name:" expandX = yes}
+              Field outXMarkerName {title = "Output name:" expandX = yes}
+            }
+          }
+          Vertical {
+            Box "WEM names" {
+              Field inWEMName {title = "Input name:" expandX = yes}
+              Field outWEMName {title = "Output name:" expandX = yes}
+            }
+          }
         }
       }
       Horizontal {

Modified: trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/MLMatlabScriptWrapper.pro
===================================================================
--- trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/MLMatlabScriptWrapper.pro	2010-06-14 08:15:30 UTC (rev 278)
+++ trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/MLMatlabScriptWrapper.pro	2010-06-17 06:45:57 UTC (rev 279)
@@ -14,7 +14,7 @@
 DLLDESTDIR = ../../../lib
 
 # add dependencies of this project here
-CONFIG += dll ML MLBase MLMacOSSupport
+CONFIG += dll ML MLBase MLMacOSSupport MLWEM
 
 # set high warn level (warn 4 on MSCV)
 WARN = HIGH

Modified: trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp	2010-06-14 08:15:30 UTC (rev 278)
+++ trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp	2010-06-17 06:45:57 UTC (rev 279)
@@ -75,6 +75,10 @@
   (_inputXMarkerListFld = fields->addBase("inputXMarkerList"))->setBaseValue(NULL);
   _outputXMarkerListFld = fields->addBase("outputXMarkerList");
   _outputXMarkerListFld->setBaseValue(&_outputXMarkerList);
+  
+  ML_CHECK_NEW(_outWEM,WEM());
+  (_inputWEMFld = fields->addBase("inputWEM"))->setBaseValue(NULL);
+  (_outputWEMFld = fields->addBase("outputWEM"))->setBaseValue(_outWEM);
 
   //! Use matlab commands in text field.
   (_matlabScriptFld = fields->addString("matlabScript"))->setStringValue("Output0=Input0 % Type your matlab script here.");
@@ -95,6 +99,9 @@
   //! Set input and output XMarker names used in matlab.
   (_inXMarkerNameFld = fields->addString("inXMarkerName"))->setStringValue("inXMarker");
   (_outXMarkerNameFld = fields->addString("outXMarkerName"))->setStringValue("outXMarker");
+  //! Set input and output WEM names used in matlab.
+  (_inWEMNameFld = fields->addString("inWEMName"))->setStringValue("inWEM");
+  (_outWEMNameFld = fields->addString("outWEMName"))->setStringValue("outWEM");
 
   //! Create image data randomly.
   (_autoCalculationFld = fields->addBool("autoUpdate"))->setBoolValue(false);
@@ -234,6 +241,8 @@
   if (m_pEngine != NULL) {
     engClose(m_pEngine);
   }
+  
+  ML_DELETE(_outWEM);
 }
 
 
@@ -271,7 +280,7 @@
   // Update output on an update or if autoapply is enabled.
   if( (field == _calculateFld) ||
       (_autoCalculationFld->isOn() && ((field == getInField(0))||(field == getInField(1))||(field == getInField(2))||
-                                       (field == _inXMarkerNameFld)) ) ||
+                                       (field == _inputXMarkerListFld)) || (field== _inputWEMFld) ) ||
            (_autoApplyFld->isOn()  && ((field == _scalarFld[0])||(field == _scalarFld[1])||(field == _scalarFld[2])||
                                        (field == _scalarFld[3])||(field == _scalarFld[4])||(field == _scalarFld[5])||
                                        (field == _vectorFld[0])||(field == _vectorFld[1])||(field == _vectorFld[2])||
@@ -305,6 +314,13 @@
           _copyInputXMarkerToMatlab();
         }
       }
+      if (_inputWEMFld->getBaseValue() != NULL) {
+        // Check if a valid WEM is attached to the input
+        if (_inputWEMFld->isValidValue() && ML_BASE_IS_A(_inputWEMFld->getBaseValue(), WEM)) {
+          // Copy input WEM to Matlab.
+          _copyInputWEMToMatlab();
+        }
+      }
 
       // Copy input image data to matlab.
       _copyInputImageDataToMatlab();
@@ -359,6 +375,10 @@
 
     // Get XMarkerList from Matlab and copy results into output XMarkerList
     _getXMarkerBackFromMatlab();
+    
+    // Get WEM from Matlab and copy results into output WEM
+    _getWEMBackFromMatlab();
+    
 
     // Get scalars back from matlab. First store the current scalars so that
     // we can check if they change. A notification is only sent upon change.
@@ -417,6 +437,16 @@
 
     // Notify the XMarkerList output
     _outputXMarkerListFld->notifyAttachments();
+    
+    // Notify the WEM output
+    std::vector<WEMEventContainer>ecList;
+    WEMEventContainer ec; 
+    ec.notificationType = WEM_NOTIFICATION_FINISHED  |
+                          WEM_NOTIFICATION_SELECTION |
+                          WEM_NOTIFICATION_REPAINT;
+    ecList.push_back(ec);
+    
+    _outWEM->notifyObservers(ecList);    
   }
 }
 
@@ -708,7 +738,13 @@
   clearString << _inXMarkerNameFld->getStringValue() << " ";
 
   // Clear output XMarker data
-  clearString << _outXMarkerNameFld->getStringValue();
+  clearString << _outXMarkerNameFld->getStringValue() << " ";
+  
+  // Clear input WEM data
+  clearString << _inWEMNameFld->getStringValue() << " ";
+  
+  // Clear output WEM data
+  clearString << _outWEMNameFld->getStringValue();
 
   // Evaluate the string in Matlab
   engEvalString(m_pEngine, clearString.str().c_str());
@@ -948,6 +984,169 @@
   }
 }
 
+//! Copy input WEM to matlab.
+void MatlabScriptWrapper::_copyInputWEMToMatlab()
+{
+  if (!_checkMatlabIsStarted())
+  {
+    std::cerr << "_copyInputWEMToMatlab(): Cannot find Matlab engine!" << std::endl << std::flush;
+    return;
+  }
+  
+  // Get input list.
+  WEM *inputWEM = mlbase_cast<WEM*>(_inputWEMFld->getBaseValue());
+  
+  // Internal loop.
+  unsigned int i = 0, j = 0, k = 0, m = 0;
+  unsigned int totalNumNodes = 0, numTriangulatedNodes = 0;
+  WEMNode *node = NULL;
+  WEMFace *face = NULL;
+  Vector3 position = NULL_VEC;
+  Vector3 normal = NULL_VEC;
+  unsigned int entryNumber = 0;
+  
+  // Get input WEM name from GUI.
+  std::string inWEMStr = _inWEMNameFld->getStringValue();
+  
+  // Strings to evaluate.
+  std::ostringstream setNodes, setFaces, setNormals;
+  setNodes << inWEMStr.c_str() << ".nodes=[";
+  setFaces << inWEMStr.c_str() << ".faces=[";
+  setNormals << inWEMStr.c_str() << ".normals=[";
+  
+  // Loop over all patches -> flatten WEM
+  for (i = 0; i < inputWEM->getNumWEMPatches(); i ++) {
+    WEMPatch *wemPatch = inputWEM->getWEMPatchAt(i);
+  
+    // Loop over all nodes
+    const unsigned int numNodes = wemPatch->getNumNodes();
+    for (j = 0; j < numNodes; j ++) {
+      node = wemPatch->getNodeAt(j);
+      position = node->getPosition();
+      setNodes << std::dec << position[0] << "," << std::dec << position[1] << "," << std::dec << position[2] << ";";
+    }
+    numTriangulatedNodes = 0;
+    
+    // Loop over all faces
+    const unsigned int numFaces = wemPatch->getNumFaces();
+    for (j = 0; j < numFaces; j ++) {
+      face = wemPatch->getFaceAt(j);      
+      const unsigned int numFaceNodes = face->getNumNodes();
+      if (numFaceNodes == 3) {
+        for (k = 0; k < 3; k ++) {
+          entryNumber = totalNumNodes + face->getNodeAt(k)->getEntryNumber();        
+          setFaces << entryNumber << ",";
+        }
+        setFaces << ";";
+      } else {
+        position = face->getCentroid();
+        setNodes << std::dec << position[0] << "," << std::dec << position[1] << "," << std::dec << position[2] << ";";
+        numTriangulatedNodes ++;
+        
+        for (k = 0; k < numFaceNodes; k ++) {
+          for (m = 0; m < 2; m ++) {
+            entryNumber = totalNumNodes + face->getNodeAt((m + k) % numFaceNodes)->getEntryNumber();        
+            setFaces << entryNumber << ",";
+          }
+          setFaces << totalNumNodes + node->getEntryNumber();
+          setFaces << ";";
+        }
+        
+      }
+      normal = face->getNormal();
+      setNormals << std::dec << normal[0] << "," << std::dec << normal[1] << "," << std::dec << normal[2] << ";";
+    }
+    
+    totalNumNodes += numNodes + numTriangulatedNodes;
+  }
+  
+  setNodes << "]";
+  setFaces << "]";
+  setNormals << "]";
+  
+  // Put WEM into matlab structure.
+  engEvalString(m_pEngine, setNodes.str().c_str());
+  engEvalString(m_pEngine, setFaces.str().c_str());
+  engEvalString(m_pEngine, setNormals.str().c_str());
+}
+
+//! Gets WEM from Matlab and copies results into output WEM.
+void MatlabScriptWrapper::_getWEMBackFromMatlab()
+{
+  // Clear _outWEM.
+  _outWEM->removeAll();
+  
+  // Check if Matlab is started.
+  if (!_checkMatlabIsStarted())
+  {
+    std::cerr << "_getWEMBackFromMatlab(): Cannot find Matlab engine!" << std::endl << std::flush;
+    return;
+  }
+  
+  // Get names from GUI.
+  std::string outWEMStr = _outWEMNameFld->getStringValue();
+  
+  // Variables
+  WEMTrianglePatch *triPatch = NULL;
+  WEMNode *node = NULL;
+  WEMTriangle *triangle = NULL;
+  unsigned int i = 0;
+  
+  std::ostringstream executeStr;
+  
+  // Get nodes
+  executeStr << "tmpOutWEMNodes=" << outWEMStr << ".nodes";
+  engEvalString(m_pEngine, executeStr.str().c_str());
+  mxArray *m_nodes = engGetVariable(m_pEngine, "tmpOutWEMNodes");
+  engEvalString(m_pEngine, "clear tmpOutWEMNodes");
+  executeStr.str("");
+  
+  // Get faces
+  executeStr << "tmpOutWEMFaces=" << outWEMStr << ".faces";
+  engEvalString(m_pEngine, executeStr.str().c_str());
+  mxArray *m_faces = engGetVariable(m_pEngine, "tmpOutWEMFaces");
+  engEvalString(m_pEngine, "clear tmpOutWEMFaces");
+  executeStr.str("");  
+  
+  // Get data from Matlab array.
+  if ((m_nodes && !mxIsEmpty(m_nodes) && mxGetClassID(m_nodes) == mxDOUBLE_CLASS) &&
+      (m_faces && !mxIsEmpty(m_faces) && mxGetClassID(m_faces) == mxDOUBLE_CLASS))
+  {
+    double *dataNodes = static_cast<double*>(mxGetPr(m_nodes));
+    double *dataFaces = static_cast<double*>(mxGetPr(m_faces));
+    
+    if (dataNodes != NULL) {
+      const size_t node_rows = mxGetM(m_nodes);
+      
+      ML_CHECK_NEW(triPatch, WEMTrianglePatch());
+      
+      for (i = 0; i < node_rows; i ++) {
+        node = triPatch->addNode();
+        node->setPosition(dataNodes[i], dataNodes[i + node_rows], dataNodes[i + 2 * node_rows]);
+      }
+      
+      const size_t face_rows = mxGetM(m_faces);
+      
+      for (i = 0; i < face_rows; i ++) {
+        triangle = triPatch->addTriangle();
+        node = triPatch->getNodeAt(dataFaces[i]);                 triangle->setNode(0,node); node->addFace(triangle);
+        node = triPatch->getNodeAt(dataFaces[i + face_rows]);     triangle->setNode(1,node); node->addFace(triangle);
+        node = triPatch->getNodeAt(dataFaces[i + 2 * face_rows]); triangle->setNode(2,node); node->addFace(triangle);
+      }
+      
+      triPatch->buildEdgeConnectivity();
+      triPatch->computeNormals();
+      
+      _outWEM->addWEMPatch(triPatch);
+      
+    }
+    
+  }
+  
+  mxDestroyArray(m_nodes);
+  mxDestroyArray(m_faces);
+}
+
 //! Copies scalar values to matlab.
 void MatlabScriptWrapper::_copyInputScalarsToMatlab()
 {

Modified: trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.h
===================================================================
--- trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.h	2010-06-14 08:15:30 UTC (rev 278)
+++ trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.h	2010-06-17 06:45:57 UTC (rev 279)
@@ -44,6 +44,7 @@
 // SDK includes
 #include <mlXMarkerList.h>
 #include <mlVersion.h>
+#include <WEMBase/WEM.h>
 
 // System includes
 #include <string>
@@ -128,6 +129,10 @@
   void _copyInputXMarkerToMatlab();
   //! Copies XMarkerList from Matlab and copies results into output XMarkerList.
   void _getXMarkerBackFromMatlab();
+  //! Copies WEM to matlab.
+  void _copyInputWEMToMatlab();
+  //! Copies WEM from matlab.
+  void _getWEMBackFromMatlab();  
   //! Copies scalar values to matlab.
   void _copyInputScalarsToMatlab();
   //! Copies scalar values from matlab.
@@ -155,6 +160,13 @@
   BaseField *_outputXMarkerListFld;
   //! The output list
   XMarkerList _outputXMarkerList;
+  
+  //! The WEM input field.
+  BaseField *_inputWEMFld;
+  //! The WEM output field.
+  BaseField *_outputWEMFld;
+  //! The output WEM.
+  WEM *_outWEM;
 
   //! Type a matlab script into this field.
   StringField* _matlabScriptFld;
@@ -175,6 +187,10 @@
   StringField *_inXMarkerNameFld;
   StringField *_outXMarkerNameFld;
   //@}
+  //{@ Set matlab names for input and output WEM.
+  StringField *_inWEMNameFld;
+  StringField *_outWEMNameFld;
+  //@}
 
   //! If pressed, the module updates.
   NotifyField* _calculateFld;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2009	Jan	Feb	Mar	Apr	May	Jun (144)	Jul (5)	Aug (23)	Sep (3)	Oct (8)	Nov (6)	Dec (3)
2010	Jan (4)	Feb	Mar (34)	Apr (1)	May (10)	Jun (12)	Jul (17)	Aug (28)	Sep (2)	Oct	Nov (2)	Dec (3)
2011	Jan (4)	Feb (7)	Mar (5)	Apr (1)	May	Jun (15)	Jul (1)	Aug (7)	Sep (9)	Oct (3)	Nov	Dec (1)
2012	Jan (1)	Feb (13)	Mar (6)	Apr	May (1)	Jun	Jul (1)	Aug (9)	Sep (7)	Oct (2)	Nov	Dec
2013	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

mevislabmodules-svn Mailing List for MeVisLab Community (Page 7)

mevislabmodules-svn — Maillist for commits