wxString lstOptions[2];
- lstOptions[0]="General options";
- lstOptions[1]="Detail options";
- _radioboxBullEyeGenOpt = new wxRadioBox(panel, -1, "General/Detail options", wxDefaultPosition, wxSize(200,45), 2 , lstOptions, 2, wxRA_SPECIFY_COLS);
+ lstOptions[0]=_T("General options");
+ lstOptions[1]=_T("Detail options");
+ _radioboxBullEyeGenOpt = new wxRadioBox(panel, -1, _T("General/Detail options"), wxDefaultPosition, wxSize(200,45), 2 , lstOptions, 2, wxRA_SPECIFY_COLS);
_radioboxBullEyeGenOpt->SetSelection(0);
_spinctrlBullEyeNumOfCrowns = new wxSpinCtrl( panel , -1,_T("B"),wxDefaultPosition, wxSize(40,20) );
inundo = 0;
inredo = 0;
stundoredo = "data/temp";
- mkdir(stundoredo.c_str());
+ char buff[3000]; // hope it's enough!
+ sprintf(buff, "mkdir %s;",stundoredo.c_str());
+ system(buff);
+ //mkdir(stundoredo.c_str());
stundoredo += "/cont";
}
//------------------------------------------------------------------------------------------------------------
void wxContourEventHandler::onSpreadReset( wxCommandEvent& event )
{
- _wxtextctrlSpread->SetValue("");
+ _wxtextctrlSpread->SetValue(_T(""));
_contourPropagation->resetAppend();
}
_contourPropagation->appendContour(&vecX , &vecY , &vecZ);
wxString newstring;
- newstring.Printf("%s %d -",_wxtextctrlSpread->GetValue(), actualSlice );
+ newstring.Printf(_T("%s %d -"),
+ _wxtextctrlSpread->GetValue().c_str(),
+ actualSlice );
_wxtextctrlSpread->SetValue(newstring);
} // if
}
for ( z=(int)minZ ; z<=(int)maxZ ; z++ )
{
porcent = 100.0* (z-minZ)/totalZ;
- tmpString.Printf(" %d %c %d/%d %d", (int)porcent , 37 , (int)(z-minZ+1), (int)totalZ,z );
+ tmpString.Printf( _T(" %d %c %d/%d %d"), (int)porcent , 37 , (int)(z-minZ+1), (int)totalZ,z );
_staticTextSpread->SetLabel(tmpString);
if (_contourPropagation->ifSliceKeyContourExist(z)==false)
} // if addedModel
}// ifSliceKeyContourExist
} // for z
- _staticTextSpread->SetLabel(" ");
+ _staticTextSpread->SetLabel(_T(" "));
//RefreshInterface();
_contourPropagation = new ContourPropagation();
- wxPanel *panel = new wxPanel(parent,-1,wxDefaultPosition, wxDefaultSize,wxNO_BORDER, wxString(""));
+ wxPanel *panel = new wxPanel(parent,-1,wxDefaultPosition, wxDefaultSize,wxNO_BORDER, /*wxString("")*/ _T("") );
wxButton *spreadResetBtn = new wxButton(panel,-1,_T("Reset"),wxDefaultPosition, wxDefaultSize );
wxButton *spreadAddBtn = new wxButton(panel,-1,_T("Add"),wxDefaultPosition, wxDefaultSize);
wxString lstOptions[3];
- lstOptions[0]="A";
- lstOptions[1]="B";
- lstOptions[2]="C";
- _spreadMethodRadiobox = new wxRadioBox(panel, -1, "Method (find ctrl. Points)", wxDefaultPosition, wxDefaultSize, 3 , lstOptions, 3, wxRA_SPECIFY_COLS);
+ lstOptions[0]=_T("A");
+ lstOptions[1]=_T("B");
+ lstOptions[2]=_T("C");
+ _spreadMethodRadiobox = new wxRadioBox(panel, -1, _T("Method (find ctrl. Points)"), wxDefaultPosition, wxDefaultSize, 3 , lstOptions, 3, wxRA_SPECIFY_COLS);
_spreadMethodRadiobox->SetSelection(2);
wxButton *spreadGoBtn = new wxButton(panel,-1,_T("Go"),wxDefaultPosition, wxDefaultSize);
_staticTextSpread = new wxStaticText(panel,-1,_T(" "));
- _wxtextctrlSpread = new wxTextCtrl(panel,-1, "",wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
+ _wxtextctrlSpread = new wxTextCtrl(panel,-1, _T("") ,wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
Connect( spreadResetBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContourEventHandler::onSpreadReset );
for( z=minZ ; z<=maxZ ; z++ )
{
porcent = 100.0* (z-minZ)/totalZ;
- tmpString.Printf(" %d %c %d/%d %d", (int)porcent , 37 , z-minZ+1, (int)totalZ,z );
+ tmpString.Printf(_T(" %d %c %d/%d %d"), (int)porcent , 37 , z-minZ+1, (int)totalZ,z );
_staticTextSegmentation->SetLabel(tmpString);
SegmentationOneSlice( x,y,z );
}
- _staticTextSegmentation->SetLabel(" ");
+ _staticTextSegmentation->SetLabel(_T(" "));
RefreshInterface();
double range[2];
_sceneManager->GetImageDataRange(range);
- wxPanel *panel = new wxPanel(parent,-1);
+ wxPanel *panel = new wxPanel(parent,-1);
wxButton *segmentationOneSliceBtn = new wxButton(panel,-1,_T("Actual slice"), wxDefaultPosition, wxSize(200,35) );
- wxButton *segmentationAllSliceBtn = new wxButton(panel,-1,_T("All slices") ,wxDefaultPosition, wxSize(200,35) );
- _isovalue = new wxSlider(panel, -1, 40 , (int)(range[0]), (int)(range[1]), wxDefaultPosition, wxSize(200,35), wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
- _sampling = new wxSlider(panel, -1, 20 , 4, 50, wxDefaultPosition, wxSize(200,35), wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
+ wxButton *segmentationAllSliceBtn = new wxButton(panel,-1,_T("All slices") ,wxDefaultPosition, wxSize(200,35) );
+ _isovalue = new wxSlider(panel, -1, 40 , (int)(range[0]), (int)(range[1]), wxDefaultPosition, wxSize(200,35), wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
+ _sampling = new wxSlider(panel, -1, 20 , 4, 50, wxDefaultPosition, wxSize(200,35), wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
wxString lstOptions[3];
- lstOptions[0]="A";
- lstOptions[1]="B";
- lstOptions[2]="C";
- methodRadiobox = new wxRadioBox(panel, -1, "Method (find ctrl. Points)", wxDefaultPosition, wxSize(200,45), 3 , lstOptions, 3, wxRA_SPECIFY_COLS);
+ lstOptions[0]=_T("A");
+ lstOptions[1]=_T("B");
+ lstOptions[2]=_T("C");
+ methodRadiobox = new wxRadioBox(panel, -1, _T("Method (find ctrl. Points)"), wxDefaultPosition, wxSize(200,45), 3 , lstOptions, 3, wxRA_SPECIFY_COLS);
methodRadiobox->SetSelection(2);
_staticTextSegmentation = new wxStaticText(panel,-1,_T(" "));
{
if (_TestFrame==NULL)
{
- _contourPropagation = new ContourPropagation();
- _TestFrame = new wxFrame (_theViewPanel, -1,_T(" Test Segmentation "), wxDefaultPosition, wxDefaultSize, wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT );
+ _contourPropagation = new ContourPropagation();
+ _TestFrame = new wxFrame (_theViewPanel, -1,_T(" Test Segmentation "), wxDefaultPosition, wxDefaultSize, wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT );
wxSize sizepanel(200,300);
_TestFrame->SetSize( sizepanel );
- wxPanel *panel = new wxPanel(_TestFrame,-1);
+ wxPanel *panel = new wxPanel(_TestFrame,-1);
wxButton *spreadResetBtn = new wxButton(panel,-1,_T("Reset"),wxDefaultPosition, wxSize(80,35) );
wxButton *spreadAddBtn = new wxButton(panel,-1,_T("Add"),wxDefaultPosition, wxSize(80,35));
wxButton *spreadGoBtn = new wxButton(panel,-1,_T("GoA"),wxDefaultPosition, wxSize(80,35));
- _wxtextctrlTest = new wxTextCtrl(panel,-1, "",wxDefaultPosition, wxSize(200,150), wxTE_MULTILINE );
+ _wxtextctrlTest = new wxTextCtrl(panel,-1, _T(""),wxDefaultPosition, wxSize(200,150), wxTE_MULTILINE );
_TestFrame->SetEventHandler( this );
Connect( spreadResetBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContourEventHandler::onTestReset );
void wxContourEventHandler::onTestReset( wxCommandEvent& event )
{
- _wxtextctrlTest->SetValue("");
+ _wxtextctrlTest->SetValue(_T(""));
_contourPropagation->resetAppend();
}
} // for
_contourPropagation->appendContour(&vecX , &vecY , &vecZ);
+ wxString newstring1( _wxtextctrlTest->GetValue().c_str() , wxConvUTF8);
+ wxString newstring2;
+ newstring2.Printf(_T(" %d -"), actualSlice );
+
wxString newstring;
- newstring.Printf("%s %d -",_wxtextctrlTest->GetValue(), actualSlice );
+ newstring = newstring1+newstring2;
+
+ //newstring.Printf("%s %d -",_wxtextctrlTest->GetValue(), actualSlice );
+
_wxtextctrlTest->SetValue(newstring);
} // if
}
//------------------------------------------------------------------------------------------------------------
void wxContourEventHandler::FillGridWithContoursInformation()
{
- wxString tempString;
_grid->ClearGrid();
_grid->SetColLabelValue(0, _T("A") );
_grid->SetColLabelValue(1, _T("B") );
std::vector<ContourThing**> lstContourThings = this->_modelManager->getOutlinesAtInstant( &instant );
sizeLstContourThings = lstContourThings.size();
- tempString.Printf("%d - %d",z, sizeLstContourThings);
+ wxString tempString;
+ tempString.Printf(_T("%d - %d"),
+ z,
+ sizeLstContourThings);
+
_grid->SetRowLabelValue(z, tempString );
for (ii=0 ; ii<sizeLstContourThings ; ii++)
{
ContourThing **contourthing = lstContourThings[ii];
- tempString = (*contourthing)->getName().c_str() ;
- _grid->SetCellValue( z, ii, tempString );
+ //wxString tempString = (*contourthing)->getName() ; // Doesn't compile. See Creatis Wiki !
+ const wxString tempString2((*contourthing)->getName().c_str(),wxConvUTF8 );
+ _grid->SetCellValue( z, ii, tempString2 );
}
}
for ( z=minZ ; z<=maxZ ; z++ )
{
porcent = 100.0* (z-minZ)/totalZ;
- tmpString.Printf(" %d %c %d/%d %d", (int)porcent , 37 , z-minZ+1, (int)totalZ ,z);
+ tmpString.Printf(_T(" %d %c %d/%d %d"), (int)porcent , 37 , z-minZ+1, (int)totalZ ,z);
_staticTextInformation->SetLabel(tmpString);
//Extraction data from contours of each slice
wxString tempString;
- tempString.Printf("%d - %d",z, sizeLstContourThings);
+ tempString.Printf(_T("%d - %d"),z, sizeLstContourThings);
_grid->SetRowLabelValue(z, tempString );
//EED004
int iContourGroup,sizeContourGroup;
tmpIntA=_numberOfVariablesStatistics*iContourGroup ;
- tempString.Printf("%d",resultSize);
+ tempString.Printf(_T("%d"),resultSize);
_grid->SetCellValue( z, tmpIntA + 0, tempString );
- tempString.Printf("%d",resultGrayRangeCount);
+ tempString.Printf(_T("%d"),resultGrayRangeCount);
_grid->SetCellValue( z, tmpIntA + 1, tempString );
- tempString.Printf("%f",resultMin);
+ tempString.Printf(_T("%f"),resultMin);
_grid->SetCellValue( z, tmpIntA + 2, tempString );
- tempString.Printf("%f",resultMax);
+ tempString.Printf(_T("%f"),resultMax);
_grid->SetCellValue( z, tmpIntA + 3, tempString );
- tempString.Printf("%f",resultAverage);
+ tempString.Printf(_T("%f"),resultAverage);
_grid->SetCellValue( z, tmpIntA + 4, tempString );
- tempString.Printf("%f",resultStandardeviation);
+ tempString.Printf(_T("%f"),resultStandardeviation);
_grid->SetCellValue( z, tmpIntA + 5, tempString );
} // for iContourGroup
{
porcent = 100.0* (z-minZ)/totalZ;
- tmpString.Printf("Saving Values %d %c %d/%d %d", (int)porcent , 37 , z-minZ+1, (int)totalZ ,z);
+ tmpString.Printf(_T("Saving Values %d %c %d/%d %d"), (int)porcent , 37 , z-minZ+1, (int)totalZ ,z);
_staticTextInformation->SetLabel(tmpString);
&pLstValuePosZ);
wxString filename;
- filename.Printf("%s\\%s-slice%d-cont%d.txt",directory.c_str(),namefile.c_str(),z,iContourGroup);
+ filename.Printf(_T("%s\\%s-slice%d-cont%d.txt"),directory.c_str(),namefile.c_str(),z,iContourGroup);
FILE *pFile=fopen((const char *)filename.mb_str(),"w+");
fprintf(pFile,"value \t x \t y \t z\n" );
int iLstValue,sizeLstValue=pLstValue.size();
{
porcent = 100.0* (z-minZ)/totalZ;
- tmpString.Printf("Saving Values %d %c %d/%d %d", (int)porcent , 37 , z-minZ+1, (int)totalZ ,z);
+ tmpString.Printf(_T("Saving Values %d %c %d/%d %d"), (int)porcent , 37 , z-minZ+1, (int)totalZ ,z);
_staticTextInformation->SetLabel(tmpString);
//Extraction data from contours of each slice
wxString filename;
- filename.Printf("%s\\%s-Value.mhd",directory.c_str(),namefile.c_str(),z);
+ filename.Printf(_T("%s\\%s-Value.mhd"),directory.c_str(),namefile.c_str(),z);
// Image Value
vtkMetaImageWriter *writerValueImage = vtkMetaImageWriter::New( );
writerValueImage->Write( );
// Image Mask
- filename.Printf("%s\\%s-Mask.mhd",directory.c_str(),namefile.c_str(),z);
+ filename.Printf(_T("%s\\%s-Mask.mhd"),directory.c_str(),namefile.c_str(),z);
vtkMetaImageWriter *writerMaskImage = vtkMetaImageWriter::New( );
writerMaskImage->SetInput( contourextractdata->GetVtkImageMaskResult() );
writerMaskImage->SetFileName( (const char *)filename.mb_str() );
std::vector<int> tempVector;
_instantPanel->getInstant( tempVector );
_performingOperation->reset();
- _performingOperation->setStartCommand( (char)wxContour_ActionCommandsID::COPY_TOOL );
+ _performingOperation->setStartCommand( /*(char)*/wxContour_ActionCommandsID::COPY_TOOL );
_performingOperation->setStartOperationInstantVector( tempVector );
_performingOperation->setKeyNamesOperationElems( keyNamesVector );
//------------------------------------------------------------------
- void wxContourEventHandler :: executeActionCommand( const char toolCommand )
+ void wxContourEventHandler :: executeActionCommand( const wxString & toolCommand )
{
std::vector<std::string> currentSelection = _sceneManager->getSelectedObjects();
int elementsSelected = currentSelection.size();
inredo = 0;
char str[9000];
- itoa(inundo, str, 10);
+ //itoa(inundo, str, 10);
+ sprintf(str, "%d", inundo);
std::string temp = stundoredo + *str + ".roi";
saveFileWithContours(temp);
inundo++;
char str[9000];
- itoa(inundo, str, 10);
+ //itoa(inundo, str, 10);
+ sprintf(str, "%d", inundo);
std::string temp = stundoredo + *str + ".roi";
void wxContourEventHandler :: onUNDO()
{
if(inundo>0){
+ char str[9000];
if(inredo==0){
- char str[9000];
- itoa(inundo, str, 10);
+
+ //itoa(inundo, str, 10);
+ sprintf(str, "%d",inundo);
std::string temp = stundoredo + *str + ".roi";
saveFileWithContours(temp);
inredo++;
inundo--;
- char str[9000];
- itoa(inundo, str, 10);
-
+
+ //itoa(inundo, str, 10);
+ sprintf(str, "%d",inundo);
std::string temp = stundoredo + *str + ".roi";
vecZ[i] = actualSlice;
} // for
- wxDialog* dialog = new wxDialog(parent, -1, wxString("Snake"));
+ wxDialog* dialog = new wxDialog(parent, -1, _T("Snake"));
wxPanel* panel = new wxPanel(dialog,-1);
- wxStaticText* sttext = new wxStaticText(panel, -1, wxString("Panel para snake"));
+ wxStaticText* sttext = new wxStaticText(panel, -1, _T("Panel para snake"));
dialog->ShowModal();
} // if
git://git.creatis.insa-lyon.fr / creaContours.git / blobdiff