*** empty log message ***

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index 42779112ebb55e37c2487100efca2ee0de6b37a4..29ffeaf98048ca60450c31314602281e93592ee0 100644 (file)
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.cxx
@@ -12,9 +12,12 @@ void nDimensions::Process()
        std::vector<int> size;
        vtkImageData *mask, *value;
 
-
-//     eventHandler->getValuesXYZ(vectx, vecty, vectz, &size); 
-//     eventHandler->getMaskValue(mask, value);
+       if(bbGetInputGet()==1){
+               bbSetInputGet(0);
+               eventHandler->checkInformationPanel();
+               eventHandler->getValuesXYZ(vectx, vecty, vectz, &size); 
+               eventHandler->getMaskValue(mask, value);
+       }
 
     bbSetOutputX(vectx);
        bbSetOutputY(vecty);
@@ -37,7 +40,6 @@ void nDimensions::CreateWidget()
        std::map<std::string, AxeThing *>* axesMap                                      = new std::map<std::string, AxeThing *>();
        std::map<std::string, ContourThing *>* outlinesMap                      = new std::map<std::string, ContourThing *>();  
 
-
        vtkImageData* img = bbGetInputIn();
        if(img==NULL){
                vtkMetaImageReader *reader = vtkMetaImageReader::New();
@@ -55,8 +57,10 @@ void nDimensions::CreateWidget()
        _builder->buildAxe_Envornment(axeThingsFN, axesMap );
        _builder->buildCountour_Envornment( imageSectionsFN, outlinesMap );
        
-       frame = new wxContourMainFrame( bbGetWxParent(), wxID_ANY, wxString(""), wxPoint(50,50), wxSize(800, 600) ); 
-                                                                       
+       wxFrame* frame1 = new wxFrame(bbGetWxParent(), wxID_ANY, wxT("ROI Application  -    Evaluation version, 23 Oct 2008 "), wxPoint(50,50), wxSize(800, 600) );
+       frame = new wxContourMainFrame( frame1, wxID_ANY, wxString(""), wxPoint(50,50), wxSize(800, 600) ); 
+       frame1->CreateStatusBar();
+
        wxAuiNotebook * parent = frame->createNotebook();
 
        OutlineModelManager             * modelManager                          = new OutlineModelManager( _builder->getImSourceEnv(), _builder->getImSectionEnv(), _builder->getAxesEnv(),  _builder->getContourEnv() );
@@ -78,7 +82,7 @@ void nDimensions::CreateWidget()
        successConfiuration &= frame->configurePanels( parent );
 
 
-       interfMainPanel* pannew = interfMainPanel::getInstance(frame, eventHandler, s+"/Icons");
+       interfMainPanel* pannew = interfMainPanel::getInstance(frame1, eventHandler, s+"/Icons");
 
    bbSetOutputWidget( frame ); 
 
@@ -88,6 +92,8 @@ void nDimensions::CreateWidget()
 void nDimensions::bbUserConstructor()
 {
 
+       bbSetInputGet(0);
+
 }
 void nDimensions::bbUserCopyConstructor()
 {

diff --git a/bbtk/src/bbCreaContournDimensions.h b/bbtk/src/bbCreaContournDimensions.h
index 2e9dd042b2c813ac56742d41244fc2d865a93aae..5cb3ab5d2cc0ece28fffab99d3cff74f98976011 100644 (file)
--- a/bbtk/src/bbCreaContournDimensions.h
+++ b/bbtk/src/bbCreaContournDimensions.h
@@ -42,6 +42,7 @@ virtual void bbUserDestructor();
 //==================================================================
   BBTK_DECLARE_INPUT(WorkDir,std::string);
   BBTK_DECLARE_INPUT(In,vtkImageData*);
+  BBTK_DECLARE_INPUT(Get,int);
   BBTK_PROCESS(Process);
   void Process();
   BBTK_CREATE_WIDGET(CreateWidget);
@@ -67,6 +68,7 @@ BBTK_DESCRIPTION("With a given image, the box shows the ndimension application")
 BBTK_CATEGORY("__CategoryBlackBox__");
 BBTK_INPUT(nDimensions,WorkDir,"Working data directory where config and data files are located",std::string,"");
 BBTK_INPUT(nDimensions,In,"Image to be shown",vtkImageData*,"");
+BBTK_INPUT(nDimensions,Get,"Set to 1 when data ready to be exported",int,"");
 
 BBTK_OUTPUT(nDimensions,Mask,"Mask of the contours",vtkImageData*,"");
 BBTK_OUTPUT(nDimensions,Value,"Value of the contours",vtkImageData*,"");

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
index edf9fc2d572e7512d2e5258f5e0b98dc711a1b30..720c24e3e878e814a1acee3e63e7d6e11751d64a 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
@@ -207,6 +207,7 @@ interfMainPanel::~interfMainPanel(void)
 interfMainPanel* interfMainPanel::getInstance(wxWindow* parent, wxEvtHandler * evtHandler, std::string datadir){       
 
        wxFrame* newframe = new wxFrame(parent, -1, wxT("New Interface"), wxPoint(1,1), wxSize(380,750),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT);
+       
                                                                                                                                                                                
        if(interfmainpanel == NULL){
                interfmainpanel = new interfMainPanel(newframe, 380, 750, evtHandler, datadir);

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx
index 78d56c337ce4455d6ba0059968894c5c5a29047f..2f1083117b6e2236fda37977a617ce18c1343133 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx
@@ -3671,4 +3671,11 @@ void wxContourEventHandler :: onREDO()
                } // if 
 
        }
+
+       void wxContourEventHandler::checkInformationPanel(){
+               if (_InformationContourFrame==NULL){
+                       onInformationContourFrame();
+                       _InformationContourFrame->Show(false);
+               }               
+       }
 //JCP 21 - 10 - 09
\ No newline at end of file

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.h b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.h
index 72ec7ac8bf7cfad3c184db95a769f1ce1e5dce48..eaabde7a4f5e7d420c87a64f5b17a178e40a7b75 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.h
@@ -254,6 +254,10 @@ class wxContourEventHandler : public wxEvtHandler {
        **      This method gets the mask and value images generated by the contours
        **/
        void getMaskValue(vtkImageData* mask, vtkImageData* value);
+       /**This Method checks for the information panel, it initalizes all the values 
+       ** in the controls so they can be retreived
+       **/
+       void checkInformationPanel();
 //JCP 22-10-09
 
 //JCP 16-10-09