-#include <creaImageIOPACSConnection.h>
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+# pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+# This software is governed by the CeCILL-B license under French law and
+# abiding by the rules of distribution of free software. You can use,
+# modify and/ or redistribute the software under the terms of the CeCILL-B
+# license as circulated by CEA, CNRS and INRIA at the following URL
+# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+# or in the file LICENSE.txt.
+#
+# As a counterpart to the access to the source code and rights to copy,
+# modify and redistribute granted by the license, users are provided only
+# with a limited warranty and the software's author, the holder of the
+# economic rights, and the successive licensors have only limited
+# liability.
+#
+# The fact that you are presently reading this means that you have had
+# knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------
+*/
+
+
+
#include <creaImageIOWxPACSConnectionPanel.h>
-#include <creaImageIOWxGimmickView.h>
#include <creaImageIOWxTreeView.h>
-#include <creaImageIOSystem.h>
#include <creaImageIOWxCustomizeConfigPanel.h>
#include <creaImageIOWxListenerPanel.h>
#include <creaImageIOWxEditFieldsPanel.h>
#include <creaImageIOWxOutputDlg.h>
#include <creaImageIOOutputModel.h>
+#if defined(_WIN32)
+#pragma warning(disable: 4996)
+#endif
+
using namespace crea;
// Icons
#include "icons/accept.xpm"
mBottomPanel->SetSizer(mbottom_sizer);
// Splitting
+ /// \TODO fix warning: unused variable hsize
int hsize = size.GetHeight();
- int top_minsize = 450;
- int bottom_minsize = 50;
+ int top_minsize = 450;
+ int bottom_minsize = 50;
mSplitter->SetMinimumPaneSize( bottom_minsize );
mSplitter->SplitHorizontally( mNotebook, mBottomPanel,
bool mult, const std::string out_model)
{
// First we select the files
- std::vector<std::string> files;
+ std::vector<std::string> files;
std::string db_name = crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()));
GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetSelectedAsString(files);
mGimmick->GetSetting(SETTINGS_OUTPUT_ASK, asking);
mGimmick->GetSetting(SETTINGS_OUTPUT_DIM, dim);
+
if (asking == "true")
{
// display the output dialog box
dim = dlg->getDim();
mGimmick->UpdateSetting(SETTINGS_OUTPUT_ASK, dlg->getAsking());
mGimmick->UpdateSetting(SETTINGS_OUTPUT_DIM, dim);
- }
- else
- {
+ } else {
return;
}
- }
- else
- {
+ } else {
}
sscanf(dim.c_str(),"%d",&i_dim_out);
-
// Next we create the structure for dicom output infos
OutputAttr Oattr;
+//EED 01/09/2014
+ if (i_dim_out==2)
+ {
+ Oattr.mult=true;
+ } // i_dim_out
+
+
Oattr.db = crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()));
if(i_attr.empty())
{
// We don't send informations!
- }
- else if( i_attr.size() == 1 && i_attr.front() == "ALL")
+ } else if( i_attr.size() == 1 && i_attr.front() == "ALL")
{
// we send all database
Oattr.inside.push_back("ALL");
- }
- else if( (i_attr.size() == 1 && i_attr.front() != "ALL")
+ } else if( (i_attr.size() == 1 && i_attr.front() != "ALL")
|| (i_attr.size() >1) )
{
mGimmick->fillVectInfos(i_attr, Oattr);
- }
- else
- {
+ } else {
// nothing
}
void WxGimmickView::OnAddFiles(wxCommandEvent& event)
{
mViewer->StopPlayer();
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
long style = wxOPEN | wxFILE_MUST_EXIST | wxFD_MULTIPLE;
+#else
+ long style = wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_MULTIPLE;
+#endif
+
+
std::string wc("*");
wxFileDialog* FD = new wxFileDialog( 0,
_T("Select file"),
new wxProgressDialog(_T("Adding file(s)"),
_T(""),
1000,
- this,
+// this,
+ NULL,
wxPD_ELAPSED_TIME |
// wxPD_ESTIMATED_TIME |
// wxPD_REMAINING_TIME |
mProgressDialog->Pulse(_T("Updating view..."));
UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
- delete mProgressDialog;
+ killProgress();
DisplayAddSummary();
}
new wxProgressDialog(_T("Adding directory"),
_T(""),
NumberFilesToAdd(dirname,recurse),
- this,
+
+//EED this,
+ NULL,
+
wxPD_ELAPSED_TIME |
wxPD_SMOOTH |
// wxPD_ESTIMATED_TIME |
mProgressDialog->Pulse(_T("Updating view..."));
UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
- delete mProgressDialog;
+ killProgress();
DisplayAddSummary();
}
mViewer->StartPlayer();
{
if (recursive)
{
- nb += NumberFilesToAdd(itr->string(), recursive);
+ nb += NumberFilesToAdd(itr->path().string(), recursive);
}
}
else
bool WxGimmickView::isNeedRecursive(std::string i_name)
{
boost::filesystem::directory_iterator iter(i_name), end_iter;
- bool bfindir = false;
+ //bool bfindir = false;
for(; iter != end_iter; ++iter)
{
if(boost::filesystem::is_directory(*iter))
//=================================================
void WxGimmickView::OnSelectionChange(const std::vector<tree::Node*>& sel, bool isSelection, int selection, bool needProcess)
{
- GimmickDebugMessage(5,
- "WxGimmickView::OnSelectionChange"
- <<std::endl);
+ GimmickDebugMessage(5,"WxGimmickView::OnSelectionChange"<<std::endl);
wxBusyCursor busy;
bool valid=true;
valid= ValidateSelected(NULL,
mSelectionMinDimension,
mSelectionMaxDimension );
- }
- else if(needProcess)
- {
+ } else if(needProcess) {
ResetExtent();
std::vector<tree::Node*>::const_iterator i;
for(i=sel.begin();i!=sel.end()&&valid;++i)
valid= ValidateSelected((*i),
mSelectionMinDimension,
mSelectionMaxDimension );
- }
- }
- else if(isSelection)
- {
+ } // for
+ } else if(isSelection) {
valid= ValidateSelected(sel.front(),
mSelectionMinDimension,
mSelectionMaxDimension );
- }
- else
- {
+ } else {
ResetExtent();
std::vector<tree::Node*>::const_iterator i;
for(i=sel.begin();i!=sel.end()&&valid;++i)
valid= ValidateSelected((*i),
mSelectionMinDimension,
mSelectionMaxDimension );
- }
- }
+ } // for
+ } // if sel.size
mText->SetLabel(crea::std2wx(GetMessage()));
- /*if(valid)
- {
- ReadImageThreaded(sel);
- }
- else
- {
- ClearSelection();
- }*/
- ReadImageThreaded(sel);
+/*
+ if(valid)
+ {
+ ReadImageThreaded(sel);
+ } else {
+ ClearSelection();
+ }
+*/
+
+
+//EED1 2018-08
+//EED1 ReadImageThreaded(sel);
+
}
//==================================================
RequestReading(*iterDown,prio,-1,ph);
// AddEntryToMap(*iterDown);
prio--;
- if (prio == maxprio) break;
- }
- }
- else
- {
+ if (prio == maxprio) { break; }
+ } // for
+ } else {
pointers.clear();
//ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
boost::shared_ptr<ImagePointerHolder> ph(new ImagePointerHolder(GetDefaultImage()));
pointers.push_back(ph);
mViewer->SetImageVector(pointers);
- }
+ } // if
}
//==================================================
//==================================================
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");
}
//=================================================
//=================================================
void WxGimmickView::AddDir(std::string dirName)
{
- mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
+ mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,
+
+//EED this,
+ NULL,
+
+ wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
mCurrentDirectory = crea::std2wx(dirName);
mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),dirName,true);
mProgressDialog->Pulse(_T("Updating view..."));
UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
- delete mProgressDialog;
+ killProgress();
DisplayAddSummary();
}
if (dial->GetReturnCode() == wxID_OK)
{
#if defined(BUILD_BRUKER)
- if (nb->GetSelection()==0)//Selection: Bruker Image Reader
+ if (nb->GetSelection()==0)//Selection: Bruker Image Reader
{
std::string inputDir = crea::wx2std(gimmickTools->getInputDir());
std::string outputDir = crea::wx2std(gimmickTools->getOutputDir());
if (addToDB)
{
std::cout <<"after addToDB" << std::endl;
- mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
+ mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,
+
+//EED this,
+ NULL,
+
+ wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
std::cout <<"after new wxProgressDialog" << std::endl;
mCurrentDirectory = gimmickTools->getOutputDir();
std::cout <<"after gimmickTools->getOutputDir[" <<mCurrentDirectory << std::endl;
std::cout <<"after mProgressDialog->Pulse" << std::endl;
UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
std::cout <<"after UpdateTreeViewLevel" << std::endl;
- delete mProgressDialog;
+ killProgress();
std::cout <<"after delete mProgressDialog" << std::endl;
DisplayAddSummary();
std::cout <<"after dDisplayAddSummary" << std::endl;
new wxProgressDialog(_T("Adding drive"),
_T(""),
1000,
- this,
+
+//EED this,
+ NULL,
+
wxPD_ELAPSED_TIME |
// wxPD_ESTIMATED_TIME |
// wxPD_REMAINING_TIME |
mProgressDialog->Pulse(_T("Updating view..."));
UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
- delete mProgressDialog;
+ killProgress();
DisplayAddSummary();
mViewer->StartPlayer();
}
//========================================================================
void WxGimmickView::CreateEditFieldsDialog(tree::Node* node, std::vector<std::string> names, std::vector<std::string> keys)
{
- wxDialog* dial= new wxDialog (this,-1,crea::std2wx("Edit Fields for node "+node->GetLabel()),wxDefaultPosition, wxSize(350,155));
- wxBoxSizer *siz = new wxBoxSizer(wxVERTICAL);
- WxEditFieldsPanel* ef = new WxEditFieldsPanel(dial, dial, this, node, names, keys);
+ wxDialog *dial= new wxDialog (this,-1,crea::std2wx("Edit Fields for node "+node->GetLabel()),wxDefaultPosition, wxSize(350,155));
+ wxBoxSizer *siz = new wxBoxSizer(wxVERTICAL);
+ WxEditFieldsPanel *ef = new WxEditFieldsPanel(dial, dial, this, node, names, keys);
siz->Add( ef,1,wxGROW ,0);
dial->SetSizer(siz);
new wxProgressDialog(_T("Adding file(s)"),
_T(""),
1000,
- this,
+
+//EED this,
+ NULL,
+
wxPD_ELAPSED_TIME |
// wxPD_ESTIMATED_TIME |
// wxPD_REMAINING_TIME |
mGimmick->AddFiles(storage,i_filenames);
mProgressDialog->Pulse(_T("Updating view..."));
UpdateTreeViewLevel(storage,1);
- delete mProgressDialog;
+ killProgress();
DisplayAddSummary();
}
}
// std::cout << "OnAddProgress "<<mess<<std::endl;
wxString s(wxString::From8BitData(mess));
// std::cout << "Pulse"<<std::endl;
- if (!mProgressDialog->Pulse(s))
- {
- p.SetStop();
- }
+
+ if(mProgressDialog != 0)
+ {
+ if (!mProgressDialog->Pulse(s))
+ {
+ p.SetStop();
+ }
+ }
// std::cout << "OnAddProgress ok"<<std::endl;
}
//=================================================
}
}
+ void WxGimmickView::killProgress()
+ {
+ mProgressDialog->Resume();
+ mProgressDialog->Destroy();
+ mProgressDialog = 0;
+ }
+
//=================================================
//=================================================
git://git.creatis.insa-lyon.fr / creaImageIO.git / blobdiff