Skip to content

GitLab

Commit 8a7d4412 authored by Emmanuel Promayon's avatar Emmanuel Promayon
Browse files

Merge branch 'feature/update-api-4.x' into 'develop' 

Feature/update api 4.x

See merge request !10
parents 78cc2892 43b2fef2
Hide whitespace changes
Inline Side-by-side
sdk/actions/application/OpenAction.cpp
View file @ 8a7d4412
......@@ -72,7 +72,7 @@ Action::ApplyStatus OpenAction::apply() {
filter += QString ("All known files (*.") + ExtensionManager::getFileExtensions().join(" *.") + ");;";
// add the extension of loaded and valid plugins
foreach(ComponentExtension * ext, ExtensionManager::getComponentExtensions().values().toSet()) {
foreach(ComponentExtension * ext, ExtensionManager::getComponentExtensionsList()) {
filter += ext->getName() + " (*." + ext->getFileExtensions().join(" *.") + ");;";
}
......
sdk/actions/application/OpenFile.cpp
View file @ 8a7d4412
......@@ -126,15 +126,14 @@ Action::ApplyStatus OpenFile::apply() {
// --------------- selectFile -------------------
void OpenFile::selectFile() {
// filter: extension of known file format
// filter: extension of known file format, example: (*.xml *.vtk *.wrl)
QString filter;
QString allKnownFiles; //example: (*.xml *.vtk *.wrl)
// first item = all known files
filter += QString ("All known files (*.") + ExtensionManager::getFileExtensions().join(" *.") + ");;";
// add the extension of loaded and valid plugins
foreach(ComponentExtension * ext, ExtensionManager::getComponentExtensions().values().toSet()) {
foreach(ComponentExtension * ext, ExtensionManager::getComponentExtensionsList()) {
filter += ext->getName() + " (*." + ext->getFileExtensions().join(" *.") + ");;";
}
......
sdk/actions/application/SaveAsAction.cpp
View file @ 8a7d4412
......@@ -91,7 +91,7 @@ Action::ApplyStatus SaveAsAction::apply() {
const ImageComponent* compAsImg = dynamic_cast<const ImageComponent*> ( comp );
if (compAsImg) {
foreach (ComponentExtension * pl, ExtensionManager::getComponentExtensions().values().toSet()) {
foreach (ComponentExtension * pl, ExtensionManager::getComponentExtensionsList()) {
const ImageComponentExtension* imageExt = dynamic_cast<const ImageComponentExtension*> (pl);
if (imageExt) {
......@@ -109,7 +109,7 @@ Action::ApplyStatus SaveAsAction::apply() {
const MeshComponent* compAsMesh = dynamic_cast<const MeshComponent*> ( comp );
if (compAsMesh) {
foreach (ComponentExtension * pl, ExtensionManager::getComponentExtensions().values().toSet()) {
foreach (ComponentExtension * pl, ExtensionManager::getComponentExtensionsList()) {
const ComponentExtension* meshExt = dynamic_cast<const MeshComponentExtension*> (pl);
if (meshExt) {
......
sdk/actions/image/cropvolume/BoxVOI.cpp
View file @ 8a7d4412
......@@ -173,9 +173,10 @@ void BoxVOI::process ( ImageComponent* comp ) {
// Adapt properties of the new volume
double* inputO = inputImage->GetOrigin();
// value - origin in case of origin of an image is not (0,0,0)
resultImage->SetOrigin (std::min ( x1, x2 )*comp->getVoxelSize().x() + inputO[0],
std::min ( y1, y2 )*comp->getVoxelSize().y() + inputO[1],
std::min ( z1, z2 )*comp->getVoxelSize().z() + inputO[2]);
double* spacing = comp->getImageData()->GetSpacing();
resultImage->SetOrigin (std::min ( x1, x2 )*spacing[0] + inputO[0],
std::min ( y1, y2 )*spacing[1] + inputO[1],
std::min ( z1, z2 )*spacing[2] + inputO[2]);
// adapt extent to the new volume
int* dims = resultImage->GetDimensions();
......
sdk/actions/image/multipicking/MultiPickingWidget.cpp
View file @ 8a7d4412
......@@ -182,6 +182,7 @@ void MultiPickingWidget::removePixelFromTable() {
void MultiPickingWidget::removeSeedNumber(int i, int j) {
QVector3D point;
double* spacing = img->getImageData()->GetSpacing();
switch (j) {
case REMOVE_TABLE_INDEX:
pPM->removePixel (i);
......@@ -199,7 +200,7 @@ void MultiPickingWidget::removeSeedNumber(int i, int j) {
break;
case VIEW_TABLE_INDEX:
point = pPM->getPixelIndexList()->at(ui.pointsTableWidget->currentRow());
img->pixelPicked(point.x() * img->getVoxelSize().x(), point.y() * img->getVoxelSize().y(), point.z() * img->getVoxelSize().z(), img->getAxialSlices());//Need here the voxel coordinates (not voxel index, not voxel world coordinates)
img->pixelPicked(point.x() * spacing[0], point.y() * spacing[1], point.z() * spacing[2], img->getAxialSlices());//Need here the voxel coordinates (not voxel index, not voxel world coordinates)
Application::refresh();
break;
default:
......@@ -319,7 +320,8 @@ void MultiPickingWidget::manuallyModified(int i, int j) {
}
else if (ui.indexRadioButton->isChecked()) {
int* imageDims = img->getImageData()->GetDimensions();
QVector3D voxSize = img->getVoxelSize();
double* voxSize = img->getImageData()->GetSpacing();
// Change the pixel index at this row
// 3 possible case, either x, or y or z of one point have been manually changed
// We thus pick this new point
......@@ -330,15 +332,15 @@ void MultiPickingWidget::manuallyModified(int i, int j) {
// Exceptionnally, we do not make this calculation by image picking and use image voxel size
// to mimick a picking from the axial slice.
double x = iPick * voxSize.x();
double y = jPick * voxSize.y();
double z = kPick * voxSize.z();
double x = iPick * voxSize[0];
double y = jPick * voxSize[1];
double z = kPick * voxSize[2];
// check that this point is within image dimensions
if (((x < 0) || (x > imageDims[0]*voxSize.x())) ||
((y < 0) || (y > imageDims[1]*voxSize.y())) ||
((z < 0) || (z > imageDims[2]*voxSize.z()))) {
if (((x < 0) || (x > imageDims[0]*voxSize[0])) ||
((y < 0) || (y > imageDims[1]*voxSize[1])) ||
((z < 0) || (z > imageDims[2]*voxSize[2]))) {
QString msg = "The point (" + QString::number(x) + ", " + QString::number(y) + ", " + QString::number(z) + "), does not belong to the image " + img->getName() + ". Sorry...";
QMessageBox::warning(this, "Impossible Operation", msg);
......@@ -358,7 +360,8 @@ void MultiPickingWidget::manuallyModified(int i, int j) {
}
else { // Image Coordinates
int* imageDims = img->getImageData()->GetDimensions();
QVector3D voxSize = img->getVoxelSize();
double* voxSize = img->getImageData()->GetSpacing();
// Change the pixel index at this row
// 3 possible case, either x, or y or z of one point have been manually changed
// We thus pick this new point
......@@ -369,9 +372,9 @@ void MultiPickingWidget::manuallyModified(int i, int j) {
// check that this point is within image dimensions
if (((x < 0) || (x > imageDims[0]*voxSize.x())) ||
((y < 0) || (y > imageDims[1]*voxSize.y())) ||
((z < 0) || (z > imageDims[2]*voxSize.z()))) {
if (((x < 0) || (x > imageDims[0]*voxSize[0])) ||
((y < 0) || (y > imageDims[1]*voxSize[1])) ||
((z < 0) || (z > imageDims[2]*voxSize[2]))) {
QString msg = "The point (" + QString::number(x) + ", " + QString::number(y) + ", " + QString::number(z) + "), does not belong to the image " + img->getName() + ". Sorry...";
QMessageBox::warning(this, "Impossible Operation", msg);
......
sdk/actions/image/multipicking/PickedPixelMap.cpp
View file @ 8a7d4412
......@@ -32,7 +32,7 @@
using namespace camitk;
//-------------------------- Constructor ---------------------
PickedPixelMap::PickedPixelMap (ImageComponent* imageComp) {
PickedPixelMap::PickedPixelMap(ImageComponent* imageComp) {
image = imageComp;
pixelIndexList = new QList<QVector3D>();
coordIndexList = new QList<QVector3D>();
......@@ -89,40 +89,6 @@ void PickedPixelMap::addPixel() {
}
}
////------------------------ convertIndexToCoordinates ------------------------
//QVector3D PickedPixelMap::convertIndexToCoordinates (int i, int j, int k) {
// QVector3D realCoord;
//
// // get the size of voxel and the origin
// QVector3D voxelSize = image->getVoxelSize();
//
// // transform pixel index to 3D image coordinates
// // (index pixel) * size of voxel = real coordinates
// realCoord.setX(i*voxelSize.x());
// realCoord.setY(j*voxelSize.y());
// realCoord.setZ(k*voxelSize.z());
//
// return realCoord;
//}
//
//
//QVector3D PickedPixelMap::convertCoordinatesToIndex(double x, double y, double z) {
// QVector3D index;
//
// // get the size of voxel and the origin
// QVector3D voxelSize = image->getVoxelSize();
//
// // transform 3D image coordinates to index
// // real coords = (index + 0.5) * voxelSize
// // index = (real coords) / voxelSize
// index.setX((int)((x / voxelSize.x())+0.5));
// index.setY((int)((y / voxelSize.y())+0.5));
// index.setZ((int)((z / voxelSize.z())+0.5));
//
// return index;
//
//}
//-------------------- getCoordIndexList -----------------------
QList<QVector3D>* PickedPixelMap::getCoordIndexList() {
return coordIndexList;
......@@ -130,42 +96,20 @@ QList<QVector3D>* PickedPixelMap::getCoordIndexList() {
QList<double>* PickedPixelMap::getPixelValueList() {
return pixelValueList;
//
// QList<QVector3D>* coordList = getPixelIndexList();
//
// QList<double> * values = new QList<double>();
//
// for (int i = 0; i < coordList->size(); i++) {
// // NOTE if this was a colored image, this would be the red value (the last parameter
// // of GetScalarComponentAsDouble is the index of the color component)
// double val = image->getImageData()->GetScalarComponentAsDouble(coordList->value(i).x(),
// coordList->value(i).y(),
// coordList->value(i).z(),
// 0);
// values->insert(i, val);
// }
//
// return values;
}
//----------------------- getCoordIndexList --------------------
QList<QVector3D>* PickedPixelMap::getPixelIndexList() {
return pixelIndexList;
// QList<QVector3D> *coord = new QList<QVector3D>();
//
// for (int i = 0; i<pixelIndexList->size(); i++) {
// // For each point in the list of coordinates, indexes are calculated
// coord->insert(i, convertCoordinatesToIndex(pixelIndexList->value(i).x(), pixelIndexList->value(i).y(), pixelIndexList->value(i).z()));
// }
//
// return coord;
}
//----------------------- getRealWorldList --------------------
QList<QVector3D>* PickedPixelMap::getRealWorldList() {
return realCoordList;
}
//-------------- modifyPixel -----------------------------------
void PickedPixelMap::modifyPixel (int index) {
void PickedPixelMap::modifyPixel(int index) {
if ((index >= 0) && (index < pixelIndexList->size())) {
// get the last picked pixel index
int i, j, k;
......@@ -194,24 +138,12 @@ void PickedPixelMap::modifyPixel (int index) {
}
}
// // get the last picked pixel index
// int i, j, k;
// image->getLastPixelPicked (&i, &j, &k);
//
// double x, y, z;
// image->getLastPointPickedImageCoords(&x, &y, &z);
// QVector3D lastPoint = QVector3D(x, y, z);
//
// // check validity
// if (i != -1 && j != -1 && k != -1 && (index >=0 && index< pixelIndexList->size())) {
// pixelIndexList->replace (index,lastPoint);
// }
}
//------------------ removePixel ----------------------------
void PickedPixelMap::removePixel (int index) {
void PickedPixelMap::removePixel(int index) {
if (index >= 0 && index < pixelIndexList->size()) {
pixelIndexList->removeAt (index);
pixelIndexList->removeAt(index);
coordIndexList->removeAt(index);
realCoordList->removeAt(index);
pixelValueList->removeAt(index);
......@@ -219,9 +151,9 @@ void PickedPixelMap::removePixel (int index) {
}
//------------------ savePixelList ---------------------
void PickedPixelMap::savePixelList (QString fileName) {
void PickedPixelMap::savePixelList(QString fileName) {
//-- prepare filename (add .csv if needed)
QFileInfo fileNameInfo (fileName);
QFileInfo fileNameInfo(fileName);
if (fileNameInfo.suffix() != "csv") {
fileName += ".csv";
......@@ -234,7 +166,7 @@ void PickedPixelMap::savePixelList (QString fileName) {
// open the file to write
char separator = ',';
myFile.open (fileName.toStdString().c_str());
myFile.open(fileName.toStdString().c_str());
myFile << "index" << separator << "i" << separator << "j" << separator << "k" << separator << "x" << separator << "y" << separator << "z" << separator << "rx" << separator << "ry" << separator << "rz" << separator << "val" << endl;
if (pixelIndexList != NULL) {
......@@ -259,20 +191,15 @@ void PickedPixelMap::savePixelList (QString fileName) {
myFile << pixelValueList->value(idx) << endl;
}
// for (int i = 0; i < pixelIndexList->size(); i++) {
// coord2pix = convertCoordinatesToIndex(pixelIndexList->value(i).x(), pixelIndexList->value(i).y(), pixelIndexList->value(i).z());
// myFile << i << separator;
//
// myFile << coord2pix.x() << separator << coord2pix.y() << separator << coord2pix.z() << separator;
// myFile << (int)pixelIndexList->value(i).x() << separator << (int)pixelIndexList->value(i).y() << separator << (int)pixelIndexList->value(i).z() << endl;
// }
}
// close after
myFile.close();
}
void PickedPixelMap::openPixelList (QString fileName) {
//----------------- openPixelList -------------------
void PickedPixelMap::openPixelList(QString fileName) {
// Read the input file
QFile file(fileName);
......@@ -299,7 +226,7 @@ void PickedPixelMap::openPixelList (QString fileName) {
QStringList liste = line.split(",");
QString s = liste.at(0);
if ( (s != QString("index")) && (liste.size() == 11)) {
if ((s != QString("index")) && (liste.size() == 11)) {
s = liste.at(1);
i = s.toInt();
s = liste.at(2);
......@@ -323,7 +250,7 @@ void PickedPixelMap::openPixelList (QString fileName) {
//insert the new points in the list
int whereToInsert = pixelIndexList->size();
pixelIndexList->insert (whereToInsert, QVector3D(i, j, k));
pixelIndexList->insert(whereToInsert, QVector3D(i, j, k));
coordIndexList->insert(whereToInsert, QVector3D(x, y, z));
realCoordList->insert(whereToInsert, QVector3D(rx, ry, rz));
pixelValueList->insert(whereToInsert, val);
......@@ -338,38 +265,11 @@ ImageComponent* PickedPixelMap::getImage() {
return image;
}
//----------------- resetPixelList -------------------
void PickedPixelMap::resetPixelList() {
pixelIndexList->clear();
coordIndexList->clear();
realCoordList->clear();
pixelValueList->clear();
// // Empty the list if it is not already empty
// if ((pixelIndexList != NULL) && !(pixelIndexList->isEmpty())) {
// pixelIndexList->erase(pixelIndexList->begin(), pixelIndexList->end());
// }
//
// if (pixelIndexList == NULL)
// pixelIndexList = new QList<QVector3D>();
}
void PickedPixelMap::changePixelIndexList(QList<QVector3D>* liste) {
resetPixelList();
// for (int i = 0; i < liste->size(); i++) {
// QVector3D index = convertIndexToCoordinates(liste->at(i).x(),
// liste->at(i).y(),
// liste->at(i).z());
// pixelIndexList->append(index);
// }
//
}
void PickedPixelMap::changePixelIndexListFromRealCoordinates(QList<QVector3D>* listeOfRealCoords) {
resetPixelList();
// for (int i = 0; i < listeOfRealCoords->size(); i++) {
// pixelIndexList->append(listeOfRealCoords->at(i));
// }
}
sdk/actions/image/multipicking/PickedPixelMap.h
View file @ 8a7d4412
......@@ -101,37 +101,8 @@ public:
/// Empties the pixel list.
void resetPixelList();
// TODO CAMITK_DEPRECATED. This section list all the methods marked as deprecated. They are to be removed in CamiTK 4.0
/** Deprecated.
/// Change pixel list (copy the one given in parameters)
*/
void changePixelIndexList(QList<QVector3D>* liste);
// TODO CAMITK_DEPRECATED. This section list all the methods marked as deprecated. They are to be removed in CamiTK 4.0
/** Deprecated.
/// Change pixel list from a list of real coordinates
*/
void changePixelIndexListFromRealCoordinates(QList<QVector3D>* listeOfRealCoords);
private:
// No more conversion in this class. Conversions are asked to ImageComponent while picking...
// /** conversion pixel index to coordinates
// * @param i the first index pixel to retrieve x in coordinate
// * @param j the second index pixel to retrieve y in coordinate
// * @param k the third index pixel to retrieve z in coordinate
// */
// QVector3D convertIndexToCoordinates (int i, int j, int k);
//
// /** conversion pixel index to coordinates
// * @param x
// * @param y
// * @param z
// */
// QVector3D convertCoordinatesToIndex (double x, double y, double z);
/// this is a list of pixels (as i,j,k indexes in the 3 directions)
QList<QVector3D>* pixelIndexList;
......
sdk/actions/image/showin3d/ShowImageIn3D.cpp
View file @ 8a7d4412
......@@ -53,7 +53,12 @@ ShowImageIn3D::~ShowImageIn3D() {
// --------------- getWidget --------------
QWidget* ShowImageIn3D::getWidget() {
return NULL;
ImageComponent* img = dynamic_cast<ImageComponent*> (getTargets().last());
if (img!=nullptr) {
bool isDisplayedIn3D = img->property("Display Image in 3D Viewer").toBool();
getQAction()->setChecked(isDisplayedIn3D);
}
return nullptr;
}
// --------------- apply -------------------
......@@ -63,7 +68,11 @@ Action::ApplyStatus ShowImageIn3D::apply() {
foreach (Component * comp, getTargets()) {
ImageComponent* img = dynamic_cast<ImageComponent*> (comp);
if (img) {
img->setViewIn3D(! img->getViewIn3D());
bool isDisplayedIn3D = img->property("Display Image in 3D Viewer").toBool();
// togle
isDisplayedIn3D = !isDisplayedIn3D;
img->setProperty("Display Image in 3D Viewer",isDisplayedIn3D);
getQAction()->setChecked(isDisplayedIn3D);
Application::refresh();
}
}
......
sdk/applications/imp/ImpMainWindow.cpp
View file @ 8a7d4412
......@@ -78,7 +78,7 @@ ImpMainWindow::ImpMainWindow() : MainWindow( "imp" ) {
addDockViewer(Qt::LeftDockWidgetArea, Explorer::getInstance());
addDockViewer(Qt::LeftDockWidgetArea, FrameExplorer::getInstance());
addDockViewer(Qt::LeftDockWidgetArea, PropertyExplorer::getInstance());
addDockViewer(Qt::RightDockWidgetArea, ActionViewer::getActionViewer());
addDockViewer(Qt::RightDockWidgetArea, ActionViewer::getInstance());
//Merge Explorer and FrameExplorer viewers in one layout
QDockWidget* dockWidgetExplorer = dockWidgetMap.value(Explorer::getInstance(), NULL);
......@@ -88,8 +88,8 @@ ImpMainWindow::ImpMainWindow() : MainWindow( "imp" ) {
dockWidgetExplorer->raise();
}
showViewer(ActionViewer::getActionViewer(), false);
ActionViewer::getActionViewer()->setSearchPanelVisible(true);
showViewer(ActionViewer::getInstance(), false);
ActionViewer::getInstance()->setSearchPanelVisible(true);
showStatusBar(true);
}
......@@ -140,7 +140,7 @@ void ImpMainWindow::setCentralViewer ( Viewer* theViewer ) {
void ImpMainWindow::initActions() {
//-- Check for action applications
ActionExtension* applicationActionExtension = NULL;
QListIterator<ActionExtension*> it(ExtensionManager::getActionExtensions().values());
QListIterator<ActionExtension*> it(ExtensionManager::getActionExtensionsList());
while (it.hasNext() && applicationActionExtension == NULL) {
ActionExtension* current = it.next();
if (current->getName() == "Application Level Action Extension") {
......@@ -401,7 +401,7 @@ void ImpMainWindow::resetWindows() {
addDockWidget(Qt::LeftDockWidgetArea, it.value() );
it.value()->show();
}
else if (it.value()->widget() == ActionViewer::getActionViewer()->getWidget()) {
else if (it.value()->widget() == ActionViewer::getInstance()->getWidget()) {
removeDockWidget(it.value());
addDockWidget(Qt::RightDockWidgetArea, it.value());
it.value()->show();
......
sdk/cmake/modules/doxygen.conf.in
View file @ 8a7d4412
......@@ -69,7 +69,6 @@ GENERATE_DEPRECATEDLIST= YES
ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES
#obsolete SHOW_DIRECTORIES = NO
SHOW_FILES = YES
SHOW_NAMESPACES = NO
FILE_VERSION_FILTER =
......@@ -142,7 +141,6 @@ HTML_COLORSTYLE_HUE = 0
HTML_COLORSTYLE_SAT = 120
HTML_COLORSTYLE_GAMMA = 100
HTML_TIMESTAMP = NO
#obsolete HTML_ALIGN_MEMBERS = YES
HTML_DYNAMIC_SECTIONS = YES
GENERATE_DOCSET = NO
DOCSET_FEEDNAME = "Doxygen generated docs"
......@@ -169,7 +167,6 @@ ECLIPSE_DOC_ID = org.doxygen.Project
DISABLE_INDEX = NO
ENUM_VALUES_PER_LINE = 4
GENERATE_TREEVIEW = NO
#obsolete USE_INLINE_TREES = NO
TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
FORMULA_FONTSIZE = 10
......
sdk/cmake/modules/macros/camitk/CamiTKApplication.cmake
View file @ 8a7d4412
......@@ -285,17 +285,7 @@ macro(camitk_application)
endif()
endforeach()
endif()
# BACKWARD COMPATIBILITY
# NEEDS_TOOLS option
# TODO CAMITK_DEPRECATED. This option is marked as deprecated. It is to be removed in CamiTK 4.0
# check deprecated (and warn)
# TODO CAMITK_DEPRECATED. This option is marked as deprecated. It is to be removed in CamiTK 4.0
if(${APPLICATION_NAME_CMAKE}_NEEDS_TOOL)
message(WARNING "Warning: ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt: camitk_application macro option NEEDS_TOOL is deprecated, please use NEEDS_CEP_LIBRARIES instead..")
set(CEP_LIBRARIES ${CEP_LIBRARIES} ${${APPLICATION_NAME_CMAKE}_NEEDS_TOOL})
endif()
#########################################################################
......
sdk/cmake/modules/macros/camitk/CamiTKExtension.cmake
View file @ 8a7d4412
......@@ -387,14 +387,6 @@ macro(camitk_extension)
endforeach()
endif()
# BACKWARD COMPATIBILITY
# NEEDS_TOOLS option
# TODO CAMITK_DEPRECATED. This option is marked as deprecated. It is to be removed in CamiTK 4.0
if(${EXTENSION_NAME_CMAKE}_NEEDS_TOOL)
message(WARNING "Warning: ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt: camitk_extension macro option NEEDS_TOOL is deprecated, please use NEEDS_CEP_LIBRARIES instead..")
set(${EXTENSION_NAME_CMAKE}_NEEDS_CEP_LIBRARIES ${${EXTENSION_NAME_CMAKE}_NEEDS_CEP_LIBRARIES} ${${EXTENSION_NAME_CMAKE}_NEEDS_TOOL})
endif()
#########################################################################
......@@ -958,20 +950,5 @@ macro(camitk_extension)
endmacro()
# Old macro to configure a new action to the framework
# Use camitk_extension macro instead
# TODO CAMITK_DEPRECATED. This macro is marked as deprecated. It is to be removed in CamiTK 4.0
macro(action_extension)
message(WARNING "Deprecated macro action_extension detected : please use camitk_extension(ACTION_EXTENSION ...) instead.")
camitk_extension(ACTION_EXTENSION ${ARGN})
endmacro()
# Old macro to configure a new component to the framework
# Use camitk_extension macro instead
# TODO CAMITK_DEPRECATED. This macro is marked as deprecated. It is to be removed in CamiTK 4.0
macro(component_extension)
message(WARNING "Deprecated macro component_extension detected : please use camitk_extension(COMPONENT_EXTENSION ...) instead.")
camitk_extension(COMPONENT_EXTENSION ${ARGN})
endmacro()
# TODO write a viewer_extension macro in CamiTK
sdk/cmake/modules/macros/camitk/CamiTKLibrary.cmake
View file @ 8a7d4412
......@@ -670,13 +670,3 @@ macro(camitk_library)
endif()
endmacro()
# Old macro to configure a tool
# Use camitk_library macro instead
# TODO CAMITK_DEPRECATED. This macro is marked as deprecated. It is to be removed in CamiTK 4.0
macro(camitk_tool)
message(WARNING "Warning: ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt: camitk_tool macro is deprecated, please usecamitk_library(...) instead (use the same parameters).")
# string(REPLACE "NEEDS_TOOL" "NEEDS_CEP_LIBRARIES" OBSOLETE_ARGN ${ARGN})
# message(STATUS "**************************************** ${ARGN} ===>>> ${OBSOLETE_ARGN} ")
camitk_library(${OBSOLETE_ARGN})
endmacro()
sdk/cmake/modules/macros/camitk/test/CamiTKAdditionalActionTest.cmake
View file @ 8a7d4412
......@@ -16,10 +16,10 @@
#! \endcode
#!
#! \param ACTION_EXTENSIONS List of the action extension that will be additionnaly tested with the given
#! test files. Only the action extension name (note the full library/dll name nor
#! the path should be given. This macro checks the existence of the extension
#! test files. Only the action extension name (not the full library/dll name nor
#! the path) should be given. This macro checks the existence of the extension
#! library/dll in the following directories (in this order) : build dir;
#! user install dir and global install dir. The first one found is used for the tests.
#! user install dir and global install dir. The first one that is found is used for the tests.
#! \param TEST_FILES Optional. List of files to use for testing. If not set, then all the files in the
#! testdata dir are used.
#! If provided, only the filenames are required (not the absolute paths) and
......
sdk/libraries/core/Core.cpp
View file @ 8a7d4412
......@@ -185,10 +185,8 @@ const QString Core::getConfig() {
foreach(ActionExtension * ae, allActions) {
QStringList actionNames;
for (int i = 0; i < ae->getActions().size(); i++) {
actionNames << ae->getActions().at(i)->getName(); // + ": " + a->getDescription();
}
installationDirectory = ExtensionManager::getInstallationString(ExtensionManager::getActionExtensions().key(ae));
installationDirectory = ExtensionManager::getInstallationString(ae->getLocation());
actions << " - " + ae->getName() + " " + installationDirectory + ": " + QString::number(ae->getActions().size()) + " actions (" + actionNames.join(", ") + ")"; //+ ae->getDescription();
extensionCount++;
extensionUnitCount += ae->getActions().size();
......@@ -352,45 +350,4 @@ const bool Core::isDebugBuild() {
}
// ----------------------------------------------------------------
//
// OBSOLETE PUBLIC METHODS
//
// TODO CAMITK_DEPRECATED. This section list all the methods marked as deprecated.
// They are to be removed in CamiTK 4.0
// ----------------------------------------------------------------