Merge branch 'welko-develop' into develop

Author: codeling

core/src/dlg_modalities.cpp

@@ -55,11 +55,7 @@ dlg_modalities::dlg_modalities(iAFast3DMagicLensWidget* magicLensWidget,
 
 	modalities(new iAModalityList),
 	m_magicLensWidget(magicLensWidget),
-	m_mainRenderer(mainRenderer),
-	m_showSlicers(false),
-	m_plane1(nullptr),
-	m_plane2(nullptr),
-	m_plane3(nullptr)
+	m_mainRenderer(mainRenderer)
 {
 	connect(pbAdd,    SIGNAL(clicked()), this, SLOT(AddClicked()));
 	connect(pbRemove, SIGNAL(clicked()), this, SLOT(RemoveClicked()));
@@ -101,7 +97,7 @@ bool CanHaveMultipleChannels(QString const & fileName)
 void dlg_modalities::AddClicked()
 {
 	QString fileName = QFileDialog::getOpenFileName(this, tr("Load"),
-		"",
+		modalities->size() > 0 ? QFileInfo(modalities->Get(0)->GetFileName()).absolutePath() : "",
 		iAIOProvider::GetSupportedLoadFormats() + tr("Volume Stack (*.volstack);;"));
 	if (fileName.isEmpty())
 		return;
@@ -406,9 +402,8 @@ void dlg_modalities::RendererMouseMoved()
 	}
 }
 
-void dlg_modalities::ShowSlicers(bool enabled)
+void dlg_modalities::ShowSlicers(bool enabled, vtkPlane* plane1, vtkPlane* plane2, vtkPlane* plane3)
 {
-	m_showSlicers = enabled;
 	for (int i = 0; i < modalities->size(); ++i)
 	{
 		QSharedPointer<iAVolumeRenderer> renderer = modalities->Get(i)->GetRenderer();
@@ -419,7 +414,7 @@ void dlg_modalities::ShowSlicers(bool enabled)
 		}
 		if (enabled)
 		{
-			renderer->SetCuttingPlanes(m_plane1, m_plane2, m_plane3);
+			renderer->SetCuttingPlanes(plane1, plane2, plane3);
 		}
 		else
 		{
@@ -428,13 +423,6 @@ void dlg_modalities::ShowSlicers(bool enabled)
 	}
 }
 
-void dlg_modalities::SetSlicePlanes(vtkPlane* plane1, vtkPlane* plane2, vtkPlane* plane3)
-{
-	m_plane1 = plane1;
-	m_plane2 = plane2;
-	m_plane3 = plane3;
-}
-
 void dlg_modalities::AddModality(vtkSmartPointer<vtkImageData> img, QString const & name)
 {
 	QSharedPointer<iAModality> newModality(new iAModality(name, "", -1, img, iAModality::MainRenderer));

core/src/dlg_modalities.h

@@ -60,8 +60,7 @@ class open_iA_Core_API dlg_modalities : public dlg_modalitiesUI
 	vtkSmartPointer<vtkColorTransferFunction> GetCTF(int modality);
 	vtkSmartPointer<vtkPiecewiseFunction> GetOTF(int modality);
 	void ChangeRenderSettings(iAVolumeSettings const & rs, const bool loadSavedVolumeSettings);
-	void ShowSlicers(bool enabled);
-	void SetSlicePlanes(vtkPlane* plane1, vtkPlane* plane2, vtkPlane* plane3);
+	void ShowSlicers(bool enabled, vtkPlane* plane1, vtkPlane* plane2, vtkPlane* plane3);
 	void AddListItem(QSharedPointer<iAModality> mod);
 	//! initialize a modality's display in renderers
 	void InitDisplay(QSharedPointer<iAModality> mod);
@@ -96,8 +95,6 @@ private slots:
 	QSharedPointer<iAModalityList> modalities;
 	QString m_FileName;
 	iAFast3DMagicLensWidget* m_magicLensWidget;
-	bool m_showSlicers;
-	vtkPlane *m_plane1, *m_plane2, *m_plane3;
 	vtkRenderer* m_mainRenderer;
 
 	void AddToList(QSharedPointer<iAModality> mod);

core/src/iAChannelVisualizationData.h

@@ -78,6 +78,11 @@ class open_iA_Core_API iAChannelSlicerData
 	void SetShowContours( bool show );
 	void SetContourLineParams( double lineWidth, bool dashed = false );
 	// }
+
+	vtkScalarsToColors*					m_ctf;
+	vtkPiecewiseFunction*				m_otf;
+	vtkSmartPointer<vtkLookupTable>		m_lut;
+
 private:
 	iAChannelSlicerData(iAChannelSlicerData const & other);
 
@@ -90,10 +95,10 @@ class open_iA_Core_API iAChannelSlicerData
 	vtkImageMapToColors*				colormapper;
 	bool								m_isInitialized;
 	QColor								color;
-	vtkSmartPointer<vtkLookupTable>		m_lut;
+	//vtkSmartPointer<vtkLookupTable>	m_lut;
 
-	vtkScalarsToColors*					m_ctf;
-	vtkPiecewiseFunction*				m_otf;
+	//vtkScalarsToColors*				m_ctf;
+	//vtkPiecewiseFunction*				m_otf;
 	QString                             m_name;};
 
 

core/src/iAModuleInterface.cpp

@@ -193,7 +193,7 @@ bool iAModuleInterface::AttachToMdiChild( MdiChild * child )
 		connect ( attachment, SIGNAL( detach() ), this, SLOT (detach() ) );
 	}
 	catch( itk::ExceptionObject &excep )
