sunwen/DCMV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add EndPanEvent to infinitiViewer::raiseEvent, use infinitiViewer::raiseEvent to instead of addObserver mode.

Browse Source
This commit is contained in:
Krad
2022-03-09 15:16:27 +08:00
parent d45d80ea14
commit 03a0b242f0
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/src/base/infinitiViewer.cxx
View File

@@ -800,6 +800,7 @@ void infinitiViewer::InstallPipeline()
this->InteractorStyle->AddObserver(ActorDraggableInteractorStyle::DraggableStyleEvents::SlicedEvent, this, &infinitiViewer::raiseEvent); this->InteractorStyle->AddObserver(ActorDraggableInteractorStyle::DraggableStyleEvents::SlicedEvent, this, &infinitiViewer::raiseEvent);
this->InteractorStyle->AddObserver(ActorDraggableInteractorStyle::DraggableStyleEvents::EndDollyEvent, this, &infinitiViewer::raiseEvent); this->InteractorStyle->AddObserver(ActorDraggableInteractorStyle::DraggableStyleEvents::EndDollyEvent, this, &infinitiViewer::raiseEvent);
this->InteractorStyle->AddObserver(vtkCommand::EventIds::EndWindowLevelEvent, this, &infinitiViewer::raiseEvent); this->InteractorStyle->AddObserver(vtkCommand::EventIds::EndWindowLevelEvent, this, &infinitiViewer::raiseEvent);
this->InteractorStyle->AddObserver(vtkCommand::EventIds::EndPanEvent, this, &infinitiViewer::raiseEvent);
} }
this->Interactor->SetInteractorStyle(this->InteractorStyle); this->Interactor->SetInteractorStyle(this->InteractorStyle);

8
src/src/view/dicomimageview.cpp
View File

@@ -682,12 +682,10 @@ void DicomImageView::CopyFromSeries(SeriesImageSet *series)
//以下是一些转接函数 //以下是一些转接函数
//TODO: 考虑使用connect 替代 AddObserver,避免出现多种事件机制架构 //TODO: 考虑使用connect 替代 AddObserver,避免出现多种事件机制架构
connect(_ImageViewer->GetSignalRaiser(),&vtkSignalRaiser::raiseEvent, this, &DicomImageView::syncEventFunc);
//目前 替换了一部分包括SlicedEvent，EndDollyEvent，EndWindowLevelEvent，EndPanEvent，主要关联到sync
ActorDraggableInteractorStyle *style = _ImageViewer->GetInteractorStyle(); ActorDraggableInteractorStyle *style = _ImageViewer->GetInteractorStyle();
style->AddObserver(vtkCommand::EventIds::EndPanEvent, this, &DicomImageView::syncEventFunc);
//style->AddObserver(vtkCommand::EventIds::EndRotateEvent, this, &DicomImageView::syncEventFunc);
style->AddObserver(vtkCommand::EventIds::EndWindowLevelEvent, this, &DicomImageView::syncEventFunc);
style->AddObserver(ActorDraggableInteractorStyle::DraggableStyleEvents::EndDollyEvent, this, &DicomImageView::syncEventFunc);
style->AddObserver(ActorDraggableInteractorStyle::DraggableStyleEvents::SlicedEvent, this, &DicomImageView::syncEventFunc);
style->AddObserver(vtkCommand::EventIds::WindowLevelEvent, this, &DicomImageView::updateWindowLevelCb); style->AddObserver(vtkCommand::EventIds::WindowLevelEvent, this, &DicomImageView::updateWindowLevelCb);
style->AddObserver(ActorDraggableInteractorStyle::DoubleClickEvent, this, &DicomImageView::doubleclickedEventCb); style->AddObserver(ActorDraggableInteractorStyle::DoubleClickEvent, this, &DicomImageView::doubleclickedEventCb);
style->AddObserver(ActorDraggableInteractorStyle::ScalarOpacityEvent, this, &DicomImageView::scalarEventCb); style->AddObserver(ActorDraggableInteractorStyle::ScalarOpacityEvent, this, &DicomImageView::scalarEventCb);

8
src/src/view/viewcontainerwidget.cpp
View File

@@ -337,18 +337,10 @@ void ViewContainerWidget::emptyCurrentView()
void ViewContainerWidget::Slot_ViewEmpty(DicomImageView *view) void ViewContainerWidget::Slot_ViewEmpty(DicomImageView *view)
{ {
if (view != nullptr) if (view != nullptr)
{ {
view->ResetView(); view->ResetView();
} }
////default notify is true
//if (current_view_ == view)
//{
// setCurrentView(view_list_.first());
//}
} }
void ViewContainerWidget::Slot_DragDropEvent(DicomImageView *view, thumbnailImage* tb) void ViewContainerWidget::Slot_DragDropEvent(DicomImageView *view, thumbnailImage* tb)