#include <vtkImageMapToWindowLevelColors.h>
-
//------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
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]= wxString("General options",wxConvUTF8);
+ lstOptions[1]= wxString("Detail options",wxConvUTF8);
+ _radioboxBullEyeGenOpt = new wxRadioBox(panel, -1, wxString("General/Detail options",wxConvUTF8), 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";
+#if(WIN32)
mkdir(stundoredo.c_str());
+#else
+ mkdir(stundoredo.c_str(),755);
+#endif
stundoredo += "/cont";
}
//------------------------------------------------------------------------------------------------------------
else
{
dataConcept = _instantPanel->getLastConceptData();
- if( dataConcept->getName().compare( _theViewPanel->getVerticalConceptName() ) )
+ if( dataConcept->getName().compare( _theViewPanel->getVerticalConceptName() ) == 0)
{
_theViewPanel->setActualVertical( dataConcept->getActualValue());
//_theViewPanel->setVerticalConcept( dataConcept->getName(), dataConcept->getMinShowedValue()/*dataConcept->getMinValue()*/, /*dataConcept->getMaxValue()*/ dataConcept->getMaxShowedValue(), dataConcept->getMinShowedValue(), dataConcept->getMaxShowedValue(), dataConcept->getActualValue());
}
- else if( dataConcept->getName().compare( _theViewPanel->getHorizontalConceptName() ) || _instantPanel->getIfConceptCheckedAt( dataConcept->getName(), 0 ) )
+ else if( dataConcept->getName().compare( _theViewPanel->getHorizontalConceptName() ) == 0|| _instantPanel->getIfConceptCheckedAt( dataConcept->getName(), 0 ) )
{
_theViewPanel->setHorizontalConcept( dataConcept->getName(), dataConcept->getMinShowedValue()/*dataConcept->getMinValue()*/, /*dataConcept->getMaxValue()*/ dataConcept->getMaxShowedValue(), dataConcept->getMinShowedValue(), dataConcept->getMaxShowedValue(), dataConcept->getActualValue());
}
void wxContourEventHandler::onSpreadReset( wxCommandEvent& event )
{
- _wxtextctrlSpread->SetValue("");
+ _wxtextctrlSpread->SetValue(wxString("",wxConvUTF8));
_contourPropagation->resetAppend();
}
_contourPropagation->appendContour(&vecX , &vecY , &vecZ);
wxString newstring;
- newstring.Printf("%s %d -",_wxtextctrlSpread->GetValue(), actualSlice );
+ //newstring.Printf("%s %d -",_wxtextctrlSpread->GetValue(), actualSlice );
+ newstring.append(wxString(_wxtextctrlSpread->GetValue(),wxConvUTF8));
+ newstring.append(wxString(" ",wxConvUTF8));
+ newstring.append(wxString(intToString(actualSlice).c_str(),wxConvUTF8));
_wxtextctrlSpread->SetValue(newstring);
} // if
}
+
+
//------------------------------------------------------------------------------------------------------------
void wxContourEventHandler::onSpreadGo( wxCommandEvent& event )
{
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 );
+ int numero = (int)(z-minZ+1)/(int)totalZ;
+ std::string stringtemp = " "+intToString(porcent)+"% "+intToString(numero)+" "+intToString(z);
+ tmpString.Append(wxString(stringtemp.c_str(),wxConvUTF8));
+
+ //tmpString.Printf(" %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(wxString(" ",wxConvUTF8));
//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("",wxConvUTF8));
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();
_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(" "));
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();
}
_contourPropagation->appendContour(&vecX , &vecY , &vecZ);
wxString newstring;
- newstring.Printf("%s %d -",_wxtextctrlTest->GetValue(), actualSlice );
+ newstring.append(_wxtextctrlTest->GetValue());
+ newstring.append(_T(" "));
+ newstring.append(wxString(intToString(actualSlice).c_str(),wxConvUTF8));
+ //newstring.Printf(_T("%s %d -"),, );
+ newstring.append(_T(" -"));
_wxtextctrlTest->SetValue(newstring);
} // if
}
std::vector<ContourThing**> lstContourThings = this->_modelManager->getOutlinesAtInstant( &instant );
sizeLstContourThings = lstContourThings.size();
- tempString.Printf("%d - %d",z, sizeLstContourThings);
+ 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() ;
+ tempString = wxString((*contourthing)->getName().c_str(),wxConvUTF8) ;
_grid->SetCellValue( z, ii, tempString );
}
}
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"));
+ tmpString.Printf(_T(" %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"),directory.c_str());
+ filename.Printf(_T("\\"));
+ filename.Printf(_T("%s"),namefile.c_str());
+ filename.Printf(_T("-slice"));
+ filename.Printf(_T("%d"),z);
+ filename.Printf(_T("-cont"));
+ filename.Printf(_T("%d"),iContourGroup);
+ filename.Printf(_T(".txt"));
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"));
+ 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 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);
+ filename.Printf(_T("%s"),directory.c_str());
+ filename.Printf(_T("\\"));
+ filename.Printf(_T("%s"),namefile.c_str());
+ filename.Printf(_T("-Value.mhd"));
// 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("%s\\%s-Mask.mhd",directory.c_str(),namefile.c_str(),z);
+ filename.Printf(_T("%s"),directory.c_str());
+ filename.Printf(_T("\\"));
+ filename.Printf(_T("%s"),namefile.c_str());
+ filename.Printf(_T("-Mask.mhd"));
vtkMetaImageWriter *writerMaskImage = vtkMetaImageWriter::New( );
writerMaskImage->SetInput( contourextractdata->GetVtkImageMaskResult() );
writerMaskImage->SetFileName( (const char *)filename.mb_str() );
int iTitle,sizeTitle = (maxX / _numberOfVariablesStatistics);
for ( iTitle=0; iTitle<sizeTitle ; iTitle++)
{
- fprintf(pFile,"-- \t %d-Size \t SizeRange \t Min \t Max \t Ave \t StDv \t" , iTitle,tmpString.char_str() );
+ fprintf(pFile,"-- \t %d-Size \t SizeRange \t Min \t Max \t Ave \t StDv \t" , iTitle,tmpString.c_str() );
}
fprintf(pFile,"\n" );
}
//------------------------------------------------------------------------------------------------------------
- void wxContourEventHandler :: deleteContours( std::vector<std::string> & keyNamesVector )
+ void wxContourEventHandler :: deleteContours( std::vector<std::string> keyNamesVector )
{
int i,size=keyNamesVector.size();
for (i=0;i<size;i++)
_instantPanel = theInstantChooserPanel;
_instantPanel->setWxEventHandler( this );
- Connect( _instantPanel->GetId(), wxINSTANT_CHOOSER_CHANGE, (wxObjectEventFunction) (wxCommandEventFunction) &wxContourEventHandler::onChangeInstant );
+ //Connect( _instantPanel->GetId(), wxINSTANT_CHOOSER_CHANGE, (wxObjectEventFunction) (wxCommandEventFunction) &wxContourEventHandler::onChangeInstant );
std::vector<int> vect;
_instantPanel->getInstant( vect );
//JCP 20-10-08 Undo redo implementation
saveState();
//JCP 20-10-08 Undo redo implementation
- deleteContours( _sceneManager->GetlstContoursNameActualSlice() );
+ deleteContours( (std::vector<std::string>)_sceneManager->GetlstContoursNameActualSlice() );
}
return panel;*/
- wxPanel *panel = new wxPanel(parent,-1,wxDefaultPosition, wxDefaultSize,wxNO_BORDER, wxString(""));
+ wxPanel *panel = new wxPanel(parent,-1,wxDefaultPosition, wxDefaultSize,wxNO_BORDER, wxString(_T("")));
_withOfContourLine = new wxSlider(panel, -1, 1 , 1, 10, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
double range[2];
inredo = 0;
- char str[9000];
- itoa(inundo, str, 10);
+ //char str[9000];
+ //itoa(inundo, str, 10);
+ std::string str = intToString(inundo);
- std::string temp = stundoredo + *str + ".roi";
+
+ std::string temp = stundoredo + str + ".roi";
saveFileWithContours(temp);
inundo++;
inredo--;
inundo++;
- char str[9000];
- itoa(inundo, str, 10);
+ //char str[9000];
+ //itoa(inundo, str, 10);
+ std::string str = intToString(inundo);
- std::string temp = stundoredo + *str + ".roi";
+ std::string temp = stundoredo + str + ".roi";
loadState(temp);
if(inundo>0){
if(inredo==0){
- char str[9000];
- itoa(inundo, str, 10);
+ //char str[9000];
+ //itoa(inundo, str, 10);
+ std::string str = intToString(inundo);
- std::string temp = stundoredo + *str + ".roi";
+ std::string temp = stundoredo + str + ".roi";
saveFileWithContours(temp);
}
inredo++;
inundo--;
- char str[9000];
- itoa(inundo, str, 10);
+ //char str[9000];
+ //itoa(inundo, str, 10);
+ std::string str = intToString(inundo);
- std::string temp = stundoredo + *str + ".roi";
+ std::string temp = stundoredo + str + ".roi";
loadState(temp);
}
{
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"));
+ 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
_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(" "));
vecZ[i] = actualSlice;
} // for
- wxDialog* dialog = new wxDialog(parent, -1, wxString("Snake"));
+ wxDialog* dialog = new wxDialog(parent, -1, wxString(_T("Snake")));
wxPanel* panel = new wxPanel(dialog,-1);
- wxStaticText* sttext = new wxStaticText(panel, -1, wxString("Panel para snake"));
+ wxStaticText* sttext = new wxStaticText(panel, -1, wxString(_T("Panel para snake")));
dialog->ShowModal();
} // if
_InformationContourFrame->Show(false);
}
}
+
+ std::string wxContourEventHandler::intToString(int num){
+ std::string result;
+ if(num == 0){
+ result = "0";
+ }else{
+ int k=num;
+ while (k > 0){
+ char temp = k % 10 + 48;
+ k = k / 10;
+ result = temp + result;
+ }
+ }
+ return result;
+ }
//JCP 21 - 10 - 09
git://git.creatis.insa-lyon.fr / creaContours.git / blobdiff