*** empty log message ***

[creaContours.git] / bbtk / src / bbCreaContournDimensions.cxx

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index 52aeb2882d3a524ae491283d12666f4ff74fa558..6708db5ec1c9f4ef009aa50368eee0eeca6a5467 100644 (file)
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.cxx
@@ -9,6 +9,8 @@ void nDimensions::Process()
 {
  
        double **vectx, **vecty, **vectz;
+
+       std::vector< void * > vectortemp;
        std::vector<int> size;
        vtkImageData *mask, *value;
 
@@ -19,16 +21,15 @@ void nDimensions::Process()
 
                currentimg=img;
                selectedimages.push_back(img);
-               frame->setVectImages(selectedimages);
+               wxContourMainFrame::getInstance()->setVectImages(selectedimages);
        }
 
 
 
-       if(bbGetInputGet()==1){
-               bbSetInputGet(0);               
-               //eventHandler->checkInformationPanel();
-               //eventHandler->getValuesXYZ(vectx, vecty, vectz, &size);       
-               //eventHandler->getMaskValue(mask, value);
+       if(currentimg != NULL){
+               int contourtype = bbGetInputContourType();              
+               //wxContourMainFrame::getInstance()->getValuesXYZ(vectx, vecty, vectz, &size);
+               wxContourMainFrame::getInstance()->getMaskValue(mask, value, contourtype);              
        }
 
     bbSetOutputX(vectx);
@@ -51,8 +52,17 @@ void nDimensions::CreateWidget(wxWindow* parent)
        //new wxContourMainFrame( frame1, wxID_ANY, _T(""), wxPoint(50,50), wxSize(800, 600),selectedimages ); 
        //frame1->CreateStatusBar();
        //bbSetOutputWidget( frame1 ); 
-       frame = wxContourMainFrame::getInstance(parent, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages );
-       bbSetOutputWidget( frame ); 
+
+       char currentPath[_MAX_PATH];
+       HMODULE hand = GetModuleHandle("bbcreaContours");
+       GetModuleFileName(hand, currentPath, _MAX_PATH);
+
+       std::string path = currentPath;
+
+       path = path.substr(0,path.find_last_of("\\"));
+
+       wxPanel* panel = wxContourMainFrame::getInstance(parent, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages,wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER,path );
+       bbSetOutputWidget( panel ); 
        
    
 
@@ -62,7 +72,7 @@ void nDimensions::CreateWidget(wxWindow* parent)
 void nDimensions::bbUserConstructor()
 {
 
-       bbSetInputGet(0);
+       bbSetInputContourType(0);
        bbSetInputIn(NULL);
 
 }