#3264 creaImageIO Feature New Normal - Add Dicom Tags to the DB sqlite

[creaImageIO.git] / src / creaImageIOWxGimmickView.cpp

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index ea691e387973e3500f5b076de29fcca3ec39f79b..63d4f4257ad3aac2b3162e1664a315f8fc01c87e 100644 (file)
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -138,6 +138,7 @@ namespace creaImageIO
       mProgressDialog(NULL),
       mConstructed(false)
   {
+       mViewer = NULL;
     GimmickDebugMessage(1,"WxGimmickView::WxGimmickView" <<std::endl);
     // Sets the current directory to the home dir
     mCurrentDirectory =  std2wx(gimmick->GetHomeDirectory());
@@ -229,6 +230,8 @@ namespace creaImageIO
     GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView" <<std::endl);
        delete mIcon;
        delete mViewer;
+       mIcon   = NULL;
+       mViewer = NULL;
     //if(mListener->IsAlive())   {        mListener->Delete();    }
   }
   //======================================================================
@@ -348,18 +351,28 @@ namespace creaImageIO
   void WxGimmickView::getSelectedFiles(std::vector<OutStrGimmick> &outG, std::vector< std::string> i_attr, 
                                        bool mult, const std::string out_model)
   {
+printf("EED WxGimmickView::getSelectedFiles Start\n");
+
        // First we select the files
    std::vector<std::string> files;
+printf("EED WxGimmickView::getSelectedFiles 1.1\n");
        std::string db_name = crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()));
+printf("EED WxGimmickView::getSelectedFiles 1.2\n");
        GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetSelectedAsString(files);
+printf("EED WxGimmickView::getSelectedFiles 1.3\n");
 
        std::string asking;
        std::string dim;
-       bool bsingle = isSingle(files.front());
+printf("EED WxGimmickView::getSelectedFiles 1.3.1\n");
+       bool bsingle = isSingle( files.front() );
+printf("EED WxGimmickView::getSelectedFiles 1.3.2\n");
        int i_dim_out;
+printf("EED WxGimmickView::getSelectedFiles 1.4\n");
        mGimmick->GetSetting(SETTINGS_OUTPUT_ASK, asking);
+printf("EED WxGimmickView::getSelectedFiles 1.5\n");
        mGimmick->GetSetting(SETTINGS_OUTPUT_DIM, dim);
 
+printf("EED WxGimmickView::getSelectedFiles 1.6\n");
 
        if (asking == "true")
        {
@@ -367,7 +380,9 @@ namespace creaImageIO
                // get dim
                int idim;
                sscanf(dim.c_str(),"%d",&idim);
+printf("EED WxGimmickView::getSelectedFiles 1.7\n");
                WxOutputDlg *dlg = new WxOutputDlg(this,files, idim -1, bsingle);
+printf("EED WxGimmickView::getSelectedFiles 1.8\n");
                if (dlg->ShowModal() == wxID_OK)
                {
                        dim = dlg->getDim();
@@ -380,6 +395,9 @@ namespace creaImageIO
        }
        sscanf(dim.c_str(),"%d",&i_dim_out);
 
+printf("EED WxGimmickView::getSelectedFiles 2\n");
+
+
        // Next we create the structure for dicom output infos
        OutputAttr Oattr;
 //EED 01/09/2014
@@ -423,6 +441,9 @@ namespace creaImageIO
        }
        // Now we read and create the waiting output (vtkImageData * or OutGimmickData *)
        readImages(outG, sort_files, Oattr, i_dim_out, zspacing);
+
+printf("EED WxGimmickView::getSelectedFiles End\n");
+
   }
 
 
@@ -784,15 +805,16 @@ namespace creaImageIO
   //==================================================
    void  WxGimmickView::OnInternalIdle()
    {
-     if (!mConstructed) return;
+       if (!mConstructed) return;
      static bool first_time = true;
+        
      if (false)
      {
        first_time = false;
      }
    //   GimmickMessage(1,"WxGimmickView : Refresh viewer"<<std::endl);
        //  mViewer->StartPlayer();
-     if(mViewer)
+     if(mViewer!=NULL)
      {
         mViewer->RefreshIfNecessary();
      }
@@ -800,9 +822,11 @@ namespace creaImageIO
 #else
   void WxGimmickView::UpdateWindowUI(long flags)
   {
-         if(mViewer)
+         if(mViewer!=NULL)
      {
-        mViewer->RefreshIfNecessary();
+// EED 2018-08-23
+// GL Conflict because window is not showing the fist time
+//EED        mViewer->RefreshIfNecessary();
      }
   }
 #endif
@@ -811,14 +835,12 @@ namespace creaImageIO
   //==================================================
    void  WxGimmickView::ClearSelection()
    {
-printf("EED WxGimmickView::ClearSelection Start\n");      
        pointers.clear();
        pointers.push_back(boost::shared_ptr<creaImageIO::ImagePointerHolder>(new ImagePointerHolder(GetDefaultImage())));
        //pointers.push_back(new ImagePointerHolder(GetDefaultImage()));
        mViewer->SetImageVector(pointers);
        mViewer->RefreshIfNecessary();
        ResetExtent();
-printf("EED WxGimmickView::ClearSelection End\n");        
   }
 
   //=================================================