From e25100962d6ed57fbeaeb2734c067628e77d96e2 Mon Sep 17 00:00:00 2001 From: Krad Date: Tue, 1 Mar 2022 10:53:43 +0800 Subject: [PATCH] New viewer Open logic(only the first time) --- src/include/base/DicomLoader.h | 2 +- src/include/base/infinitiViewer.h | 3 +- src/include/view/viewcontainerwidget.h | 6 +- src/src/QDicomViewer.cpp | 93 ++++++-------------------- src/src/base/DicomLoader.cpp | 5 +- src/src/base/infinitiViewer.cxx | 41 ++++++------ src/src/view/dicomimageview.cpp | 34 ++++++---- src/src/view/viewcontainerwidget.cpp | 24 +++---- 8 files changed, 75 insertions(+), 133 deletions(-) diff --git a/src/include/base/DicomLoader.h b/src/include/base/DicomLoader.h index 7f5b130..6586d17 100644 --- a/src/include/base/DicomLoader.h +++ b/src/include/base/DicomLoader.h @@ -37,7 +37,7 @@ public: * @param dir * @param openMode */ - void preRead(const std::string &dir, SeriesOpenMode openMode); + void preReadNewFile(const std::string &dir, SeriesOpenMode openMode); UniqueIDInfo_t* createUniqueID(const std::string &dicomName, SeriesOpenMode openMode); bool IsDuplicate(UniqueIDInfo_t* unique); diff --git a/src/include/base/infinitiViewer.h b/src/include/base/infinitiViewer.h index 65cddc9..f887a80 100644 --- a/src/include/base/infinitiViewer.h +++ b/src/include/base/infinitiViewer.h @@ -25,6 +25,7 @@ class vtkRenderWindow; class vtkRenderer; class vtkRenderWindowInteractor; +class ExtendMedicalImageProperties; class MeasureStore; #define IN_TEST_MODE @@ -56,7 +57,7 @@ public: } void updateCornerInfo(int index); void updateCornerInfoAll(); - void initCornerInfo(DicomTagInfo_t *pSeriesTags); + void initCornerInfo(ExtendMedicalImageProperties *pSeriesTags); void updateOrienInfo(TransFormType type); void setUpImageViewer(); diff --git a/src/include/view/viewcontainerwidget.h b/src/include/view/viewcontainerwidget.h index 5477c17..dfb1853 100644 --- a/src/include/view/viewcontainerwidget.h +++ b/src/include/view/viewcontainerwidget.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include #include #include "global/QGlobals.h" @@ -28,8 +28,8 @@ public: void setCurrentView(DicomImageView *view); void emptyCurrentView(); - void replaceViewWithSerie(UniqueIDInfo_t* unique_info, DicomTagInfo_t* tag_info, - DicomImageView* curV, SeriesInstance* old = nullptr, bool copy = false); + void replaceViewWithSerie(UniqueIDInfo_t* unique_info, + DicomImageView* curV = nullptr); //fusion void toggleViewWithFusion(); diff --git a/src/src/QDicomViewer.cpp b/src/src/QDicomViewer.cpp index 5588309..71e05a4 100644 --- a/src/src/QDicomViewer.cpp +++ b/src/src/QDicomViewer.cpp @@ -1,4 +1,4 @@ -#include "QDicomViewer.h" +#include "QDicomViewer.h" #include "global/include_all.h" #include "base/SeriesImageSet.h" #include "view/subview/gridpopwidget.h" @@ -1001,97 +1001,42 @@ void QDicomViewer::openDICOMFromPACS(int err, std::string dirName) } } -void QDicomViewer::openAndDrawDICOM(const std::string& dicomName, SeriesOpenMode openMode) -{ +void QDicomViewer::openAndDrawDICOM(const std::string& dicomName, SeriesOpenMode openMode) { - displayThumbnailBar(true); + displayThumbnailBar(true); - DicomLoader* helper = DicomLoader::GetInstance(); + DicomLoader *helper = DicomLoader::GetInstance(); //load image and tag - helper->preRead(dicomName, openMode); + helper->preReadNewFile(dicomName, openMode); - UniqueIDInfo_t* unique = helper->createUniqueID(dicomName, openMode); - if (!unique){ + UniqueIDInfo_t *unique = helper->createUniqueID(dicomName, openMode); + if (!unique) { this->statusBar()->showMessage(tr("Error unique data!")); return; } //判断是否重复，并设置AddDicomType - if (helper->IsDuplicate(unique)) - { - this->statusBar()->showMessage(tr("Already Exists!")); + if (helper->IsDuplicate(unique)) { + this->statusBar()->showMessage(tr("Already Exists!")); - //need to delete UniqueID first - //delete unique; - return; - } + //need to delete UniqueID first + //delete unique; + return; + } //read tag of first series - DicomTagInfo_t* tag_info = helper->createDicomTagsInfo(); + DicomTagInfo_t *tag_info = helper->createDicomTagsInfo(); - //You have to judge AddDicomType first! - AddDicomType type = helper->getAddDicomType(); + //You have to judge AddDicomType first! + AddDicomType type = helper->getAddDicomType(); - DicomImageView* curV = nullptr; - // -// if (type == AddDicomType::OVERRIDE_LEVEL) - // disable override first - if (false) - { - /************************************************************************/ - /* 1.Get multiple relevant windows - * 2.createSeries and addSeries one by one - * 3.Get the return replaced instance,delete it! - /************************************************************************/ - QList view_list; - ui->viewContainer->getRelevantViewList(*unique, view_list); - //only the first conducts raw mode - //the following conducts copy mode - bool copy = false; + ui->viewContainer->replaceViewWithSerie(unique); + //view clicked will notify thumbnailbar update + ui->thumbnailBar->updateThumbnailBar(); - for (DicomImageView* v : view_list) - { - //copy mode - SeriesInstance* series = helper->createSeries(unique, tag_info, v->getRenWin(), copy); - //after series is properly set, call addSeriesInstance - SeriesInstance* to_del = helper->addSeriesInstance(series); - if (false == copy) - { - ui->thumbnailBar->updateThumbnailBar(); - //d_unique = to_del->getUniqueID(); - //d_tag_info = to_del->getDicomTagInfo(); - copy = true; - } - v->setDicomImageView(series); - v->Render(); - // not use deleteSeries here - delete to_del; - //curV = v; - } - //it is time to release memory of series - //delete d_unique; - //delete d_tag_info; - curV = view_list.at(view_list.size() - 1); - ui->viewContainer->setCurrentView(curV); - } - else - { - //only add new data - curV = ui->viewContainer->getCurrentView(); - - SeriesInstance* old = nullptr; - if (curV->HasSeries()) - { - old = curV->getSeriesInstance(); - } - ui->viewContainer->replaceViewWithSerie(unique, tag_info, curV, old); - //view clicked will notify thumbnailbar update - ui->thumbnailBar->updateThumbnailBar(); - ui->viewContainer->setCurrentView(curV); - } } diff --git a/src/src/base/DicomLoader.cpp b/src/src/base/DicomLoader.cpp index b9f58fc..3ae4f0e 100644 --- a/src/src/base/DicomLoader.cpp +++ b/src/src/base/DicomLoader.cpp @@ -306,10 +306,7 @@ SeriesInfo_t* DicomLoader::getSerieInfo(const UniqueIDInfo &uniqueID) } - return nullptr; -} - -void DicomLoader::preRead(const std::string &dir, SeriesOpenMode openMode) +void DicomLoader::preReadNewFile(const std::string &dir, SeriesOpenMode openMode) { DICOMDirectoryHelper DICOMHelper; if (openMode == FILE_OPEN_MODE) diff --git a/src/src/base/infinitiViewer.cxx b/src/src/base/infinitiViewer.cxx index 2fd6948..2c92889 100644 --- a/src/src/base/infinitiViewer.cxx +++ b/src/src/base/infinitiViewer.cxx @@ -22,7 +22,7 @@ #include "MeasureStore.h" #include "vtkTextActor.h" #include "vtkTextProperty.h" -#include "vtkLookupTable.h" +#include "ExtendMedicalImageProperties.h" #include "RulerLegendActor.h" #include "ColorMapReader.h" @@ -1199,44 +1199,41 @@ void infinitiViewer::initTopLeftCornerInfo(const std::string& lbl_ser_num, const m_cornerInfo.ConstAnno[TOP_LEFT].append(ser_num); } -void infinitiViewer::initCornerInfo(DicomTagInfo_t* pSeriesTags) +void infinitiViewer::initCornerInfo(ExtendMedicalImageProperties* pSeries) { + if(pSeries->GetNumberOfWindowLevelPresets()>0) + { + double * wwwl = pSeries->GetNthWindowLevelPreset(0); + m_cornerInfo.win_level = (int)wwwl[1]; + m_cornerInfo.win_width = (int)wwwl[0]; + } - m_cornerInfo.win_level = pSeriesTags->WL; - //m_cornerInfo.ConstAnno[BOTTOM_RIGHT].append("WL "); - //m_cornerInfo.ConstAnno[BOTTOM_RIGHT].append(std::to_string(pSeriesTags->WL)); - //m_cornerInfo.ConstAnno[BOTTOM_RIGHT].append("\n"); - - - m_cornerInfo.win_width = pSeriesTags->WW; - //m_cornerInfo.ConstAnno[BOTTOM_RIGHT].append("WW "); - //m_cornerInfo.ConstAnno[BOTTOM_RIGHT].append(std::to_string(pSeriesTags->WW)); - - - m_cornerInfo.ConstAnno[TOP_LEFT].append(pSeriesTags->lbl_ser_num); + char buffer [sizeof(long)*8+1]; + const char* s = ltoa(pSeries->GetFileNames()->size(), buffer, 10); + m_cornerInfo.ConstAnno[TOP_LEFT].append(buffer); m_cornerInfo.ConstAnno[TOP_LEFT].append(" "); - m_cornerInfo.ConstAnno[TOP_LEFT].append(pSeriesTags->m_SeriesNumber); + m_cornerInfo.ConstAnno[TOP_LEFT].append(pSeries->GetSeriesNumber()); - m_cornerInfo.ConstAnno[TOP_RIGHT].append(pSeriesTags->m_PatientName); + m_cornerInfo.ConstAnno[TOP_RIGHT].append(pSeries->GetPatientName()); m_cornerInfo.ConstAnno[TOP_RIGHT].append("\n"); - m_cornerInfo.ConstAnno[TOP_RIGHT].append(pSeriesTags->m_StudyDescription); + m_cornerInfo.ConstAnno[TOP_RIGHT].append(pSeries->GetStudyDescription()); m_cornerInfo.ConstAnno[TOP_RIGHT].append("\n"); - m_cornerInfo.ConstAnno[TOP_RIGHT].append(pSeriesTags->m_SeriesDescription); + m_cornerInfo.ConstAnno[TOP_RIGHT].append(pSeries->GetSeriesDescription()); m_cornerInfo.ConstAnno[TOP_RIGHT].append("\n"); - m_cornerInfo.ConstAnno[TOP_RIGHT].append(pSeriesTags->m_Institution); + m_cornerInfo.ConstAnno[TOP_RIGHT].append(pSeries->GetInstitutionName()); m_cornerInfo.ConstAnno[TOP_RIGHT].append("\n"); m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("****"); m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("\n"); - m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append(pSeriesTags->m_StudyDescription); + m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append(pSeries->GetStudyDescription()); m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("\n"); - m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append(pSeriesTags->m_SeriesDescription); + m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append(pSeries->GetSeriesDescription()); m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("\n"); m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("****"); m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("\n"); - std::vector* orien_list = orientationHelper::getOrientationStrList(pSeriesTags->m_orientation); + std::vector* orien_list = orientationHelper::getOrientationStrList(""); //currently only adapt to USCT Format if (orien_list) { diff --git a/src/src/view/dicomimageview.cpp b/src/src/view/dicomimageview.cpp index ef4fe25..10bfdca 100644 --- a/src/src/view/dicomimageview.cpp +++ b/src/src/view/dicomimageview.cpp @@ -38,11 +38,8 @@ DicomImageView::DicomImageView(QWidget* parent) _glWidt = new QVTKOpenGLNativeWidget(wrapper); - m_glrenWin = vtkSmartPointer ::New(); - //m_glrenWin->SetOffScreenRendering(1); //for offscreen rendering - _glWidt->SetRenderWindow(m_glrenWin);//set up interacte - //in order to visit in both way! -// _glWidt->SetImageView(this); + m_glrenWin = vtkSmartPointer ::New(); + _glWidt->SetRenderWindow(m_glrenWin);//set up interacte controlLayout->addWidget(_glWidt, 0, 0); @@ -650,8 +647,14 @@ void DicomImageView::removeViewWithMeasure() -void DicomImageView::setDicomImageView(SeriesInstance *series) +void DicomImageView::setDicomImageView(SeriesImageSet *series) { + if (!_ImageViewer){ + + _ImageViewer = infinitiViewer::New(); + _ImageViewer->SetRenderWindow(m_glrenWin); + _ImageViewer->SetupInteractor(m_glrenWin->GetInteractor()); + } //series->setVTKOpenGLNativeWidget(this->_glView); CopyFromSeries(series); //whenver change instance,set scroll value to zero @@ -663,11 +666,7 @@ void DicomImageView::setDicomImageView(SeriesInstance *series) bool DicomImageView::HasSeries() { - if (nullptr == _Series) - { - return false; - } - return true; + return _Series ; } void DicomImageView::Render() { @@ -683,12 +682,19 @@ void DicomImageView::Render() } -void DicomImageView::CopyFromSeries(SeriesInstance *series) +void DicomImageView::CopyFromSeries(SeriesImageSet *series) { _Series = series; - _ImageViewer = series->getImageViewer2(); - //_CornerAnno = _ImageViewer->GetvtkCornerAnnotation(); + _ImageViewer->SetInputData(_Series->GetData()); + //_CornerAnno = _ImageViewer->GetvtkCornerAnnotation(); + _ImageViewer->initCornerInfo(series->GetProperty()); + _ImageViewer->setUpImageViewer(); + + +// vtkCamera* cam = _ImageViewer->GetRenderer()->GetActiveCamera(); +// m_extent = m_image->GetDimensions()[0] * m_pSeriesTags->spacing[0] * 0.5; +// cam->SetParallelScale(m_extent); //create some callbacks //m_syncEventCallback = vtkCallbackCommand::New(); diff --git a/src/src/view/viewcontainerwidget.cpp b/src/src/view/viewcontainerwidget.cpp index 8c3812f..8ada35a 100644 --- a/src/src/view/viewcontainerwidget.cpp +++ b/src/src/view/viewcontainerwidget.cpp @@ -1,4 +1,4 @@ -#include "viewcontainerwidget.h" +#include "viewcontainerwidget.h" #include "thumbnailImage.h" #include "DicomLoader.h" #include @@ -207,11 +207,9 @@ void ViewContainerWidget::Slot_SyncEvent(DicomImageView *view, int interactionMo void ViewContainerWidget::SetInteractionMode(int InteractionMode) { for (auto *v : view_list_) { - QVTKOpenGLNativeWidget*gl_w = v->getGLWidget(); - if (gl_w->GetRenderWindow() && gl_w->GetRenderWindow()->GetInteractor() && v->HasSeries()) + if (v->getImageViewer()) { - infinitiViewer* viewer = v->getSeriesInstance()->getImageViewer2(); - viewer->GetInteractorStyle()->SetInteractionModeFromEnum(InteractionMode); + v->getImageViewer()->GetInteractorStyle()->SetInteractionModeFromEnum(InteractionMode); } } } @@ -397,7 +395,7 @@ void ViewContainerWidget::Slot_DragDropEvent(DicomImageView *view, thumbnailImag { old = view->getSeriesInstance(); } - replaceViewWithSerie(serie_info->unique_info, serie_info->tag_info, view, old, copy); + replaceViewWithSerie(serie_info->unique_info, view); setCurrentView(view); } @@ -416,22 +414,20 @@ void ViewContainerWidget::Slot_ThumbnailClickEvent(thumbnailImage* tb) { old = view->getSeriesInstance(); } - replaceViewWithSerie(serie_info->unique_info, serie_info->tag_info, view, old, copy); + replaceViewWithSerie(serie_info->unique_info, view); setCurrentView(view); } -void ViewContainerWidget::replaceViewWithSerie(UniqueIDInfo_t* unique_info, DicomTagInfo_t* tag_info, DicomImageView* curV, SeriesInstance* old, bool copy) +void ViewContainerWidget::replaceViewWithSerie(UniqueIDInfo_t* unique_info, DicomImageView* curV) { + if (!curV) + { + curV= getCurrentView(); + } curV->removeViewWithFusion(); - DicomLoader *helper = DicomLoader::GetInstance(); curV->setDicomImageView(helper->createSeries(unique_info)); curV->Render(); - //delete old after new instance render - if (old) - { - helper->deleteSeriesInstance(old); - } } void ViewContainerWidget::toggleViewWithFusion()