X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfToolsPanels.cxx;h=32284ec4b05e0528c3df47c9b400992f9386df50;hb=52396e2d4f1d48b55613aadaca83ad18b90f130a;hp=baa8cd810574b04aa25fa41ab78fd3dabd8e2727;hpb=b467cd27f8b79c7e33d1f44dd4eaaf4030c65151;p=creaContours.git diff --git a/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx index baa8cd8..32284ec 100644 --- a/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx +++ b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx @@ -107,7 +107,6 @@ void interfConfigurationPanel::onBrigthnessColorWindowLevel(wxScrollEvent& event void interfConfigurationPanel::OnInterpolation(wxCommandEvent& event) { - interfMainPanel::getInstance()->onInterpolation(_interpolationCheckBox->GetValue()); @@ -213,7 +212,8 @@ void interfSpreadPanel::setStringSpread(std::string stringtemp){ ** Begin of information panel **/ interfInformationPanel::interfInformationPanel(wxWindow * parent) -: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN) +//: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN) +: wxPanel(parent, -1) { //wxPanel *panel = new wxPanel(parent,-1,wxDefaultPosition, wxDefaultSize,wxTAB_TRAVERSAL); wxString lstOptions[4]; @@ -310,7 +310,7 @@ interfInformationPanel::interfInformationPanel(wxWindow * parent) _grid = new wxGrid( this, wxID_ANY, wxPoint( 0, 0 ), - wxSize( 200, 500 ) ); + wxSize( 200, 250 ) ); int i,gridCol=10,gridRow=sizeZ+2; _grid->CreateGrid( 0, 0 ); @@ -350,13 +350,13 @@ interfInformationPanel::interfInformationPanel(wxWindow * parent) sizer->Add( _mbarrangeSliceInformation , 1, wxALL|wxGROW , 2 ); sizer->Add( new wxStaticText(this ,-1,_T("Gray Range")) , 1, wxALL , 0 ); sizer->Add( _mbarrangeRangeInformation , 1, wxALL|wxGROW , 2 ); - sizer->Add( sizerB , 1, wxEXPAND , 0 ); - sizer->Add( _staticTextInformation , 1, wxEXPAND , 0 ); + sizer->Add( sizerB , 1, wxALL|wxGROW , 0 ); + sizer->Add( _staticTextInformation , 1, wxALL|wxGROW , 0 ); sizer->Add( _grid , 1, wxEXPAND , 0 ); this->SetSizer( sizer ); - this->SetSize( wxSize(1500,1500) ); - //this->SetBackgroundColour( wxColour(100,100,100) ); +// this->SetSize( wxSize(1500,1500) ); +// this->SetBackgroundColour( wxColour(100,100,100) ); this->SetAutoLayout( true ); this->Layout(); //return panel;