Skip to content

Commit 2f42db5

Browse files
alonsoJASLalonsoJASL
committed
[FI/overlap] First commit - minor changes.
1 parent ecbb299 commit 2f42db5

4 files changed

Lines changed: 28 additions & 76 deletions

File tree

‎Version2.0/Modules/CemrgAppModule/include/CemrgScarAdvanced.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ class MITKCEMRGAPPMODULE_EXPORT CemrgScarAdvanced {
198198
void GetNeighboursAroundPoint2(int pointID, std::vector<std::pair<int, int>>& pointNeighbourAndOrder, int max_order);
199199
void getCorridorPoints(std::vector<vtkSmartPointer<vtkDijkstraGraphGeodesicPath>> allShortestPaths);
200200
bool InsertPointIntoVisitedList2(vtkIdType id, int order);
201-
void CorridorFromPointList(std::vector<int> points);
201+
void CorridorFromPointList(std::vector<int> points, bool circleToStart=true);
202202

203203
// F&I T3
204204
void SetSourceAndTarget(vtkSmartPointer<vtkPolyData> sc, vtkSmartPointer<vtkPolyData> tg);

‎Version2.0/Modules/CemrgAppModule/src/CemrgScarAdvanced.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ void CemrgScarAdvanced::getCorridorPoints(
643643
this->_corridoridarray = pointIDsInCorridor;
644644
}
645645

646-
void CemrgScarAdvanced::CorridorFromPointList(std::vector<int> points) {
646+
void CemrgScarAdvanced::CorridorFromPointList(std::vector<int> points, bool circleToStart) {
647647

648648
vtkSmartPointer<vtkPolyData> poly_data = vtkSmartPointer<vtkPolyData>::New();
649649
poly_data = this->GetSourcePolyData();
@@ -654,16 +654,17 @@ void CemrgScarAdvanced::CorridorFromPointList(std::vector<int> points) {
654654
vtkSmartPointer<vtkDijkstraGraphGeodesicPath> dijkstra = vtkSmartPointer<vtkDijkstraGraphGeodesicPath>::New();
655655
dijkstra->SetInputData(poly_data);
656656

657-
if (this->IsWeighted())
657+
if (this->IsWeighted()){
658658
dijkstra->UseScalarWeightsOn();
659+
}
659660

660661
dijkstra->Update();
661662

662663
if (i<lim-1) {
663664
dijkstra->SetStartVertex(this->_pointidarray[i]);
664665
dijkstra->SetEndVertex(this->_pointidarray[i+1]);
665666
}
666-
else {
667+
else if(circleToStart){
667668
dijkstra->SetStartVertex(this->_pointidarray[i]);
668669
dijkstra->SetEndVertex(this->_pointidarray[0]);
669670
}

‎Version2.0/Plugins/kcl.cemrgapp.scar/src/internal/ScarCalculationsView.cpp‎

Lines changed: 20 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -272,14 +272,7 @@ void ScarCalculationsView::CreateQtPartControl(QWidget *parent) {
272272

273273
if (surface.IsNotNull()) {
274274
QString prodPathOut = ScarCalculationsView::advdir + mitk::IOUtil::GetDirectorySeparator();
275-
pickedSeedIds = vtkSmartPointer<vtkIdList>::New();
276-
pickedSeedIds->Initialize();
277-
pickedLineSeeds = vtkSmartPointer<vtkPolyData>::New();
278-
pickedLineSeeds->Initialize();
279-
pickedLineSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
280-
pickedCutterSeeds = vtkSmartPointer<vtkPolyData>::New();
281-
pickedCutterSeeds->Initialize();
282-
pickedCutterSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
275+
InitialisePickerObjects();
283276

284277
csadv = std::unique_ptr<CemrgScarAdvanced>(new CemrgScarAdvanced());
285278
outprefix = "pre";
@@ -424,14 +417,7 @@ void ScarCalculationsView::KeyCallBackFunc(
424417
self->renderer->RemoveAllViewProps();
425418
self->dijkstraActors.clear();
426419
self->pickedSeedLabels.clear();
427-
self->pickedSeedIds = vtkSmartPointer<vtkIdList>::New();
428-
self->pickedSeedIds->Initialize();
429-
self->pickedLineSeeds = vtkSmartPointer<vtkPolyData>::New();
430-
self->pickedLineSeeds->Initialize();
431-
self->pickedLineSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
432-
self->pickedCutterSeeds = vtkSmartPointer<vtkPolyData>::New();
433-
self->pickedCutterSeeds->Initialize();
434-
self->pickedCutterSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
420+
self->InitialisePickerObjects();
435421

436422
self->csadv->ResetValues();
437423
self->Visualiser();
@@ -611,14 +597,7 @@ void ScarCalculationsView::CtrlPrePostSelection(const QString& text) {
611597
renderer->RemoveAllViewProps();
612598
dijkstraActors.clear();
613599
pickedSeedLabels.clear();
614-
pickedSeedIds = vtkSmartPointer<vtkIdList>::New();
615-
pickedSeedIds->Initialize();
616-
pickedLineSeeds = vtkSmartPointer<vtkPolyData>::New();
617-
pickedLineSeeds->Initialize();
618-
pickedLineSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
619-
pickedCutterSeeds = vtkSmartPointer<vtkPolyData>::New();
620-
pickedCutterSeeds->Initialize();
621-
pickedCutterSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
600+
InitialisePickerObjects();
622601

623602
csadv->ResetValues();
624603
csadv->SetFillThreshold(thres);
@@ -663,14 +642,7 @@ void ScarCalculationsView::EditThreshold() {
663642
renderer->RemoveAllViewProps();
664643
dijkstraActors.clear();
665644
pickedSeedLabels.clear();
666-
pickedSeedIds = vtkSmartPointer<vtkIdList>::New();
667-
pickedSeedIds->Initialize();
668-
pickedLineSeeds = vtkSmartPointer<vtkPolyData>::New();
669-
pickedLineSeeds->Initialize();
670-
pickedLineSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
671-
pickedCutterSeeds = vtkSmartPointer<vtkPolyData>::New();
672-
pickedCutterSeeds->Initialize();
673-
pickedCutterSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
645+
InitialisePickerObjects();
674646

675647
csadv->ResetValues();
676648
BinVisualiser();
@@ -706,14 +678,7 @@ void ScarCalculationsView::SetNewThreshold(const QString& text) {
706678
renderer->RemoveAllViewProps();
707679
dijkstraActors.clear();
708680
pickedSeedLabels.clear();
709-
pickedSeedIds = vtkSmartPointer<vtkIdList>::New();
710-
pickedSeedIds->Initialize();
711-
pickedLineSeeds = vtkSmartPointer<vtkPolyData>::New();
712-
pickedLineSeeds->Initialize();
713-
pickedLineSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
714-
pickedCutterSeeds = vtkSmartPointer<vtkPolyData>::New();
715-
pickedCutterSeeds->Initialize();
716-
pickedCutterSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
681+
InitialisePickerObjects();
717682

718683
csadv->ResetValues();
719684
BinVisualiser();
@@ -763,14 +728,7 @@ void ScarCalculationsView::SaveNewThreshold() {
763728
renderer->RemoveAllViewProps();
764729
dijkstraActors.clear();
765730
pickedSeedLabels.clear();
766-
pickedSeedIds = vtkSmartPointer<vtkIdList>::New();
767-
pickedSeedIds->Initialize();
768-
pickedLineSeeds = vtkSmartPointer<vtkPolyData>::New();
769-
pickedLineSeeds->Initialize();
770-
pickedLineSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
771-
pickedCutterSeeds = vtkSmartPointer<vtkPolyData>::New();
772-
pickedCutterSeeds->Initialize();
773-
pickedCutterSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
731+
InitialisePickerObjects();
774732

775733
csadv->ResetValues();
776734
csadv->SetFillThreshold(thres);
@@ -831,14 +789,7 @@ void ScarCalculationsView::CancelThresholdEdit() {
831789
renderer->RemoveAllViewProps();
832790
dijkstraActors.clear();
833791
pickedSeedLabels.clear();
834-
pickedSeedIds = vtkSmartPointer<vtkIdList>::New();
835-
pickedSeedIds->Initialize();
836-
pickedLineSeeds = vtkSmartPointer<vtkPolyData>::New();
837-
pickedLineSeeds->Initialize();
838-
pickedLineSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
839-
pickedCutterSeeds = vtkSmartPointer<vtkPolyData>::New();
840-
pickedCutterSeeds->Initialize();
841-
pickedCutterSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
792+
InitialisePickerObjects();
842793

843794
csadv->ResetValues();
844795
csadv->SetFillThreshold(thres);
@@ -1006,14 +957,7 @@ void ScarCalculationsView::GapMeasurementVisualisation(const QString& text) {
1006957
renderer->RemoveAllViewProps();
1007958
dijkstraActors.clear();
1008959
pickedSeedLabels.clear();
1009-
pickedSeedIds = vtkSmartPointer<vtkIdList>::New();
1010-
pickedSeedIds->Initialize();
1011-
pickedLineSeeds = vtkSmartPointer<vtkPolyData>::New();
1012-
pickedLineSeeds->Initialize();
1013-
pickedLineSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
1014-
pickedCutterSeeds = vtkSmartPointer<vtkPolyData>::New();
1015-
pickedCutterSeeds->Initialize();
1016-
pickedCutterSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
960+
InitialisePickerObjects();
1017961

1018962
csadv->ResetValues();
1019963
BinVisualiser();
@@ -1109,14 +1053,7 @@ void ScarCalculationsView::BeforeAndAfterCompVisualisation() {
11091053
renderer->RemoveAllViewProps();
11101054
dijkstraActors.clear();
11111055
pickedSeedLabels.clear();
1112-
pickedSeedIds = vtkSmartPointer<vtkIdList>::New();
1113-
pickedSeedIds->Initialize();
1114-
pickedLineSeeds = vtkSmartPointer<vtkPolyData>::New();
1115-
pickedLineSeeds->Initialize();
1116-
pickedLineSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
1117-
pickedCutterSeeds = vtkSmartPointer<vtkPolyData>::New();
1118-
pickedCutterSeeds->Initialize();
1119-
pickedCutterSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
1056+
InitialisePickerObjects();
11201057

11211058
csadv->ResetValues();
11221059
BinVisualiser();
@@ -1226,3 +1163,14 @@ void ScarCalculationsView::CopyScalarValues() {
12261163
csadv->SetSourceAndTarget(_source->GetVtkPolyData(), _target->GetVtkPolyData());
12271164
csadv->TransformSource2Target();
12281165
}
1166+
1167+
void ScarCalculationsView::InitialisePickerObjects(){
1168+
pickedSeedIds = vtkSmartPointer<vtkIdList>::New();
1169+
pickedSeedIds->Initialize();
1170+
pickedLineSeeds = vtkSmartPointer<vtkPolyData>::New();
1171+
pickedLineSeeds->Initialize();
1172+
pickedLineSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
1173+
pickedCutterSeeds = vtkSmartPointer<vtkPolyData>::New();
1174+
pickedCutterSeeds->Initialize();
1175+
pickedCutterSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
1176+
}

‎Version2.0/Plugins/kcl.cemrgapp.scar/src/internal/ScarCalculationsView.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ protected slots:
110110
void Visualiser();
111111
void BinVisualiser();
112112
void PickCallBack();
113+
114+
void InitialisePickerObjects();
115+
113116
static void KeyCallBackFunc(vtkObject*, long unsigned int, void* ClientData, void*);
114117
static QStringList CheckForAdvancedDirectoryFiles();
115118

0 commit comments

Comments
 (0)