#2507 creaMaracasVisu Feature New Normal - creaPanelButtonContainer ListPanel

diff --git a/appli/BasicViewer/main.cxx b/appli/BasicViewer/main.cxx
index 462a57ed311ee9991906535b5e76409dd7682027..b71b6682625a0cbcc0834385353b06e0fd45fc81 100644 (file)
--- a/appli/BasicViewer/main.cxx
+++ b/appli/BasicViewer/main.cxx
@@ -29,6 +29,9 @@
 #include "OpenImageDialog.h"
 #include "vtkImageData.h"
 
+#include <structBCPSettings.h>
+#include <buttonContainerSettings.h>
+#include <creaPanelButtonContainer.h>
 
 class MyApp:public wxApp
 {
@@ -66,10 +69,11 @@ bool MyApp::OnInit()
        MyFrame *frame = new MyFrame(wxT("CREATIS basic"));
 
        const int width = 600;
+
        const int height = 250;
 
        frame->SetSize(width,height);
-       
+
        frame->Show(true);
 
        return true;

diff --git a/appli/CMakeLists.txt b/appli/CMakeLists.txt
index 197b3c507a8766673679927c310af5ac5365b3c8..7f4788158fb1a15b7dacb87f40cfaed974f20481 100644 (file)
--- a/appli/CMakeLists.txt
+++ b/appli/CMakeLists.txt
@@ -24,7 +24,7 @@
 # ------------------------------------------------------------------------ */ 
 
 #ADD_SUBDIRECTORY(ManualPaint)
-#ADD_SUBDIRECTORY(BasicViewer)
+##ADD_SUBDIRECTORY(BasicViewer)
 
 IF(QT_USE_QTUITOOLS)
   ADD_SUBDIRECTORY(QtVTKViewer)

diff --git a/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx b/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
index 3386357f1cf69e8dd0194e822b1aeda64496169a..fcc9903ea0ce63d4119f8a1ed71829b3ee08a548 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
+++ b/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
@@ -42,11 +42,7 @@ PanelButtonContainer::Process( )
 {
        ButtonContainerSettings* settings = new ButtonContainerSettings( );
        printf("EED PanelButtonContainer::Process %d\n", bbGetInputIn( ).size() );
-
-
          settings->AddButtons(bbGetInputIn( ), bbGetInputType());
-
-       
        PBContainer* panel = new PBContainer( myPanel, settings, bbGetInputType() );
        wxBoxSizer* sizer  = new wxBoxSizer( wxHORIZONTAL );
        sizer->Add( panel, 1, wxEXPAND, 0 );
@@ -65,8 +61,8 @@ void PanelButtonContainer::CreateWidget( wxWindow* parent )
        this->myPanel = new wxPanel( parent, -1 );
        /// \TODO fix  warning: unused variable ww
        wxWindow* ww = bbCreateWidgetOfInput( "In", this->myPanel );
-       bbSetOutputWidget( myPanel);
-
+       ww=NULL;
+       bbSetOutputWidget( myPanel );
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)