From: guigues <guigues>
Date: Thu, 19 Feb 2009 10:00:57 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~182
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=4c2b3017f90a93165a5f436f4f546096a36e0fb1;p=creaImageIO.git

*** empty log message ***
---

diff --git a/appli/CMakeLists.txt b/appli/CMakeLists.txt
index 6dcb4e0..2c2bcd1 100644
--- a/appli/CMakeLists.txt
+++ b/appli/CMakeLists.txt
@@ -1,6 +1,7 @@
 IF (BUILD_V2)
   SUBDIRS(gimmick)
   SUBDIRS(wxGimmick)
+  SUBDIRS(TestWxGimmickReaderDialog)
 ELSE (BUILD_V2)
   SUBDIRS(TestWxGimmickDialog)
 ENDIF (BUILD_V2)
diff --git a/appli/wxGimmick/CMakeLists.txt b/appli/wxGimmick/CMakeLists.txt
new file mode 100644
index 0000000..f94aeaf
--- /dev/null
+++ b/appli/wxGimmick/CMakeLists.txt
@@ -0,0 +1,11 @@
+SET(NAME wxGimmick)
+IF(WIN32)
+  ADD_EXECUTABLE(${NAME} WIN32 main)  
+  SET_TARGET_PROPERTIES(${NAME} PROPERTIES LINK_FLAGS /subsystem:console )
+ELSE(WIN32)
+  ADD_EXECUTABLE(${NAME} main)
+ENDIF(WIN32)
+
+TARGET_LINK_LIBRARIES( ${NAME} creaImageIO2)
+
+INSTALL_TARGETS(/bin/ ${NAME} )
diff --git a/appli/wxGimmick/main.cxx b/appli/wxGimmick/main.cxx
new file mode 100644
index 0000000..4485fde
--- /dev/null
+++ b/appli/wxGimmick/main.cxx
@@ -0,0 +1,43 @@
+#include <creaWx.h>
+#include <creaImageIOWxGimmickFrame.h>
+
+class myApp : public wxApp
+{
+public:
+  bool OnInit( );
+  int  OnExit() { return true; }
+};
+
+IMPLEMENT_APP(myApp);
+
+CREA_WXMAIN_WITH_CONSOLE
+
+bool myApp::OnInit( )
+{	 
+  wxApp::OnInit();
+#ifdef __WXGTK__
+  //See http://www.wxwindows.org/faqgtk.htm#locale
+  setlocale(LC_NUMERIC, "C");
+#endif
+   wxInitAllImageHandlers();
+
+   /*
+   creaImageIO::SetGimmickMessageLevel(9);
+   creaImageIO::SetGimmickDebugMessageLevel(9);
+   */
+
+   int threads = 1;
+
+   creaImageIO::WxGimmickFrame* f = new
+     creaImageIO::WxGimmickFrame(0,
+				 -1,
+				 _T("wxGimmick! (c) CREATIS-LRMN 2008"),
+				 wxDefaultPosition,
+				 wxSize(1200,800),
+				 threads);
+   f->Show();
+   
+   return true;
+}
+
+
diff --git a/src2/CMakeLists.txt b/src2/CMakeLists.txt
index 88d506d..0f2b35e 100644
--- a/src2/CMakeLists.txt
+++ b/src2/CMakeLists.txt
@@ -38,6 +38,7 @@ SET( SRCS
   creaImageIOWxGimmickView
   creaImageIOWxTreeView
   creaImageIOWxGimmickReaderDialog
+  creaImageIOWxGimmickFrame
 
 
 )
