From d5a75b23a6a4330c513f0566873ff38bb0827d4f Mon Sep 17 00:00:00 2001
From: davila <eduardo.davila@creatis.insa-lyon.fr>
Date: Fri, 6 Feb 2015 14:03:50 +0100
Subject: [PATCH] #2507 creaMaracasVisu Feature New Normal -
creaPanelButtonContainer ListPanel
---
appli/BasicViewer/main.cxx | 6 +++++-
appli/CMakeLists.txt | 2 +-
bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx | 8 ++------
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/appli/BasicViewer/main.cxx b/appli/BasicViewer/main.cxx
index 462a57e..b71b668 100644
--- 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 197b3c5..7f47881 100644
--- 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 3386357..fcc9903 100644
--- 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)
--
2.49.0