Mercurial > hg > orthanc-stone
comparison Framework/Widgets/LayerWidget.cpp @ 379:2308fe0b0b05
refactoring
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 06 Nov 2018 14:41:36 +0100 |
parents | 8eb4fe74000f |
children | ba5ad93f935a |
comparison
equal
deleted
inserted
replaced
378:814fa32e2fcc | 379:2308fe0b0b05 |
---|---|
560 size_t index; | 560 size_t index; |
561 if (LookupLayer(index, message.GetOrigin())) | 561 if (LookupLayer(index, message.GetOrigin())) |
562 { | 562 { |
563 InvalidateLayer(index); | 563 InvalidateLayer(index); |
564 } | 564 } |
565 | |
565 EmitMessage(LayerWidget::ContentChangedMessage(*this)); | 566 EmitMessage(LayerWidget::ContentChangedMessage(*this)); |
566 } | 567 } |
567 | 568 |
568 | 569 |
569 void LayerWidget::OnSliceChanged(const ILayerSource::SliceChangedMessage& message) | 570 void LayerWidget::OnSliceChanged(const ILayerSource::SliceChangedMessage& message) |
570 { | 571 { |
571 if (message.slice_.ContainsPlane(slice_)) | 572 if (message.GetSlice().ContainsPlane(slice_)) |
572 { | 573 { |
573 size_t index; | 574 size_t index; |
574 if (LookupLayer(index, message.GetOrigin())) | 575 if (LookupLayer(index, message.GetOrigin())) |
575 { | 576 { |
576 InvalidateLayer(index); | 577 InvalidateLayer(index); |
577 } | 578 } |
578 } | 579 } |
580 | |
579 EmitMessage(LayerWidget::ContentChangedMessage(*this)); | 581 EmitMessage(LayerWidget::ContentChangedMessage(*this)); |
580 } | 582 } |
581 | 583 |
582 | 584 |
583 void LayerWidget::OnLayerReady(const ILayerSource::LayerReadyMessage& message) | 585 void LayerWidget::OnLayerReady(const ILayerSource::LayerReadyMessage& message) |
584 { | 586 { |
585 size_t index; | 587 size_t index; |
586 if (LookupLayer(index, message.GetOrigin())) | 588 if (LookupLayer(index, message.GetOrigin())) |
587 { | 589 { |
588 if (message.isError_) | 590 if (message.IsError()) |
589 { | 591 { |
590 LOG(ERROR) << "Using error renderer on layer " << index; | 592 LOG(ERROR) << "Using error renderer on layer " << index; |
591 } | 593 } |
592 else | 594 else |
593 { | 595 { |
594 LOG(INFO) << "Renderer ready for layer " << index; | 596 LOG(INFO) << "Renderer ready for layer " << index; |
595 } | 597 } |
596 | 598 |
597 if (message.renderer_.get() != NULL) | 599 // TODO -- REMOVE THIS UGLY STUFF |
598 { | 600 ILayerSource::LayerReadyMessage& ugly = const_cast<ILayerSource::LayerReadyMessage&>(message); |
599 UpdateLayer(index, message.renderer_.release(), message.slice_); | 601 |
600 } | 602 if (ugly.GetRendererRaw().get() != NULL) |
601 else if (message.isError_) | 603 { |
604 UpdateLayer(index, ugly.GetRendererRaw().release(), message.GetSlice()); | |
605 } | |
606 else if (message.IsError()) | |
602 { | 607 { |
603 // TODO | 608 // TODO |
604 //UpdateLayer(index, new SliceOutlineRenderer(slice), slice); | 609 //UpdateLayer(index, new SliceOutlineRenderer(slice), slice); |
605 } | 610 } |
606 } | 611 } |