[med-svn] [fw4spl] 01/01: use good content of the fw4spl's archive
Corentin Desfarges
corentin-guest at moszumanska.debian.org
Tue Oct 7 13:54:29 UTC 2014
This is an automated email from the git hooks/post-receive script.
corentin-guest pushed a commit to branch master
in repository fw4spl.
commit a6c122d46e104e343921f2738b59cd38875b9fc3
Author: Corentin Desfarges <corentin.desfarges at gmail.com>
Date: Tue Oct 7 15:47:55 2014 +0200
use good content of the fw4spl's archive
---
.../uiImageQt/src/uiImageQt/ShowScanEditor.cpp | 4 ++--
.../LeafUI/uiImageQt/src/uiImageQt/WindowLevel.cpp | 8 ++++----
.../src/uiMeasurementQt/editor/Distance.cpp | 2 +-
.../src/uiMedDataQt/widget/SelectorModel.cpp | 4 ++--
.../uiTF/src/uiTF/TransferFunctionEditor.cpp | 12 ++++++------
.../uiVisuQt/src/uiVisuQt/SnapshotEditor.cpp | 2 +-
Bundles/media/CMakeLists.txt | 1 -
CMake/{ => Modules}/FindCAMP.cmake | 0
CMake/{ => Modules}/FindCppUnit.cmake | 0
CMake/{ => Modules}/FindHDF5.cmake | 0
CMake/{ => Modules}/FindIconv.cmake | 0
CMake/{ => Modules}/fw-ITK.cmake | 0
CMake/{ => Modules}/fw-Qt4.cmake | 0
CMake/{ => Modules}/fw-VTK.cmake | 0
CMake/{ => Modules}/fw-VXL.cmake | 0
CMake/{ => Modules}/fw-boost.cmake | 0
CMake/{ => Modules}/fw-python.cmake | 0
CMakeLists.txt | 22 ++++++++++------------
README.md | 5 -----
SrcLib/core/fwRender/CMakeLists.txt | 3 ---
.../fwRuntime/src/io/BundleDescriptorReader.cpp | 6 ++----
.../test/tu/src/AppConfigParametersTest.cpp | 1 -
.../src/fwMDSemanticPatch/PatchLoader.cpp | 15 +++++++--------
launcher/src/ProfileRunner.cpp | 4 +---
24 files changed, 36 insertions(+), 53 deletions(-)
diff --git a/Bundles/LeafUI/uiImageQt/src/uiImageQt/ShowScanEditor.cpp b/Bundles/LeafUI/uiImageQt/src/uiImageQt/ShowScanEditor.cpp
index ab1306f..65ecea3 100644
--- a/Bundles/LeafUI/uiImageQt/src/uiImageQt/ShowScanEditor.cpp
+++ b/Bundles/LeafUI/uiImageQt/src/uiImageQt/ShowScanEditor.cpp
@@ -63,11 +63,11 @@ void ShowScanEditor::starting() throw(::fwTools::Failed)
QWidget* const container = qtContainer->getQtContainer();
SLM_ASSERT("container not instanced", container);
- ::boost::filesystem::path pathImageScan (std::string(LIBSFW4SPL)+"Bundles/media_0-1/sliceShow.png");
+ ::boost::filesystem::path pathImageScan (std::string(SHAREPATH)+"media_0-1/sliceShow.png");
OSLM_ASSERT("Image "<< pathImageScan << "is missing", ::boost::filesystem::exists(pathImageScan));
m_imageShowScan = QIcon(QString::fromStdString(pathImageScan.string()));
- pathImageScan = std::string(LIBSFW4SPL)+"Bundles/media_0-1/sliceHide.png";
+ pathImageScan = std::string(SHAREPATH)+"media_0-1/sliceHide.png";
OSLM_ASSERT("Image "<< pathImageScan << "is missing", ::boost::filesystem::exists(pathImageScan));
m_imageHideScan = QIcon(QString::fromStdString(pathImageScan.string()));
diff --git a/Bundles/LeafUI/uiImageQt/src/uiImageQt/WindowLevel.cpp b/Bundles/LeafUI/uiImageQt/src/uiImageQt/WindowLevel.cpp
index 66de16b..a5e5e3d 100644
--- a/Bundles/LeafUI/uiImageQt/src/uiImageQt/WindowLevel.cpp
+++ b/Bundles/LeafUI/uiImageQt/src/uiImageQt/WindowLevel.cpp
@@ -94,8 +94,8 @@ void WindowLevel::starting() throw(::fwTools::Failed)
m_toggleTFButton = new QToolButton(container);
QIcon ico;
- QString squareIcon(LIBSFW4SPL "Bundles/media_0-1/square.png");
- QString rampIcon(LIBSFW4SPL "Bundles/media_0-1/ramp.png");
+ QString squareIcon(SHAREPATH "media_0-1/square.png");
+ QString rampIcon(SHAREPATH "media_0-1/ramp.png");
ico.addPixmap(QPixmap(squareIcon), QIcon::Normal,QIcon::On);
ico.addPixmap(QPixmap(rampIcon), QIcon::Normal,QIcon::Off);
m_toggleTFButton->setIcon(ico);
@@ -103,9 +103,9 @@ void WindowLevel::starting() throw(::fwTools::Failed)
m_toggleAutoButton = new QToolButton(container);
QIcon icon;
- QString windo(LIBSFW4SPL "Bundles/media_0-1/windowing.svg");
+ QString windo(SHAREPATH "media_0-1/windowing.svg");
icon.addFile(windo, QSize(), QIcon::Normal,QIcon::On);
- QString nowindo(LIBSFW4SPL "Bundles/media_0-1/nowindowing.svg");
+ QString nowindo(SHAREPATH "media_0-1/nowindowing.svg");
icon.addFile(nowindo, QSize(), QIcon::Normal,QIcon::Off);
m_toggleAutoButton->setIcon(icon);
m_toggleAutoButton->setToolTip("Automatic Windowing");
diff --git a/Bundles/LeafUI/uiMeasurementQt/src/uiMeasurementQt/editor/Distance.cpp b/Bundles/LeafUI/uiMeasurementQt/src/uiMeasurementQt/editor/Distance.cpp
index 075c7ba..e8d4be3 100644
--- a/Bundles/LeafUI/uiMeasurementQt/src/uiMeasurementQt/editor/Distance.cpp
+++ b/Bundles/LeafUI/uiMeasurementQt/src/uiMeasurementQt/editor/Distance.cpp
@@ -63,7 +63,7 @@ void Distance::starting() throw(::fwTools::Failed)
SLM_ASSERT("container not instanced", container);
namespace fs = ::boost::filesystem;
- fs::path pathImageDist (std::string(LIBSFW4SPL)+"Bundles/media_0-1/distance.png"); //ever in a commit
+ fs::path pathImageDist (std::string(SHAREPATH)+"media_0-1/distance.png");
OSLM_ASSERT("Image "<< pathImageDist << "is missing", fs::exists(pathImageDist));
QIcon imageDist(QString::fromStdString(pathImageDist.string()));
diff --git a/Bundles/LeafUI/uiMedDataQt/src/uiMedDataQt/widget/SelectorModel.cpp b/Bundles/LeafUI/uiMedDataQt/src/uiMedDataQt/widget/SelectorModel.cpp
index 8c51841..2a55393 100644
--- a/Bundles/LeafUI/uiMedDataQt/src/uiMedDataQt/widget/SelectorModel.cpp
+++ b/Bundles/LeafUI/uiMedDataQt/src/uiMedDataQt/widget/SelectorModel.cpp
@@ -298,11 +298,11 @@ void SelectorModel::addSeriesIcon(::fwMedData::Series::sptr series, QStandardIte
::fwMedData::ActivitySeries::sptr activitySeries = ::fwMedData::ActivitySeries::dynamicCast(series);
if(imageSeries)
{
- item->setIcon(QIcon(QString((std::string(LIBSFW4SPL) + "Bundles/media_0-1/icons/ImageSeries.svg").c_str()))); //in an other commit
+ item->setIcon(QIcon(QString((std::string(SHAREPATH) + "media_0-1/icons/ImageSeries.svg").c_str())));
}
else if (modelSeries)
{
- item->setIcon(QIcon(QString((std::string(LIBSFW4SPL) + "Bundles/media_0-1/icons/ModelSeries.svg").c_str()))); //in an other commit
+ item->setIcon(QIcon(QString((std::string(SHAREPATH) + "media_0-1/icons/ModelSeries.svg").c_str())));
}
else if (activitySeries)
{
diff --git a/Bundles/LeafUI/uiTF/src/uiTF/TransferFunctionEditor.cpp b/Bundles/LeafUI/uiTF/src/uiTF/TransferFunctionEditor.cpp
index 128c48e..5618e34 100644
--- a/Bundles/LeafUI/uiTF/src/uiTF/TransferFunctionEditor.cpp
+++ b/Bundles/LeafUI/uiTF/src/uiTF/TransferFunctionEditor.cpp
@@ -96,27 +96,27 @@ void TransferFunctionEditor::starting() throw( ::fwTools::Failed )
// Buttons creation
m_pTransferFunctionPreset = new QComboBox(m_container);
- ::boost::filesystem::path deletePath (std::string(LIBSFW4SPL)+"Bundles/media_0-1/delete.png"); //ever in a commit
+ ::boost::filesystem::path deletePath (std::string(SHAREPATH)+"media_0-1/delete.png");
m_deleteButton = new QPushButton(QIcon(deletePath.string().c_str()), "", m_container);
m_deleteButton->setToolTip(QString("Delete"));
- ::boost::filesystem::path newPath (std::string(LIBSFW4SPL)+"Bundles/media_0-1/new.png"); //ever in a commit
+ ::boost::filesystem::path newPath (std::string(SHAREPATH)+"media_0-1/new.png");
m_newButton = new QPushButton(QIcon(newPath.string().c_str()), "", m_container);
m_newButton->setToolTip(QString("New"));
- ::boost::filesystem::path reinitializePath (std::string(LIBSFW4SPL)+"Bundles/media_0-1/reinitialize.png"); //ever in a commit
+ ::boost::filesystem::path reinitializePath (std::string(SHAREPATH)+"media_0-1/reinitialize.png");
m_reinitializeButton = new QPushButton(QIcon(reinitializePath.string().c_str()), "", m_container);
m_reinitializeButton->setToolTip(QString("Reinitialize"));
- ::boost::filesystem::path renamePath (std::string(LIBSFW4SPL)+"Bundles/media_0-1/rename.png"); //ever in a commit
+ ::boost::filesystem::path renamePath (std::string(SHAREPATH)+"media_0-1/rename.png");
m_renameButton = new QPushButton(QIcon(renamePath.string().c_str()), "", m_container);
m_renameButton->setToolTip(QString("Rename"));
- ::boost::filesystem::path importPath (std::string(LIBSFW4SPL)+"Bundles/media_0-1/import.png"); //ever in a commit
+ ::boost::filesystem::path importPath (std::string(SHAREPATH)+"media_0-1/import.png");
m_importButton = new QPushButton(QIcon(importPath.string().c_str()), "", m_container);
m_importButton->setToolTip(QString("Import"));
- ::boost::filesystem::path exportPath (std::string(LIBSFW4SPL)+"Bundles/media_0-1/export.png"); //ever in a commit
+ ::boost::filesystem::path exportPath (std::string(SHAREPATH)+"media_0-1/export.png");
m_exportButton = new QPushButton(QIcon(exportPath.string().c_str()), "", m_container);
m_exportButton->setToolTip(QString("Export"));
diff --git a/Bundles/LeafUI/uiVisuQt/src/uiVisuQt/SnapshotEditor.cpp b/Bundles/LeafUI/uiVisuQt/src/uiVisuQt/SnapshotEditor.cpp
index 909ef68..d50d216 100644
--- a/Bundles/LeafUI/uiVisuQt/src/uiVisuQt/SnapshotEditor.cpp
+++ b/Bundles/LeafUI/uiVisuQt/src/uiVisuQt/SnapshotEditor.cpp
@@ -65,7 +65,7 @@ void SnapshotEditor::starting() throw(::fwTools::Failed)
::fwGuiQt::container::QtContainer::sptr qtContainer = ::fwGuiQt::container::QtContainer::dynamicCast( this->getContainer() );
QWidget *container = qtContainer->getQtContainer();
- ::boost::filesystem::path path(std::string(LIBSFW4SPL)+"Bundles/media_0-1/camera-photo.png"); //ever in a commit
+ ::boost::filesystem::path path(std::string(SHAREPATH)+"media_0-1/camera-photo.png");
QIcon icon(QString::fromStdString(path.string()));
m_snapButton = new QPushButton(icon, "", container);
m_snapButton->setToolTip(QObject::tr("Snapshot"));
diff --git a/Bundles/media/CMakeLists.txt b/Bundles/media/CMakeLists.txt
index 1c29206..15cd4c1 100644
--- a/Bundles/media/CMakeLists.txt
+++ b/Bundles/media/CMakeLists.txt
@@ -1,2 +1 @@
fwLoadProperties()
-
diff --git a/CMake/FindCAMP.cmake b/CMake/Modules/FindCAMP.cmake
similarity index 100%
rename from CMake/FindCAMP.cmake
rename to CMake/Modules/FindCAMP.cmake
diff --git a/CMake/FindCppUnit.cmake b/CMake/Modules/FindCppUnit.cmake
similarity index 100%
rename from CMake/FindCppUnit.cmake
rename to CMake/Modules/FindCppUnit.cmake
diff --git a/CMake/FindHDF5.cmake b/CMake/Modules/FindHDF5.cmake
similarity index 100%
rename from CMake/FindHDF5.cmake
rename to CMake/Modules/FindHDF5.cmake
diff --git a/CMake/FindIconv.cmake b/CMake/Modules/FindIconv.cmake
similarity index 100%
rename from CMake/FindIconv.cmake
rename to CMake/Modules/FindIconv.cmake
diff --git a/CMake/fw-ITK.cmake b/CMake/Modules/fw-ITK.cmake
similarity index 100%
rename from CMake/fw-ITK.cmake
rename to CMake/Modules/fw-ITK.cmake
diff --git a/CMake/fw-Qt4.cmake b/CMake/Modules/fw-Qt4.cmake
similarity index 100%
rename from CMake/fw-Qt4.cmake
rename to CMake/Modules/fw-Qt4.cmake
diff --git a/CMake/fw-VTK.cmake b/CMake/Modules/fw-VTK.cmake
similarity index 100%
rename from CMake/fw-VTK.cmake
rename to CMake/Modules/fw-VTK.cmake
diff --git a/CMake/fw-VXL.cmake b/CMake/Modules/fw-VXL.cmake
similarity index 100%
rename from CMake/fw-VXL.cmake
rename to CMake/Modules/fw-VXL.cmake
diff --git a/CMake/fw-boost.cmake b/CMake/Modules/fw-boost.cmake
similarity index 100%
rename from CMake/fw-boost.cmake
rename to CMake/Modules/fw-boost.cmake
diff --git a/CMake/fw-python.cmake b/CMake/Modules/fw-python.cmake
similarity index 100%
rename from CMake/fw-python.cmake
rename to CMake/Modules/fw-python.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3af41cb..fe7145c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,25 +12,23 @@ option(CLASSIC_INSTALL ON)
set(CLASSIC_INSTALL OFF)
if(CLASSIC_INSTALL)
+ set( LIBRARY_OUTPUT_DIR "lib" )
+ set( RUNTIME_OUTPUT_DIR "bin" )
add_definitions( -DLIBSFW4SPL=\"\" )
add_definitions( -DBUNDLEPATH=\"\" )
add_definitions( -DSHAREPATH=\"\" )
- set( LIBRARY_OUTPUT_DIR "lib" )
- set( RUNTIME_OUTPUT_DIR "bin" )
else()
- set(CMAKE_INSTALL_PREFIX /usr/)
- add_definitions( -DSPECIALINSTALL )
- set(CMAKE_BUILD_TYPE Release)
- set(EXTERNAL_LIBRARIES ${CMAKE_CURRENT_SOURCE_DIR}/CMake/)
- set(PROJECTS_TO_BUILD VRRender)
- set(PROJECTS_TO_INSTALL VRRender)
- add_definitions( -DLIBSFW4SPL=\"/usr/lib/fw4spl/\" )
- add_definitions( -DBUNDLEPATH=\"/usr/lib/fw4spl/Bundles/\" )
- add_definitions( -DSHAREPATH=\"/usr/share/fw4spl/\" )
+ set( CMAKE_BUILD_TYPE Release)
set( LIBRARY_OUTPUT_DIR "/usr/lib/fw4spl/" )
set( RUNTIME_OUTPUT_DIR "/usr/bin/" )
+ set( CMAKE_INSTALL_PREFIX /usr/local )
+ set( EXTERNAL_LIBRARIES ${CMAKE_CURRENT_SOURCE_DIR}/CMake/Modules/ )
set( BUNDLE_PATH "/usr/lib/fw4spl/Bundles/" )
set( SHARE_PATH "/usr/share/fw4spl/" )
+ add_definitions( -DSPECIALINSTALL )
+ add_definitions( -DLIBSFW4SPL=\"/usr/lib/fw4spl/\" )
+ add_definitions( -DBUNDLEPATH=\"/usr/lib/fw4spl/Bundles/\" )
+ add_definitions( -DSHAREPATH=\"/usr/share/fw4spl/\" )
endif()
@@ -660,7 +658,7 @@ set(PROJECTS_TO_INSTALL CACHE STRING
file(GLOB_RECURSE PROJECTS_PROPERTIES */Properties.cmake)
-# Fix problem where CMake find a bundle twice (once in ./pc == patch)
+# Fix CMake find a bundle twice (once in ./pc == quilt's patches)
foreach(PROPERTIES_FILE ${PROJECTS_PROPERTIES})
if(PROPERTIES_FILE MATCHES "(.*)/.pc/(.*)")
remove(PROJECTS_PROPERTIES ${PROPERTIES_FILE})
diff --git a/README.md b/README.md
deleted file mode 100644
index f05573d..0000000
--- a/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-fw4spl
-======
-
-The main goal of the repository is to allow the build of fw4spl on a Debian system (Jessie), using only the system libraries.
-In a second time, we want to create a Debian package, for the Debian-Med project.
diff --git a/SrcLib/core/fwRender/CMakeLists.txt b/SrcLib/core/fwRender/CMakeLists.txt
index 2d6007d..d00340c 100644
--- a/SrcLib/core/fwRender/CMakeLists.txt
+++ b/SrcLib/core/fwRender/CMakeLists.txt
@@ -5,6 +5,3 @@ fwUseForwardInclude(
fwTools
)
-
-
-
diff --git a/SrcLib/core/fwRuntime/src/io/BundleDescriptorReader.cpp b/SrcLib/core/fwRuntime/src/io/BundleDescriptorReader.cpp
index 761d9a7..a72b7a9 100644
--- a/SrcLib/core/fwRuntime/src/io/BundleDescriptorReader.cpp
+++ b/SrcLib/core/fwRuntime/src/io/BundleDescriptorReader.cpp
@@ -95,8 +95,8 @@ const BundleDescriptorReader::BundleContainer BundleDescriptorReader::createBund
#else
completeLocation = ::boost::filesystem::current_path() / location;
#endif
-
}
+
::boost::filesystem::path descriptorLocation(location / "plugin.xml");
if(::boost::filesystem::exists(descriptorLocation) == false)
{
@@ -113,7 +113,7 @@ const BundleDescriptorReader::BundleContainer BundleDescriptorReader::createBund
const ::boost::filesystem::path pluginXSDLocation(::boost::filesystem::current_path() / fileLocation.str() );
#endif
- Validator validator(pluginXSDLocation);
+ Validator validator(pluginXSDLocation);
if( validator.validate(descriptorLocation) == false )
{
throw RuntimeException("Invalid bundle descriptor file. " + validator.getErrorLog());
@@ -191,11 +191,9 @@ const BundleDescriptorReader::BundleContainer BundleDescriptorReader::createBund
#ifdef SPECIALINSTALL
fileLocation << SHAREPATH << "fwRuntime_" << FWRUNTIME_VER << "/plugin.xsd";
const ::boost::filesystem::path pluginXSDLocation(fileLocation.str() );
-
#else
fileLocation << "share/fwRuntime_" << FWRUNTIME_VER << "/plugin.xsd";
const ::boost::filesystem::path pluginXSDLocation(::boost::filesystem::current_path() / fileLocation.str() );
-
#endif
Validator validator(pluginXSDLocation);
diff --git a/SrcLib/core/fwServices/test/tu/src/AppConfigParametersTest.cpp b/SrcLib/core/fwServices/test/tu/src/AppConfigParametersTest.cpp
index c64b0b0..6018f4b 100644
--- a/SrcLib/core/fwServices/test/tu/src/AppConfigParametersTest.cpp
+++ b/SrcLib/core/fwServices/test/tu/src/AppConfigParametersTest.cpp
@@ -52,7 +52,6 @@ void AppConfigParametersTest::setUp()
#else
location = ::boost::filesystem::current_path() / "share/tu_xml_fwServices_0-0";
#endif
-
}
CPPUNIT_ASSERT(::boost::filesystem::exists(location));
diff --git a/SrcLib/patch/fwMDSemanticPatch/src/fwMDSemanticPatch/PatchLoader.cpp b/SrcLib/patch/fwMDSemanticPatch/src/fwMDSemanticPatch/PatchLoader.cpp
index 345469c..10fbfca 100644
--- a/SrcLib/patch/fwMDSemanticPatch/src/fwMDSemanticPatch/PatchLoader.cpp
+++ b/SrcLib/patch/fwMDSemanticPatch/src/fwMDSemanticPatch/PatchLoader.cpp
@@ -14,14 +14,13 @@ namespace fwMDSemanticPatch
void PatchLoader::loadPatches()
{
SPTR(::fwAtomsPatch::VersionsManager) versionManager = ::fwAtomsPatch::VersionsManager::getDefault();
- #ifdef SPECIALINSTALL
- versionManager->buildVersionTable(SHAREPATH "fwMDSemanticPatch_" FWMDSEMANTICPATCH_VER "/");
- versionManager->buildLinkTable(SHAREPATH "fwMDSemanticPatch_" FWMDSEMANTICPATCH_VER "/");
- #else
- versionManager->buildVersionTable("./share/fwMDSemanticPatch_" FWMDSEMANTICPATCH_VER "/");
- versionManager->buildLinkTable("./share/fwMDSemanticPatch_" FWMDSEMANTICPATCH_VER "/");
- #endif
-
+ #ifdef SPECIALINSTALL
+ versionManager->buildVersionTable(SHAREPATH "fwMDSemanticPatch_" FWMDSEMANTICPATCH_VER "/");
+ versionManager->buildLinkTable(SHAREPATH "fwMDSemanticPatch_" FWMDSEMANTICPATCH_VER "/");
+ #else
+ versionManager->buildVersionTable("./share/fwMDSemanticPatch_" FWMDSEMANTICPATCH_VER "/");
+ versionManager->buildLinkTable("./share/fwMDSemanticPatch_" FWMDSEMANTICPATCH_VER "/");
+ #endif
}
} //namespace fwMDSemanticPatch
diff --git a/launcher/src/ProfileRunner.cpp b/launcher/src/ProfileRunner.cpp
index ac4fd30..7df9c49 100644
--- a/launcher/src/ProfileRunner.cpp
+++ b/launcher/src/ProfileRunner.cpp
@@ -115,7 +115,6 @@ int main(int argc, char* argv[])
::fwRuntime::profile::Profile::ParamsContainer profileArgs;
po::options_description options("Launcher options");
-
#ifdef SPECIALINSTALL
options.add_options()
("help,h", "Show help message")
@@ -123,8 +122,7 @@ int main(int argc, char* argv[])
"Adds a bundle path")
("rwd", po::value(&rwd)->default_value("./"), "Sets runtime working directory")
;
- #else
-
+#else
options.add_options()
("help,h", "Show help message")
("bundle-path,B", po::value(&bundlePaths)->default_value(PathListType(1,"./Bundles/")),
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fw4spl.git
More information about the debian-med-commit
mailing list