From 17d5467beff3cbd305bfdd0505fe87e07dff3c66 Mon Sep 17 00:00:00 2001 From: guigues Date: Mon, 9 Mar 2009 14:44:14 +0000 Subject: [PATCH] *** empty log message *** --- appli/TestWxGimmickDialog/main.cxx | 6 +++--- appli/gimmick/main.cxx | 3 +++ src2/creaImageIORFImageReader.cpp | 6 ++++-- src2/creaImageIOWxGimmickView.cpp | 9 ++++++++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/appli/TestWxGimmickDialog/main.cxx b/appli/TestWxGimmickDialog/main.cxx index 1b5b950..8f5f0c8 100644 --- a/appli/TestWxGimmickDialog/main.cxx +++ b/appli/TestWxGimmickDialog/main.cxx @@ -1,7 +1,6 @@ #include #include #include - #include class myApp : public wxApp @@ -38,6 +37,7 @@ bool myApp::OnInit( ) if (w.GetReturnCode() == wxID_OK) { + std::cout << "$$$$ main : user clicked 'OK' $$$$"< s; @@ -53,7 +53,7 @@ bool myApp::OnInit( ) w.GetSelectedImages(images); crea::VtkBasicSlicer(images.front()); images.front()->Delete(); - + } else if (w.GetReturnCode() == wxID_CANCEL) { @@ -65,7 +65,7 @@ bool myApp::OnInit( ) < #include + int main(int argc, char* argv[]) { + gengetopt_args_info args; if (cmdline_parser (argc, argv, &args) != 0) return 0 ; @@ -51,5 +53,6 @@ int main(int argc, char* argv[]) { e.Print(); } + return 0; } diff --git a/src2/creaImageIORFImageReader.cpp b/src2/creaImageIORFImageReader.cpp index 886db78..547fd8b 100644 --- a/src2/creaImageIORFImageReader.cpp +++ b/src2/creaImageIORFImageReader.cpp @@ -92,13 +92,15 @@ namespace creaImageIO } fclose(rf_file); - std::cout << "NewVtkImageDataFromRaw" << std::endl; + // std::cout << "NewVtkImageDataFromRaw" << std::endl; vtkImageData* im = crea::NewVtkImageDataFromRaw( data, h.width, h.height, h.frame); - std::cout << "OK" << std::endl; + return im; + + // std::cout << "OK" << std::endl; } //===================================================================== diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index e5c6574..0c7229c 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -125,7 +125,7 @@ namespace creaImageIO // Splitting int hsize = size.GetHeight(); - int bottom_minsize = 15; + int bottom_minsize = 40; mSplitter->SetMinimumPaneSize( bottom_minsize ); mSplitter->SplitHorizontally( mNotebook, mBottomPanel, @@ -536,6 +536,13 @@ namespace creaImageIO { if (!mConstructed) return; ProcessImageEvents(); + static bool first_time = true; + if (false) + { + mViewer->SetMovieSize(1); + mViewer->SetImage(0,GetDefaultImage()); + first_time = false; + } // mViewer->Refresh(); } -- 2.45.1