Windows comp

diff --git a/src2/creaImageIOGimmickView.h b/src2/creaImageIOGimmickView.h
index 2687d383504a2cb072b25bb3c21dbf708df5e2aa..2a977bf88b9cdeb7e9a25730713a6bb64e325899 100644 (file)
--- a/src2/creaImageIOGimmickView.h
+++ b/src2/creaImageIOGimmickView.h
@@ -114,7 +114,7 @@ namespace creaImageIO
                                       MultiThreadImageReaderUser::EventType t,
                                       vtkImageData* image);
 
-      vtkImageData* GetDefaultImage() { mReader.GetImage(""); }
+      vtkImageData* GetDefaultImage() { return mReader.GetImage(""); }
 
 
       //=============================================

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index 0c7229c08930a013711dd166c4d87de455be6e70..7992b56a699ea13f6217243fe45ec45c84efe252 100644 (file)
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -117,6 +117,8 @@ namespace creaImageIO
     
     // Previewer
     mViewer = new WxViewer(mBottomPanel, wxID_ANY, wxT("Gimmick! Viewer"),wxDefaultPosition, wxDefaultSize );
+       mViewer->SetMovieSize(1);
+       mViewer->SetImage(0,GetDefaultImage());
 
     bottom_sizer->Add(mViewer,1,wxGROW,0);
     //    mViewer->Show();
@@ -125,6 +127,7 @@ namespace creaImageIO
 
     // Splitting
     int hsize = size.GetHeight();
+
     int bottom_minsize = 40;
 
     mSplitter->SetMinimumPaneSize( bottom_minsize );

diff --git a/src2/creaImageIOWxViewer.cpp b/src2/creaImageIOWxViewer.cpp
index ac2938be0547227d0eeff708ed59e8dff8ba505b..e9f0bdd73d1dfb24fc758c2a988cec87d304ba7a 100644 (file)
--- a/src2/creaImageIOWxViewer.cpp
+++ b/src2/creaImageIOWxViewer.cpp
@@ -79,9 +79,9 @@ namespace creaImageIO
     
     mCurrent = 0;
 
-    mPlayer = new WxViewerPlayer(this); //images, mViewer, mInteractor, this);
-    mPlayer->Create();
-    mPlayer->Run(); 
+    mPlayer = new WxViewerPlayer(this); //images, mViewer, mInteractor, this); 
+       mPlayer->Create();
+       mPlayer->Run();
        
     topsizer-> Add( mInteractor ,1,wxGROW  ,0);
     SetSizer( topsizer );     
@@ -109,14 +109,19 @@ namespace creaImageIO
   void WxViewer::SetImage(int i, vtkImageData* im)
   {
     wxMutexLocker lock(mMutex);
-    GimmickDebugMessage(5,"WxViewer::SetImage "<<i+1<<"/"<<images.size()
+       if(images.size()>0)
+       {
+               GimmickDebugMessage(5,"WxViewer::SetImage "<<i+1<<"/"<<images.size()
                        <<std::endl);
-    if (i<images.size())
-      {
-       //      if (images[i]!=0) images[i]->UnRegister(NULL);
-       images[i] = im;
-       //      if (im!=0) im->Register(NULL);
-      }
+               if (i<images.size())
+               {
+               //      if (images[i]!=0) images[i]->UnRegister(NULL);
+               images[i] = im;
+               //      if (im!=0) im->Register(NULL);
+               }
+               
+       }
+    
   }
 
   //================================================================
@@ -256,7 +261,7 @@ namespace creaImageIO
     //mInteractor->Render();
     //    mViewer->Render();   
 
-    ::wxWakeUpIdle();
+   ::wxWakeUpIdle();
   } 
   //================================================================
   
@@ -264,7 +269,10 @@ namespace creaImageIO
   void WxViewer::OnInternalIdle()
   {
     //    mInteractor->Refresh();
-    mInteractor->Render();
+       if(images.size()>0)
+       {
+        mInteractor->Render();
+       }
     //mViewer->Render();      
   }