From: donadio Date: Tue, 31 Mar 2009 10:06:31 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: EED.02Oct2009~58 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=09430963c5bab30db53169b3c9793a6b0acbaba3;p=creaContours.git *** empty log message *** --- diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx index e202f98..cfa1e02 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx @@ -1620,21 +1620,21 @@ void wxContourMainFrame::referenceLine() viewer2D->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _refLineControl ); _refLineModel->SetCloseContour(false); _refLineControl->CreateNewManualContour(); -/* + double z = _refLineControl->GetZ(); +/* + _refLineControl->AddPoint(50,100,z); + _refLineControl->AddPoint(80,40,z); + _refLineControl->SetCompleteCreation(true); _refLineModel->AddPoint(50,100,z); _refLineModel->AddPoint(80,40,z); - - _refLineControl->AddPoint(50,100,z); - _refLineControl->AddPoint(80,40,z); + _refLineModel->UpdateSpline(); _refLineView->UpdateViewPoint(0); _refLineView->UpdateViewPoint(1); - - _refLineControl->SetCompleteCreation(true); - _refLineControl->SetEditable(true); */ + _refLineControl->SetActive(true); _refLineView->RefreshContour(); } @@ -1644,7 +1644,9 @@ void wxContourMainFrame::refLineHide() { if (_refLineControl!=NULL) { - _refLineView->RemoveCompleteContourActor(); + _refLineView->RemoveCompleteContourActor(); + _refLineControl->SetEditable(false); + _refLineControl->SetActive(false); } } @@ -1663,8 +1665,7 @@ void wxContourMainFrame::refLineShow() _refLineControl->SetModelView( _refLineModel , _refLineView ); viewer2D->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _refLineControl ); _refLineControl->CreateNewManualContour(); - //_refLineControl->SetActive(true); - //_refLineControl->SetEditable(true); + _refLineControl->SetActive(true); _refLineView->RefreshContour(); } } diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx index bab1268..9cde2b4 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx @@ -91,7 +91,6 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) :wxPanel(parent, -1, pos, size, style) { theShowingImage->GetSpacing(last_spacing); - showingVID = theShowingImage; int gapH = 20; int gapV = 10;