]> Creatis software - creaImageIO.git/commitdiff
Typo
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Tue, 22 Sep 2009 14:34:32 +0000 (14:34 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Tue, 22 Sep 2009 14:34:32 +0000 (14:34 +0000)
appli/TestWxGimmickReaderDialog/main.cxx
src2/creaImageIOGimmick.h
src2/creaImageIOWxGimmickReaderDialog.h

index b313e90d0e3ee3a8104dd0f01fbc56c24c1bd9cf..eb89c66742f88d166cba3647481acfc9f8a7d5d0 100644 (file)
@@ -16,7 +16,7 @@ IMPLEMENT_APP(myApp);
 CREA_WXMAIN_WITH_CONSOLE
 
 bool myApp::OnInit( )
-{       
+{
   wxApp::OnInit();
 #ifdef __WXGTK__
   //See http://www.wxwindows.org/faqgtk.htm#locale
@@ -24,62 +24,60 @@ bool myApp::OnInit( )
 #endif
    wxInitAllImageHandlers();
 
-   
    creaImageIO::SetGimmickMessageLevel(5);
    creaImageIO::SetGimmickDebugMessageLevel(0);
-   
 
    int min_dim = GIMMICK_2D_IMAGE_SELECTION;
    int max_dim = GIMMICK_3D_IMAGE_SELECTION;
    int output_dim = NATIVE;
    int threads = 1;
 
-   creaImageIO::WxGimmickReaderDialog w(0,
-                                       -1,
-                                       _T("Select image(s)        - Gimmick! (c) CREATIS-LRMN 2008"),
-                                       wxDefaultPosition,
-                                       wxSize(810,750),
-                                       min_dim,
-                                       max_dim,
-                                       output_dim,
-                                       threads);
+   creaImageIO::WxGimmickReaderDialog w(
+                    0,
+                   -1,
+                   _T("Select image(s)        - Gimmick! (c) CREATIS-LRMN 2008"),
+                   wxDefaultPosition,
+                   wxSize(810,750),
+                   min_dim,
+                   max_dim,
+                   output_dim,
+                   threads);
    w.ShowModal();
-   
+
    if (w.GetReturnCode() == wxID_OK)
      {
        std::cout << "$$$$ main : user clicked 'OK' $$$$"<<std::endl;
        std::cout << "$$$$ selected files : "<<std::endl;
-          //Puts filenames
+       //Puts filenames
        std::vector<std::string> s;
        w.GetSelectedFiles(s);
        std::vector<std::string>::iterator i;
        for (i=s.begin();i!=s.end();++i) 
-        {
-          std::cout << *i << std::endl;
-        }
+         {
+           std::cout << *i << std::endl;
+         }
        std::cout << "$$$$ "<<std::endl;
 
-          //Puts images
+       //Puts images
        std::vector<vtkImageData*> images;
-          w.GetSelectedImages(images,output_dim);
-          std::cout<<images.size()<<std::endl;
+       w.GetSelectedImages(images,output_dim);
+       std::cout<<images.size()<<std::endl;
 
-          crea::VtkBasicSlicer(images.front());
+       crea::VtkBasicSlicer(images.front());
        images.front()->Delete();
-          w.OnExit();
+       w.OnExit();
 
      }
    else if (w.GetReturnCode() == wxID_CANCEL)
      {
-          w.OnExit();
+       w.OnExit();
        std::cout << "$$$$ main : user clicked 'CANCEL' $$$$"<<std::endl;
      }
    else 
      {
-                w.OnExit();
-        std::cout << "$$$$ main : dialog ended without return code ! $$$$"
-                 <<std::endl;
-      
+       w.OnExit();
+       std::cout << "$$$$ main : dialog ended without return code ! $$$$"
+                 <<std::endl;    
      }
 
    //   std::cout << "$$$$ main : deleting dialog"<<std::endl;
index 8085f69ac86a5567eb9114390d6735e9d5f202e5..4e7ec07efaeb9f3fa9a69685e572791105ea14f3 100644 (file)
@@ -58,7 +58,6 @@ namespace creaImageIO
      void ConnectAddProgressObserver( AddProgressCallbackType callback )
     { mImageAdder.ConnectProgressObserver(callback); }
     
-
     ///
     const AddProgress& GetAddProgress() const { return mImageAdder.GetProgress(); }
 
@@ -83,8 +82,7 @@ namespace creaImageIO
     TreeHandlerMapType& GetTreeHandlerMap() { return mTreeHandlerMap; }
     /// Returns the TreeHandlerMap (const ref)
     const TreeHandlerMapType& GetTreeHandlerMap() const
-    { return mTreeHandlerMap; }
-    
+    { return mTreeHandlerMap; }    
 
     /// Add the files to the given TreeHandler
     void AddFiles(const std::string& handler,
index c254ea4b4569bd5a07d989813c9ddab459b0b80f..1933a38174f1f1b3862cc1427d7bff64b0fb24d3 100644 (file)
@@ -11,23 +11,23 @@ namespace creaImageIO
   /**
    * \ingroup GUI
    */
-       
+
   //=====================================================================
  //=====================================================================
   class CREAIMAGEIO_EXPORT  WxGimmickReaderDialog : public wxDialog
   {
   public:
-    WxGimmickReaderDialog();    
-    WxGimmickReaderDialog(wxWindow *parent, 
+    WxGimmickReaderDialog();
+    WxGimmickReaderDialog(wxWindow *parent,
                          const wxWindowID id,
                          wxString title,
-                         const wxPoint& pos, 
+                         const wxPoint& pos,
                          const wxSize& size,
                          int image_min_dim = GIMMICK_2D_IMAGE_SELECTION,
                          int image_max_dim = GIMMICK_3D_IMAGE_SELECTION,
                          int output_dim = NATIVE,
                          int threads = 0);
-    
+
     Gimmick* GetGimmick() { return mGimmick; }
     //    typedef WxGimmick ViewType;
     typedef WxGimmickView::EventType EventType;
@@ -38,7 +38,7 @@ namespace creaImageIO
        //===============================================================================================
        //Image Selection
        //===============================================================================================
-   
+
     void GetSelectedImages(std::vector<vtkImageData*>& s, int dim)
     { mView->GetSelectedImages(s, dim); }
 
@@ -49,13 +49,13 @@ namespace creaImageIO
     void OnSelChanged(EventType& event);
     void OnContextualMenu(EventType& event);
     void OnMenuTest(wxCommandEvent& event);
-       void OnValid(bool valid);
-       void OnExit(){mView->StopPlayer();}
-    //    void OnButtonOk(wxCommandEvent& event);
-    //    void OnButtonCancel(wxCommandEvent& event);  
-       
+    void OnValid(bool valid);
+    void OnExit(){ mView->StopPlayer(); }
+    // void OnButtonOk(wxCommandEvent& event);
+    // void OnButtonCancel(wxCommandEvent& event);
+
   private :
-    
+
     Gimmick*       mGimmick;
     WxGimmickView* mView;