diff --git a/src2/creaImageIOWxGimmickFrame.cpp b/src2/creaImageIOWxGimmickFrame.cpp
new file mode 100644
index 0000000..d0e04fe
--- /dev/null
+++ b/src2/creaImageIOWxGimmickFrame.cpp
@@ -0,0 +1,84 @@
+#include <creaImageIOWxGimmickFrame.h>
+#include <creaImageIOSystem.h>
+
+namespace creaImageIO
+{
+  // CTor
+  WxGimmickFrame::WxGimmickFrame(wxWindow *parent, 
+					       wxWindowID id,
+					       wxString title,
+					       const wxPoint& pos,
+					       const wxSize& size,
+					       int threads)
+ :   wxFrame( parent, 
+		  id, 
+		  title,
+		  pos,
+		  size,
+		  wxRESIZE_BORDER | 
+	      //  wxSYSTEM_MENU  |
+		  wxCLOSE_BOX |
+		  wxMAXIMIZE_BOX | 
+		  wxMINIMIZE_BOX | 
+		  wxCAPTION  
+	       ),
+     mGimmick(0),
+     mView(0)
+  {
+    GimmickDebugMessage(1,"WxGimmickFrame::WxGimmickFrame"
+			<<std::endl);
+    wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
+    
+    try {
+      
+      mGimmick = new Gimmick();
+      mGimmick->Initialize();
+     
+      int image_type = GIMMICK_3D_IMAGE_SELECTION;
+      mView = new WxGimmickView(mGimmick,
+				this,
+				-1,
+				wxDefaultPosition,
+				size,
+				image_type,
+				threads);
+      mView->Initialize();
+    }
+    catch (crea::Exception e)
+    {
+      e.Print();
+      return;
+    }
+
+    topsizer->Add( mView,1,wxGROW,0);
+
+    SetSizer( topsizer );     
+    Layout(); 
+  }
+
+  /// Destructor
+  WxGimmickFrame::~WxGimmickFrame()
+  {
+    GimmickDebugMessage(1,"WxGimmickFrame::~WxGimmickFrame"
+			<<std::endl);
+    if (mView) 
+      {
+	delete mView;
+      }
+    if (mGimmick) 
+      {
+	mGimmick->Finalize();
+	delete mGimmick;
+      }
+  }
+  
+  
+  //================================================================
+  //  BEGIN_EVENT_TABLE(WxGimmickFrame, wxDialog)
+  //    END_EVENT_TABLE()
+  //================================================================
+
+
+} // EO namespace creaImageIO
+
+
diff --git a/src2/creaImageIOWxGimmickFrame.h b/src2/creaImageIOWxGimmickFrame.h
new file mode 100644
index 0000000..0572fcb
--- /dev/null
+++ b/src2/creaImageIOWxGimmickFrame.h
@@ -0,0 +1,57 @@
+#ifndef __creaImageIOWxGimmickFrame_h_INCLUDED__
+#define __creaImageIOWxGimmickFrame_h_INCLUDED__
+
+#ifdef USE_WXWIDGETS
+
+#include <creaImageIOWxGimmickView.h>
+#include <creaWx.h>
+
+namespace creaImageIO
+{
+  /**
+   * \ingroup GUI
+   */
+  //=====================================================================
+ //=====================================================================
+  class /*CREAIMAGEIO_EXPORT*/ WxGimmickFrame : public wxFrame
+  {
+  public:
+    WxGimmickFrame();    
+    WxGimmickFrame(wxWindow *parent, 
+		   const wxWindowID id,
+		   wxString title,
+		   const wxPoint& pos, 
+		   const wxSize& size,
+		   int threads = 0);
+    
+    ~WxGimmickFrame();
+
+    //    Gimmick* GetGimmick() { return mGimmick; }
+    //    typedef WxGimmick ViewType;
+    //    typedef WxGimmickView::EventType EventType;
+
+
+
+     
+    //    void OnSelChanged(EventType& event);
+    //    void OnContextualMenu(EventType& event);
+    //    void OnMenuTest(wxCommandEvent& event);
+    //    void OnButtonOk(wxCommandEvent& event);
+    //    void OnButtonCancel(wxCommandEvent& event);
+
+    //    DECLARE_EVENT_TABLE();
+  private :
+    
+    Gimmick*       mGimmick;
+    WxGimmickView* mView;
+
+  }; // class WxGimmickFrame
+  //=====================================================================
+
+  
+} // EO namespace creaImageIO
+
+
+#endif // USE_WIDGETS
+// EOF
+#endif