const wxPoint& pos,
const wxSize& size,
int min_dim,
- int max_dim,
+ int max_dim,
int number_of_threads)
: wxPanel(parent,id,pos,size),
GimmickView(gimmick, number_of_threads),
- mProgressDialog(0),
+ mProgressDialog(NULL),
mConstructed(false)
{
- GimmickDebugMessage(1,"WxGimmickView::WxGimmickView"
- <<std::endl);
+ mViewer = NULL;
+ GimmickDebugMessage(1,"WxGimmickView::WxGimmickView" <<std::endl);
// Sets the current directory to the home dir
mCurrentDirectory = std2wx(gimmick->GetHomeDirectory());
-
// Connect the AddProgress callback
- gimmick->ConnectAddProgressObserver
- ( boost::bind( &WxGimmickView::OnAddProgress , this, _1 ) );
+ gimmick->ConnectAddProgressObserver( boost::bind( &WxGimmickView::OnAddProgress , this, _1 ) );
// Create the list of icons (mIcon)
CreateIconList();
mSplitter = new wxSplitterWindow( this , -1);
// Notebook
- mNotebook = new wxNotebook(mSplitter,
- -1, wxDefaultPosition, wxDefaultSize, 0);
+ mNotebook = new wxNotebook(mSplitter, -1, wxDefaultPosition, wxDefaultSize, 0);
//Gimmick
mGimmick=gimmick;
mText = new wxStaticText(mBottomPanel, wxID_ANY, wxT("Welcome to Gimmick!"));
mbottom_sizer->Add(mText,0,wxGROW,0);
-
-
-
+
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,
- top_minsize);
+ mSplitter->SplitHorizontally( mNotebook, mBottomPanel, top_minsize);
msizer->Add( mSplitter, 1, wxGROW, 0);
- mProgressDialog=0;
+ mProgressDialog=NULL;
SetSizer( msizer );
SetAutoLayout(true);
Layout();
{
// stop the viewer before application exit.
mViewer->StopPlayer();
- GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView"
- <<std::endl);
+ GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView" <<std::endl);
delete mIcon;
delete mViewer;
+ mIcon = NULL;
+ mViewer = NULL;
//if(mListener->IsAlive()) { mListener->Delete(); }
}
//======================================================================
void WxGimmickView::CreateTreeView( TreeHandler* h)
{
std::string name(h->GetTree().GetAttribute("Name"));
- GimmickMessage(2,"Creating the tree view for '"<<
- name<<"'"<<std::endl);
+ GimmickMessage(2,"Creating the tree view for '"<< name<<"'"<<std::endl);
// Create the WxTreeView
WxTreeView* view = new WxTreeView(h, this, mNotebook, -1);
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")
{
// 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();
}
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
}
// 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");
+
}
//=================================================
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
+// ReadImageThreaded(sel);
+
}
//==================================================
///Reads Images (Threaded)
void WxGimmickView::ReadImageThreaded(const std::vector<tree::Node*>& sel)
{
- GimmickDebugMessage(5,
- "ReadImageThreaded"
- <<std::endl);
+ GimmickDebugMessage(5, "ReadImageThreaded" <<std::endl);
int maxprio = GetMaximalPriority();
int prio = maxprio + 2000;
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::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();
}
#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
//========================================================================
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);
wxString s(wxString::From8BitData(mess));
// std::cout << "Pulse"<<std::endl;
- if(mProgressDialog != 0)
+ if(mProgressDialog != NULL)
{
if (!mProgressDialog->Pulse(s))
{
{
mProgressDialog->Resume();
mProgressDialog->Destroy();
- mProgressDialog = 0;
+ mProgressDialog = NULL;
}
//=================================================
git://git.creatis.insa-lyon.fr / creaImageIO.git / blobdiff