-	{
+	{  // check why we catch an ITK exception here! in the attachment initialization, no ITK filters should be called...
 		child->addMsg( tr("%1 in File %2, Line %3").arg( excep.GetDescription() )
 			.arg( excep.GetFile() )
 			.arg( excep.GetLine() ) );

core/src/iASettings.cpp

@@ -20,6 +20,7 @@
 * ************************************************************************************/
 #include "iASettings.h"
 
+#include <iAConsole.h>
 #include "dlg_transfer.h"
 
 #include <vtkPiecewiseFunction.h>
@@ -75,7 +76,10 @@ void iASettings::LoadTransferFunction(QDomNode const & functionsNode, iATransfer
 {
 	QDomNode transferNode = functionsNode.namedItem("transfer");
 	if (!transferNode.isElement())
+	{
+		DEBUG_LOG("'transfer' node not found in given XML file, aborting load of transfer function!");
 		return;
+	}
 	transferFunction->getOpacityFunction()->RemoveAllPoints();
 	transferFunction->getColorFunction()->RemoveAllPoints();
 	QDomNodeList list = transferNode.childNodes();

core/src/iASlicer.h

@@ -108,7 +108,6 @@ class open_iA_Core_API iASlicer : public QObject
 	void setPositionMarkerCenter(double x, double y);
 	void SetROIVisible(bool isVisible);
 	void UpdateROI(int const roi[6]);
-	void update();
 	void saveMovie(QString& fileName, int qual = 2);
 	void saveImageStack();
 	vtkImageReslice * GetReslicer() const;
@@ -147,6 +146,7 @@ public slots:
 	void rotateSlice( double angle );
 	void setSlabThickness(int thickness);
 	void setSlabCompositeMode(int compositeMode);
+	void update();
 
 protected:
 	iASlicerData * m_data;

core/src/iAVolumeRenderer.cpp

@@ -108,6 +108,11 @@ const iAVolumeSettings& iAVolumeRenderer::getVolumeSettings() const
 	return m_VolSettings;
 }
 
+bool iAVolumeRenderer::isRendered() const
+{
+	return currentRenderer;
+}
+
 void iAVolumeRenderer::ApplySettings(iAVolumeSettings const & vs)
 {
 	if (m_isFlat)

core/src/iAVolumeRenderer.h

@@ -70,6 +70,7 @@ class open_iA_Core_API iAVolumeRenderer
 	void SetMovable(bool movable);
 
 	const iAVolumeSettings& getVolumeSettings() const;
+	bool isRendered() const;
 private:
 	iAVolumeSettings m_VolSettings;
 	vtkSmartPointer<vtkVolume> volume;

core/src/mainwindow.cpp

@@ -1655,6 +1655,10 @@ void MainWindow::updateMenus()
 			actionDeletePoint->setEnabled(true);
 			actionChangeColor->setEnabled(true);
 		}
+		// set current application working directory to the one where the file is in (as default directory, e.g. for file open)
+		// see also MdiChild::setCurrentFile
+		if (!activeMdiChild()->getFilePath().isEmpty())
+			QDir::setCurrent(activeMdiChild()->getFilePath());
 		//??if (activeMdiChild())
 		//	histogramToolbar->setEnabled(activeMdiChild()->getTabIndex() == 1 && !activeMdiChild()->isMaximized());
 	}

core/src/mdichild.cpp

@@ -163,7 +163,6 @@ MdiChild::MdiChild(MainWindow * mainWnd, iAPreferences const & prefs, bool unsav
 	QSharedPointer<iAModalityList> modList(new iAModalityList);
 	SetModalities(modList);
 	splitDockWidget(logs, m_dlgModalities, Qt::Horizontal);
-	m_dlgModalities->SetSlicePlanes(Raycaster->getPlane1(), Raycaster->getPlane2(), Raycaster->getPlane3());
 	ApplyViewerPreferences();
 	imgProperty = nullptr;
 	imgProfile = nullptr;
@@ -1580,7 +1579,7 @@ void MdiChild::ApplyVolumeSettings(const bool loadSavedVolumeSettings)
 {
 	for (int i = 0; i < 3; ++i)
 		slicer[i]->widget()->showBorder(renderSettings.ShowSlicePlanes);
-	m_dlgModalities->ShowSlicers(renderSettings.ShowSlicers);
+	m_dlgModalities->ShowSlicers(renderSettings.ShowSlicers, Raycaster->getPlane1(), Raycaster->getPlane2(), Raycaster->getPlane3());
 	m_dlgModalities->ChangeRenderSettings(volumeSettings, loadSavedVolumeSettings);
 }
 
@@ -1730,6 +1729,7 @@ bool MdiChild::editSlicerSettings(iASlicerSettings const & slicerSettings)
 	setupSlicers(slicerSettings, false);
 	for (int s = 0; s<3; ++s)
 		slicer[s]->show();
+	emit slicerSettingsChanged();
 	return true;
 }
 
@@ -2286,6 +2286,8 @@ void MdiChild::setCurrentFile(const QString &f)
 	fileInfo.setFile(f);
 	curFile = f;
 	path = fileInfo.canonicalPath();
+	if (isActiveWindow())
+		QDir::setCurrent(path);  // set current application working directory to the one where the file is in (as default directory, e.g. for file open)
 	isUntitled = f.isEmpty();
 	setWindowTitle(userFriendlyCurrentFile() + "[*]");
 }