diff --git a/.gitignore b/.gitignore index cf77e45959..9eada9738d 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ CTest*.cmake # Target program /ApplicationCode/ResInsight +/.project diff --git a/ApplicationCode/Adm/ResInsightLicenseText.txt b/ApplicationCode/Adm/ResInsightLicenseText.txt index 318e0411bc..c0ae6a92be 100644 --- a/ApplicationCode/Adm/ResInsightLicenseText.txt +++ b/ApplicationCode/Adm/ResInsightLicenseText.txt @@ -1,17 +1,35 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. -// \ No newline at end of file +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. +// +//################################################################################################## diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index 8352237d53..741e6ca194 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -444,9 +444,9 @@ bool RiaApplication::saveProjectPromptForFileName() startPath = app->defaultFileDialogDirectory("BINARY_GRID"); } - startPath += "/ResInsightProject.rip"; + startPath += "/ResInsightProject.rsp"; - QString fileName = QFileDialog::getSaveFileName(NULL, tr("Save File"), startPath, tr("Project Files (*.rip *.xml)")); + QString fileName = QFileDialog::getSaveFileName(NULL, tr("Save File"), startPath, tr("Project Files (*.rsp);;All files(*.*)")); if (fileName.isEmpty()) { return false; @@ -1028,7 +1028,7 @@ bool RiaApplication::launchProcess(const QString& program, const QStringList& ar // Set the LD_LIBRARY_PATH to make the octave plugins find the embedded Qt - QProcessEnvironment penv = m_workerProcess->processEnvironment(); + QProcessEnvironment penv = QProcessEnvironment::systemEnvironment(); QString ldPath = penv.value("LD_LIBRARY_PATH", ""); if (ldPath == "") ldPath = QApplication::applicationDirPath(); diff --git a/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt b/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt index 685c558d68..475f353da7 100644 --- a/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt +++ b/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt @@ -15,9 +15,9 @@ include_directories( ${ResInsight_SOURCE_DIR}/ApplicationCode/ProjectDataModel ${ResInsight_SOURCE_DIR}/ThirdParty - ${ResInsight_SOURCE_DIR}/cafProjectDataModel + ${ResInsight_SOURCE_DIR}/Fwk/AppFwk/cafProjectDataModel - ${ResInsight_SOURCE_DIR}/CommonCode + ${ResInsight_SOURCE_DIR}/Fwk/AppFwk/CommonCode #Remove when RigStatistics is out ${ResInsight_SOURCE_DIR}/ApplicationCode/ModelVisualization @@ -47,7 +47,7 @@ source_group( "ReservoirDataModel" FILES ${CODE_SOURCE_FILES} ) set( CPP_SOURCES ${CPP_SOURCES} - ${ResInsight_SOURCE_DIR}/cafUserInterface/cafProgressInfo.cpp + ${ResInsight_SOURCE_DIR}/Fwk/AppFwk/cafUserInterface/cafProgressInfo.cpp ) source_group( "Headers" FILES ${CODE_HEADER_FILES} ) diff --git a/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp b/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp index b6cd9bc1ff..7e917ed8fc 100644 --- a/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp +++ b/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp @@ -61,6 +61,8 @@ namespace caf { addItem(RimLegendConfig::OPPOSITE_NORMAL,"OPPOSITE_NORMAL", "Full color, Blue on top"); addItem(RimLegendConfig::WHITE_PINK, "WHITE_PIMK", "White to pink"); addItem(RimLegendConfig::PINK_WHITE, "PINK_WHITE", "Pink to white"); + addItem(RimLegendConfig::BLUE_WHITE_RED, "BLUE_WHITE_RED", "Blue, white, red"); + addItem(RimLegendConfig::RED_WHITE_BLUE, "RED_WHITE_BLUE", "Red, white, blue"); addItem(RimLegendConfig::WHITE_BLACK, "WHITE_BLACK", "White to black"); addItem(RimLegendConfig::BLACK_WHITE, "BLACK_WHITE", "Black to white"); setDefault(RimLegendConfig::NORMAL); @@ -104,13 +106,13 @@ RimLegendConfig::RimLegendConfig() m_localAutoNegClosestToZero(0) { CAF_PDM_InitObject("Legend Definition", ":/Legend.png", "", ""); - CAF_PDM_InitField(&m_numLevels, "NumberOfLevels", 8, "Number of levels", "", "",""); - CAF_PDM_InitField(&m_precision, "Precision", 2, "Precision", "", "",""); - CAF_PDM_InitField(&m_tickNumberFormat, "TickNumberFormat", caf::AppEnum(FIXED), "Precision", "", "",""); + CAF_PDM_InitField(&m_numLevels, "NumberOfLevels", 8, "Number of levels", "", "A hint on how many tick marks you whish.",""); + CAF_PDM_InitField(&m_precision, "Precision", 2, "Significant digits", "", "The number of significant digits displayed in the legend numbers",""); + CAF_PDM_InitField(&m_tickNumberFormat, "TickNumberFormat", caf::AppEnum(FIXED), "Number format", "", "",""); - CAF_PDM_InitField(&m_colorRangeMode, "ColorRangeMode", ColorRangeEnum(NORMAL) , "Color range", "", "", ""); + CAF_PDM_InitField(&m_colorRangeMode, "ColorRangeMode", ColorRangeEnum(NORMAL) , "Colors", "", "", ""); CAF_PDM_InitField(&m_mappingMode, "MappingMode", MappingEnum(LINEAR_CONTINUOUS) , "Mapping", "", "", ""); - CAF_PDM_InitField(&m_rangeMode, "RangeType", caf::AppEnum(AUTOMATIC_ALLTIMESTEPS), "Legend range type", "", "Switches between automatic and user defined range on the legend", ""); + CAF_PDM_InitField(&m_rangeMode, "RangeType", caf::AppEnum(AUTOMATIC_ALLTIMESTEPS), "Range type", "", "Switches between automatic and user defined range on the legend", ""); CAF_PDM_InitField(&m_userDefinedMaxValue, "UserDefinedMax", 1.0, "Max", "", "Min value of the legend", ""); CAF_PDM_InitField(&m_userDefinedMinValue, "UserDefinedMin", 0.0, "Min", "", "Max value of the legend", ""); CAF_PDM_InitField(&resultVariableName, "ResultVariableUsage", QString(""), "", "", "", ""); @@ -155,11 +157,11 @@ void RimLegendConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedField, { if (m_userDefinedMaxValue == m_userDefinedMaxValue.defaultValue() && m_globalAutoMax != cvf::UNDEFINED_DOUBLE) { - m_userDefinedMaxValue = adjust(m_globalAutoMax, m_precision); + m_userDefinedMaxValue = roundToNumSignificantDigits(m_globalAutoMax, m_precision); } if (m_userDefinedMinValue == m_userDefinedMinValue.defaultValue() && m_globalAutoMin != cvf::UNDEFINED_DOUBLE) { - m_userDefinedMinValue = adjust(m_globalAutoMin, m_precision); + m_userDefinedMinValue = roundToNumSignificantDigits(m_globalAutoMin, m_precision); } } @@ -184,24 +186,24 @@ void RimLegendConfig::updateLegend() if (m_rangeMode == AUTOMATIC_ALLTIMESTEPS) { - adjustedMin = adjust(m_globalAutoMin, m_precision); - adjustedMax = adjust(m_globalAutoMax, m_precision); + adjustedMin = roundToNumSignificantDigits(m_globalAutoMin, m_precision); + adjustedMax = roundToNumSignificantDigits(m_globalAutoMax, m_precision); posClosestToZero = m_globalAutoPosClosestToZero; negClosestToZero = m_globalAutoNegClosestToZero; } else if (m_rangeMode == AUTOMATIC_CURRENT_TIMESTEP) { - adjustedMin = adjust(m_localAutoMin, m_precision); - adjustedMax = adjust(m_localAutoMax, m_precision); + adjustedMin = roundToNumSignificantDigits(m_localAutoMin, m_precision); + adjustedMax = roundToNumSignificantDigits(m_localAutoMax, m_precision); posClosestToZero = m_localAutoPosClosestToZero; negClosestToZero = m_localAutoNegClosestToZero; } else { - adjustedMin = adjust(m_userDefinedMinValue, m_precision); - adjustedMax = adjust(m_userDefinedMaxValue, m_precision); + adjustedMin = roundToNumSignificantDigits(m_userDefinedMinValue, m_precision); + adjustedMax = roundToNumSignificantDigits(m_userDefinedMaxValue, m_precision); posClosestToZero = m_globalAutoPosClosestToZero; negClosestToZero = m_globalAutoNegClosestToZero; @@ -277,7 +279,8 @@ void RimLegendConfig::updateLegend() legendColors.add(cvf::Color3ub( 0, 127, 255)); legendColors.add(cvf::Color3ub( 0, 0, 255)); } - break; case BLACK_WHITE: + break; + case BLACK_WHITE: case WHITE_BLACK: { legendColors.reserve(2); @@ -309,6 +312,25 @@ void RimLegendConfig::updateLegend() } } break; + case BLUE_WHITE_RED: + case RED_WHITE_BLUE: + { + legendColors.reserve(3); + if (m_colorRangeMode() == BLUE_WHITE_RED) + { + legendColors.add(cvf::Color3ub::BLUE); + legendColors.add(cvf::Color3ub::WHITE); + legendColors.add(cvf::Color3ub::RED); + } + else + { + legendColors.add(cvf::Color3ub::RED); + legendColors.add(cvf::Color3ub::WHITE); + legendColors.add(cvf::Color3ub::BLUE); + } + } + break; + } m_linDiscreteScalarMapper->setColors(legendColors); @@ -340,11 +362,35 @@ void RimLegendConfig::updateLegend() } m_legend->setScalarMapper(m_currentScalarMapper.p()); - m_legend->setTickPrecision(m_precision()); + double decadesInRange = 0; + if (m_mappingMode == LOG10_CONTINUOUS || m_mappingMode == LOG10_DISCRETE) + { + // For log mapping, use the min value as reference for num valid digits + decadesInRange = abs(adjustedMin) < abs(adjustedMax) ? abs(adjustedMin) : abs(adjustedMax); + decadesInRange = log10(decadesInRange); + } + else + { + // For linear mapping, use the max value as reference for num valid digits + double absRange = CVF_MAX(abs(adjustedMax), abs(adjustedMin)); + decadesInRange = log10(absRange); + } + + decadesInRange = cvf::Math::ceil(decadesInRange); + + // Using Fixed format NumberFormatType nft = m_tickNumberFormat(); m_legend->setTickFormat((cvf::OverlayScalarMapperLegend::NumberFormat)nft); + // Set the fixed number of digits after the decimal point to the number needed to show all the significant digits. + int numDecimalDigits = m_precision(); + if (nft != SCIENTIFIC) + { + numDecimalDigits -= decadesInRange; + } + m_legend->setTickPrecision(cvf::Math::clamp(numDecimalDigits, 0, 20)); + if (m_globalAutoMax != cvf::UNDEFINED_DOUBLE ) { @@ -370,11 +416,11 @@ void RimLegendConfig::updateLegend() //-------------------------------------------------------------------------------------------------- void RimLegendConfig::setAutomaticRanges(double globalMin, double globalMax, double localMin, double localMax) { - m_globalAutoMin = adjust(globalMin, m_precision); - m_globalAutoMax = adjust(globalMax, m_precision); + m_globalAutoMin = roundToNumSignificantDigits(globalMin, m_precision); + m_globalAutoMax = roundToNumSignificantDigits(globalMax, m_precision); - m_localAutoMin = adjust(localMin, m_precision); - m_localAutoMax = adjust(localMax, m_precision); + m_localAutoMin = roundToNumSignificantDigits(localMin, m_precision); + m_localAutoMax = roundToNumSignificantDigits(localMax, m_precision); updateLegend(); } @@ -485,9 +531,9 @@ void RimLegendConfig::recreateLegend() } //-------------------------------------------------------------------------------------------------- -/// Adjust double value to given precision +/// Rounding the double value to given number of significant digits //-------------------------------------------------------------------------------------------------- -double RimLegendConfig::adjust(double domainValue, double precision) +double RimLegendConfig::roundToNumSignificantDigits(double domainValue, double numSignificantDigits) { double absDomainValue = cvf::Math::abs(domainValue); if (absDomainValue == 0.0) @@ -498,11 +544,13 @@ double RimLegendConfig::adjust(double domainValue, double precision) double logDecValue = log10(absDomainValue); logDecValue = cvf::Math::ceil(logDecValue); - double factor = pow(10.0, precision - logDecValue); + double factor = pow(10.0, numSignificantDigits - logDecValue); double tmp = domainValue * factor; double integerPart; - modf(tmp, &integerPart); + double fraction = modf(tmp, &integerPart); + + if (abs(fraction)>= 0.5) (integerPart >= 0) ? integerPart++: integerPart-- ; double newDomainValue = integerPart / factor; @@ -527,3 +575,21 @@ void RimLegendConfig::setClosestToZeroValues(double globalPosClosestToZero, doub updateLegend(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimLegendConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) +{ + caf::PdmUiOrdering * formatGr = uiOrdering.addNewGroup("Format"); + formatGr->add(&m_numLevels); + formatGr->add(&m_precision); + formatGr->add(&m_tickNumberFormat); + formatGr->add(&m_colorRangeMode); + + caf::PdmUiOrdering * mappingGr = uiOrdering.addNewGroup("Mapping"); + mappingGr->add(&m_mappingMode); + mappingGr->add(&m_rangeMode); + mappingGr->add(&m_userDefinedMaxValue); + mappingGr->add(&m_userDefinedMinValue); +} + diff --git a/ApplicationCode/ProjectDataModel/RimLegendConfig.h b/ApplicationCode/ProjectDataModel/RimLegendConfig.h index 40975643ec..3b4e1cdd92 100644 --- a/ApplicationCode/ProjectDataModel/RimLegendConfig.h +++ b/ApplicationCode/ProjectDataModel/RimLegendConfig.h @@ -68,7 +68,9 @@ public: WHITE_PINK, PINK_WHITE, WHITE_BLACK, - BLACK_WHITE + BLACK_WHITE, + BLUE_WHITE_RED, + RED_WHITE_BLUE }; typedef caf::AppEnum ColorRangeEnum; @@ -96,11 +98,14 @@ public: protected: virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue); virtual void initAfterRead(); + virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ); private: void updateFieldVisibility(); cvf::ref interpolateColorArray(const cvf::Color3ubArray& colorArray, cvf::uint targetColorCount); - double adjust(double value, double precision); - + double roundToNumSignificantDigits(double value, double precision); + + + private: caf::PdmPointer m_reservoirView; diff --git a/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp index ae46561b5d..472bfd6f2d 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp @@ -20,6 +20,7 @@ #include "cafAppEnum.h" #include "cafPdmFieldCvfColor.h" +#include "cafProgressInfo.h" #include "RimWellPathCollection.h" #include "RimWellPath.h" @@ -122,9 +123,14 @@ void RimWellPathCollection::setProject( RimProject* project ) //-------------------------------------------------------------------------------------------------- void RimWellPathCollection::readWellPathFiles() { + caf::ProgressInfo progress(wellPaths.size(), "Reading well paths from file"); + for (size_t wpIdx = 0; wpIdx < wellPaths.size(); wpIdx++) { wellPaths[wpIdx]->readWellPathFile(); + + progress.setProgressDescription(QString("Reading file %1").arg(wellPaths[wpIdx]->name)); + progress.incrementProgress(); } } diff --git a/ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt b/ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt index 3ed2140ef2..732f0927cf 100644 --- a/ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt +++ b/ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt @@ -19,9 +19,9 @@ include_directories( ${ResInsight_SOURCE_DIR}/ApplicationCode/ProjectDataModel ${ResInsight_SOURCE_DIR}/ThirdParty - ${ResInsight_SOURCE_DIR}/cafProjectDataModel + ${ResInsight_SOURCE_DIR}/Fwk/AppFwk/cafProjectDataModel - ${ResInsight_SOURCE_DIR}/CommonCode + ${ResInsight_SOURCE_DIR}/Fwk/AppFwk/CommonCode #Remove when RigStatistics is out #${ResInsight_SOURCE_DIR}/ApplicationCode/ModelVisualization @@ -33,7 +33,7 @@ include ("${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists_files.cmake") set( UNIT_TEST_CPP_SOURCES - ${ResInsight_SOURCE_DIR}/cafUserInterface/cafProgressInfo.cpp + ${ResInsight_SOURCE_DIR}/Fwk/AppFwk/cafUserInterface/cafProgressInfo.cpp main.cpp RigActiveCellInfo-Test.cpp diff --git a/ApplicationCode/UserInterface/RiuMainWindow.cpp b/ApplicationCode/UserInterface/RiuMainWindow.cpp index d30ccab338..c6a0352d72 100644 --- a/ApplicationCode/UserInterface/RiuMainWindow.cpp +++ b/ApplicationCode/UserInterface/RiuMainWindow.cpp @@ -767,7 +767,7 @@ void RiuMainWindow::slotOpenProject() { RiaApplication* app = RiaApplication::instance(); QString defaultDir = app->defaultFileDialogDirectory("BINARY_GRID"); - QString fileName = QFileDialog::getOpenFileName(this, "Open ResInsight Project", defaultDir, "ResInsight project (*.rip)"); + QString fileName = QFileDialog::getOpenFileName(this, "Open ResInsight Project", defaultDir, "ResInsight project (*.rsp *.rip);;All files(*.*)"); if (fileName.isEmpty()) return; diff --git a/ApplicationCode/WellPathImportSsihub/CMakeLists.txt b/ApplicationCode/WellPathImportSsihub/CMakeLists.txt index 73a5f85fef..56cabdd553 100644 --- a/ApplicationCode/WellPathImportSsihub/CMakeLists.txt +++ b/ApplicationCode/WellPathImportSsihub/CMakeLists.txt @@ -20,8 +20,8 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../FileInterface - ${CMAKE_CURRENT_SOURCE_DIR}/../../cafProjectDataModel - ${CMAKE_CURRENT_SOURCE_DIR}/../../cafUserInterface + ${CMAKE_CURRENT_SOURCE_DIR}/../../Fwk/AppFwk/cafProjectDataModel + ${CMAKE_CURRENT_SOURCE_DIR}/../../Fwk/AppFwk/cafUserInterface ) diff --git a/ApplicationCode/WellPathImportSsihub/RimOilFieldEntry.cpp b/ApplicationCode/WellPathImportSsihub/RimOilFieldEntry.cpp index 3f6ef908f9..8e3010c468 100644 --- a/ApplicationCode/WellPathImportSsihub/RimOilFieldEntry.cpp +++ b/ApplicationCode/WellPathImportSsihub/RimOilFieldEntry.cpp @@ -41,7 +41,7 @@ RimOilFieldEntry::RimOilFieldEntry() CAF_PDM_InitFieldNoDefault(&name, "OilFieldName", "OilFieldName", "", "", ""); CAF_PDM_InitFieldNoDefault(&edmId, "EdmId", "EdmId", "", "", ""); - CAF_PDM_InitField(&selected, "Selected", true, "Selected", "", "", ""); + CAF_PDM_InitField(&selected, "Selected", true, "Selected", "", "", ""); CAF_PDM_InitFieldNoDefault(&wellsFilePath, "wellsFilePath", "wellsFilePath", "", "", ""); diff --git a/ApplicationCode/WellPathImportSsihub/RimOilRegionEntry.cpp b/ApplicationCode/WellPathImportSsihub/RimOilRegionEntry.cpp index ad947d30fe..d0f5893347 100644 --- a/ApplicationCode/WellPathImportSsihub/RimOilRegionEntry.cpp +++ b/ApplicationCode/WellPathImportSsihub/RimOilRegionEntry.cpp @@ -34,7 +34,7 @@ RimOilRegionEntry::RimOilRegionEntry() CAF_PDM_InitFieldNoDefault(&fields, "Fields", "", "", "", ""); - CAF_PDM_InitField(&selected, "Selected", true, "Selected", "", "", ""); + CAF_PDM_InitField(&selected, "Selected", false, "Selected", "", "", ""); } diff --git a/ApplicationCode/WellPathImportSsihub/RimOilRegionEntry.h b/ApplicationCode/WellPathImportSsihub/RimOilRegionEntry.h index 875ea6082c..db0ed686d4 100644 --- a/ApplicationCode/WellPathImportSsihub/RimOilRegionEntry.h +++ b/ApplicationCode/WellPathImportSsihub/RimOilRegionEntry.h @@ -38,12 +38,12 @@ public: virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue); + void updateState(); + caf::PdmField name; caf::PdmField selected; caf::PdmPointersField fields; -private: - void updateState(); }; diff --git a/ApplicationCode/WellPathImportSsihub/RimWellPathImport.cpp b/ApplicationCode/WellPathImportSsihub/RimWellPathImport.cpp index 73c11b7492..a5f17403e4 100644 --- a/ApplicationCode/WellPathImportSsihub/RimWellPathImport.cpp +++ b/ApplicationCode/WellPathImportSsihub/RimWellPathImport.cpp @@ -17,6 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RimWellPathImport.h" +#include "cafPdmUiTreeViewEditor.h" namespace caf { @@ -186,3 +187,19 @@ void RimWellPathImport::fieldChangedByUi(const caf::PdmFieldHandle* changedField } } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimWellPathImport::defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute * attribute) +{ + caf::PdmUiTreeViewEditorAttribute* myAttr = dynamic_cast(attribute); + if (myAttr) + { + QStringList colHeaders; + colHeaders << "Region"; + myAttr->columnHeaders = colHeaders; + } +} + + + diff --git a/ApplicationCode/WellPathImportSsihub/RimWellPathImport.h b/ApplicationCode/WellPathImportSsihub/RimWellPathImport.h index 0cf24e0271..d74b055552 100644 --- a/ApplicationCode/WellPathImportSsihub/RimWellPathImport.h +++ b/ApplicationCode/WellPathImportSsihub/RimWellPathImport.h @@ -57,9 +57,11 @@ public: virtual void initAfterRead(); virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ); + virtual void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute * attribute ); -//private: void updateFieldVisibility(); + + }; diff --git a/ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.cpp b/ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.cpp index 012ccac377..2904c3fbb4 100644 --- a/ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.cpp +++ b/ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.cpp @@ -32,6 +32,7 @@ #include "RimWellPathImport.h" #include "RifJsonEncodeDecode.h" +#include "cafPdmUiTreeViewEditor.h" //-------------------------------------------------------------------------------------------------- @@ -45,8 +46,7 @@ RiuWellImportWizard::RiuWellImportWizard(const QString& webServiceAddress, const m_destinationFolder = downloadFolder; m_webServiceAddress = webServiceAddress; - - m_progressDialog = new QProgressDialog(this); + m_myProgressDialog = new QProgressDialog(this); m_firstTimeRequestingAuthentication = true; @@ -64,8 +64,6 @@ RiuWellImportWizard::RiuWellImportWizard(const QString& webServiceAddress, const this, SLOT(sslErrors(QNetworkReply*,QList))); #endif - connect(m_progressDialog, SIGNAL(canceled()), this, SLOT(cancelDownload())); - } //-------------------------------------------------------------------------------------------------- @@ -121,9 +119,6 @@ void RiuWellImportWizard::issueHttpRequestToFile(QString completeUrlText, QStrin return; } - m_progressDialog->setWindowTitle(tr("HTTP")); - m_progressDialog->setLabelText(tr("Downloading %1.").arg(destinationFileName)); - // schedule the request m_httpRequestAborted = false; startRequest(m_url); @@ -152,7 +147,7 @@ void RiuWellImportWizard::httpFinished() m_file = 0; } m_reply->deleteLater(); - m_progressDialog->hide(); + m_myProgressDialog->hide(); return; } @@ -215,7 +210,12 @@ void RiuWellImportWizard::httpFinished() out << singleWellPathContent; } } + + m_myProgressDialog->setLabelText(QString("Downloaded well path : %1").arg(wellPathName)); } + + int newValue = m_myProgressDialog->maximum() - m_wellRequestQueue.size(); + m_myProgressDialog->setValue(newValue); } m_reply->deleteLater(); @@ -247,20 +247,6 @@ void RiuWellImportWizard::httpReadyRead() m_file->write(m_reply->readAll()); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RiuWellImportWizard::updateDataReadProgress(qint64 bytesRead, qint64 totalBytes) -{ - if (m_httpRequestAborted) - return; - - m_progressDialog->setMaximum(totalBytes); - m_progressDialog->setValue(bytesRead); - -} - - //-------------------------------------------------------------------------------------------------- /// This slot will be called for the first network reply that will need authentication. /// If the authentication is successful, the username/password is cached in the QNetworkAccessManager @@ -323,8 +309,6 @@ void RiuWellImportWizard::startRequest(QUrl url) this, SLOT(httpFinished())); connect(m_reply, SIGNAL(readyRead()), this, SLOT(httpReadyRead())); - connect(m_reply, SIGNAL(downloadProgress(qint64,qint64)), - this, SLOT(updateDataReadProgress(qint64,qint64))); } @@ -385,6 +369,13 @@ void RiuWellImportWizard::updateFieldsModel() } m_wellPathImportObject->updateRegions(regions, fields, edmIds); + + for (size_t i = 0; i < m_wellPathImportObject->regions.size(); i++) + { + m_wellPathImportObject->regions[i]->updateState(); + } + + m_wellPathImportObject->updateConnectedEditors(); } } @@ -413,7 +404,7 @@ void RiuWellImportWizard::downloadWells() } else { - wellRequest = QString("/resinsight/projects/%1/wellsInArea?north=%2&south=%3&east=%4&west=%5&utmZone=32N") + wellRequest = QString("/resinsight/projects/%1/wellsInArea?north=%2&south=%3&east=%4&west=%5&utmzone=32N") .arg(oilField->edmId) .arg(QString::number(m_wellPathImportObject->north, 'g', 10)) .arg(QString::number(m_wellPathImportObject->south, 'g', 10)) @@ -455,16 +446,15 @@ void RiuWellImportWizard::downloadWellPaths() for (size_t wIdx = 0; wIdx < oilField->wells.size(); wIdx++) { RimWellPathEntry* wellPathEntry = oilField->wells[wIdx]; - - if (!wellPathEntry->isWellPathValid()) - continue; - - DownloadEntity urlToFile; + if (wellPathEntry->selected && wellPathEntry->isWellPathValid()) + { + DownloadEntity urlToFile; - urlToFile.requestUrl = wellPathEntry->requestUrl; - urlToFile.responseFilename = wellPathEntry->wellPathFilePath; + urlToFile.requestUrl = wellPathEntry->requestUrl; + urlToFile.responseFilename = wellPathEntry->wellPathFilePath; - m_wellRequestQueue.push_back(urlToFile); + m_wellRequestQueue.push_back(urlToFile); + } } } } @@ -473,6 +463,11 @@ void RiuWellImportWizard::downloadWellPaths() m_currentDownloadState = DOWNLOAD_WELL_PATH; + m_myProgressDialog->setMaximum(m_wellRequestQueue.size()); + m_myProgressDialog->setValue(0); + m_myProgressDialog->show(); + + checkDownloadQueueAndIssueRequests(); } @@ -497,6 +492,8 @@ void RiuWellImportWizard::checkDownloadQueueAndIssueRequests() if (m_currentDownloadState == DOWNLOAD_WELLS) { + m_myProgressDialog->hide(); + // Update UI with downloaded wells for (size_t rIdx = 0; rIdx < m_wellPathImportObject->regions.size(); rIdx++) @@ -528,7 +525,7 @@ void RiuWellImportWizard::checkDownloadQueueAndIssueRequests() m_currentDownloadState = DOWNLOAD_UNDEFINED; - m_progressDialog->hide(); + m_myProgressDialog->hide(); } //-------------------------------------------------------------------------------------------------- @@ -695,7 +692,7 @@ void RiuWellImportWizard::parseWellsResponse(RimOilFieldEntry* oilFieldEntry) WellSelectionPage* wellSelectionPage = dynamic_cast(page(m_wellSelectionPageId)); if (wellSelectionPage) - wellSelectionPage->expandAllTreeNodes(); + wellSelectionPage->buildWellTreeView(); } //-------------------------------------------------------------------------------------------------- @@ -802,6 +799,31 @@ void FieldSelectionPage::initializePage() +//-------------------------------------------------------------------------------------------------- +/// Helper class used to define column headers +//-------------------------------------------------------------------------------------------------- +class ObjectGroupWithHeaders : public caf::PdmObjectGroup +{ +public: + ObjectGroupWithHeaders() : caf::PdmObjectGroup() + { + + } + + //-------------------------------------------------------------------------------------------------- + /// + //-------------------------------------------------------------------------------------------------- + virtual void defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute * attribute) + { + caf::PdmUiTreeViewEditorAttribute* myAttr = dynamic_cast(attribute); + if (myAttr) + { + QStringList colHeaders; + colHeaders << "Wells"; + myAttr->columnHeaders = colHeaders; + } + } +}; @@ -823,9 +845,7 @@ WellSelectionPage::WellSelectionPage(RimWellPathImport* wellPathImport, QWidget* m_wellPathImportObject = wellPathImport; - m_regionsWithVisibleWells = new caf::PdmObjectGroup; - - //m_wellSelectionTreeView->setPdmObject(wellPathImport); + m_regionsWithVisibleWells = new ObjectGroupWithHeaders; } //-------------------------------------------------------------------------------------------------- @@ -837,27 +857,73 @@ void WellSelectionPage::initializePage() if (!wiz) return; wiz->downloadWells(); + + setButtonText(QWizard::NextButton, "Download"); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void WellSelectionPage::expandAllTreeNodes() +void WellSelectionPage::buildWellTreeView() { - m_regionsWithVisibleWells->objects.clear(); + for (size_t rIdx = 0; rIdx < m_regionsWithVisibleWells->objects.size(); rIdx++) + { + caf::PdmObjectGroup* regGroup = dynamic_cast(m_regionsWithVisibleWells->objects[rIdx]); + if (!regGroup) + continue; + + for (size_t fIdx = 0; fIdx < regGroup->objects.size(); fIdx++) + { + caf::PdmObjectGroup* fieldGroup = dynamic_cast(regGroup->objects[fIdx]); + if (!fieldGroup) + continue; + + // RimWellPathEntry objects are present here, they must be taken out out the container, but not deleted + // If fieldGroup->objects->deleteObjects is performed, the objects are deleted + fieldGroup->objects.clear(); + } + } + + // Delete all temporary pdm object groups + m_regionsWithVisibleWells->deleteObjects(); for (size_t rIdx = 0; rIdx < m_wellPathImportObject->regions.size(); rIdx++) { RimOilRegionEntry* oilRegion = m_wellPathImportObject->regions[rIdx]; if (oilRegion->selected) { - m_regionsWithVisibleWells->objects.push_back(oilRegion); + caf::PdmObjectGroup* regGroup = new caf::PdmObjectGroup; + regGroup->setUiName(oilRegion->userDescriptionField()->uiValue().toString()); + + m_regionsWithVisibleWells->objects.push_back(regGroup); + + for (size_t fIdx = 0; fIdx < oilRegion->fields.size(); fIdx++) + { + RimOilFieldEntry* oilField = oilRegion->fields[fIdx]; + if (oilField->selected) + { + caf::PdmObjectGroup* fieldGroup = new caf::PdmObjectGroup; + fieldGroup->setUiName(oilField->userDescriptionField()->uiValue().toString()); + + regGroup->objects.push_back(fieldGroup); + + for (size_t wIdx = 0; wIdx < oilField->wells.size(); wIdx++) + { + RimWellPathEntry* wellPathEntry = oilField->wells[wIdx]; + if (wellPathEntry->selected) + { + fieldGroup->objects.push_back(wellPathEntry); + } + } + } + } } } m_wellSelectionTreeView->setPdmObject(m_regionsWithVisibleWells); m_regionsWithVisibleWells->updateConnectedEditors(); - //m_wellSelectionTreeView->treeView()->expandAll(); + + m_wellSelectionTreeView->treeView()->expandAll(); } //-------------------------------------------------------------------------------------------------- @@ -877,6 +943,7 @@ WellSelectionPage::~WellSelectionPage() WellSummaryPage::WellSummaryPage(RimWellPathImport* wellPathImport, QWidget* parent /*= 0*/) { m_wellPathImportObject = wellPathImport; + m_wellPathImportObject->setUiHidden(true); QVBoxLayout* layout = new QVBoxLayout; setLayout(layout); @@ -885,15 +952,18 @@ WellSummaryPage::WellSummaryPage(RimWellPathImport* wellPathImport, QWidget* par m_textEdit->setReadOnly(true); layout->addWidget(m_textEdit); - QPushButton* button = new QPushButton("Details", this); + QPushButton* button = new QPushButton("Show/hide details", this); connect(button, SIGNAL(clicked()), this, SLOT(slotShowDetails())); layout->addWidget(button); m_listView = new caf::PdmUiListView(this); + layout->setStretchFactor(m_listView, 10); layout->addWidget(m_listView); m_listView->hide(); m_objectGroup = new caf::PdmObjectGroup; + + setButtonText(QWizard::FinishButton, "Import"); } //-------------------------------------------------------------------------------------------------- @@ -933,17 +1003,19 @@ void WellSummaryPage::updateSummaryPage() for (size_t wIdx = 0; wIdx < oilField->wells.size(); wIdx++) { RimWellPathEntry* wellPathEntry = oilField->wells[wIdx]; - - if (QFile::exists(oilField->wells[wIdx]->wellPathFilePath)) + if (wellPathEntry->selected) { - wellPathCount++; - } - else - { - errorString += QString("Failed to get file '%1' from well '%2'\n").arg(oilField->wells[wIdx]->wellPathFilePath).arg(oilField->wells[wIdx]->name); - } + if (QFile::exists(oilField->wells[wIdx]->wellPathFilePath)) + { + wellPathCount++; + } + else + { + errorString += QString("Failed to get file '%1' from well '%2'\n").arg(oilField->wells[wIdx]->wellPathFilePath).arg(oilField->wells[wIdx]->name); + } - m_objectGroup->objects.push_back(wellPathEntry); + m_objectGroup->objects.push_back(wellPathEntry); + } } } } @@ -951,7 +1023,7 @@ void WellSummaryPage::updateSummaryPage() } - m_textEdit->setText(QString("Downloaded successfully %1 well paths.\nPlease push 'Finish' button to import well paths into ResInsight.\n\n").arg(wellPathCount)); + m_textEdit->setText(QString("Downloaded successfully %1 well paths.\nPlease push 'Import' button to import well paths into ResInsight.\n\n").arg(wellPathCount)); if (!errorString.isEmpty()) { m_textEdit->append("Detected following errors during well path download. See details below."); @@ -968,6 +1040,13 @@ void WellSummaryPage::updateSummaryPage() //-------------------------------------------------------------------------------------------------- void WellSummaryPage::slotShowDetails() { - m_listView->show(); + if (m_listView->isHidden()) + { + m_listView->show(); + } + else + { + m_listView->hide(); + } } diff --git a/ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.h b/ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.h index 196b4ee4d4..aea5bee92e 100644 --- a/ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.h +++ b/ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.h @@ -72,6 +72,10 @@ public: }; + +class ObjectGroupWithHeaders; + + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -84,10 +88,10 @@ public: ~WellSelectionPage(); virtual void initializePage(); - void expandAllTreeNodes(); + void buildWellTreeView(); private: - caf::PdmObjectGroup* m_regionsWithVisibleWells; + ObjectGroupWithHeaders* m_regionsWithVisibleWells; RimWellPathImport* m_wellPathImportObject; caf::PdmUiTreeView* m_wellSelectionTreeView; @@ -163,7 +167,6 @@ public slots: void httpFinished(); void httpReadyRead(); - void updateDataReadProgress(qint64 bytesRead, qint64 totalBytes); void slotAuthenticationRequired(QNetworkReply* networkReply, QAuthenticator* authenticator); @@ -195,7 +198,7 @@ private: RimWellPathImport* m_wellPathImportObject; caf::PdmUiTreeView* m_pdmTreeView; - QProgressDialog* m_progressDialog; + QProgressDialog* m_myProgressDialog; QUrl m_url; QNetworkAccessManager m_networkAccessManager; diff --git a/ApplicationCode/WellPathImportSsihubTestApp/CMakeLists.txt b/ApplicationCode/WellPathImportSsihubTestApp/CMakeLists.txt index 3553745023..020f3032e9 100644 --- a/ApplicationCode/WellPathImportSsihubTestApp/CMakeLists.txt +++ b/ApplicationCode/WellPathImportSsihubTestApp/CMakeLists.txt @@ -13,15 +13,15 @@ find_package( OpenGL ) add_subdirectory(../WellPathImportSsihub "${CMAKE_CURRENT_BINARY_DIR}/WellPathImportSsihub") -add_subdirectory(../../cafProjectDataModel "${CMAKE_CURRENT_BINARY_DIR}/cafProjectDataModel") -add_subdirectory(../../cafUserInterface "${CMAKE_CURRENT_BINARY_DIR}/cafUserInterface") +add_subdirectory(../../Fwk/AppFwk/cafProjectDataModel "${CMAKE_CURRENT_BINARY_DIR}/cafProjectDataModel") +add_subdirectory(../../Fwk/AppFwk/cafUserInterface "${CMAKE_CURRENT_BINARY_DIR}/cafUserInterface") -add_subdirectory(../../cafTests/cafTestApplication "${CMAKE_CURRENT_BINARY_DIR}/cafTestApplication") +#add_subdirectory(../../cafTests/cafTestApplication "${CMAKE_CURRENT_BINARY_DIR}/cafTestApplication") include_directories( ${WellPathImportSsihub_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../../cafProjectDataModel - ${CMAKE_CURRENT_SOURCE_DIR}/../../cafUserInterface + ${WellPathImportSsihub_SOURCE_DIR}/../../Fwk/AppFwk/cafProjectDataModel + ${WellPathImportSsihub_SOURCE_DIR}/../../Fwk/AppFwk/cafUserInterface ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d649ae87e..d5b60a828f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 2.8) project (ResInsight) -set (VIZ_MODULES_FOLDER_NAME VisualizationModules) +set (VIZ_MODULES_FOLDER_NAME Fwk/VizFwk) @@ -98,12 +98,12 @@ include_directories( # Ceetron Application Framework ################################################################################ -add_subdirectory(cafProjectDataModel) -add_subdirectory(CommonCode) -add_subdirectory(cafAnimControl) -add_subdirectory(cafViewer) -add_subdirectory(cafUserInterface) -add_subdirectory(cafPdmCvf) +add_subdirectory(Fwk/AppFwk/cafProjectDataModel) +add_subdirectory(Fwk/AppFwk/CommonCode) +add_subdirectory(Fwk/AppFwk/cafAnimControl) +add_subdirectory(Fwk/AppFwk/cafViewer) +add_subdirectory(Fwk/AppFwk/cafUserInterface) +add_subdirectory(Fwk/AppFwk/cafPdmCvf) include_directories( ${cafUserInterface_SOURCE_DIR} diff --git a/CommonCode/cvfStructGridScalarDataAccess.h b/CommonCode/cvfStructGridScalarDataAccess.h deleted file mode 100644 index cbdac5ee4e..0000000000 --- a/CommonCode/cvfStructGridScalarDataAccess.h +++ /dev/null @@ -1,38 +0,0 @@ -//################################################################################################## -// -// Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. -// -//################################################################################################## - -#pragma once - -#include "cvfBase.h" -#include "cvfObject.h" -#include "cvfVector3.h" - - -namespace cvf { - - -class StructGridScalarDataAccess : public Object -{ -public: - virtual double cellScalar(size_t cellIndex) const = 0; - virtual void setCellScalar(size_t cellIndex, double value) = 0; -}; - - -} // namespace cvf diff --git a/CommonCode/CMakeLists.txt b/Fwk/AppFwk/CommonCode/CMakeLists.txt similarity index 100% rename from CommonCode/CMakeLists.txt rename to Fwk/AppFwk/CommonCode/CMakeLists.txt diff --git a/CommonCode/cafEffectCache.cpp b/Fwk/AppFwk/CommonCode/cafEffectCache.cpp similarity index 79% rename from CommonCode/cafEffectCache.cpp rename to Fwk/AppFwk/CommonCode/cafEffectCache.cpp index 5000acb1b0..d0734f361a 100644 --- a/CommonCode/cafEffectCache.cpp +++ b/Fwk/AppFwk/CommonCode/cafEffectCache.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafEffectGenerator.h" #include "cafEffectCache.h" diff --git a/CommonCode/cafEffectCache.h b/Fwk/AppFwk/CommonCode/cafEffectCache.h similarity index 60% rename from CommonCode/cafEffectCache.h rename to Fwk/AppFwk/CommonCode/cafEffectCache.h index d617d77d5b..c26e437b80 100644 --- a/CommonCode/cafEffectCache.h +++ b/Fwk/AppFwk/CommonCode/cafEffectCache.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfBase.h" diff --git a/CommonCode/cafEffectGenerator.cpp b/Fwk/AppFwk/CommonCode/cafEffectGenerator.cpp similarity index 95% rename from CommonCode/cafEffectGenerator.cpp rename to Fwk/AppFwk/CommonCode/cafEffectGenerator.cpp index 910dbcb2e0..84dcdc4a08 100644 --- a/CommonCode/cafEffectGenerator.cpp +++ b/Fwk/AppFwk/CommonCode/cafEffectGenerator.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafEffectGenerator.h" #include "cafUtils.h" @@ -43,8 +61,8 @@ namespace caf { -//############################################################################################################################# -//############################################################################################################################# +//============================================================================================================================= +//============================================================================================================================= static const char light_AmbientDiffuse_inl[] = " \n" "varying vec3 v_ecPosition; \n" diff --git a/CommonCode/cafEffectGenerator.h b/Fwk/AppFwk/CommonCode/cafEffectGenerator.h similarity index 87% rename from CommonCode/cafEffectGenerator.h rename to Fwk/AppFwk/CommonCode/cafEffectGenerator.h index 735008aac8..f2fc2f4420 100644 --- a/CommonCode/cafEffectGenerator.h +++ b/Fwk/AppFwk/CommonCode/cafEffectGenerator.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfBase.h" diff --git a/CommonCode/cafLog.cpp b/Fwk/AppFwk/CommonCode/cafLog.cpp similarity index 82% rename from CommonCode/cafLog.cpp rename to Fwk/AppFwk/CommonCode/cafLog.cpp index 76f5b047a6..aab270bd36 100644 --- a/CommonCode/cafLog.cpp +++ b/Fwk/AppFwk/CommonCode/cafLog.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfTrace.h" diff --git a/CommonCode/cafLog.h b/Fwk/AppFwk/CommonCode/cafLog.h similarity index 56% rename from CommonCode/cafLog.h rename to Fwk/AppFwk/CommonCode/cafLog.h index 31e2127b7f..00fb26c2d1 100644 --- a/CommonCode/cafLog.h +++ b/Fwk/AppFwk/CommonCode/cafLog.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once class QString; diff --git a/CommonCode/cafMessagePanel.cpp b/Fwk/AppFwk/CommonCode/cafMessagePanel.cpp similarity index 79% rename from CommonCode/cafMessagePanel.cpp rename to Fwk/AppFwk/CommonCode/cafMessagePanel.cpp index 0d0ece7dcf..88714f07f1 100644 --- a/CommonCode/cafMessagePanel.cpp +++ b/Fwk/AppFwk/CommonCode/cafMessagePanel.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafMessagePanel.h" #include diff --git a/CommonCode/cafMessagePanel.h b/Fwk/AppFwk/CommonCode/cafMessagePanel.h similarity index 57% rename from CommonCode/cafMessagePanel.h rename to Fwk/AppFwk/CommonCode/cafMessagePanel.h index d48dff62f8..65ab380145 100644 --- a/CommonCode/cafMessagePanel.h +++ b/Fwk/AppFwk/CommonCode/cafMessagePanel.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include diff --git a/CommonCode/cafMouseState.cpp b/Fwk/AppFwk/CommonCode/cafMouseState.cpp similarity index 88% rename from CommonCode/cafMouseState.cpp rename to Fwk/AppFwk/CommonCode/cafMouseState.cpp index 69d44f3d6d..a14040b23d 100644 --- a/CommonCode/cafMouseState.cpp +++ b/Fwk/AppFwk/CommonCode/cafMouseState.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfMath.h" #include "cafMouseState.h" diff --git a/CommonCode/cafMouseState.h b/Fwk/AppFwk/CommonCode/cafMouseState.h similarity index 71% rename from CommonCode/cafMouseState.h rename to Fwk/AppFwk/CommonCode/cafMouseState.h index bb072b1062..e8db4c3990 100644 --- a/CommonCode/cafMouseState.h +++ b/Fwk/AppFwk/CommonCode/cafMouseState.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once class QMouseEvent; diff --git a/CommonCode/cafUtils.cpp b/Fwk/AppFwk/CommonCode/cafUtils.cpp similarity index 77% rename from CommonCode/cafUtils.cpp rename to Fwk/AppFwk/CommonCode/cafUtils.cpp index 41434fed1b..53a25f9c74 100644 --- a/CommonCode/cafUtils.cpp +++ b/Fwk/AppFwk/CommonCode/cafUtils.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafUtils.h" #include diff --git a/CommonCode/cafUtils.h b/Fwk/AppFwk/CommonCode/cafUtils.h similarity index 57% rename from CommonCode/cafUtils.h rename to Fwk/AppFwk/CommonCode/cafUtils.h index 248eeef537..27e85796c8 100644 --- a/CommonCode/cafUtils.h +++ b/Fwk/AppFwk/CommonCode/cafUtils.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once class QLineEdit; diff --git a/CommonCode/cvfStructGrid.cpp b/Fwk/AppFwk/CommonCode/cvfStructGrid.cpp similarity index 90% rename from CommonCode/cvfStructGrid.cpp rename to Fwk/AppFwk/CommonCode/cvfStructGrid.cpp index cbd42c01f4..91a84021fe 100644 --- a/CommonCode/cvfStructGrid.cpp +++ b/Fwk/AppFwk/CommonCode/cvfStructGrid.cpp @@ -1,23 +1,41 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfStructGrid.h" diff --git a/CommonCode/cvfStructGrid.h b/Fwk/AppFwk/CommonCode/cvfStructGrid.h similarity index 74% rename from CommonCode/cvfStructGrid.h rename to Fwk/AppFwk/CommonCode/cvfStructGrid.h index 4353192b74..cde6c212ce 100644 --- a/CommonCode/cvfStructGrid.h +++ b/Fwk/AppFwk/CommonCode/cvfStructGrid.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/CommonCode/cvfStructGridGeometryGenerator.cpp b/Fwk/AppFwk/CommonCode/cvfStructGridGeometryGenerator.cpp similarity index 93% rename from CommonCode/cvfStructGridGeometryGenerator.cpp rename to Fwk/AppFwk/CommonCode/cvfStructGridGeometryGenerator.cpp index 18f7591bb7..0cd2bfe5ee 100644 --- a/CommonCode/cvfStructGridGeometryGenerator.cpp +++ b/Fwk/AppFwk/CommonCode/cvfStructGridGeometryGenerator.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfStructGrid.h" diff --git a/CommonCode/cvfStructGridGeometryGenerator.h b/Fwk/AppFwk/CommonCode/cvfStructGridGeometryGenerator.h similarity index 83% rename from CommonCode/cvfStructGridGeometryGenerator.h rename to Fwk/AppFwk/CommonCode/cvfStructGridGeometryGenerator.h index 26d9c7be11..14b9691a61 100644 --- a/CommonCode/cvfStructGridGeometryGenerator.h +++ b/Fwk/AppFwk/CommonCode/cvfStructGridGeometryGenerator.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/Fwk/AppFwk/CommonCode/cvfStructGridScalarDataAccess.h b/Fwk/AppFwk/CommonCode/cvfStructGridScalarDataAccess.h new file mode 100644 index 0000000000..506c7d45ed --- /dev/null +++ b/Fwk/AppFwk/CommonCode/cvfStructGridScalarDataAccess.h @@ -0,0 +1,56 @@ +//################################################################################################## +// +// Custom Visualization Core library +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. +// +//################################################################################################## + + +#pragma once + +#include "cvfBase.h" +#include "cvfObject.h" +#include "cvfVector3.h" + + +namespace cvf { + + +class StructGridScalarDataAccess : public Object +{ +public: + virtual double cellScalar(size_t cellIndex) const = 0; + virtual void setCellScalar(size_t cellIndex, double value) = 0; +}; + + +} // namespace cvf diff --git a/cafAnimControl/CMakeLists.txt b/Fwk/AppFwk/cafAnimControl/CMakeLists.txt similarity index 100% rename from cafAnimControl/CMakeLists.txt rename to Fwk/AppFwk/cafAnimControl/CMakeLists.txt diff --git a/cafAnimControl/Resources/Fast.png b/Fwk/AppFwk/cafAnimControl/Resources/Fast.png similarity index 100% rename from cafAnimControl/Resources/Fast.png rename to Fwk/AppFwk/cafAnimControl/Resources/Fast.png diff --git a/cafAnimControl/Resources/Pause.png b/Fwk/AppFwk/cafAnimControl/Resources/Pause.png similarity index 100% rename from cafAnimControl/Resources/Pause.png rename to Fwk/AppFwk/cafAnimControl/Resources/Pause.png diff --git a/cafAnimControl/Resources/Play.png b/Fwk/AppFwk/cafAnimControl/Resources/Play.png similarity index 100% rename from cafAnimControl/Resources/Play.png rename to Fwk/AppFwk/cafAnimControl/Resources/Play.png diff --git a/cafAnimControl/Resources/PlayBwd.png b/Fwk/AppFwk/cafAnimControl/Resources/PlayBwd.png similarity index 100% rename from cafAnimControl/Resources/PlayBwd.png rename to Fwk/AppFwk/cafAnimControl/Resources/PlayBwd.png diff --git a/cafAnimControl/Resources/RepeatFromStart.png b/Fwk/AppFwk/cafAnimControl/Resources/RepeatFromStart.png similarity index 100% rename from cafAnimControl/Resources/RepeatFromStart.png rename to Fwk/AppFwk/cafAnimControl/Resources/RepeatFromStart.png diff --git a/cafAnimControl/Resources/RepeatFwdBwd.png b/Fwk/AppFwk/cafAnimControl/Resources/RepeatFwdBwd.png similarity index 100% rename from cafAnimControl/Resources/RepeatFwdBwd.png rename to Fwk/AppFwk/cafAnimControl/Resources/RepeatFwdBwd.png diff --git a/cafAnimControl/Resources/SkipToEnd.png b/Fwk/AppFwk/cafAnimControl/Resources/SkipToEnd.png similarity index 100% rename from cafAnimControl/Resources/SkipToEnd.png rename to Fwk/AppFwk/cafAnimControl/Resources/SkipToEnd.png diff --git a/cafAnimControl/Resources/SkipToStart.png b/Fwk/AppFwk/cafAnimControl/Resources/SkipToStart.png similarity index 100% rename from cafAnimControl/Resources/SkipToStart.png rename to Fwk/AppFwk/cafAnimControl/Resources/SkipToStart.png diff --git a/cafAnimControl/Resources/Slow.png b/Fwk/AppFwk/cafAnimControl/Resources/Slow.png similarity index 100% rename from cafAnimControl/Resources/Slow.png rename to Fwk/AppFwk/cafAnimControl/Resources/Slow.png diff --git a/cafAnimControl/Resources/StepBwd.png b/Fwk/AppFwk/cafAnimControl/Resources/StepBwd.png similarity index 100% rename from cafAnimControl/Resources/StepBwd.png rename to Fwk/AppFwk/cafAnimControl/Resources/StepBwd.png diff --git a/cafAnimControl/Resources/StepFwd.png b/Fwk/AppFwk/cafAnimControl/Resources/StepFwd.png similarity index 100% rename from cafAnimControl/Resources/StepFwd.png rename to Fwk/AppFwk/cafAnimControl/Resources/StepFwd.png diff --git a/cafAnimControl/Resources/Stop.png b/Fwk/AppFwk/cafAnimControl/Resources/Stop.png similarity index 100% rename from cafAnimControl/Resources/Stop.png rename to Fwk/AppFwk/cafAnimControl/Resources/Stop.png diff --git a/cafAnimControl/Resources/cafAnimControl.qrc b/Fwk/AppFwk/cafAnimControl/Resources/cafAnimControl.qrc similarity index 100% rename from cafAnimControl/Resources/cafAnimControl.qrc rename to Fwk/AppFwk/cafAnimControl/Resources/cafAnimControl.qrc diff --git a/cafAnimControl/cafAnimationToolBar.cpp b/Fwk/AppFwk/cafAnimControl/cafAnimationToolBar.cpp similarity index 92% rename from cafAnimControl/cafAnimationToolBar.cpp rename to Fwk/AppFwk/cafAnimControl/cafAnimationToolBar.cpp index ab0c5ba7b1..3121662b04 100644 --- a/cafAnimControl/cafAnimationToolBar.cpp +++ b/Fwk/AppFwk/cafAnimControl/cafAnimationToolBar.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafAnimationToolBar.h" #include diff --git a/cafAnimControl/cafAnimationToolBar.h b/Fwk/AppFwk/cafAnimControl/cafAnimationToolBar.h similarity index 70% rename from cafAnimControl/cafAnimationToolBar.h rename to Fwk/AppFwk/cafAnimControl/cafAnimationToolBar.h index 527e2c2b55..e09bd0c521 100644 --- a/cafAnimControl/cafAnimationToolBar.h +++ b/Fwk/AppFwk/cafAnimControl/cafAnimationToolBar.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include diff --git a/cafAnimControl/cafFrameAnimationControl.cpp b/Fwk/AppFwk/cafAnimControl/cafFrameAnimationControl.cpp similarity index 92% rename from cafAnimControl/cafFrameAnimationControl.cpp rename to Fwk/AppFwk/cafAnimControl/cafFrameAnimationControl.cpp index 4ec1e04953..8a10a2dd73 100644 --- a/cafAnimControl/cafFrameAnimationControl.cpp +++ b/Fwk/AppFwk/cafAnimControl/cafFrameAnimationControl.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafFrameAnimationControl.h" #include "qtimer.h" diff --git a/cafAnimControl/cafFrameAnimationControl.h b/Fwk/AppFwk/cafAnimControl/cafFrameAnimationControl.h similarity index 70% rename from cafAnimControl/cafFrameAnimationControl.h rename to Fwk/AppFwk/cafAnimControl/cafFrameAnimationControl.h index 755e51185c..89023c76e6 100644 --- a/cafAnimControl/cafFrameAnimationControl.h +++ b/Fwk/AppFwk/cafAnimControl/cafFrameAnimationControl.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include diff --git a/cafPdmCvf/CMakeLists.txt b/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt similarity index 100% rename from cafPdmCvf/CMakeLists.txt rename to Fwk/AppFwk/cafPdmCvf/CMakeLists.txt diff --git a/cafPdmCvf/cafPdmFieldCvfColor.cpp b/Fwk/AppFwk/cafPdmCvf/cafPdmFieldCvfColor.cpp similarity index 53% rename from cafPdmCvf/cafPdmFieldCvfColor.cpp rename to Fwk/AppFwk/cafPdmCvf/cafPdmFieldCvfColor.cpp index def8fe5ebe..17bafcf76f 100644 --- a/cafPdmCvf/cafPdmFieldCvfColor.cpp +++ b/Fwk/AppFwk/cafPdmCvf/cafPdmFieldCvfColor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include #include "cvfBase.h" diff --git a/cafPdmCvf/cafPdmFieldCvfColor.h b/Fwk/AppFwk/cafPdmCvf/cafPdmFieldCvfColor.h similarity index 69% rename from cafPdmCvf/cafPdmFieldCvfColor.h rename to Fwk/AppFwk/cafPdmCvf/cafPdmFieldCvfColor.h index 3d68d6351a..d8f7a5c777 100644 --- a/cafPdmCvf/cafPdmFieldCvfColor.h +++ b/Fwk/AppFwk/cafPdmCvf/cafPdmFieldCvfColor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include #include diff --git a/cafPdmCvf/cafPdmFieldCvfMat4d.cpp b/Fwk/AppFwk/cafPdmCvf/cafPdmFieldCvfMat4d.cpp similarity index 55% rename from cafPdmCvf/cafPdmFieldCvfMat4d.cpp rename to Fwk/AppFwk/cafPdmCvf/cafPdmFieldCvfMat4d.cpp index 1df6fcc652..ea16aafe1e 100644 --- a/cafPdmCvf/cafPdmFieldCvfMat4d.cpp +++ b/Fwk/AppFwk/cafPdmCvf/cafPdmFieldCvfMat4d.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include // Includes needed for field editor registration diff --git a/cafPdmCvf/cafPdmFieldCvfMat4d.h b/Fwk/AppFwk/cafPdmCvf/cafPdmFieldCvfMat4d.h similarity index 69% rename from cafPdmCvf/cafPdmFieldCvfMat4d.h rename to Fwk/AppFwk/cafPdmCvf/cafPdmFieldCvfMat4d.h index ed27923756..7afa2f1f3d 100644 --- a/cafPdmCvf/cafPdmFieldCvfMat4d.h +++ b/Fwk/AppFwk/cafPdmCvf/cafPdmFieldCvfMat4d.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include #include diff --git a/cafProjectDataModel/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt similarity index 100% rename from cafProjectDataModel/CMakeLists.txt rename to Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt diff --git a/cafProjectDataModel/cafAppEnum.h b/Fwk/AppFwk/cafProjectDataModel/cafAppEnum.h similarity index 90% rename from cafProjectDataModel/cafAppEnum.h rename to Fwk/AppFwk/cafProjectDataModel/cafAppEnum.h index 11ec828b34..927f416c67 100644 --- a/cafProjectDataModel/cafAppEnum.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafAppEnum.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include diff --git a/cafProjectDataModel/cafFactory.h b/Fwk/AppFwk/cafProjectDataModel/cafFactory.h similarity index 79% rename from cafProjectDataModel/cafFactory.h rename to Fwk/AppFwk/cafProjectDataModel/cafFactory.h index aa5e95725d..e4712b3cd5 100644 --- a/cafProjectDataModel/cafFactory.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafFactory.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include diff --git a/cafProjectDataModel/cafFixedArray.h b/Fwk/AppFwk/cafProjectDataModel/cafFixedArray.h similarity index 61% rename from cafProjectDataModel/cafFixedArray.h rename to Fwk/AppFwk/cafProjectDataModel/cafFixedArray.h index 40b9f14a76..d52d8d92dd 100644 --- a/cafProjectDataModel/cafFixedArray.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafFixedArray.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once namespace caf diff --git a/cafProjectDataModel/cafOmpMutex.h b/Fwk/AppFwk/cafProjectDataModel/cafOmpMutex.h similarity index 68% rename from cafProjectDataModel/cafOmpMutex.h rename to Fwk/AppFwk/cafProjectDataModel/cafOmpMutex.h index 98b4e65326..3887bf2b18 100644 --- a/cafProjectDataModel/cafOmpMutex.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafOmpMutex.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include diff --git a/cafProjectDataModel/cafPdmDocument.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.cpp similarity index 85% rename from cafProjectDataModel/cafPdmDocument.cpp rename to Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.cpp index 8bc3cac261..d6c3c5504b 100644 --- a/cafProjectDataModel/cafPdmDocument.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmDocument.h" #include diff --git a/cafProjectDataModel/cafPdmDocument.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.h similarity index 78% rename from cafProjectDataModel/cafPdmDocument.h rename to Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.h index 8c58fe950f..bdd8ff8e4e 100644 --- a/cafProjectDataModel/cafPdmDocument.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafPdmField.h" #include "cafPdmObject.h" diff --git a/cafProjectDataModel/cafPdmField.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmField.cpp similarity index 85% rename from cafProjectDataModel/cafPdmField.cpp rename to Fwk/AppFwk/cafProjectDataModel/cafPdmField.cpp index bda3dbeb01..a266bb290b 100644 --- a/cafProjectDataModel/cafPdmField.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmField.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmField.h" #include "cafPdmObject.h" diff --git a/cafProjectDataModel/cafPdmField.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmField.h similarity index 91% rename from cafProjectDataModel/cafPdmField.h rename to Fwk/AppFwk/cafProjectDataModel/cafPdmField.h index 22b0d081f7..17daab0bc9 100644 --- a/cafProjectDataModel/cafPdmField.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmField.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafPdmUiItem.h" diff --git a/cafProjectDataModel/cafPdmField.inl b/Fwk/AppFwk/cafProjectDataModel/cafPdmField.inl similarity index 96% rename from cafProjectDataModel/cafPdmField.inl rename to Fwk/AppFwk/cafProjectDataModel/cafPdmField.inl index b9e538653c..efeffa85a9 100644 --- a/cafProjectDataModel/cafPdmField.inl +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmField.inl @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmObject.h" #include #include diff --git a/cafProjectDataModel/cafPdmFieldImpl.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmFieldImpl.h similarity index 93% rename from cafProjectDataModel/cafPdmFieldImpl.h rename to Fwk/AppFwk/cafProjectDataModel/cafPdmFieldImpl.h index ac3bb79c51..13deae974a 100644 --- a/cafProjectDataModel/cafPdmFieldImpl.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmFieldImpl.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include #include diff --git a/cafProjectDataModel/cafPdmObject.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.cpp similarity index 88% rename from cafProjectDataModel/cafPdmObject.cpp rename to Fwk/AppFwk/cafProjectDataModel/cafPdmObject.cpp index 533a6d39f6..9f6acd1a49 100644 --- a/cafProjectDataModel/cafPdmObject.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmField.h" #include "cafPdmObject.h" @@ -380,9 +398,25 @@ PdmUiTreeOrdering* PdmObject::uiTreeOrdering(QString uiConfigName /*= ""*/) for (size_t fIdx = 0; fIdx < m_fields.size(); ++fIdx) { - if ( (m_fields[fIdx]->hasChildObjects()) && !uiTreeOrdering->containsField(m_fields[fIdx])) + if (m_fields[fIdx]->hasChildObjects() && !uiTreeOrdering->containsField(m_fields[fIdx])) { - uiTreeOrdering->add( m_fields[fIdx]); + if (m_fields[fIdx]->isUiHidden() && !m_fields[fIdx]->isUiChildrenHidden()) + { + std::vector children; + m_fields[fIdx]->childObjects(&children); + + for (size_t cIdx = 0; cIdx < children.size(); cIdx++) + { + if (!uiTreeOrdering->containsObject(children[cIdx])) + { + uiTreeOrdering->add(children[cIdx]); + } + } + } + else if ( !m_fields[fIdx]->isUiHidden()) + { + uiTreeOrdering->add(m_fields[fIdx]); + } } } } @@ -404,7 +438,7 @@ void PdmObject::expandUiTree(PdmUiTreeOrdering* root, QString uiConfigName /*= " if (!root->isSubTreeDefined() && root->dataObject()) { - if (root->m_field) + if (root->m_field && !root->m_field->isUiChildrenHidden(uiConfigName)) { std::vector fieldsChildObjects; root->m_field->childObjects(&fieldsChildObjects); diff --git a/cafProjectDataModel/cafPdmObject.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.h similarity index 92% rename from cafProjectDataModel/cafPdmObject.h rename to Fwk/AppFwk/cafProjectDataModel/cafPdmObject.h index f91bbce329..75fd509b53 100644 --- a/cafProjectDataModel/cafPdmObject.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafPdmUiItem.h" diff --git a/cafProjectDataModel/cafPdmObjectFactory.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmObjectFactory.h similarity index 71% rename from cafProjectDataModel/cafPdmObjectFactory.h rename to Fwk/AppFwk/cafProjectDataModel/cafPdmObjectFactory.h index bdbd74a29f..76e6348655 100644 --- a/cafProjectDataModel/cafPdmObjectFactory.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmObjectFactory.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include diff --git a/cafProjectDataModel/cafPdmPointer.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmPointer.cpp similarity index 59% rename from cafProjectDataModel/cafPdmPointer.cpp rename to Fwk/AppFwk/cafProjectDataModel/cafPdmPointer.cpp index cf484f7bad..1ab0948343 100644 --- a/cafProjectDataModel/cafPdmPointer.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmPointer.cpp @@ -1,21 +1,39 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmObject.h" #include "cafPdmPointer.h" diff --git a/cafProjectDataModel/cafPdmPointer.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmPointer.h similarity index 79% rename from cafProjectDataModel/cafPdmPointer.h rename to Fwk/AppFwk/cafProjectDataModel/cafPdmPointer.h index 50fa8ca96e..c9ca2359fd 100644 --- a/cafProjectDataModel/cafPdmPointer.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmPointer.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once diff --git a/cafProjectDataModel/cafPdmUiEditorHandle.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiEditorHandle.cpp similarity index 57% rename from cafProjectDataModel/cafPdmUiEditorHandle.cpp rename to Fwk/AppFwk/cafProjectDataModel/cafPdmUiEditorHandle.cpp index 6a01a8e719..b59abf0564 100644 --- a/cafProjectDataModel/cafPdmUiEditorHandle.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiEditorHandle.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiEditorHandle.h" #include "cafPdmUiItem.h" diff --git a/cafProjectDataModel/cafPdmUiEditorHandle.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiEditorHandle.h similarity index 75% rename from cafProjectDataModel/cafPdmUiEditorHandle.h rename to Fwk/AppFwk/cafProjectDataModel/cafPdmUiEditorHandle.h index c32c2cfeae..c03dc8a66e 100644 --- a/cafProjectDataModel/cafPdmUiEditorHandle.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiEditorHandle.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include #include diff --git a/cafProjectDataModel/cafPdmUiFieldEditorHandle.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiFieldEditorHandle.cpp similarity index 74% rename from cafProjectDataModel/cafPdmUiFieldEditorHandle.cpp rename to Fwk/AppFwk/cafProjectDataModel/cafPdmUiFieldEditorHandle.cpp index a820555fe2..2d0ecdc277 100644 --- a/cafProjectDataModel/cafPdmUiFieldEditorHandle.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiFieldEditorHandle.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiFieldEditorHandle.h" #include "cafPdmField.h" diff --git a/cafProjectDataModel/cafPdmUiFieldEditorHandle.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiFieldEditorHandle.h similarity index 82% rename from cafProjectDataModel/cafPdmUiFieldEditorHandle.h rename to Fwk/AppFwk/cafProjectDataModel/cafPdmUiFieldEditorHandle.h index 44b3828995..b685d1fa5a 100644 --- a/cafProjectDataModel/cafPdmUiFieldEditorHandle.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiFieldEditorHandle.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include #include diff --git a/cafProjectDataModel/cafPdmUiItem.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiItem.cpp similarity index 91% rename from cafProjectDataModel/cafPdmUiItem.cpp rename to Fwk/AppFwk/cafProjectDataModel/cafPdmUiItem.cpp index 883b76a86f..8ecc7533c4 100644 --- a/cafProjectDataModel/cafPdmUiItem.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiItem.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiItem.h" #include "cafPdmUiEditorHandle.h" diff --git a/cafProjectDataModel/cafPdmUiItem.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiItem.h similarity index 88% rename from cafProjectDataModel/cafPdmUiItem.h rename to Fwk/AppFwk/cafProjectDataModel/cafPdmUiItem.h index 62a3e3f337..00de8915e3 100644 --- a/cafProjectDataModel/cafPdmUiItem.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiItem.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include #include diff --git a/cafProjectDataModel/cafPdmUiObjectEditorHandle.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiObjectEditorHandle.cpp similarity index 62% rename from cafProjectDataModel/cafPdmUiObjectEditorHandle.cpp rename to Fwk/AppFwk/cafProjectDataModel/cafPdmUiObjectEditorHandle.cpp index d1892e5291..f5b845ab81 100644 --- a/cafProjectDataModel/cafPdmUiObjectEditorHandle.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiObjectEditorHandle.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiObjectEditorHandle.h" #include "cafPdmObject.h" diff --git a/cafProjectDataModel/cafPdmUiObjectEditorHandle.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiObjectEditorHandle.h similarity index 60% rename from cafProjectDataModel/cafPdmUiObjectEditorHandle.h rename to Fwk/AppFwk/cafProjectDataModel/cafPdmUiObjectEditorHandle.h index 954880b170..45138b2f35 100644 --- a/cafProjectDataModel/cafPdmUiObjectEditorHandle.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiObjectEditorHandle.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include #include diff --git a/cafProjectDataModel/cafPdmUiOrdering.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiOrdering.cpp similarity index 66% rename from cafProjectDataModel/cafPdmUiOrdering.cpp rename to Fwk/AppFwk/cafProjectDataModel/cafPdmUiOrdering.cpp index 73447dd78e..b2891ddb45 100644 --- a/cafProjectDataModel/cafPdmUiOrdering.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiOrdering.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiOrdering.h" diff --git a/cafProjectDataModel/cafPdmUiOrdering.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiOrdering.h similarity index 72% rename from cafProjectDataModel/cafPdmUiOrdering.h rename to Fwk/AppFwk/cafProjectDataModel/cafPdmUiOrdering.h index 9ef651ba4f..ba952cbb72 100644 --- a/cafProjectDataModel/cafPdmUiOrdering.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiOrdering.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include #include diff --git a/cafProjectDataModel/cafPdmUiTreeOrdering.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiTreeOrdering.cpp similarity index 64% rename from cafProjectDataModel/cafPdmUiTreeOrdering.cpp rename to Fwk/AppFwk/cafProjectDataModel/cafPdmUiTreeOrdering.cpp index 0ac0cede76..9135a6c07d 100644 --- a/cafProjectDataModel/cafPdmUiTreeOrdering.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiTreeOrdering.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiTreeOrdering.h" #include "cafPdmField.h" @@ -54,14 +72,14 @@ namespace caf //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- - bool PdmUiTreeOrdering::containsField(PdmFieldHandle* field) + bool PdmUiTreeOrdering::containsField(const PdmFieldHandle* field) { assert (field); for (int cIdx = 0; cIdx < this->childCount(); ++cIdx) { PdmUiTreeOrdering* child = dynamic_cast(this->child(cIdx)); - if (!(child->m_field == field)) + if (child->m_field == field) { return true; } @@ -70,6 +88,26 @@ namespace caf return false; } + //-------------------------------------------------------------------------------------------------- + /// + //-------------------------------------------------------------------------------------------------- + bool PdmUiTreeOrdering::containsObject(const PdmObject* object) + { + assert (object); + for (int cIdx = 0; cIdx < this->childCount(); ++cIdx) + { + PdmUiTreeOrdering* child = dynamic_cast(this->child(cIdx)); + + if (child->dataObject() == object) + { + return true; + } + } + + return false; + } + + //-------------------------------------------------------------------------------------------------- /// Creates an new PdmUiTreeOrdering item, and adds it to parent. If position is -1, it is added /// at the end of parents existing child list. @@ -83,5 +121,7 @@ namespace caf } + + } //End of namespace caf diff --git a/cafProjectDataModel/cafPdmUiTreeOrdering.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiTreeOrdering.h similarity index 65% rename from cafProjectDataModel/cafPdmUiTreeOrdering.h rename to Fwk/AppFwk/cafProjectDataModel/cafPdmUiTreeOrdering.h index 652d2af179..5d9def89b4 100644 --- a/cafProjectDataModel/cafPdmUiTreeOrdering.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiTreeOrdering.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include #include @@ -39,6 +57,7 @@ class PdmFieldHandle; class PdmUiTreeOrdering : public UiTreeItem< PdmPointer > { +public: PdmUiTreeOrdering(PdmUiTreeOrdering* parent = NULL, int position = -1, PdmObject* dataObject = NULL); void add(PdmFieldHandle * field); @@ -50,11 +69,14 @@ class PdmUiTreeOrdering : public UiTreeItem< PdmPointer > /// To stop the tree generation at this level, setSubTreeDefined to true void setSubTreeDefined(bool isSubTreeDefined ) { m_isSubTreeDefined = isSubTreeDefined; } + PdmFieldHandle* field() const { return m_field; } + private: friend class PdmObject; bool forgetRemainingFields() const { return m_forgetRemainingFields; } bool isSubTreeDefined() const { return m_isSubTreeDefined; } - bool containsField(PdmFieldHandle* field); + bool containsField(const PdmFieldHandle* field); + bool containsObject(const PdmObject* object); private: PdmFieldHandle* m_field; diff --git a/cafProjectDataModel/cafUiTreeItem.h b/Fwk/AppFwk/cafProjectDataModel/cafUiTreeItem.h similarity index 77% rename from cafProjectDataModel/cafUiTreeItem.h rename to Fwk/AppFwk/cafProjectDataModel/cafUiTreeItem.h index 8ee67e3072..af5bd24def 100644 --- a/cafProjectDataModel/cafUiTreeItem.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafUiTreeItem.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once //#include diff --git a/cafUserInterface/CMakeLists.txt b/Fwk/AppFwk/cafUserInterface/CMakeLists.txt similarity index 100% rename from cafUserInterface/CMakeLists.txt rename to Fwk/AppFwk/cafUserInterface/CMakeLists.txt diff --git a/cafUserInterface/cafBasicAboutDialog.cpp b/Fwk/AppFwk/cafUserInterface/cafBasicAboutDialog.cpp similarity index 90% rename from cafUserInterface/cafBasicAboutDialog.cpp rename to Fwk/AppFwk/cafUserInterface/cafBasicAboutDialog.cpp index 5a1506eed8..8a31f887c6 100644 --- a/cafUserInterface/cafBasicAboutDialog.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafBasicAboutDialog.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafBasicAboutDialog.h" #include diff --git a/cafUserInterface/cafBasicAboutDialog.h b/Fwk/AppFwk/cafUserInterface/cafBasicAboutDialog.h similarity index 68% rename from cafUserInterface/cafBasicAboutDialog.h rename to Fwk/AppFwk/cafUserInterface/cafBasicAboutDialog.h index d94256e388..7f4df36178 100644 --- a/cafUserInterface/cafBasicAboutDialog.h +++ b/Fwk/AppFwk/cafUserInterface/cafBasicAboutDialog.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include diff --git a/cafUserInterface/cafPdmUiCheckBoxEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxEditor.cpp similarity index 73% rename from cafUserInterface/cafPdmUiCheckBoxEditor.cpp rename to Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxEditor.cpp index 84a9cdd207..748cf69a9a 100644 --- a/cafUserInterface/cafPdmUiCheckBoxEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxEditor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiCheckBoxEditor.h" #include "cafPdmUiDefaultObjectEditor.h" @@ -59,6 +77,7 @@ void PdmUiCheckBoxEditor::configureAndUpdateUi(const QString& uiConfigName) m_label->setToolTip(field()->uiToolTip(uiConfigName)); m_checkBox->setEnabled(!field()->isUiReadOnly(uiConfigName)); + m_checkBox->setToolTip(field()->uiToolTip(uiConfigName)); PdmUiCheckBoxEditorAttribute attributes; field()->ownerObject()->editorAttribute(field(), uiConfigName, &attributes); diff --git a/cafUserInterface/cafPdmUiCheckBoxEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxEditor.h similarity index 61% rename from cafUserInterface/cafPdmUiCheckBoxEditor.h rename to Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxEditor.h index 68bb512e28..6b01f50e5a 100644 --- a/cafUserInterface/cafPdmUiCheckBoxEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxEditor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafPdmUiFieldEditorHandle.h" diff --git a/cafUserInterface/cafPdmUiColorEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp similarity index 83% rename from cafUserInterface/cafPdmUiColorEditor.cpp rename to Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp index 450d8511f6..18e8ad2ec8 100644 --- a/cafUserInterface/cafPdmUiColorEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiColorEditor.h" #include "cafPdmUiDefaultObjectEditor.h" diff --git a/cafUserInterface/cafPdmUiColorEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.h similarity index 67% rename from cafUserInterface/cafPdmUiColorEditor.h rename to Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.h index 367f09b8b6..32205d4795 100644 --- a/cafUserInterface/cafPdmUiColorEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafPdmUiFieldEditorHandle.h" diff --git a/cafUserInterface/cafPdmUiComboBoxEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp similarity index 76% rename from cafUserInterface/cafPdmUiComboBoxEditor.cpp rename to Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp index f0f68ac396..7931de06ce 100644 --- a/cafUserInterface/cafPdmUiComboBoxEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiComboBoxEditor.h" #include "cafPdmObject.h" diff --git a/cafUserInterface/cafPdmUiComboBoxEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.h similarity index 62% rename from cafUserInterface/cafPdmUiComboBoxEditor.h rename to Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.h index 8e4b3d4c71..b9c0480cda 100644 --- a/cafUserInterface/cafPdmUiComboBoxEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafPdmUiFieldEditorHandle.h" diff --git a/cafUserInterface/cafPdmUiDefaultObjectEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiDefaultObjectEditor.cpp similarity index 91% rename from cafUserInterface/cafPdmUiDefaultObjectEditor.cpp rename to Fwk/AppFwk/cafUserInterface/cafPdmUiDefaultObjectEditor.cpp index d79c08c9dd..822d2c3185 100644 --- a/cafUserInterface/cafPdmUiDefaultObjectEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiDefaultObjectEditor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiDefaultObjectEditor.h" #include "cafPdmObject.h" diff --git a/cafUserInterface/cafPdmUiDefaultObjectEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiDefaultObjectEditor.h similarity index 65% rename from cafUserInterface/cafPdmUiDefaultObjectEditor.h rename to Fwk/AppFwk/cafUserInterface/cafPdmUiDefaultObjectEditor.h index 5cd2daec3b..3d3a19ba92 100644 --- a/cafUserInterface/cafPdmUiDefaultObjectEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiDefaultObjectEditor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafPdmUiObjectEditorHandle.h" #include diff --git a/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp similarity index 87% rename from cafUserInterface/cafPdmUiDoubleSliderEditor.cpp rename to Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp index 0fb790dfa8..b875d5f266 100644 --- a/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiDoubleSliderEditor.h" #include "cafPdmUiDefaultObjectEditor.h" diff --git a/cafUserInterface/cafPdmUiDoubleSliderEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.h similarity index 68% rename from cafUserInterface/cafPdmUiDoubleSliderEditor.h rename to Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.h index 3e4d489e1a..f92cb32c67 100644 --- a/cafUserInterface/cafPdmUiDoubleSliderEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafPdmUiFieldEditorHandle.h" diff --git a/cafUserInterface/cafPdmUiFilePathEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.cpp similarity index 83% rename from cafUserInterface/cafPdmUiFilePathEditor.cpp rename to Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.cpp index 64070a63c3..1b3f92c7b7 100644 --- a/cafUserInterface/cafPdmUiFilePathEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiFilePathEditor.h" #include "cafPdmUiDefaultObjectEditor.h" @@ -63,8 +81,10 @@ void PdmUiFilePathEditor::configureAndUpdateUi(const QString& uiConfigName) } m_label->setEnabled(!field()->isUiReadOnly(uiConfigName)); + m_label->setToolTip(field()->uiToolTip(uiConfigName)); m_lineEdit->setEnabled(!field()->isUiReadOnly(uiConfigName)); + m_lineEdit->setToolTip(field()->uiToolTip(uiConfigName)); field()->ownerObject()->editorAttribute(field(), uiConfigName, &m_attributes); diff --git a/cafUserInterface/cafPdmUiFilePathEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.h similarity index 68% rename from cafUserInterface/cafPdmUiFilePathEditor.h rename to Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.h index 49eb90c44c..5826cc65cb 100644 --- a/cafUserInterface/cafPdmUiFilePathEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafPdmUiFieldEditorHandle.h" #include diff --git a/cafUserInterface/cafPdmUiLineEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.cpp similarity index 75% rename from cafUserInterface/cafPdmUiLineEditor.cpp rename to Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.cpp index 0e9b59bc51..fbcc9c26da 100644 --- a/cafUserInterface/cafPdmUiLineEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiLineEditor.h" #include "cafPdmUiDefaultObjectEditor.h" @@ -61,7 +79,10 @@ void PdmUiLineEditor::configureAndUpdateUi(const QString& uiConfigName) } m_label->setEnabled(!field()->isUiReadOnly(uiConfigName)); + m_label->setToolTip(field()->uiToolTip(uiConfigName)); + m_lineEdit->setEnabled(!field()->isUiReadOnly(uiConfigName)); + m_lineEdit->setToolTip(field()->uiToolTip(uiConfigName)); PdmUiLineEditorAttribute leab; field()->ownerObject()->editorAttribute(field(), uiConfigName, &leab); diff --git a/cafUserInterface/cafPdmUiLineEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.h similarity index 64% rename from cafUserInterface/cafPdmUiLineEditor.h rename to Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.h index d6dbed42ee..c444a5c1de 100644 --- a/cafUserInterface/cafPdmUiLineEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafPdmUiFieldEditorHandle.h" #include diff --git a/cafUserInterface/cafPdmUiListEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.cpp similarity index 90% rename from cafUserInterface/cafPdmUiListEditor.cpp rename to Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.cpp index 0a715b23d5..059d7e4c52 100644 --- a/cafUserInterface/cafPdmUiListEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiListEditor.h" #include "cafPdmUiDefaultObjectEditor.h" @@ -112,7 +130,10 @@ void PdmUiListEditor::configureAndUpdateUi(const QString& uiConfigName) } m_label->setEnabled(!field()->isUiReadOnly(uiConfigName)); + m_label->setToolTip(field()->uiToolTip(uiConfigName)); + m_listView->setEnabled(!field()->isUiReadOnly(uiConfigName)); + m_listView->setToolTip(field()->uiToolTip(uiConfigName)); /// Demo code Not used yet // PdmUiListEditorAttribute attributes; diff --git a/cafUserInterface/cafPdmUiListEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.h similarity index 68% rename from cafUserInterface/cafPdmUiListEditor.h rename to Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.h index 1135e51060..a8530a14aa 100644 --- a/cafUserInterface/cafPdmUiListEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafPdmUiFieldEditorHandle.h" diff --git a/cafUserInterface/cafPdmUiListView.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiListView.cpp similarity index 62% rename from cafUserInterface/cafPdmUiListView.cpp rename to Fwk/AppFwk/cafUserInterface/cafPdmUiListView.cpp index 944f85b3e5..f9bd1d805c 100644 --- a/cafUserInterface/cafPdmUiListView.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiListView.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiListView.h" #include "cafPdmObject.h" @@ -44,7 +62,10 @@ PdmUiListView::PdmUiListView(QWidget* parent, Qt::WindowFlags f) m_listViewEditor = new PdmUiListViewEditor(); - m_layout->addWidget(m_listViewEditor->getOrCreateWidget(this)); + QWidget* widget = m_listViewEditor->getOrCreateWidget(this); + m_layout->addWidget(widget); + + this->m_layout->setStretchFactor(widget, 10); } //-------------------------------------------------------------------------------------------------- diff --git a/cafUserInterface/cafPdmUiListView.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiListView.h similarity index 55% rename from cafUserInterface/cafPdmUiListView.h rename to Fwk/AppFwk/cafUserInterface/cafPdmUiListView.h index 2c81302a50..a075039d16 100644 --- a/cafUserInterface/cafPdmUiListView.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiListView.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include #include diff --git a/cafUserInterface/cafPdmUiListViewEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.cpp similarity index 87% rename from cafUserInterface/cafPdmUiListViewEditor.cpp rename to Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.cpp index e138d60ff5..a03375dee9 100644 --- a/cafUserInterface/cafPdmUiListViewEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiListViewEditor.h" #include "cafPdmObject.h" diff --git a/cafUserInterface/cafPdmUiListViewEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.h similarity index 74% rename from cafUserInterface/cafPdmUiListViewEditor.h rename to Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.h index 7eece163fc..c46119994a 100644 --- a/cafUserInterface/cafPdmUiListViewEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafPdmUiFieldEditorHandle.h" diff --git a/cafUserInterface/cafPdmUiPropertyView.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.cpp similarity index 80% rename from cafUserInterface/cafPdmUiPropertyView.cpp rename to Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.cpp index 6511ba9014..5dd66dafb2 100644 --- a/cafUserInterface/cafPdmUiPropertyView.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiPropertyView.h" #include "cafPdmObject.h" diff --git a/cafUserInterface/cafPdmUiPropertyView.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.h similarity index 58% rename from cafUserInterface/cafPdmUiPropertyView.h rename to Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.h index 6c944232e1..36cad39a12 100644 --- a/cafUserInterface/cafPdmUiPropertyView.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include #include diff --git a/cafUserInterface/cafPdmUiPushButtonEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.cpp similarity index 76% rename from cafUserInterface/cafPdmUiPushButtonEditor.cpp rename to Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.cpp index 18aa383213..67fdfa6384 100644 --- a/cafUserInterface/cafPdmUiPushButtonEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiPushButtonEditor.h" #include "cafPdmUiDefaultObjectEditor.h" @@ -59,6 +77,8 @@ void PdmUiPushButtonEditor::configureAndUpdateUi(const QString& uiConfigName) //m_label->setEnabled(!field()->isUiReadOnly(uiConfigName)); m_pushButton->setEnabled(!field()->isUiReadOnly(uiConfigName)); + m_pushButton->setToolTip(field()->uiToolTip(uiConfigName)); + m_label->setToolTip(field()->uiToolTip(uiConfigName)); PdmUiPushButtonEditorAttribute attributes; field()->ownerObject()->editorAttribute(field(), uiConfigName, &attributes); diff --git a/cafUserInterface/cafPdmUiPushButtonEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.h similarity index 62% rename from cafUserInterface/cafPdmUiPushButtonEditor.h rename to Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.h index 596f0a5b6b..8e73a5b02a 100644 --- a/cafUserInterface/cafPdmUiPushButtonEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafPdmUiFieldEditorHandle.h" diff --git a/cafUserInterface/cafPdmUiSliderEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.cpp similarity index 80% rename from cafUserInterface/cafPdmUiSliderEditor.cpp rename to Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.cpp index 5c657bd298..c395611f10 100644 --- a/cafUserInterface/cafPdmUiSliderEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiSliderEditor.h" #include "cafPdmUiDefaultObjectEditor.h" @@ -57,8 +75,13 @@ void PdmUiSliderEditor::configureAndUpdateUi(const QString& uiConfigName) } m_label->setEnabled(!field()->isUiReadOnly(uiConfigName)); + m_label->setToolTip(field()->uiToolTip(uiConfigName)); + m_spinBox->setEnabled(!field()->isUiReadOnly(uiConfigName)); + m_spinBox->setToolTip(field()->uiToolTip(uiConfigName)); + m_slider->setEnabled(!field()->isUiReadOnly(uiConfigName)); + m_slider->setToolTip(field()->uiToolTip(uiConfigName)); field()->ownerObject()->editorAttribute(field(), uiConfigName, &m_attributes); diff --git a/cafUserInterface/cafPdmUiSliderEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.h similarity index 66% rename from cafUserInterface/cafPdmUiSliderEditor.h rename to Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.h index df11b3a886..668db5191a 100644 --- a/cafUserInterface/cafPdmUiSliderEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafPdmUiFieldEditorHandle.h" diff --git a/cafUserInterface/cafPdmUiTextEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp similarity index 80% rename from cafUserInterface/cafPdmUiTextEditor.cpp rename to Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp index 1d57335310..6771e82559 100644 --- a/cafUserInterface/cafPdmUiTextEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiTextEditor.h" #include "cafPdmUiDefaultObjectEditor.h" @@ -62,9 +80,11 @@ void PdmUiTextEditor::configureAndUpdateUi(const QString& uiConfigName) } //m_label->setEnabled(!field()->isUiReadOnly(uiConfigName)); + m_label->setToolTip(field()->uiToolTip(uiConfigName)); m_textEdit->setReadOnly(field()->isUiReadOnly(uiConfigName)); //m_textEdit->setEnabled(!field()->isUiReadOnly(uiConfigName)); // Neccesary ? + m_textEdit->setToolTip(field()->uiToolTip(uiConfigName)); PdmUiTextEditorAttribute leab; field()->ownerObject()->editorAttribute(field(), uiConfigName, &leab); diff --git a/cafUserInterface/cafPdmUiTextEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.h similarity index 67% rename from cafUserInterface/cafPdmUiTextEditor.h rename to Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.h index 7f26c6fc6a..0e669307ea 100644 --- a/cafUserInterface/cafPdmUiTextEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafPdmUiFieldEditorHandle.h" #include diff --git a/cafUserInterface/cafPdmUiTreeView.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeView.cpp similarity index 73% rename from cafUserInterface/cafPdmUiTreeView.cpp rename to Fwk/AppFwk/cafUserInterface/cafPdmUiTreeView.cpp index 4ee31e4586..47a3287770 100644 --- a/cafUserInterface/cafPdmUiTreeView.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeView.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiTreeView.h" #include "cafPdmObject.h" diff --git a/cafUserInterface/cafPdmUiTreeView.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeView.h similarity index 58% rename from cafUserInterface/cafPdmUiTreeView.h rename to Fwk/AppFwk/cafUserInterface/cafPdmUiTreeView.h index b0c5d7d420..481f8452fe 100644 --- a/cafUserInterface/cafPdmUiTreeView.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeView.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include #include diff --git a/cafUserInterface/cafPdmUiTreeViewEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp similarity index 70% rename from cafUserInterface/cafPdmUiTreeViewEditor.cpp rename to Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp index 99713963c8..f2653ed19f 100644 --- a/cafUserInterface/cafPdmUiTreeViewEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafPdmUiTreeViewEditor.h" #include "cafPdmObject.h" @@ -27,6 +45,29 @@ #include #include #include +#include + + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +class MySortFilterProxyModel : public QSortFilterProxyModel +{ +public: + MySortFilterProxyModel(QObject *parent = 0) + : QSortFilterProxyModel(parent) + { + + } + + void notifyModelChanged() + { + QModelIndex startModelIdx = index(0,0); + QModelIndex endModelIdx = index(rowCount(startModelIdx), 0); + + emit dataChanged(startModelIdx, endModelIdx); + } +}; @@ -66,8 +107,14 @@ QWidget* PdmUiTreeViewEditor::createWidget(QWidget* parent) m_treeModelPdm = new caf::UiTreeModelPdm(m_mainWidget); m_treeView = new QTreeView(m_mainWidget); - m_treeView->setHeaderHidden(true); - m_treeView->setModel(m_treeModelPdm); + + m_proxyTreeModelPdm = new MySortFilterProxyModel(m_mainWidget); + m_proxyTreeModelPdm->setSourceModel(m_treeModelPdm); + m_treeView->setModel(m_proxyTreeModelPdm); + + m_treeView->setSortingEnabled(true); + m_treeView->sortByColumn(1, Qt::AscendingOrder); + m_layout->addWidget(m_treeView); @@ -107,12 +154,11 @@ void PdmUiTreeViewEditor::configureAndUpdateUi(const QString& uiConfigName) } } - - PdmUiTreeViewEditorAttribute leab; - + m_treeModelPdm->setColumnHeaders(m_editorAttributes.columnHeaders); // Notify all connected views that the complete model is updated m_treeModelPdm->notifyModelChanged(); + m_proxyTreeModelPdm->notifyModelChanged(); } //-------------------------------------------------------------------------------------------------- diff --git a/cafUserInterface/cafPdmUiTreeViewEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.h similarity index 62% rename from cafUserInterface/cafPdmUiTreeViewEditor.h rename to Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.h index 9a5c2d4ece..04ae2f44f9 100644 --- a/cafUserInterface/cafPdmUiTreeViewEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafPdmUiObjectEditorHandle.h" @@ -25,6 +43,8 @@ #include #include +class MySortFilterProxyModel; + class QGridLayout; class QVBoxLayout; class QTreeView; @@ -48,6 +68,7 @@ public: } public: + QStringList columnHeaders; }; @@ -72,8 +93,9 @@ private: QPointer m_mainWidget; QVBoxLayout* m_layout; - QTreeView* m_treeView; - UiTreeModelPdm* m_treeModelPdm; + QTreeView* m_treeView; + UiTreeModelPdm* m_treeModelPdm; + MySortFilterProxyModel* m_proxyTreeModelPdm; // Forward update events to the tree view editor connected to Pdm root object using a proxy editor PdmUiProxyEditorHandle* m_proxyEditor; diff --git a/cafUserInterface/cafProgressInfo.cpp b/Fwk/AppFwk/cafUserInterface/cafProgressInfo.cpp similarity index 93% rename from cafUserInterface/cafProgressInfo.cpp rename to Fwk/AppFwk/cafUserInterface/cafProgressInfo.cpp index 54ff45b7c3..03847fdc3b 100644 --- a/cafUserInterface/cafProgressInfo.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafProgressInfo.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafProgressInfo.h" #include #include diff --git a/cafUserInterface/cafProgressInfo.h b/Fwk/AppFwk/cafUserInterface/cafProgressInfo.h similarity index 56% rename from cafUserInterface/cafProgressInfo.h rename to Fwk/AppFwk/cafUserInterface/cafProgressInfo.h index 9820df12cf..a889a1dda2 100644 --- a/cafUserInterface/cafProgressInfo.h +++ b/Fwk/AppFwk/cafUserInterface/cafProgressInfo.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include diff --git a/cafUserInterface/cafUiProcess.cpp b/Fwk/AppFwk/cafUserInterface/cafUiProcess.cpp similarity index 84% rename from cafUserInterface/cafUiProcess.cpp rename to Fwk/AppFwk/cafUserInterface/cafUiProcess.cpp index 97e9e758bd..bb3c5d0312 100644 --- a/cafUserInterface/cafUiProcess.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafUiProcess.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafUiProcess.h" #include diff --git a/cafUserInterface/cafUiProcess.h b/Fwk/AppFwk/cafUserInterface/cafUiProcess.h similarity index 64% rename from cafUserInterface/cafUiProcess.h rename to Fwk/AppFwk/cafUserInterface/cafUiProcess.h index 60ba6f93f7..46351f1ce5 100644 --- a/cafUserInterface/cafUiProcess.h +++ b/Fwk/AppFwk/cafUserInterface/cafUiProcess.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include diff --git a/cafUserInterface/cafUiTreeModelPdm.cpp b/Fwk/AppFwk/cafUserInterface/cafUiTreeModelPdm.cpp similarity index 91% rename from cafUserInterface/cafUiTreeModelPdm.cpp rename to Fwk/AppFwk/cafUserInterface/cafUiTreeModelPdm.cpp index e00efee9e2..5c5718e878 100644 --- a/cafUserInterface/cafUiTreeModelPdm.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafUiTreeModelPdm.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafUiTreeModelPdm.h" #include "cafPdmField.h" #include "cafPdmObject.h" @@ -480,6 +498,33 @@ void UiTreeModelPdm::notifyModelChanged() emit dataChanged(startModelIdx, endModelIdx); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QVariant UiTreeModelPdm::headerData(int section, Qt::Orientation orientation, int role /*= Qt::DisplayRole */) const +{ + if (role != Qt::DisplayRole) + return QVariant(); + + if (section < m_columnHeaders.size()) + { + return m_columnHeaders[section]; + } + + return QVariant(); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void UiTreeModelPdm::setColumnHeaders(const QStringList& columnHeaders) +{ + m_columnHeaders = columnHeaders; +} + + + + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/cafUserInterface/cafUiTreeModelPdm.h b/Fwk/AppFwk/cafUserInterface/cafUiTreeModelPdm.h similarity index 70% rename from cafUserInterface/cafUiTreeModelPdm.h rename to Fwk/AppFwk/cafUserInterface/cafUiTreeModelPdm.h index f26811ad64..2bba5d4210 100644 --- a/cafUserInterface/cafUiTreeModelPdm.h +++ b/Fwk/AppFwk/cafUserInterface/cafUiTreeModelPdm.h @@ -1,27 +1,47 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafUiTreeItem.h" #include +#include + #include #include "cafPdmPointer.h" @@ -53,6 +73,7 @@ public: void updateUiSubTree(PdmObject* root); void notifyModelChanged(); + void setColumnHeaders(const QStringList& columnHeaders); public: // Overrides from QAbstractItemModel @@ -61,10 +82,12 @@ public: virtual int rowCount(const QModelIndex &parentIndex = QModelIndex( ) ) const; virtual int columnCount(const QModelIndex &parentIndex = QModelIndex( ) ) const; virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole ) const; + virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const; virtual Qt::ItemFlags flags(const QModelIndex &index) const; virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + virtual bool removeRows_special(int position, int rows, const QModelIndex &parent = QModelIndex()); protected: @@ -73,6 +96,7 @@ private: void updateModelSubTree(const QModelIndex& uiSubTreeRootModelIdx, PdmUiTreeItem* uiModelSubTreeRoot, PdmUiTreeItem* updatedPdmSubTreeRoot); PdmUiTreeItem* m_treeItemRoot; + QStringList m_columnHeaders; }; diff --git a/cafViewer/CMakeLists.txt b/Fwk/AppFwk/cafViewer/CMakeLists.txt similarity index 100% rename from cafViewer/CMakeLists.txt rename to Fwk/AppFwk/cafViewer/CMakeLists.txt diff --git a/cafViewer/cafCadNavigation.cpp b/Fwk/AppFwk/cafViewer/cafCadNavigation.cpp similarity index 88% rename from cafViewer/cafCadNavigation.cpp rename to Fwk/AppFwk/cafViewer/cafCadNavigation.cpp index 28b4023d91..f31032b0ec 100644 --- a/cafViewer/cafCadNavigation.cpp +++ b/Fwk/AppFwk/cafViewer/cafCadNavigation.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafCadNavigation.h" #include "cafViewer.h" #include "cvfCamera.h" diff --git a/cafViewer/cafCadNavigation.h b/Fwk/AppFwk/cafViewer/cafCadNavigation.h similarity index 57% rename from cafViewer/cafCadNavigation.h rename to Fwk/AppFwk/cafViewer/cafCadNavigation.h index 9ace3fddc0..9cbae679be 100644 --- a/cafViewer/cafCadNavigation.h +++ b/Fwk/AppFwk/cafViewer/cafCadNavigation.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafNavigationPolicy.h" diff --git a/cafViewer/cafCeetronNavigation.cpp b/Fwk/AppFwk/cafViewer/cafCeetronNavigation.cpp similarity index 89% rename from cafViewer/cafCeetronNavigation.cpp rename to Fwk/AppFwk/cafViewer/cafCeetronNavigation.cpp index e4a444ed20..8202ac2432 100644 --- a/cafViewer/cafCeetronNavigation.cpp +++ b/Fwk/AppFwk/cafViewer/cafCeetronNavigation.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafCeetronNavigation.h" #include "cafViewer.h" #include "cvfCamera.h" diff --git a/cafViewer/cafCeetronNavigation.h b/Fwk/AppFwk/cafViewer/cafCeetronNavigation.h similarity index 63% rename from cafViewer/cafCeetronNavigation.h rename to Fwk/AppFwk/cafViewer/cafCeetronNavigation.h index c6374db724..e9f7d78f73 100644 --- a/cafViewer/cafCeetronNavigation.h +++ b/Fwk/AppFwk/cafViewer/cafCeetronNavigation.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cafNavigationPolicy.h" diff --git a/cafViewer/cafNavigationPolicy.cpp b/Fwk/AppFwk/cafViewer/cafNavigationPolicy.cpp similarity index 52% rename from cafViewer/cafNavigationPolicy.cpp rename to Fwk/AppFwk/cafViewer/cafNavigationPolicy.cpp index a597256ac8..52a1b3e37c 100644 --- a/cafViewer/cafNavigationPolicy.cpp +++ b/Fwk/AppFwk/cafViewer/cafNavigationPolicy.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafNavigationPolicy.h" #include "cafViewer.h" #include "cvfScene.h" diff --git a/cafViewer/cafNavigationPolicy.h b/Fwk/AppFwk/cafViewer/cafNavigationPolicy.h similarity index 59% rename from cafViewer/cafNavigationPolicy.h rename to Fwk/AppFwk/cafViewer/cafNavigationPolicy.h index ab8e1fabdd..66a9528e44 100644 --- a/cafViewer/cafNavigationPolicy.h +++ b/Fwk/AppFwk/cafViewer/cafNavigationPolicy.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfAssert.h" diff --git a/cafViewer/cafOpenGLWidget.cpp b/Fwk/AppFwk/cafViewer/cafOpenGLWidget.cpp similarity index 84% rename from cafViewer/cafOpenGLWidget.cpp rename to Fwk/AppFwk/cafViewer/cafOpenGLWidget.cpp index f479ddf88c..1813c08e3e 100644 --- a/cafViewer/cafOpenGLWidget.cpp +++ b/Fwk/AppFwk/cafViewer/cafOpenGLWidget.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOpenGLContextGroup.h" #include "cvfqtCvfBoundQGLContext.h" diff --git a/cafViewer/cafOpenGLWidget.h b/Fwk/AppFwk/cafViewer/cafOpenGLWidget.h similarity index 57% rename from cafViewer/cafOpenGLWidget.h rename to Fwk/AppFwk/cafViewer/cafOpenGLWidget.h index c1528dc518..b0cf0a5cd2 100644 --- a/cafViewer/cafOpenGLWidget.h +++ b/Fwk/AppFwk/cafViewer/cafOpenGLWidget.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include diff --git a/cafViewer/cafViewer.cpp b/Fwk/AppFwk/cafViewer/cafViewer.cpp similarity index 96% rename from cafViewer/cafViewer.cpp rename to Fwk/AppFwk/cafViewer/cafViewer.cpp index b1b7356911..11018c0abc 100644 --- a/cafViewer/cafViewer.cpp +++ b/Fwk/AppFwk/cafViewer/cafViewer.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cafViewer.h" #include "cvfCamera.h" diff --git a/cafViewer/cafViewer.h b/Fwk/AppFwk/cafViewer/cafViewer.h similarity index 86% rename from cafViewer/cafViewer.h rename to Fwk/AppFwk/cafViewer/cafViewer.h index e9ad4bf13e..8cc92a41b5 100644 --- a/cafViewer/cafViewer.h +++ b/Fwk/AppFwk/cafViewer/cafViewer.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfAssert.h" diff --git a/VisualizationModules/LibCore/CMakeLists.txt b/Fwk/VizFwk/LibCore/CMakeLists.txt similarity index 100% rename from VisualizationModules/LibCore/CMakeLists.txt rename to Fwk/VizFwk/LibCore/CMakeLists.txt diff --git a/VisualizationModules/LibCore/cvfArray.h b/Fwk/VizFwk/LibCore/cvfArray.h similarity index 81% rename from VisualizationModules/LibCore/cvfArray.h rename to Fwk/VizFwk/LibCore/cvfArray.h index f4657bf952..d52d104c20 100644 --- a/VisualizationModules/LibCore/cvfArray.h +++ b/Fwk/VizFwk/LibCore/cvfArray.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibCore/cvfArray.inl b/Fwk/VizFwk/LibCore/cvfArray.inl similarity index 95% rename from VisualizationModules/LibCore/cvfArray.inl rename to Fwk/VizFwk/LibCore/cvfArray.inl index b480ddc06a..6f76a71919 100644 --- a/VisualizationModules/LibCore/cvfArray.inl +++ b/Fwk/VizFwk/LibCore/cvfArray.inl @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + namespace cvf { @@ -752,7 +770,7 @@ T Array::max(size_t* index) const /// /// \param other Modifiable reference to the array that should have its contents swapped. /// -/// \warning Note that signature differs from normal CeeVizFramework practice. This is done to be +/// \warning Note that signature differs from normal practice. This is done to be /// consistent with the signature of std::swap() //-------------------------------------------------------------------------------------------------- template diff --git a/VisualizationModules/LibCore/cvfAssert.cpp b/Fwk/VizFwk/LibCore/cvfAssert.cpp similarity index 93% rename from VisualizationModules/LibCore/cvfAssert.cpp rename to Fwk/VizFwk/LibCore/cvfAssert.cpp index 272c2ab8ef..d5f300925a 100644 --- a/VisualizationModules/LibCore/cvfAssert.cpp +++ b/Fwk/VizFwk/LibCore/cvfAssert.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfAssert.h" #include "cvfSystem.h" diff --git a/VisualizationModules/LibCore/cvfAssert.h b/Fwk/VizFwk/LibCore/cvfAssert.h similarity index 73% rename from VisualizationModules/LibCore/cvfAssert.h rename to Fwk/VizFwk/LibCore/cvfAssert.h index aa89c8edd7..dde61490c5 100644 --- a/VisualizationModules/LibCore/cvfAssert.h +++ b/Fwk/VizFwk/LibCore/cvfAssert.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once namespace cvf { diff --git a/VisualizationModules/LibCore/cvfBase.h b/Fwk/VizFwk/LibCore/cvfBase.h similarity index 76% rename from VisualizationModules/LibCore/cvfBase.h rename to Fwk/VizFwk/LibCore/cvfBase.h index 674faaa968..30970d05fb 100644 --- a/VisualizationModules/LibCore/cvfBase.h +++ b/Fwk/VizFwk/LibCore/cvfBase.h @@ -1,29 +1,47 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #if !defined(WIN32) && !defined(CVF_LINUX) && !defined(CVF_IOS) && !defined(CVF_OSX) && !defined(CVF_ANDROID) #error No platform defined #endif -// Global include file with definitions useful for all CeeVizFramework files +// Global include file with definitions useful for all library files // Disable some annoying warnings so we can compile with warning level Wall #ifdef WIN32 diff --git a/VisualizationModules/LibCore/cvfBase64.cpp b/Fwk/VizFwk/LibCore/cvfBase64.cpp similarity index 81% rename from VisualizationModules/LibCore/cvfBase64.cpp rename to Fwk/VizFwk/LibCore/cvfBase64.cpp index ba03300ca9..b12aceb715 100644 --- a/VisualizationModules/LibCore/cvfBase64.cpp +++ b/Fwk/VizFwk/LibCore/cvfBase64.cpp @@ -1,12 +1,40 @@ //################################################################################################## // -// CeeVizFramework -// Lib: LibCore -// -// -------------------------------------------------------------------------------------------- -// Please see references below for copyright, usage rights and license for this file. +// Custom Visualization Core library +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. +// //################################################################################################## + #include "cvfBase.h" #include "cvfBase64.h" diff --git a/VisualizationModules/LibCore/cvfBase64.h b/Fwk/VizFwk/LibCore/cvfBase64.h similarity index 52% rename from VisualizationModules/LibCore/cvfBase64.h rename to Fwk/VizFwk/LibCore/cvfBase64.h index 68473230ed..cbe956e29c 100644 --- a/VisualizationModules/LibCore/cvfBase64.h +++ b/Fwk/VizFwk/LibCore/cvfBase64.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfString.h" diff --git a/VisualizationModules/LibCore/cvfCharArray.cpp b/Fwk/VizFwk/LibCore/cvfCharArray.cpp similarity index 82% rename from VisualizationModules/LibCore/cvfCharArray.cpp rename to Fwk/VizFwk/LibCore/cvfCharArray.cpp index 92fb3e5b5c..0754cc987b 100644 --- a/VisualizationModules/LibCore/cvfCharArray.cpp +++ b/Fwk/VizFwk/LibCore/cvfCharArray.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfCharArray.h" #include "cvfSystem.h" diff --git a/VisualizationModules/LibCore/cvfCharArray.h b/Fwk/VizFwk/LibCore/cvfCharArray.h similarity index 55% rename from VisualizationModules/LibCore/cvfCharArray.h rename to Fwk/VizFwk/LibCore/cvfCharArray.h index a4448313be..b2707fa4eb 100644 --- a/VisualizationModules/LibCore/cvfCharArray.h +++ b/Fwk/VizFwk/LibCore/cvfCharArray.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include diff --git a/VisualizationModules/LibCore/cvfCodeLocation.cpp b/Fwk/VizFwk/LibCore/cvfCodeLocation.cpp similarity index 82% rename from VisualizationModules/LibCore/cvfCodeLocation.cpp rename to Fwk/VizFwk/LibCore/cvfCodeLocation.cpp index 4716136be2..3d6e8e533d 100644 --- a/VisualizationModules/LibCore/cvfCodeLocation.cpp +++ b/Fwk/VizFwk/LibCore/cvfCodeLocation.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfCodeLocation.h" diff --git a/VisualizationModules/LibCore/cvfCodeLocation.h b/Fwk/VizFwk/LibCore/cvfCodeLocation.h similarity index 62% rename from VisualizationModules/LibCore/cvfCodeLocation.h rename to Fwk/VizFwk/LibCore/cvfCodeLocation.h index c8f5722a72..1e35b511fc 100644 --- a/VisualizationModules/LibCore/cvfCodeLocation.h +++ b/Fwk/VizFwk/LibCore/cvfCodeLocation.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once namespace cvf { diff --git a/VisualizationModules/LibCore/cvfCollection.h b/Fwk/VizFwk/LibCore/cvfCollection.h similarity index 69% rename from VisualizationModules/LibCore/cvfCollection.h rename to Fwk/VizFwk/LibCore/cvfCollection.h index 26075711d9..bca56507b9 100644 --- a/VisualizationModules/LibCore/cvfCollection.h +++ b/Fwk/VizFwk/LibCore/cvfCollection.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibCore/cvfCollection.inl b/Fwk/VizFwk/LibCore/cvfCollection.inl similarity index 90% rename from VisualizationModules/LibCore/cvfCollection.inl rename to Fwk/VizFwk/LibCore/cvfCollection.inl index 862b99b6fd..063e10c11e 100644 --- a/VisualizationModules/LibCore/cvfCollection.inl +++ b/Fwk/VizFwk/LibCore/cvfCollection.inl @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + namespace cvf { diff --git a/VisualizationModules/LibCore/cvfColor3.cpp b/Fwk/VizFwk/LibCore/cvfColor3.cpp similarity index 94% rename from VisualizationModules/LibCore/cvfColor3.cpp rename to Fwk/VizFwk/LibCore/cvfColor3.cpp index d1e606cf2a..cab22e0023 100644 --- a/VisualizationModules/LibCore/cvfColor3.cpp +++ b/Fwk/VizFwk/LibCore/cvfColor3.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfColor3.h" #include "cvfMath.h" diff --git a/VisualizationModules/LibCore/cvfColor3.h b/Fwk/VizFwk/LibCore/cvfColor3.h similarity index 82% rename from VisualizationModules/LibCore/cvfColor3.h rename to Fwk/VizFwk/LibCore/cvfColor3.h index 0b6e894e2f..524ba5227e 100644 --- a/VisualizationModules/LibCore/cvfColor3.h +++ b/Fwk/VizFwk/LibCore/cvfColor3.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once namespace cvf { diff --git a/VisualizationModules/LibCore/cvfColor4.cpp b/Fwk/VizFwk/LibCore/cvfColor4.cpp similarity index 94% rename from VisualizationModules/LibCore/cvfColor4.cpp rename to Fwk/VizFwk/LibCore/cvfColor4.cpp index 54cbad72af..9a3bb013e4 100644 --- a/VisualizationModules/LibCore/cvfColor4.cpp +++ b/Fwk/VizFwk/LibCore/cvfColor4.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfColor4.h" #include "cvfColor3.h" diff --git a/VisualizationModules/LibCore/cvfColor4.h b/Fwk/VizFwk/LibCore/cvfColor4.h similarity index 74% rename from VisualizationModules/LibCore/cvfColor4.h rename to Fwk/VizFwk/LibCore/cvfColor4.h index 3d1f4b2fd2..db4764527e 100644 --- a/VisualizationModules/LibCore/cvfColor4.h +++ b/Fwk/VizFwk/LibCore/cvfColor4.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfColor3.h" diff --git a/VisualizationModules/LibCore/cvfConfigCore.h b/Fwk/VizFwk/LibCore/cvfConfigCore.h similarity index 61% rename from VisualizationModules/LibCore/cvfConfigCore.h rename to Fwk/VizFwk/LibCore/cvfConfigCore.h index e84ff0a1c3..b0fc3be3e6 100644 --- a/VisualizationModules/LibCore/cvfConfigCore.h +++ b/Fwk/VizFwk/LibCore/cvfConfigCore.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once diff --git a/VisualizationModules/LibCore/cvfDebugTimer.cpp b/Fwk/VizFwk/LibCore/cvfDebugTimer.cpp similarity index 85% rename from VisualizationModules/LibCore/cvfDebugTimer.cpp rename to Fwk/VizFwk/LibCore/cvfDebugTimer.cpp index a1301ea940..c08e3194c3 100644 --- a/VisualizationModules/LibCore/cvfDebugTimer.cpp +++ b/Fwk/VizFwk/LibCore/cvfDebugTimer.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfDebugTimer.h" #include "cvfTimer.h" diff --git a/VisualizationModules/LibCore/cvfDebugTimer.h b/Fwk/VizFwk/LibCore/cvfDebugTimer.h similarity index 63% rename from VisualizationModules/LibCore/cvfDebugTimer.h rename to Fwk/VizFwk/LibCore/cvfDebugTimer.h index 9297a3df2b..13a83af1a6 100644 --- a/VisualizationModules/LibCore/cvfDebugTimer.h +++ b/Fwk/VizFwk/LibCore/cvfDebugTimer.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfString.h" diff --git a/VisualizationModules/LibCore/cvfFlags.h b/Fwk/VizFwk/LibCore/cvfFlags.h similarity index 60% rename from VisualizationModules/LibCore/cvfFlags.h rename to Fwk/VizFwk/LibCore/cvfFlags.h index 31d15c4bc8..65af77efc7 100644 --- a/VisualizationModules/LibCore/cvfFlags.h +++ b/Fwk/VizFwk/LibCore/cvfFlags.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once namespace cvf { diff --git a/VisualizationModules/LibCore/cvfFlags.inl b/Fwk/VizFwk/LibCore/cvfFlags.inl similarity index 85% rename from VisualizationModules/LibCore/cvfFlags.inl rename to Fwk/VizFwk/LibCore/cvfFlags.inl index 74d0969bc6..4f2b93606d 100644 --- a/VisualizationModules/LibCore/cvfFlags.inl +++ b/Fwk/VizFwk/LibCore/cvfFlags.inl @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + namespace cvf { diff --git a/VisualizationModules/LibCore/cvfFunctorRange.h b/Fwk/VizFwk/LibCore/cvfFunctorRange.h similarity index 61% rename from VisualizationModules/LibCore/cvfFunctorRange.h rename to Fwk/VizFwk/LibCore/cvfFunctorRange.h index d8946f3e01..b04861a711 100644 --- a/VisualizationModules/LibCore/cvfFunctorRange.h +++ b/Fwk/VizFwk/LibCore/cvfFunctorRange.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once namespace cvf { diff --git a/VisualizationModules/LibCore/cvfLibCore.h b/Fwk/VizFwk/LibCore/cvfLibCore.h similarity index 55% rename from VisualizationModules/LibCore/cvfLibCore.h rename to Fwk/VizFwk/LibCore/cvfLibCore.h index 02ddf45b05..88238dfa22 100644 --- a/VisualizationModules/LibCore/cvfLibCore.h +++ b/Fwk/VizFwk/LibCore/cvfLibCore.h @@ -1,29 +1,47 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + // Doxygen module definition -/// \ingroup CeeVizFramework +/// \ingroup VizFramework /// @{ /// \defgroup Core Core module /// @} -/// \defgroup CeeVizFramework CeeViz Framework Basis +/// \defgroup VizFramework Framework Basis // Intentionally on top to be included first #include "cvfBase.h" diff --git a/VisualizationModules/LibCore/cvfLogDestination.h b/Fwk/VizFwk/LibCore/cvfLogDestination.h similarity index 50% rename from VisualizationModules/LibCore/cvfLogDestination.h rename to Fwk/VizFwk/LibCore/cvfLogDestination.h index 9fa8e12ae0..b3b9c7294f 100644 --- a/VisualizationModules/LibCore/cvfLogDestination.h +++ b/Fwk/VizFwk/LibCore/cvfLogDestination.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibCore/cvfLogDestinationConsole.cpp b/Fwk/VizFwk/LibCore/cvfLogDestinationConsole.cpp similarity index 78% rename from VisualizationModules/LibCore/cvfLogDestinationConsole.cpp rename to Fwk/VizFwk/LibCore/cvfLogDestinationConsole.cpp index 3ec37d5d57..2c1e302594 100644 --- a/VisualizationModules/LibCore/cvfLogDestinationConsole.cpp +++ b/Fwk/VizFwk/LibCore/cvfLogDestinationConsole.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfLogDestinationConsole.h" #include "cvfLogEvent.h" diff --git a/VisualizationModules/LibCore/cvfLogDestinationConsole.h b/Fwk/VizFwk/LibCore/cvfLogDestinationConsole.h similarity index 54% rename from VisualizationModules/LibCore/cvfLogDestinationConsole.h rename to Fwk/VizFwk/LibCore/cvfLogDestinationConsole.h index 87f3bdd00a..640f9d6c6b 100644 --- a/VisualizationModules/LibCore/cvfLogDestinationConsole.h +++ b/Fwk/VizFwk/LibCore/cvfLogDestinationConsole.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfLogDestination.h" diff --git a/VisualizationModules/LibCore/cvfLogDestinationFile.cpp b/Fwk/VizFwk/LibCore/cvfLogDestinationFile.cpp similarity index 81% rename from VisualizationModules/LibCore/cvfLogDestinationFile.cpp rename to Fwk/VizFwk/LibCore/cvfLogDestinationFile.cpp index c6b6617e05..bcf2d51f11 100644 --- a/VisualizationModules/LibCore/cvfLogDestinationFile.cpp +++ b/Fwk/VizFwk/LibCore/cvfLogDestinationFile.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfLogDestinationFile.h" #include "cvfLogEvent.h" diff --git a/VisualizationModules/LibCore/cvfLogDestinationFile.h b/Fwk/VizFwk/LibCore/cvfLogDestinationFile.h similarity index 56% rename from VisualizationModules/LibCore/cvfLogDestinationFile.h rename to Fwk/VizFwk/LibCore/cvfLogDestinationFile.h index a01ddc344b..a2d56fd800 100644 --- a/VisualizationModules/LibCore/cvfLogDestinationFile.h +++ b/Fwk/VizFwk/LibCore/cvfLogDestinationFile.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfLogDestination.h" diff --git a/VisualizationModules/LibCore/cvfLogEvent.cpp b/Fwk/VizFwk/LibCore/cvfLogEvent.cpp similarity index 78% rename from VisualizationModules/LibCore/cvfLogEvent.cpp rename to Fwk/VizFwk/LibCore/cvfLogEvent.cpp index 7d08ffe386..66454c6468 100644 --- a/VisualizationModules/LibCore/cvfLogEvent.cpp +++ b/Fwk/VizFwk/LibCore/cvfLogEvent.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfLogEvent.h" diff --git a/VisualizationModules/LibCore/cvfLogEvent.h b/Fwk/VizFwk/LibCore/cvfLogEvent.h similarity index 62% rename from VisualizationModules/LibCore/cvfLogEvent.h rename to Fwk/VizFwk/LibCore/cvfLogEvent.h index 4cb02f5313..10c23270fa 100644 --- a/VisualizationModules/LibCore/cvfLogEvent.h +++ b/Fwk/VizFwk/LibCore/cvfLogEvent.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibCore/cvfLogManager.cpp b/Fwk/VizFwk/LibCore/cvfLogManager.cpp similarity index 88% rename from VisualizationModules/LibCore/cvfLogManager.cpp rename to Fwk/VizFwk/LibCore/cvfLogManager.cpp index 1e48c0abf9..eb5800a506 100644 --- a/VisualizationModules/LibCore/cvfLogManager.cpp +++ b/Fwk/VizFwk/LibCore/cvfLogManager.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfLogManager.h" #include "cvfLogDestinationConsole.h" diff --git a/VisualizationModules/LibCore/cvfLogManager.h b/Fwk/VizFwk/LibCore/cvfLogManager.h similarity index 67% rename from VisualizationModules/LibCore/cvfLogManager.h rename to Fwk/VizFwk/LibCore/cvfLogManager.h index 50720e7bff..381de9b5b2 100644 --- a/VisualizationModules/LibCore/cvfLogManager.h +++ b/Fwk/VizFwk/LibCore/cvfLogManager.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibCore/cvfLogger.cpp b/Fwk/VizFwk/LibCore/cvfLogger.cpp similarity index 85% rename from VisualizationModules/LibCore/cvfLogger.cpp rename to Fwk/VizFwk/LibCore/cvfLogger.cpp index 5a97eea156..5862e7e7b0 100644 --- a/VisualizationModules/LibCore/cvfLogger.cpp +++ b/Fwk/VizFwk/LibCore/cvfLogger.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfLogger.h" #include "cvfLogEvent.h" diff --git a/VisualizationModules/LibCore/cvfLogger.h b/Fwk/VizFwk/LibCore/cvfLogger.h similarity index 75% rename from VisualizationModules/LibCore/cvfLogger.h rename to Fwk/VizFwk/LibCore/cvfLogger.h index d48e4363a6..c92bee3d1c 100644 --- a/VisualizationModules/LibCore/cvfLogger.h +++ b/Fwk/VizFwk/LibCore/cvfLogger.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibCore/cvfMath.cpp b/Fwk/VizFwk/LibCore/cvfMath.cpp similarity index 90% rename from VisualizationModules/LibCore/cvfMath.cpp rename to Fwk/VizFwk/LibCore/cvfMath.cpp index e475990763..f60827db25 100644 --- a/VisualizationModules/LibCore/cvfMath.cpp +++ b/Fwk/VizFwk/LibCore/cvfMath.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfMath.h" diff --git a/VisualizationModules/LibCore/cvfMath.h b/Fwk/VizFwk/LibCore/cvfMath.h similarity index 77% rename from VisualizationModules/LibCore/cvfMath.h rename to Fwk/VizFwk/LibCore/cvfMath.h index d97becdc2d..0b0b7ab2b6 100644 --- a/VisualizationModules/LibCore/cvfMath.h +++ b/Fwk/VizFwk/LibCore/cvfMath.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once namespace cvf { diff --git a/VisualizationModules/LibCore/cvfMath.inl b/Fwk/VizFwk/LibCore/cvfMath.inl similarity index 69% rename from VisualizationModules/LibCore/cvfMath.inl rename to Fwk/VizFwk/LibCore/cvfMath.inl index 3a9bd26ff4..fe104c0087 100644 --- a/VisualizationModules/LibCore/cvfMath.inl +++ b/Fwk/VizFwk/LibCore/cvfMath.inl @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + namespace cvf { diff --git a/VisualizationModules/LibCore/cvfMatrix3.h b/Fwk/VizFwk/LibCore/cvfMatrix3.h similarity index 73% rename from VisualizationModules/LibCore/cvfMatrix3.h rename to Fwk/VizFwk/LibCore/cvfMatrix3.h index 8b1a3ae348..06162d8d1d 100644 --- a/VisualizationModules/LibCore/cvfMatrix3.h +++ b/Fwk/VizFwk/LibCore/cvfMatrix3.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfSystem.h" diff --git a/VisualizationModules/LibCore/cvfMatrix3.inl b/Fwk/VizFwk/LibCore/cvfMatrix3.inl similarity index 93% rename from VisualizationModules/LibCore/cvfMatrix3.inl rename to Fwk/VizFwk/LibCore/cvfMatrix3.inl index 266487bb60..e5698586ac 100644 --- a/VisualizationModules/LibCore/cvfMatrix3.inl +++ b/Fwk/VizFwk/LibCore/cvfMatrix3.inl @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + namespace cvf { diff --git a/VisualizationModules/LibCore/cvfMatrix4.h b/Fwk/VizFwk/LibCore/cvfMatrix4.h similarity index 80% rename from VisualizationModules/LibCore/cvfMatrix4.h rename to Fwk/VizFwk/LibCore/cvfMatrix4.h index c9a9b5b6da..141d524225 100644 --- a/VisualizationModules/LibCore/cvfMatrix4.h +++ b/Fwk/VizFwk/LibCore/cvfMatrix4.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfSystem.h" diff --git a/VisualizationModules/LibCore/cvfMatrix4.inl b/Fwk/VizFwk/LibCore/cvfMatrix4.inl similarity index 96% rename from VisualizationModules/LibCore/cvfMatrix4.inl rename to Fwk/VizFwk/LibCore/cvfMatrix4.inl index d0c39d62c8..6a2a0a9545 100644 --- a/VisualizationModules/LibCore/cvfMatrix4.inl +++ b/Fwk/VizFwk/LibCore/cvfMatrix4.inl @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + namespace cvf { diff --git a/VisualizationModules/LibCore/cvfMutex.cpp b/Fwk/VizFwk/LibCore/cvfMutex.cpp similarity index 83% rename from VisualizationModules/LibCore/cvfMutex.cpp rename to Fwk/VizFwk/LibCore/cvfMutex.cpp index d72a683d1a..139c203051 100644 --- a/VisualizationModules/LibCore/cvfMutex.cpp +++ b/Fwk/VizFwk/LibCore/cvfMutex.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfMutex.h" diff --git a/VisualizationModules/LibCore/cvfMutex.h b/Fwk/VizFwk/LibCore/cvfMutex.h similarity index 54% rename from VisualizationModules/LibCore/cvfMutex.h rename to Fwk/VizFwk/LibCore/cvfMutex.h index 5571a9717c..4f62e668cd 100644 --- a/VisualizationModules/LibCore/cvfMutex.h +++ b/Fwk/VizFwk/LibCore/cvfMutex.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include diff --git a/VisualizationModules/LibCore/cvfObject.cpp b/Fwk/VizFwk/LibCore/cvfObject.cpp similarity index 78% rename from VisualizationModules/LibCore/cvfObject.cpp rename to Fwk/VizFwk/LibCore/cvfObject.cpp index 68edaf99f8..6ac3272793 100644 --- a/VisualizationModules/LibCore/cvfObject.cpp +++ b/Fwk/VizFwk/LibCore/cvfObject.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfObject.h" #include "cvfTrace.h" diff --git a/VisualizationModules/LibCore/cvfObject.h b/Fwk/VizFwk/LibCore/cvfObject.h similarity index 85% rename from VisualizationModules/LibCore/cvfObject.h rename to Fwk/VizFwk/LibCore/cvfObject.h index 2943ed065c..9ff28e7ad6 100644 --- a/VisualizationModules/LibCore/cvfObject.h +++ b/Fwk/VizFwk/LibCore/cvfObject.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfSystem.h" diff --git a/VisualizationModules/LibCore/cvfObject.inl b/Fwk/VizFwk/LibCore/cvfObject.inl similarity index 93% rename from VisualizationModules/LibCore/cvfObject.inl rename to Fwk/VizFwk/LibCore/cvfObject.inl index 40529aee8f..a4c65fd573 100644 --- a/VisualizationModules/LibCore/cvfObject.inl +++ b/Fwk/VizFwk/LibCore/cvfObject.inl @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + namespace cvf { @@ -354,7 +372,7 @@ bool ref::operator<(const ref& rhs) const /// Swap the associated pointer in this and the passed ref object. Will not modify the reference /// count of any of the associated objects. /// -/// \warning Note that signature differs from normal CeeVizFramework practice. This is done to be +/// \warning Note that signature differs from normal practice. This is done to be /// consistent with the signature of std::swap() //-------------------------------------------------------------------------------------------------- template diff --git a/VisualizationModules/LibCore/cvfPlane.cpp b/Fwk/VizFwk/LibCore/cvfPlane.cpp similarity index 94% rename from VisualizationModules/LibCore/cvfPlane.cpp rename to Fwk/VizFwk/LibCore/cvfPlane.cpp index 6f42e802a6..dcb523125a 100644 --- a/VisualizationModules/LibCore/cvfPlane.cpp +++ b/Fwk/VizFwk/LibCore/cvfPlane.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfPlane.h" #include "cvfMath.h" diff --git a/VisualizationModules/LibCore/cvfPlane.h b/Fwk/VizFwk/LibCore/cvfPlane.h similarity index 73% rename from VisualizationModules/LibCore/cvfPlane.h rename to Fwk/VizFwk/LibCore/cvfPlane.h index f3f500aa5a..0ce4614d69 100644 --- a/VisualizationModules/LibCore/cvfPlane.h +++ b/Fwk/VizFwk/LibCore/cvfPlane.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibCore/cvfPropertySet.cpp b/Fwk/VizFwk/LibCore/cvfPropertySet.cpp similarity index 81% rename from VisualizationModules/LibCore/cvfPropertySet.cpp rename to Fwk/VizFwk/LibCore/cvfPropertySet.cpp index dac0d3feb1..0854b69d1e 100644 --- a/VisualizationModules/LibCore/cvfPropertySet.cpp +++ b/Fwk/VizFwk/LibCore/cvfPropertySet.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfPropertySet.h" diff --git a/VisualizationModules/LibCore/cvfPropertySet.h b/Fwk/VizFwk/LibCore/cvfPropertySet.h similarity index 61% rename from VisualizationModules/LibCore/cvfPropertySet.h rename to Fwk/VizFwk/LibCore/cvfPropertySet.h index cf2f0969df..1433a4185e 100644 --- a/VisualizationModules/LibCore/cvfPropertySet.h +++ b/Fwk/VizFwk/LibCore/cvfPropertySet.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibCore/cvfPropertySetCollection.cpp b/Fwk/VizFwk/LibCore/cvfPropertySetCollection.cpp similarity index 82% rename from VisualizationModules/LibCore/cvfPropertySetCollection.cpp rename to Fwk/VizFwk/LibCore/cvfPropertySetCollection.cpp index f751d2170a..66ba15c733 100644 --- a/VisualizationModules/LibCore/cvfPropertySetCollection.cpp +++ b/Fwk/VizFwk/LibCore/cvfPropertySetCollection.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfPropertySetCollection.h" diff --git a/VisualizationModules/LibCore/cvfPropertySetCollection.h b/Fwk/VizFwk/LibCore/cvfPropertySetCollection.h similarity index 60% rename from VisualizationModules/LibCore/cvfPropertySetCollection.h rename to Fwk/VizFwk/LibCore/cvfPropertySetCollection.h index 2b8b628aea..20f58ec63f 100644 --- a/VisualizationModules/LibCore/cvfPropertySetCollection.h +++ b/Fwk/VizFwk/LibCore/cvfPropertySetCollection.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibCore/cvfQuat.h b/Fwk/VizFwk/LibCore/cvfQuat.h similarity index 72% rename from VisualizationModules/LibCore/cvfQuat.h rename to Fwk/VizFwk/LibCore/cvfQuat.h index be9f0791de..428a5aade6 100644 --- a/VisualizationModules/LibCore/cvfQuat.h +++ b/Fwk/VizFwk/LibCore/cvfQuat.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfVector3.h" diff --git a/VisualizationModules/LibCore/cvfQuat.inl b/Fwk/VizFwk/LibCore/cvfQuat.inl similarity index 91% rename from VisualizationModules/LibCore/cvfQuat.inl rename to Fwk/VizFwk/LibCore/cvfQuat.inl index a97f3f531d..e4a0b3a610 100644 --- a/VisualizationModules/LibCore/cvfQuat.inl +++ b/Fwk/VizFwk/LibCore/cvfQuat.inl @@ -1,23 +1,41 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + namespace cvf { diff --git a/VisualizationModules/LibCore/cvfRect.h b/Fwk/VizFwk/LibCore/cvfRect.h similarity index 70% rename from VisualizationModules/LibCore/cvfRect.h rename to Fwk/VizFwk/LibCore/cvfRect.h index 93c71c34fd..40772f86d5 100644 --- a/VisualizationModules/LibCore/cvfRect.h +++ b/Fwk/VizFwk/LibCore/cvfRect.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfVector2.h" diff --git a/VisualizationModules/LibCore/cvfRect.inl b/Fwk/VizFwk/LibCore/cvfRect.inl similarity index 93% rename from VisualizationModules/LibCore/cvfRect.inl rename to Fwk/VizFwk/LibCore/cvfRect.inl index 420f0e4c21..5c1f991957 100644 --- a/VisualizationModules/LibCore/cvfRect.inl +++ b/Fwk/VizFwk/LibCore/cvfRect.inl @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + namespace cvf { diff --git a/VisualizationModules/LibCore/cvfString.cpp b/Fwk/VizFwk/LibCore/cvfString.cpp similarity index 97% rename from VisualizationModules/LibCore/cvfString.cpp rename to Fwk/VizFwk/LibCore/cvfString.cpp index af87068021..be05c85b7e 100644 --- a/VisualizationModules/LibCore/cvfString.cpp +++ b/Fwk/VizFwk/LibCore/cvfString.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfString.h" #include "cvfSystem.h" @@ -1533,7 +1551,7 @@ String String::arg(double a, int fieldWidth, char format, int precision, const w /// /// \param other Modifiable reference to the string that should have its contents swapped. /// -/// \warning Note that signature differs from normal CeeVizFramework practice. This is done to be +/// \warning Note that signature differs from normal practice. This is done to be /// consistent with the signature of std::swap() //-------------------------------------------------------------------------------------------------- void String::swap(String& other) diff --git a/VisualizationModules/LibCore/cvfString.h b/Fwk/VizFwk/LibCore/cvfString.h similarity index 82% rename from VisualizationModules/LibCore/cvfString.h rename to Fwk/VizFwk/LibCore/cvfString.h index 342f6d37e6..0be089dcde 100644 --- a/VisualizationModules/LibCore/cvfString.h +++ b/Fwk/VizFwk/LibCore/cvfString.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfCharArray.h" diff --git a/VisualizationModules/LibCore/cvfSystem.cpp b/Fwk/VizFwk/LibCore/cvfSystem.cpp similarity index 89% rename from VisualizationModules/LibCore/cvfSystem.cpp rename to Fwk/VizFwk/LibCore/cvfSystem.cpp index 31933c81c2..60c7f0b37f 100644 --- a/VisualizationModules/LibCore/cvfSystem.cpp +++ b/Fwk/VizFwk/LibCore/cvfSystem.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfSystem.h" #include "cvfString.h" diff --git a/VisualizationModules/LibCore/cvfSystem.h b/Fwk/VizFwk/LibCore/cvfSystem.h similarity index 61% rename from VisualizationModules/LibCore/cvfSystem.h rename to Fwk/VizFwk/LibCore/cvfSystem.h index 841880ee07..e705f28108 100644 --- a/VisualizationModules/LibCore/cvfSystem.h +++ b/Fwk/VizFwk/LibCore/cvfSystem.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once namespace cvf { diff --git a/VisualizationModules/LibCore/cvfTBBControl.cpp b/Fwk/VizFwk/LibCore/cvfTBBControl.cpp similarity index 65% rename from VisualizationModules/LibCore/cvfTBBControl.cpp rename to Fwk/VizFwk/LibCore/cvfTBBControl.cpp index 80669d8033..105c501865 100644 --- a/VisualizationModules/LibCore/cvfTBBControl.cpp +++ b/Fwk/VizFwk/LibCore/cvfTBBControl.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfTBBControl.h" diff --git a/VisualizationModules/LibCore/cvfTBBControl.h b/Fwk/VizFwk/LibCore/cvfTBBControl.h similarity index 50% rename from VisualizationModules/LibCore/cvfTBBControl.h rename to Fwk/VizFwk/LibCore/cvfTBBControl.h index b7a2eb3aea..11bab6e1a8 100644 --- a/VisualizationModules/LibCore/cvfTBBControl.h +++ b/Fwk/VizFwk/LibCore/cvfTBBControl.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once namespace cvf { diff --git a/VisualizationModules/LibCore/cvfTimer.cpp b/Fwk/VizFwk/LibCore/cvfTimer.cpp similarity index 87% rename from VisualizationModules/LibCore/cvfTimer.cpp rename to Fwk/VizFwk/LibCore/cvfTimer.cpp index ddb45b4132..db80ce18ba 100644 --- a/VisualizationModules/LibCore/cvfTimer.cpp +++ b/Fwk/VizFwk/LibCore/cvfTimer.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfTimer.h" diff --git a/VisualizationModules/LibCore/cvfTimer.h b/Fwk/VizFwk/LibCore/cvfTimer.h similarity index 51% rename from VisualizationModules/LibCore/cvfTimer.h rename to Fwk/VizFwk/LibCore/cvfTimer.h index ddee5e0c5e..3b0f3f82a2 100644 --- a/VisualizationModules/LibCore/cvfTimer.h +++ b/Fwk/VizFwk/LibCore/cvfTimer.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibCore/cvfTrace.cpp b/Fwk/VizFwk/LibCore/cvfTrace.cpp similarity index 80% rename from VisualizationModules/LibCore/cvfTrace.cpp rename to Fwk/VizFwk/LibCore/cvfTrace.cpp index 99fa035708..5abf95390d 100644 --- a/VisualizationModules/LibCore/cvfTrace.cpp +++ b/Fwk/VizFwk/LibCore/cvfTrace.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfTrace.h" #include "cvfSystem.h" diff --git a/VisualizationModules/LibCore/cvfTrace.h b/Fwk/VizFwk/LibCore/cvfTrace.h similarity index 57% rename from VisualizationModules/LibCore/cvfTrace.h rename to Fwk/VizFwk/LibCore/cvfTrace.h index 1d6fa9877b..48e902604a 100644 --- a/VisualizationModules/LibCore/cvfTrace.h +++ b/Fwk/VizFwk/LibCore/cvfTrace.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfString.h" diff --git a/VisualizationModules/LibCore/cvfValueArray.h b/Fwk/VizFwk/LibCore/cvfValueArray.h similarity index 62% rename from VisualizationModules/LibCore/cvfValueArray.h rename to Fwk/VizFwk/LibCore/cvfValueArray.h index 754990a7ed..9047f66492 100644 --- a/VisualizationModules/LibCore/cvfValueArray.h +++ b/Fwk/VizFwk/LibCore/cvfValueArray.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfVector4.h" diff --git a/VisualizationModules/LibCore/cvfVariant.cpp b/Fwk/VizFwk/LibCore/cvfVariant.cpp similarity index 92% rename from VisualizationModules/LibCore/cvfVariant.cpp rename to Fwk/VizFwk/LibCore/cvfVariant.cpp index 971e3df03f..989e912946 100644 --- a/VisualizationModules/LibCore/cvfVariant.cpp +++ b/Fwk/VizFwk/LibCore/cvfVariant.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfVariant.h" diff --git a/VisualizationModules/LibCore/cvfVariant.h b/Fwk/VizFwk/LibCore/cvfVariant.h similarity index 71% rename from VisualizationModules/LibCore/cvfVariant.h rename to Fwk/VizFwk/LibCore/cvfVariant.h index 0983c37d24..80decf6e34 100644 --- a/VisualizationModules/LibCore/cvfVariant.h +++ b/Fwk/VizFwk/LibCore/cvfVariant.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfVector3.h" diff --git a/Fwk/VizFwk/LibCore/cvfVector2.cpp b/Fwk/VizFwk/LibCore/cvfVector2.cpp new file mode 100644 index 0000000000..2930a25f62 --- /dev/null +++ b/Fwk/VizFwk/LibCore/cvfVector2.cpp @@ -0,0 +1,50 @@ +//################################################################################################## +// +// Custom Visualization Core library +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. +// +//################################################################################################## + + +#include "cvfBase.h" +#include "cvfVector2.h" + +namespace cvf { + + +template<> Vector2 const Vector2::UNDEFINED(UNDEFINED_DOUBLE, UNDEFINED_DOUBLE); +template<> Vector2 const Vector2::UNDEFINED(UNDEFINED_FLOAT, UNDEFINED_FLOAT); +template<> Vector2 const Vector2::UNDEFINED(UNDEFINED_INT, UNDEFINED_INT); + + +} // namespace cvf + diff --git a/VisualizationModules/LibCore/cvfVector2.h b/Fwk/VizFwk/LibCore/cvfVector2.h similarity index 80% rename from VisualizationModules/LibCore/cvfVector2.h rename to Fwk/VizFwk/LibCore/cvfVector2.h index 00a6bc0db3..0bf1806b67 100644 --- a/VisualizationModules/LibCore/cvfVector2.h +++ b/Fwk/VizFwk/LibCore/cvfVector2.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfMath.h" diff --git a/VisualizationModules/LibCore/cvfVector2.inl b/Fwk/VizFwk/LibCore/cvfVector2.inl similarity index 93% rename from VisualizationModules/LibCore/cvfVector2.inl rename to Fwk/VizFwk/LibCore/cvfVector2.inl index 9db31aa4b8..7a74ae73d2 100644 --- a/VisualizationModules/LibCore/cvfVector2.inl +++ b/Fwk/VizFwk/LibCore/cvfVector2.inl @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + namespace cvf { diff --git a/VisualizationModules/LibCore/cvfVector3.cpp b/Fwk/VizFwk/LibCore/cvfVector3.cpp similarity index 52% rename from VisualizationModules/LibCore/cvfVector3.cpp rename to Fwk/VizFwk/LibCore/cvfVector3.cpp index ae2f609e1c..4116ae0b72 100644 --- a/VisualizationModules/LibCore/cvfVector3.cpp +++ b/Fwk/VizFwk/LibCore/cvfVector3.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfVector3.h" diff --git a/VisualizationModules/LibCore/cvfVector3.h b/Fwk/VizFwk/LibCore/cvfVector3.h similarity index 84% rename from VisualizationModules/LibCore/cvfVector3.h rename to Fwk/VizFwk/LibCore/cvfVector3.h index 5254ba1d7f..25d4c9533e 100644 --- a/VisualizationModules/LibCore/cvfVector3.h +++ b/Fwk/VizFwk/LibCore/cvfVector3.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfVector2.h" diff --git a/VisualizationModules/LibCore/cvfVector3.inl b/Fwk/VizFwk/LibCore/cvfVector3.inl similarity index 96% rename from VisualizationModules/LibCore/cvfVector3.inl rename to Fwk/VizFwk/LibCore/cvfVector3.inl index f663e21c78..d8379b251e 100644 --- a/VisualizationModules/LibCore/cvfVector3.inl +++ b/Fwk/VizFwk/LibCore/cvfVector3.inl @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + namespace cvf { diff --git a/VisualizationModules/LibCore/cvfVector4.cpp b/Fwk/VizFwk/LibCore/cvfVector4.cpp similarity index 51% rename from VisualizationModules/LibCore/cvfVector4.cpp rename to Fwk/VizFwk/LibCore/cvfVector4.cpp index 7ef304a8dc..e78645581a 100644 --- a/VisualizationModules/LibCore/cvfVector4.cpp +++ b/Fwk/VizFwk/LibCore/cvfVector4.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfVector4.h" #include "cvfMath.h" diff --git a/VisualizationModules/LibCore/cvfVector4.h b/Fwk/VizFwk/LibCore/cvfVector4.h similarity index 81% rename from VisualizationModules/LibCore/cvfVector4.h rename to Fwk/VizFwk/LibCore/cvfVector4.h index d93c7c5c0d..35f1586265 100644 --- a/VisualizationModules/LibCore/cvfVector4.h +++ b/Fwk/VizFwk/LibCore/cvfVector4.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfVector3.h" diff --git a/VisualizationModules/LibCore/cvfVector4.inl b/Fwk/VizFwk/LibCore/cvfVector4.inl similarity index 93% rename from VisualizationModules/LibCore/cvfVector4.inl rename to Fwk/VizFwk/LibCore/cvfVector4.inl index 5ec517c125..5c0bd9269a 100644 --- a/VisualizationModules/LibCore/cvfVector4.inl +++ b/Fwk/VizFwk/LibCore/cvfVector4.inl @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + namespace cvf { diff --git a/Fwk/VizFwk/LibCore/cvfVersion.h b/Fwk/VizFwk/LibCore/cvfVersion.h new file mode 100644 index 0000000000..e0dd973b39 --- /dev/null +++ b/Fwk/VizFwk/LibCore/cvfVersion.h @@ -0,0 +1,45 @@ +//################################################################################################## +// +// Custom Visualization Core library +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. +// +//################################################################################################## + + +#pragma once + + + +#define CVF_MAJOR_VERSION "0" // Major version number +#define CVF_MINOR_VERSION "9" // Minor version number +#define CVF_SPECIAL_BUILD "" // Special build description +#define CVF_BUILD_NUMBER "5" // Build number. Increase for each shipment diff --git a/VisualizationModules/LibGeometry/CMakeLists.txt b/Fwk/VizFwk/LibGeometry/CMakeLists.txt similarity index 100% rename from VisualizationModules/LibGeometry/CMakeLists.txt rename to Fwk/VizFwk/LibGeometry/CMakeLists.txt diff --git a/VisualizationModules/LibGeometry/cvfArrowGenerator.cpp b/Fwk/VizFwk/LibGeometry/cvfArrowGenerator.cpp similarity index 77% rename from VisualizationModules/LibGeometry/cvfArrowGenerator.cpp rename to Fwk/VizFwk/LibGeometry/cvfArrowGenerator.cpp index aea8260ce3..cb34f38092 100644 --- a/VisualizationModules/LibGeometry/cvfArrowGenerator.cpp +++ b/Fwk/VizFwk/LibGeometry/cvfArrowGenerator.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfArrowGenerator.h" #include "cvfGeometryUtils.h" diff --git a/VisualizationModules/LibGeometry/cvfArrowGenerator.h b/Fwk/VizFwk/LibGeometry/cvfArrowGenerator.h similarity index 57% rename from VisualizationModules/LibGeometry/cvfArrowGenerator.h rename to Fwk/VizFwk/LibGeometry/cvfArrowGenerator.h index c3ceb37cf9..14fcb99d64 100644 --- a/VisualizationModules/LibGeometry/cvfArrowGenerator.h +++ b/Fwk/VizFwk/LibGeometry/cvfArrowGenerator.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once namespace cvf { diff --git a/VisualizationModules/LibGeometry/cvfBoundingBox.cpp b/Fwk/VizFwk/LibGeometry/cvfBoundingBox.cpp similarity index 92% rename from VisualizationModules/LibGeometry/cvfBoundingBox.cpp rename to Fwk/VizFwk/LibGeometry/cvfBoundingBox.cpp index bcfa45d71f..57482ac7df 100644 --- a/VisualizationModules/LibGeometry/cvfBoundingBox.cpp +++ b/Fwk/VizFwk/LibGeometry/cvfBoundingBox.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfBoundingBox.h" #include "cvfString.h" diff --git a/VisualizationModules/LibGeometry/cvfBoundingBox.h b/Fwk/VizFwk/LibGeometry/cvfBoundingBox.h similarity index 66% rename from VisualizationModules/LibGeometry/cvfBoundingBox.h rename to Fwk/VizFwk/LibGeometry/cvfBoundingBox.h index 514c1ca897..771eb4b1a2 100644 --- a/VisualizationModules/LibGeometry/cvfBoundingBox.h +++ b/Fwk/VizFwk/LibGeometry/cvfBoundingBox.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfArray.h" diff --git a/VisualizationModules/LibGeometry/cvfBoxGenerator.cpp b/Fwk/VizFwk/LibGeometry/cvfBoxGenerator.cpp similarity index 84% rename from VisualizationModules/LibGeometry/cvfBoxGenerator.cpp rename to Fwk/VizFwk/LibGeometry/cvfBoxGenerator.cpp index 492605ad7a..8d8203ad1e 100644 --- a/VisualizationModules/LibGeometry/cvfBoxGenerator.cpp +++ b/Fwk/VizFwk/LibGeometry/cvfBoxGenerator.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfBoxGenerator.h" #include "cvfPatchGenerator.h" diff --git a/VisualizationModules/LibGeometry/cvfBoxGenerator.h b/Fwk/VizFwk/LibGeometry/cvfBoxGenerator.h similarity index 58% rename from VisualizationModules/LibGeometry/cvfBoxGenerator.h rename to Fwk/VizFwk/LibGeometry/cvfBoxGenerator.h index 26895f303c..224afc8a10 100644 --- a/VisualizationModules/LibGeometry/cvfBoxGenerator.h +++ b/Fwk/VizFwk/LibGeometry/cvfBoxGenerator.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfVector3.h" diff --git a/VisualizationModules/LibGeometry/cvfEdgeKey.cpp b/Fwk/VizFwk/LibGeometry/cvfEdgeKey.cpp similarity index 73% rename from VisualizationModules/LibGeometry/cvfEdgeKey.cpp rename to Fwk/VizFwk/LibGeometry/cvfEdgeKey.cpp index c98548ecfd..9b78e838a4 100644 --- a/VisualizationModules/LibGeometry/cvfEdgeKey.cpp +++ b/Fwk/VizFwk/LibGeometry/cvfEdgeKey.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfEdgeKey.h" diff --git a/VisualizationModules/LibGeometry/cvfEdgeKey.h b/Fwk/VizFwk/LibGeometry/cvfEdgeKey.h similarity index 57% rename from VisualizationModules/LibGeometry/cvfEdgeKey.h rename to Fwk/VizFwk/LibGeometry/cvfEdgeKey.h index 3dfb964a0b..74c4544333 100644 --- a/VisualizationModules/LibGeometry/cvfEdgeKey.h +++ b/Fwk/VizFwk/LibGeometry/cvfEdgeKey.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once namespace cvf { diff --git a/VisualizationModules/LibGeometry/cvfFrustum.cpp b/Fwk/VizFwk/LibGeometry/cvfFrustum.cpp similarity index 86% rename from VisualizationModules/LibGeometry/cvfFrustum.cpp rename to Fwk/VizFwk/LibGeometry/cvfFrustum.cpp index e4296a61fb..9641cb9145 100644 --- a/VisualizationModules/LibGeometry/cvfFrustum.cpp +++ b/Fwk/VizFwk/LibGeometry/cvfFrustum.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfBoundingBox.h" #include "cvfFrustum.h" diff --git a/VisualizationModules/LibGeometry/cvfFrustum.h b/Fwk/VizFwk/LibGeometry/cvfFrustum.h similarity index 62% rename from VisualizationModules/LibGeometry/cvfFrustum.h rename to Fwk/VizFwk/LibGeometry/cvfFrustum.h index 9d993380fc..5acc76d8e2 100644 --- a/VisualizationModules/LibGeometry/cvfFrustum.h +++ b/Fwk/VizFwk/LibGeometry/cvfFrustum.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibGeometry/cvfGeometryBuilder.cpp b/Fwk/VizFwk/LibGeometry/cvfGeometryBuilder.cpp similarity index 91% rename from VisualizationModules/LibGeometry/cvfGeometryBuilder.cpp rename to Fwk/VizFwk/LibGeometry/cvfGeometryBuilder.cpp index 7d929caa80..630e6e751a 100644 --- a/VisualizationModules/LibGeometry/cvfGeometryBuilder.cpp +++ b/Fwk/VizFwk/LibGeometry/cvfGeometryBuilder.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfGeometryBuilder.h" diff --git a/VisualizationModules/LibGeometry/cvfGeometryBuilder.h b/Fwk/VizFwk/LibGeometry/cvfGeometryBuilder.h similarity index 67% rename from VisualizationModules/LibGeometry/cvfGeometryBuilder.h rename to Fwk/VizFwk/LibGeometry/cvfGeometryBuilder.h index ebe17fd551..76f94c76af 100644 --- a/VisualizationModules/LibGeometry/cvfGeometryBuilder.h +++ b/Fwk/VizFwk/LibGeometry/cvfGeometryBuilder.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibGeometry/cvfGeometryBuilderFaceList.cpp b/Fwk/VizFwk/LibGeometry/cvfGeometryBuilderFaceList.cpp similarity index 81% rename from VisualizationModules/LibGeometry/cvfGeometryBuilderFaceList.cpp rename to Fwk/VizFwk/LibGeometry/cvfGeometryBuilderFaceList.cpp index 9e18cf009f..5d536db8a6 100644 --- a/VisualizationModules/LibGeometry/cvfGeometryBuilderFaceList.cpp +++ b/Fwk/VizFwk/LibGeometry/cvfGeometryBuilderFaceList.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfGeometryBuilderFaceList.h" diff --git a/VisualizationModules/LibGeometry/cvfGeometryBuilderFaceList.h b/Fwk/VizFwk/LibGeometry/cvfGeometryBuilderFaceList.h similarity index 60% rename from VisualizationModules/LibGeometry/cvfGeometryBuilderFaceList.h rename to Fwk/VizFwk/LibGeometry/cvfGeometryBuilderFaceList.h index 20836e6ed5..4c83714beb 100644 --- a/VisualizationModules/LibGeometry/cvfGeometryBuilderFaceList.h +++ b/Fwk/VizFwk/LibGeometry/cvfGeometryBuilderFaceList.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfGeometryBuilder.h" diff --git a/VisualizationModules/LibGeometry/cvfGeometryBuilderTriangles.cpp b/Fwk/VizFwk/LibGeometry/cvfGeometryBuilderTriangles.cpp similarity index 79% rename from VisualizationModules/LibGeometry/cvfGeometryBuilderTriangles.cpp rename to Fwk/VizFwk/LibGeometry/cvfGeometryBuilderTriangles.cpp index 3752744fc0..db34b461bb 100644 --- a/VisualizationModules/LibGeometry/cvfGeometryBuilderTriangles.cpp +++ b/Fwk/VizFwk/LibGeometry/cvfGeometryBuilderTriangles.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfGeometryBuilderTriangles.h" diff --git a/VisualizationModules/LibGeometry/cvfGeometryBuilderTriangles.h b/Fwk/VizFwk/LibGeometry/cvfGeometryBuilderTriangles.h similarity index 59% rename from VisualizationModules/LibGeometry/cvfGeometryBuilderTriangles.h rename to Fwk/VizFwk/LibGeometry/cvfGeometryBuilderTriangles.h index 854e703273..c0445f84c6 100644 --- a/VisualizationModules/LibGeometry/cvfGeometryBuilderTriangles.h +++ b/Fwk/VizFwk/LibGeometry/cvfGeometryBuilderTriangles.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfGeometryBuilder.h" diff --git a/VisualizationModules/LibGeometry/cvfGeometryUtils.cpp b/Fwk/VizFwk/LibGeometry/cvfGeometryUtils.cpp similarity index 96% rename from VisualizationModules/LibGeometry/cvfGeometryUtils.cpp rename to Fwk/VizFwk/LibGeometry/cvfGeometryUtils.cpp index f78f84fc30..1b6d284897 100644 --- a/VisualizationModules/LibGeometry/cvfGeometryUtils.cpp +++ b/Fwk/VizFwk/LibGeometry/cvfGeometryUtils.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfGeometryBuilder.h" #include "cvfGeometryUtils.h" diff --git a/VisualizationModules/LibGeometry/cvfGeometryUtils.h b/Fwk/VizFwk/LibGeometry/cvfGeometryUtils.h similarity index 75% rename from VisualizationModules/LibGeometry/cvfGeometryUtils.h rename to Fwk/VizFwk/LibGeometry/cvfGeometryUtils.h index 3f04d4c966..c19a1052b8 100644 --- a/VisualizationModules/LibGeometry/cvfGeometryUtils.h +++ b/Fwk/VizFwk/LibGeometry/cvfGeometryUtils.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfVector3.h" diff --git a/VisualizationModules/LibGeometry/cvfLibGeometry.h b/Fwk/VizFwk/LibGeometry/cvfLibGeometry.h similarity index 53% rename from VisualizationModules/LibGeometry/cvfLibGeometry.h rename to Fwk/VizFwk/LibGeometry/cvfLibGeometry.h index c819b9ca16..9cacbbceb0 100644 --- a/VisualizationModules/LibGeometry/cvfLibGeometry.h +++ b/Fwk/VizFwk/LibGeometry/cvfLibGeometry.h @@ -1,25 +1,43 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + // Doxygen module definition -/// \ingroup CeeVizFramework +/// \ingroup VizFramework /// @{ /// \defgroup Geometry Geometry module /// @} diff --git a/VisualizationModules/LibGeometry/cvfMeshEdgeExtractor.cpp b/Fwk/VizFwk/LibGeometry/cvfMeshEdgeExtractor.cpp similarity index 81% rename from VisualizationModules/LibGeometry/cvfMeshEdgeExtractor.cpp rename to Fwk/VizFwk/LibGeometry/cvfMeshEdgeExtractor.cpp index 8dbb4688c8..a6bbf47d96 100644 --- a/VisualizationModules/LibGeometry/cvfMeshEdgeExtractor.cpp +++ b/Fwk/VizFwk/LibGeometry/cvfMeshEdgeExtractor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfMeshEdgeExtractor.h" #include "cvfEdgeKey.h" diff --git a/VisualizationModules/LibGeometry/cvfMeshEdgeExtractor.h b/Fwk/VizFwk/LibGeometry/cvfMeshEdgeExtractor.h similarity index 55% rename from VisualizationModules/LibGeometry/cvfMeshEdgeExtractor.h rename to Fwk/VizFwk/LibGeometry/cvfMeshEdgeExtractor.h index d5f4f4443d..e21a61fd79 100644 --- a/VisualizationModules/LibGeometry/cvfMeshEdgeExtractor.h +++ b/Fwk/VizFwk/LibGeometry/cvfMeshEdgeExtractor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfArray.h" diff --git a/VisualizationModules/LibGeometry/cvfOutlineEdgeExtractor.cpp b/Fwk/VizFwk/LibGeometry/cvfOutlineEdgeExtractor.cpp similarity index 89% rename from VisualizationModules/LibGeometry/cvfOutlineEdgeExtractor.cpp rename to Fwk/VizFwk/LibGeometry/cvfOutlineEdgeExtractor.cpp index b4d12b2ba3..b4f256c597 100644 --- a/VisualizationModules/LibGeometry/cvfOutlineEdgeExtractor.cpp +++ b/Fwk/VizFwk/LibGeometry/cvfOutlineEdgeExtractor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOutlineEdgeExtractor.h" #include "cvfEdgeKey.h" diff --git a/VisualizationModules/LibGeometry/cvfOutlineEdgeExtractor.h b/Fwk/VizFwk/LibGeometry/cvfOutlineEdgeExtractor.h similarity index 64% rename from VisualizationModules/LibGeometry/cvfOutlineEdgeExtractor.h rename to Fwk/VizFwk/LibGeometry/cvfOutlineEdgeExtractor.h index e198c50715..7de21fff07 100644 --- a/VisualizationModules/LibGeometry/cvfOutlineEdgeExtractor.h +++ b/Fwk/VizFwk/LibGeometry/cvfOutlineEdgeExtractor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfArray.h" diff --git a/VisualizationModules/LibGeometry/cvfPatchGenerator.cpp b/Fwk/VizFwk/LibGeometry/cvfPatchGenerator.cpp similarity index 81% rename from VisualizationModules/LibGeometry/cvfPatchGenerator.cpp rename to Fwk/VizFwk/LibGeometry/cvfPatchGenerator.cpp index a86abed5dc..20bdc8c13e 100644 --- a/VisualizationModules/LibGeometry/cvfPatchGenerator.cpp +++ b/Fwk/VizFwk/LibGeometry/cvfPatchGenerator.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfPatchGenerator.h" #include "cvfGeometryUtils.h" diff --git a/VisualizationModules/LibGeometry/cvfPatchGenerator.h b/Fwk/VizFwk/LibGeometry/cvfPatchGenerator.h similarity index 65% rename from VisualizationModules/LibGeometry/cvfPatchGenerator.h rename to Fwk/VizFwk/LibGeometry/cvfPatchGenerator.h index 358b5ae603..1572b58e02 100644 --- a/VisualizationModules/LibGeometry/cvfPatchGenerator.h +++ b/Fwk/VizFwk/LibGeometry/cvfPatchGenerator.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfVector3.h" diff --git a/VisualizationModules/LibGeometry/cvfRay.cpp b/Fwk/VizFwk/LibGeometry/cvfRay.cpp similarity index 93% rename from VisualizationModules/LibGeometry/cvfRay.cpp rename to Fwk/VizFwk/LibGeometry/cvfRay.cpp index a198cfeab1..4f8e07dc3b 100644 --- a/VisualizationModules/LibGeometry/cvfRay.cpp +++ b/Fwk/VizFwk/LibGeometry/cvfRay.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRay.h" #include "cvfBoundingBox.h" diff --git a/VisualizationModules/LibGeometry/cvfRay.h b/Fwk/VizFwk/LibGeometry/cvfRay.h similarity index 70% rename from VisualizationModules/LibGeometry/cvfRay.h rename to Fwk/VizFwk/LibGeometry/cvfRay.h index 4bb008a8e3..73aa665a5a 100644 --- a/VisualizationModules/LibGeometry/cvfRay.h +++ b/Fwk/VizFwk/LibGeometry/cvfRay.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibGeometry/cvfTriangleMeshEdgeExtractor.cpp b/Fwk/VizFwk/LibGeometry/cvfTriangleMeshEdgeExtractor.cpp similarity index 77% rename from VisualizationModules/LibGeometry/cvfTriangleMeshEdgeExtractor.cpp rename to Fwk/VizFwk/LibGeometry/cvfTriangleMeshEdgeExtractor.cpp index 5ad00d568f..72b359489b 100644 --- a/VisualizationModules/LibGeometry/cvfTriangleMeshEdgeExtractor.cpp +++ b/Fwk/VizFwk/LibGeometry/cvfTriangleMeshEdgeExtractor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfTriangleMeshEdgeExtractor.h" diff --git a/VisualizationModules/LibGeometry/cvfTriangleMeshEdgeExtractor.h b/Fwk/VizFwk/LibGeometry/cvfTriangleMeshEdgeExtractor.h similarity index 60% rename from VisualizationModules/LibGeometry/cvfTriangleMeshEdgeExtractor.h rename to Fwk/VizFwk/LibGeometry/cvfTriangleMeshEdgeExtractor.h index 07a9ad2e65..89a70478d8 100644 --- a/VisualizationModules/LibGeometry/cvfTriangleMeshEdgeExtractor.h +++ b/Fwk/VizFwk/LibGeometry/cvfTriangleMeshEdgeExtractor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfArray.h" diff --git a/VisualizationModules/LibGeometry/cvfTriangleVertexSplitter.cpp b/Fwk/VizFwk/LibGeometry/cvfTriangleVertexSplitter.cpp similarity index 90% rename from VisualizationModules/LibGeometry/cvfTriangleVertexSplitter.cpp rename to Fwk/VizFwk/LibGeometry/cvfTriangleVertexSplitter.cpp index 4ef19c5ede..659394f3fe 100644 --- a/VisualizationModules/LibGeometry/cvfTriangleVertexSplitter.cpp +++ b/Fwk/VizFwk/LibGeometry/cvfTriangleVertexSplitter.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfTriangleVertexSplitter.h" #include "cvfFrustum.h" diff --git a/VisualizationModules/LibGeometry/cvfTriangleVertexSplitter.h b/Fwk/VizFwk/LibGeometry/cvfTriangleVertexSplitter.h similarity index 65% rename from VisualizationModules/LibGeometry/cvfTriangleVertexSplitter.h rename to Fwk/VizFwk/LibGeometry/cvfTriangleVertexSplitter.h index ac180b40eb..4b805a6d38 100644 --- a/VisualizationModules/LibGeometry/cvfTriangleVertexSplitter.h +++ b/Fwk/VizFwk/LibGeometry/cvfTriangleVertexSplitter.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfArray.h" diff --git a/VisualizationModules/LibGeometry/cvfVertexCompactor.cpp b/Fwk/VizFwk/LibGeometry/cvfVertexCompactor.cpp similarity index 79% rename from VisualizationModules/LibGeometry/cvfVertexCompactor.cpp rename to Fwk/VizFwk/LibGeometry/cvfVertexCompactor.cpp index 1bbb9cef82..ae3840fa8e 100644 --- a/VisualizationModules/LibGeometry/cvfVertexCompactor.cpp +++ b/Fwk/VizFwk/LibGeometry/cvfVertexCompactor.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfVertexCompactor.h" #include "cvfGeometryUtils.h" diff --git a/VisualizationModules/LibGeometry/cvfVertexCompactor.h b/Fwk/VizFwk/LibGeometry/cvfVertexCompactor.h similarity index 62% rename from VisualizationModules/LibGeometry/cvfVertexCompactor.h rename to Fwk/VizFwk/LibGeometry/cvfVertexCompactor.h index 10b8009ed8..4af9c0633a 100644 --- a/VisualizationModules/LibGeometry/cvfVertexCompactor.h +++ b/Fwk/VizFwk/LibGeometry/cvfVertexCompactor.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfArray.h" diff --git a/VisualizationModules/LibGeometry/cvfVertexWelder.cpp b/Fwk/VizFwk/LibGeometry/cvfVertexWelder.cpp similarity index 89% rename from VisualizationModules/LibGeometry/cvfVertexWelder.cpp rename to Fwk/VizFwk/LibGeometry/cvfVertexWelder.cpp index 4ef99cd3c3..b7965f1d56 100644 --- a/VisualizationModules/LibGeometry/cvfVertexWelder.cpp +++ b/Fwk/VizFwk/LibGeometry/cvfVertexWelder.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfVertexWelder.h" diff --git a/VisualizationModules/LibGeometry/cvfVertexWelder.h b/Fwk/VizFwk/LibGeometry/cvfVertexWelder.h similarity index 67% rename from VisualizationModules/LibGeometry/cvfVertexWelder.h rename to Fwk/VizFwk/LibGeometry/cvfVertexWelder.h index 6ed7a31250..82b3fbd0a5 100644 --- a/VisualizationModules/LibGeometry/cvfVertexWelder.h +++ b/Fwk/VizFwk/LibGeometry/cvfVertexWelder.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfArray.h" diff --git a/VisualizationModules/LibGuiQt/CMakeLists.txt b/Fwk/VizFwk/LibGuiQt/CMakeLists.txt similarity index 100% rename from VisualizationModules/LibGuiQt/CMakeLists.txt rename to Fwk/VizFwk/LibGuiQt/CMakeLists.txt diff --git a/VisualizationModules/LibGuiQt/cvfqtBasicAboutDialog.cpp b/Fwk/VizFwk/LibGuiQt/cvfqtBasicAboutDialog.cpp similarity index 92% rename from VisualizationModules/LibGuiQt/cvfqtBasicAboutDialog.cpp rename to Fwk/VizFwk/LibGuiQt/cvfqtBasicAboutDialog.cpp index fd168a5e5c..a10f9779cc 100644 --- a/VisualizationModules/LibGuiQt/cvfqtBasicAboutDialog.cpp +++ b/Fwk/VizFwk/LibGuiQt/cvfqtBasicAboutDialog.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfSystem.h" diff --git a/VisualizationModules/LibGuiQt/cvfqtBasicAboutDialog.h b/Fwk/VizFwk/LibGuiQt/cvfqtBasicAboutDialog.h similarity index 70% rename from VisualizationModules/LibGuiQt/cvfqtBasicAboutDialog.h rename to Fwk/VizFwk/LibGuiQt/cvfqtBasicAboutDialog.h index 993c803fcb..7e70e11789 100644 --- a/VisualizationModules/LibGuiQt/cvfqtBasicAboutDialog.h +++ b/Fwk/VizFwk/LibGuiQt/cvfqtBasicAboutDialog.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include diff --git a/VisualizationModules/LibGuiQt/cvfqtCvfBoundQGLContext.cpp b/Fwk/VizFwk/LibGuiQt/cvfqtCvfBoundQGLContext.cpp similarity index 67% rename from VisualizationModules/LibGuiQt/cvfqtCvfBoundQGLContext.cpp rename to Fwk/VizFwk/LibGuiQt/cvfqtCvfBoundQGLContext.cpp index 22e2772260..c3734d7af2 100644 --- a/VisualizationModules/LibGuiQt/cvfqtCvfBoundQGLContext.cpp +++ b/Fwk/VizFwk/LibGuiQt/cvfqtCvfBoundQGLContext.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfqtCvfBoundQGLContext.h" #include "cvfqtOpenGLContext.h" @@ -53,7 +71,7 @@ CvfBoundQGLContext::~CvfBoundQGLContext() { // TODO // Need to resolve the case where the Qt QGLcontext (that we're deriving from) is deleted - // and CeeViz is still holding a reference to one or more OpenGLContext objects + // and we are still holding a reference to one or more OpenGLContext objects // By the time we get here we expect that we're holding the only reference CVF_ASSERT(m_cvfGLContext->refCount() == 1); m_cvfGLContext = NULL; diff --git a/VisualizationModules/LibGuiQt/cvfqtCvfBoundQGLContext.h b/Fwk/VizFwk/LibGuiQt/cvfqtCvfBoundQGLContext.h similarity index 52% rename from VisualizationModules/LibGuiQt/cvfqtCvfBoundQGLContext.h rename to Fwk/VizFwk/LibGuiQt/cvfqtCvfBoundQGLContext.h index 3b3b58ffc8..5160f372fc 100644 --- a/VisualizationModules/LibGuiQt/cvfqtCvfBoundQGLContext.h +++ b/Fwk/VizFwk/LibGuiQt/cvfqtCvfBoundQGLContext.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfOpenGLContext.h" @@ -28,7 +46,7 @@ namespace cvfqt { //================================================================================================== // -// Utility class used to piggyback our CeeViz OpenGLContext onto Qt's QGLContext +// Utility class used to piggyback OpenGLContext onto Qt's QGLContext // //================================================================================================== class CvfBoundQGLContext : public QGLContext diff --git a/VisualizationModules/LibGuiQt/cvfqtMouseState.cpp b/Fwk/VizFwk/LibGuiQt/cvfqtMouseState.cpp similarity index 88% rename from VisualizationModules/LibGuiQt/cvfqtMouseState.cpp rename to Fwk/VizFwk/LibGuiQt/cvfqtMouseState.cpp index cef1636d7d..72a7d0bcda 100644 --- a/VisualizationModules/LibGuiQt/cvfqtMouseState.cpp +++ b/Fwk/VizFwk/LibGuiQt/cvfqtMouseState.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfMath.h" diff --git a/VisualizationModules/LibGuiQt/cvfqtMouseState.h b/Fwk/VizFwk/LibGuiQt/cvfqtMouseState.h similarity index 71% rename from VisualizationModules/LibGuiQt/cvfqtMouseState.h rename to Fwk/VizFwk/LibGuiQt/cvfqtMouseState.h index 3b44897fa8..406c6909a0 100644 --- a/VisualizationModules/LibGuiQt/cvfqtMouseState.h +++ b/Fwk/VizFwk/LibGuiQt/cvfqtMouseState.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once class QMouseEvent; diff --git a/VisualizationModules/LibGuiQt/cvfqtOpenGLContext.cpp b/Fwk/VizFwk/LibGuiQt/cvfqtOpenGLContext.cpp similarity index 84% rename from VisualizationModules/LibGuiQt/cvfqtOpenGLContext.cpp rename to Fwk/VizFwk/LibGuiQt/cvfqtOpenGLContext.cpp index 264ed6cd6e..088aadc42c 100644 --- a/VisualizationModules/LibGuiQt/cvfqtOpenGLContext.cpp +++ b/Fwk/VizFwk/LibGuiQt/cvfqtOpenGLContext.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOpenGL.h" #include "cvfqtOpenGLContext.h" diff --git a/VisualizationModules/LibGuiQt/cvfqtOpenGLContext.h b/Fwk/VizFwk/LibGuiQt/cvfqtOpenGLContext.h similarity index 61% rename from VisualizationModules/LibGuiQt/cvfqtOpenGLContext.h rename to Fwk/VizFwk/LibGuiQt/cvfqtOpenGLContext.h index 4d957ec425..89dc0bc57b 100644 --- a/VisualizationModules/LibGuiQt/cvfqtOpenGLContext.h +++ b/Fwk/VizFwk/LibGuiQt/cvfqtOpenGLContext.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfOpenGLContext.h" diff --git a/VisualizationModules/LibGuiQt/cvfqtOpenGLWidget.cpp b/Fwk/VizFwk/LibGuiQt/cvfqtOpenGLWidget.cpp similarity index 82% rename from VisualizationModules/LibGuiQt/cvfqtOpenGLWidget.cpp rename to Fwk/VizFwk/LibGuiQt/cvfqtOpenGLWidget.cpp index 712517549e..fbfb54f65a 100644 --- a/VisualizationModules/LibGuiQt/cvfqtOpenGLWidget.cpp +++ b/Fwk/VizFwk/LibGuiQt/cvfqtOpenGLWidget.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOpenGLContextGroup.h" #include "cvfqtCvfBoundQGLContext.h" diff --git a/VisualizationModules/LibGuiQt/cvfqtOpenGLWidget.h b/Fwk/VizFwk/LibGuiQt/cvfqtOpenGLWidget.h similarity index 56% rename from VisualizationModules/LibGuiQt/cvfqtOpenGLWidget.h rename to Fwk/VizFwk/LibGuiQt/cvfqtOpenGLWidget.h index 905bbe4405..c598f9997d 100644 --- a/VisualizationModules/LibGuiQt/cvfqtOpenGLWidget.h +++ b/Fwk/VizFwk/LibGuiQt/cvfqtOpenGLWidget.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include diff --git a/VisualizationModules/LibGuiQt/cvfqtPerformanceInfoHud.cpp b/Fwk/VizFwk/LibGuiQt/cvfqtPerformanceInfoHud.cpp similarity index 89% rename from VisualizationModules/LibGuiQt/cvfqtPerformanceInfoHud.cpp rename to Fwk/VizFwk/LibGuiQt/cvfqtPerformanceInfoHud.cpp index b2393614f4..c3470c7a84 100644 --- a/VisualizationModules/LibGuiQt/cvfqtPerformanceInfoHud.cpp +++ b/Fwk/VizFwk/LibGuiQt/cvfqtPerformanceInfoHud.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfCamera.h" #include "cvfPerformanceInfo.h" diff --git a/VisualizationModules/LibGuiQt/cvfqtPerformanceInfoHud.h b/Fwk/VizFwk/LibGuiQt/cvfqtPerformanceInfoHud.h similarity index 58% rename from VisualizationModules/LibGuiQt/cvfqtPerformanceInfoHud.h rename to Fwk/VizFwk/LibGuiQt/cvfqtPerformanceInfoHud.h index 5dd3bd0894..457d0c0e27 100644 --- a/VisualizationModules/LibGuiQt/cvfqtPerformanceInfoHud.h +++ b/Fwk/VizFwk/LibGuiQt/cvfqtPerformanceInfoHud.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include diff --git a/VisualizationModules/LibGuiQt/cvfqtUtils.cpp b/Fwk/VizFwk/LibGuiQt/cvfqtUtils.cpp similarity index 70% rename from VisualizationModules/LibGuiQt/cvfqtUtils.cpp rename to Fwk/VizFwk/LibGuiQt/cvfqtUtils.cpp index 439685ffbe..8e917ff8e7 100644 --- a/VisualizationModules/LibGuiQt/cvfqtUtils.cpp +++ b/Fwk/VizFwk/LibGuiQt/cvfqtUtils.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfqtUtils.h" @@ -32,7 +50,7 @@ namespace cvfqt { /// \class cvfqt::Utils /// \ingroup GuiQt /// -/// Static helper class for CeeViz/Qt interop +/// Static helper class for Qt interop /// //================================================================================================== diff --git a/Fwk/VizFwk/LibGuiQt/cvfqtUtils.h b/Fwk/VizFwk/LibGuiQt/cvfqtUtils.h new file mode 100644 index 0000000000..63d1429b11 --- /dev/null +++ b/Fwk/VizFwk/LibGuiQt/cvfqtUtils.h @@ -0,0 +1,59 @@ +//################################################################################################## +// +// Custom Visualization Core library +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. +// +//################################################################################################## + + +#pragma once + +#include "cvfString.h" + +#include + +namespace cvfqt { + + +//================================================================================================== +// +// Static helper class for Qt interop +// +//================================================================================================== +class Utils +{ +public: + static QString toQString(const cvf::String& ceeString); + static cvf::String fromQString(const QString& qtString); +}; + +} diff --git a/VisualizationModules/LibRender/CMakeLists.txt b/Fwk/VizFwk/LibRender/CMakeLists.txt similarity index 100% rename from VisualizationModules/LibRender/CMakeLists.txt rename to Fwk/VizFwk/LibRender/CMakeLists.txt diff --git a/VisualizationModules/LibRender/cvfBufferObjectManaged.cpp b/Fwk/VizFwk/LibRender/cvfBufferObjectManaged.cpp similarity index 85% rename from VisualizationModules/LibRender/cvfBufferObjectManaged.cpp rename to Fwk/VizFwk/LibRender/cvfBufferObjectManaged.cpp index 1308604fce..2eee81a0ed 100644 --- a/VisualizationModules/LibRender/cvfBufferObjectManaged.cpp +++ b/Fwk/VizFwk/LibRender/cvfBufferObjectManaged.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfBufferObjectManaged.h" #include "cvfOpenGL.h" diff --git a/VisualizationModules/LibRender/cvfBufferObjectManaged.h b/Fwk/VizFwk/LibRender/cvfBufferObjectManaged.h similarity index 64% rename from VisualizationModules/LibRender/cvfBufferObjectManaged.h rename to Fwk/VizFwk/LibRender/cvfBufferObjectManaged.h index 77c407b2c9..3fb22fdca0 100644 --- a/VisualizationModules/LibRender/cvfBufferObjectManaged.h +++ b/Fwk/VizFwk/LibRender/cvfBufferObjectManaged.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfCamera.cpp b/Fwk/VizFwk/LibRender/cvfCamera.cpp similarity index 97% rename from VisualizationModules/LibRender/cvfCamera.cpp rename to Fwk/VizFwk/LibRender/cvfCamera.cpp index ebc9f98323..f90ed87021 100644 --- a/VisualizationModules/LibRender/cvfCamera.cpp +++ b/Fwk/VizFwk/LibRender/cvfCamera.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfCamera.h" #include "cvfOpenGL.h" diff --git a/VisualizationModules/LibRender/cvfCamera.h b/Fwk/VizFwk/LibRender/cvfCamera.h similarity index 83% rename from VisualizationModules/LibRender/cvfCamera.h rename to Fwk/VizFwk/LibRender/cvfCamera.h index 58899da671..7a1d14d45f 100644 --- a/VisualizationModules/LibRender/cvfCamera.h +++ b/Fwk/VizFwk/LibRender/cvfCamera.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfCameraAnimation.cpp b/Fwk/VizFwk/LibRender/cvfCameraAnimation.cpp similarity index 76% rename from VisualizationModules/LibRender/cvfCameraAnimation.cpp rename to Fwk/VizFwk/LibRender/cvfCameraAnimation.cpp index f72739d765..fb6d4d6523 100644 --- a/VisualizationModules/LibRender/cvfCameraAnimation.cpp +++ b/Fwk/VizFwk/LibRender/cvfCameraAnimation.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfCameraAnimation.h" #include "cvfCamera.h" diff --git a/VisualizationModules/LibRender/cvfCameraAnimation.h b/Fwk/VizFwk/LibRender/cvfCameraAnimation.h similarity index 59% rename from VisualizationModules/LibRender/cvfCameraAnimation.h rename to Fwk/VizFwk/LibRender/cvfCameraAnimation.h index bbd5a50270..dcb23ed550 100644 --- a/VisualizationModules/LibRender/cvfCameraAnimation.h +++ b/Fwk/VizFwk/LibRender/cvfCameraAnimation.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfDrawable.cpp b/Fwk/VizFwk/LibRender/cvfDrawable.cpp similarity index 72% rename from VisualizationModules/LibRender/cvfDrawable.cpp rename to Fwk/VizFwk/LibRender/cvfDrawable.cpp index d4f5cb5f9e..9b58849b8c 100644 --- a/VisualizationModules/LibRender/cvfDrawable.cpp +++ b/Fwk/VizFwk/LibRender/cvfDrawable.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfDrawable.h" diff --git a/VisualizationModules/LibRender/cvfDrawable.h b/Fwk/VizFwk/LibRender/cvfDrawable.h similarity index 65% rename from VisualizationModules/LibRender/cvfDrawable.h rename to Fwk/VizFwk/LibRender/cvfDrawable.h index bed46a1ca4..f9de092fc8 100644 --- a/VisualizationModules/LibRender/cvfDrawable.h +++ b/Fwk/VizFwk/LibRender/cvfDrawable.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfDrawableGeo.cpp b/Fwk/VizFwk/LibRender/cvfDrawableGeo.cpp similarity index 97% rename from VisualizationModules/LibRender/cvfDrawableGeo.cpp rename to Fwk/VizFwk/LibRender/cvfDrawableGeo.cpp index 28ee7bba9c..4804e28329 100644 --- a/VisualizationModules/LibRender/cvfDrawableGeo.cpp +++ b/Fwk/VizFwk/LibRender/cvfDrawableGeo.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfDrawableGeo.h" #include "cvfOpenGL.h" diff --git a/VisualizationModules/LibRender/cvfDrawableGeo.h b/Fwk/VizFwk/LibRender/cvfDrawableGeo.h similarity index 82% rename from VisualizationModules/LibRender/cvfDrawableGeo.h rename to Fwk/VizFwk/LibRender/cvfDrawableGeo.h index 0ea57b4103..9a640c5943 100644 --- a/VisualizationModules/LibRender/cvfDrawableGeo.h +++ b/Fwk/VizFwk/LibRender/cvfDrawableGeo.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfDrawable.h" diff --git a/VisualizationModules/LibRender/cvfDrawableText.cpp b/Fwk/VizFwk/LibRender/cvfDrawableText.cpp similarity index 93% rename from VisualizationModules/LibRender/cvfDrawableText.cpp rename to Fwk/VizFwk/LibRender/cvfDrawableText.cpp index 11ac32b535..a00ab3f356 100644 --- a/VisualizationModules/LibRender/cvfDrawableText.cpp +++ b/Fwk/VizFwk/LibRender/cvfDrawableText.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfDrawableText.h" #include "cvfOpenGL.h" diff --git a/VisualizationModules/LibRender/cvfDrawableText.h b/Fwk/VizFwk/LibRender/cvfDrawableText.h similarity index 80% rename from VisualizationModules/LibRender/cvfDrawableText.h rename to Fwk/VizFwk/LibRender/cvfDrawableText.h index f9a6bdacfc..beb75a568f 100644 --- a/VisualizationModules/LibRender/cvfDrawableText.h +++ b/Fwk/VizFwk/LibRender/cvfDrawableText.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfDrawable.h" diff --git a/VisualizationModules/LibRender/cvfDrawableVectors.cpp b/Fwk/VizFwk/LibRender/cvfDrawableVectors.cpp similarity index 94% rename from VisualizationModules/LibRender/cvfDrawableVectors.cpp rename to Fwk/VizFwk/LibRender/cvfDrawableVectors.cpp index 47264ebb19..d07c79291d 100644 --- a/VisualizationModules/LibRender/cvfDrawableVectors.cpp +++ b/Fwk/VizFwk/LibRender/cvfDrawableVectors.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfDrawableVectors.h" #include "cvfOpenGL.h" diff --git a/VisualizationModules/LibRender/cvfDrawableVectors.h b/Fwk/VizFwk/LibRender/cvfDrawableVectors.h similarity index 77% rename from VisualizationModules/LibRender/cvfDrawableVectors.h rename to Fwk/VizFwk/LibRender/cvfDrawableVectors.h index 147b81ef07..18798b1fce 100644 --- a/VisualizationModules/LibRender/cvfDrawableVectors.h +++ b/Fwk/VizFwk/LibRender/cvfDrawableVectors.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfDrawable.h" diff --git a/VisualizationModules/LibRender/cvfFixedAtlasFont.cpp b/Fwk/VizFwk/LibRender/cvfFixedAtlasFont.cpp similarity index 99% rename from VisualizationModules/LibRender/cvfFixedAtlasFont.cpp rename to Fwk/VizFwk/LibRender/cvfFixedAtlasFont.cpp index a47d1f35e5..99a9b50a02 100644 --- a/VisualizationModules/LibRender/cvfFixedAtlasFont.cpp +++ b/Fwk/VizFwk/LibRender/cvfFixedAtlasFont.cpp @@ -1,12 +1,40 @@ //################################################################################################## // -// CeeVizFramework -// Lib: LibRender -// -// -------------------------------------------------------------------------------------------- -// Please see references below for copyright, usage rights and license for this file. +// Custom Visualization Core library +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. +// //################################################################################################## + #include "cvfBase.h" #include "cvfFixedAtlasFont.h" #include "cvfTextureImage.h" diff --git a/VisualizationModules/LibRender/cvfFixedAtlasFont.h b/Fwk/VizFwk/LibRender/cvfFixedAtlasFont.h similarity index 69% rename from VisualizationModules/LibRender/cvfFixedAtlasFont.h rename to Fwk/VizFwk/LibRender/cvfFixedAtlasFont.h index d657899629..6e5897a4ce 100644 --- a/VisualizationModules/LibRender/cvfFixedAtlasFont.h +++ b/Fwk/VizFwk/LibRender/cvfFixedAtlasFont.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfFont.cpp b/Fwk/VizFwk/LibRender/cvfFont.cpp similarity index 81% rename from VisualizationModules/LibRender/cvfFont.cpp rename to Fwk/VizFwk/LibRender/cvfFont.cpp index 948afd181e..b72f19fb79 100644 --- a/VisualizationModules/LibRender/cvfFont.cpp +++ b/Fwk/VizFwk/LibRender/cvfFont.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfFont.h" #include "cvfGlyph.h" diff --git a/VisualizationModules/LibRender/cvfFont.h b/Fwk/VizFwk/LibRender/cvfFont.h similarity index 58% rename from VisualizationModules/LibRender/cvfFont.h rename to Fwk/VizFwk/LibRender/cvfFont.h index f79346cfb2..5943996c5b 100644 --- a/VisualizationModules/LibRender/cvfFont.h +++ b/Fwk/VizFwk/LibRender/cvfFont.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfFontManager.cpp b/Fwk/VizFwk/LibRender/cvfFontManager.cpp similarity index 73% rename from VisualizationModules/LibRender/cvfFontManager.cpp rename to Fwk/VizFwk/LibRender/cvfFontManager.cpp index aeff279109..99b91476c3 100644 --- a/VisualizationModules/LibRender/cvfFontManager.cpp +++ b/Fwk/VizFwk/LibRender/cvfFontManager.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfFontManager.h" diff --git a/VisualizationModules/LibRender/cvfFontManager.h b/Fwk/VizFwk/LibRender/cvfFontManager.h similarity index 58% rename from VisualizationModules/LibRender/cvfFontManager.h rename to Fwk/VizFwk/LibRender/cvfFontManager.h index 343a1f04a0..33de4a9498 100644 --- a/VisualizationModules/LibRender/cvfFontManager.h +++ b/Fwk/VizFwk/LibRender/cvfFontManager.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfFramebufferObject.cpp b/Fwk/VizFwk/LibRender/cvfFramebufferObject.cpp similarity index 95% rename from VisualizationModules/LibRender/cvfFramebufferObject.cpp rename to Fwk/VizFwk/LibRender/cvfFramebufferObject.cpp index 8dd83b6c69..3196999ff2 100644 --- a/VisualizationModules/LibRender/cvfFramebufferObject.cpp +++ b/Fwk/VizFwk/LibRender/cvfFramebufferObject.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfFramebufferObject.h" #include "cvfRenderbufferObject.h" diff --git a/VisualizationModules/LibRender/cvfFramebufferObject.h b/Fwk/VizFwk/LibRender/cvfFramebufferObject.h similarity index 74% rename from VisualizationModules/LibRender/cvfFramebufferObject.h rename to Fwk/VizFwk/LibRender/cvfFramebufferObject.h index 3175c15931..03e0147d8e 100644 --- a/VisualizationModules/LibRender/cvfFramebufferObject.h +++ b/Fwk/VizFwk/LibRender/cvfFramebufferObject.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfGeometryBuilderDrawableGeo.cpp b/Fwk/VizFwk/LibRender/cvfGeometryBuilderDrawableGeo.cpp similarity index 83% rename from VisualizationModules/LibRender/cvfGeometryBuilderDrawableGeo.cpp rename to Fwk/VizFwk/LibRender/cvfGeometryBuilderDrawableGeo.cpp index bc1f9d40ec..750b7e43b4 100644 --- a/VisualizationModules/LibRender/cvfGeometryBuilderDrawableGeo.cpp +++ b/Fwk/VizFwk/LibRender/cvfGeometryBuilderDrawableGeo.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfGeometryBuilderDrawableGeo.h" diff --git a/VisualizationModules/LibRender/cvfGeometryBuilderDrawableGeo.h b/Fwk/VizFwk/LibRender/cvfGeometryBuilderDrawableGeo.h similarity index 62% rename from VisualizationModules/LibRender/cvfGeometryBuilderDrawableGeo.h rename to Fwk/VizFwk/LibRender/cvfGeometryBuilderDrawableGeo.h index 301be7bc20..b5ebd42022 100644 --- a/VisualizationModules/LibRender/cvfGeometryBuilderDrawableGeo.h +++ b/Fwk/VizFwk/LibRender/cvfGeometryBuilderDrawableGeo.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfGeometryBuilder.h" diff --git a/VisualizationModules/LibRender/cvfGlyph.cpp b/Fwk/VizFwk/LibRender/cvfGlyph.cpp similarity index 92% rename from VisualizationModules/LibRender/cvfGlyph.cpp rename to Fwk/VizFwk/LibRender/cvfGlyph.cpp index f4d8edc016..400ab64b5a 100644 --- a/VisualizationModules/LibRender/cvfGlyph.cpp +++ b/Fwk/VizFwk/LibRender/cvfGlyph.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOpenGL.h" #include "cvfGlyph.h" diff --git a/VisualizationModules/LibRender/cvfGlyph.h b/Fwk/VizFwk/LibRender/cvfGlyph.h similarity index 75% rename from VisualizationModules/LibRender/cvfGlyph.h rename to Fwk/VizFwk/LibRender/cvfGlyph.h index eda75000fa..3356098ed5 100644 --- a/VisualizationModules/LibRender/cvfGlyph.h +++ b/Fwk/VizFwk/LibRender/cvfGlyph.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfHitDetail.cpp b/Fwk/VizFwk/LibRender/cvfHitDetail.cpp similarity index 58% rename from VisualizationModules/LibRender/cvfHitDetail.cpp rename to Fwk/VizFwk/LibRender/cvfHitDetail.cpp index 4399292198..8cf8d78f45 100644 --- a/VisualizationModules/LibRender/cvfHitDetail.cpp +++ b/Fwk/VizFwk/LibRender/cvfHitDetail.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfHitDetail.h" diff --git a/VisualizationModules/LibRender/cvfHitDetail.h b/Fwk/VizFwk/LibRender/cvfHitDetail.h similarity index 50% rename from VisualizationModules/LibRender/cvfHitDetail.h rename to Fwk/VizFwk/LibRender/cvfHitDetail.h index ae00a92747..53354ac705 100644 --- a/VisualizationModules/LibRender/cvfHitDetail.h +++ b/Fwk/VizFwk/LibRender/cvfHitDetail.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfLibRender.h b/Fwk/VizFwk/LibRender/cvfLibRender.h similarity index 73% rename from VisualizationModules/LibRender/cvfLibRender.h rename to Fwk/VizFwk/LibRender/cvfLibRender.h index f9c2573d3b..4b46fbcd0b 100644 --- a/VisualizationModules/LibRender/cvfLibRender.h +++ b/Fwk/VizFwk/LibRender/cvfLibRender.h @@ -1,24 +1,42 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + // Doxygen module definition -/// \ingroup CeeVizFramework +/// \ingroup VizFramework /// @{ /// \defgroup Render Render module /// @} diff --git a/VisualizationModules/LibRender/cvfMatrixState.cpp b/Fwk/VizFwk/LibRender/cvfMatrixState.cpp similarity index 90% rename from VisualizationModules/LibRender/cvfMatrixState.cpp rename to Fwk/VizFwk/LibRender/cvfMatrixState.cpp index 65edddc254..311e5077f3 100644 --- a/VisualizationModules/LibRender/cvfMatrixState.cpp +++ b/Fwk/VizFwk/LibRender/cvfMatrixState.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfMatrixState.h" #include "cvfCamera.h" diff --git a/VisualizationModules/LibRender/cvfMatrixState.h b/Fwk/VizFwk/LibRender/cvfMatrixState.h similarity index 74% rename from VisualizationModules/LibRender/cvfMatrixState.h rename to Fwk/VizFwk/LibRender/cvfMatrixState.h index f7caa6a368..aae955ed54 100644 --- a/VisualizationModules/LibRender/cvfMatrixState.h +++ b/Fwk/VizFwk/LibRender/cvfMatrixState.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfMatrix4.h" diff --git a/VisualizationModules/LibRender/cvfOglRc.cpp b/Fwk/VizFwk/LibRender/cvfOglRc.cpp similarity index 89% rename from VisualizationModules/LibRender/cvfOglRc.cpp rename to Fwk/VizFwk/LibRender/cvfOglRc.cpp index dae7c57e87..b9d5aacab2 100644 --- a/VisualizationModules/LibRender/cvfOglRc.cpp +++ b/Fwk/VizFwk/LibRender/cvfOglRc.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOglRc.h" #include "cvfOpenGL.h" diff --git a/VisualizationModules/LibRender/cvfOglRc.h b/Fwk/VizFwk/LibRender/cvfOglRc.h similarity index 76% rename from VisualizationModules/LibRender/cvfOglRc.h rename to Fwk/VizFwk/LibRender/cvfOglRc.h index 7e0e844bf8..dee85737d4 100644 --- a/VisualizationModules/LibRender/cvfOglRc.h +++ b/Fwk/VizFwk/LibRender/cvfOglRc.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfOpenGL.cpp b/Fwk/VizFwk/LibRender/cvfOpenGL.cpp similarity index 85% rename from VisualizationModules/LibRender/cvfOpenGL.cpp rename to Fwk/VizFwk/LibRender/cvfOpenGL.cpp index b021de0ae9..0e535170c0 100644 --- a/VisualizationModules/LibRender/cvfOpenGL.cpp +++ b/Fwk/VizFwk/LibRender/cvfOpenGL.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOpenGL.h" #include "cvfSystem.h" diff --git a/VisualizationModules/LibRender/cvfOpenGL.h b/Fwk/VizFwk/LibRender/cvfOpenGL.h similarity index 80% rename from VisualizationModules/LibRender/cvfOpenGL.h rename to Fwk/VizFwk/LibRender/cvfOpenGL.h index a5e09d3542..00c50c02b8 100644 --- a/VisualizationModules/LibRender/cvfOpenGL.h +++ b/Fwk/VizFwk/LibRender/cvfOpenGL.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once diff --git a/VisualizationModules/LibRender/cvfOpenGLCapabilities.cpp b/Fwk/VizFwk/LibRender/cvfOpenGLCapabilities.cpp similarity index 84% rename from VisualizationModules/LibRender/cvfOpenGLCapabilities.cpp rename to Fwk/VizFwk/LibRender/cvfOpenGLCapabilities.cpp index b8eb0f2a39..6a31eaca27 100644 --- a/VisualizationModules/LibRender/cvfOpenGLCapabilities.cpp +++ b/Fwk/VizFwk/LibRender/cvfOpenGLCapabilities.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOpenGLCapabilities.h" diff --git a/VisualizationModules/LibRender/cvfOpenGLCapabilities.h b/Fwk/VizFwk/LibRender/cvfOpenGLCapabilities.h similarity index 71% rename from VisualizationModules/LibRender/cvfOpenGLCapabilities.h rename to Fwk/VizFwk/LibRender/cvfOpenGLCapabilities.h index 3f6162e0f1..3f97f97813 100644 --- a/VisualizationModules/LibRender/cvfOpenGLCapabilities.h +++ b/Fwk/VizFwk/LibRender/cvfOpenGLCapabilities.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfOpenGLContext.cpp b/Fwk/VizFwk/LibRender/cvfOpenGLContext.cpp similarity index 85% rename from VisualizationModules/LibRender/cvfOpenGLContext.cpp rename to Fwk/VizFwk/LibRender/cvfOpenGLContext.cpp index 1cf16efb1f..f993313996 100644 --- a/VisualizationModules/LibRender/cvfOpenGLContext.cpp +++ b/Fwk/VizFwk/LibRender/cvfOpenGLContext.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOpenGLContext.h" #include "cvfOpenGLResourceManager.h" diff --git a/VisualizationModules/LibRender/cvfOpenGLContext.h b/Fwk/VizFwk/LibRender/cvfOpenGLContext.h similarity index 66% rename from VisualizationModules/LibRender/cvfOpenGLContext.h rename to Fwk/VizFwk/LibRender/cvfOpenGLContext.h index 6cc2d70c93..254a656c60 100644 --- a/VisualizationModules/LibRender/cvfOpenGLContext.h +++ b/Fwk/VizFwk/LibRender/cvfOpenGLContext.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfOpenGLContextGroup.cpp b/Fwk/VizFwk/LibRender/cvfOpenGLContextGroup.cpp similarity index 93% rename from VisualizationModules/LibRender/cvfOpenGLContextGroup.cpp rename to Fwk/VizFwk/LibRender/cvfOpenGLContextGroup.cpp index a7b9ca2cec..b85c592025 100644 --- a/VisualizationModules/LibRender/cvfOpenGLContextGroup.cpp +++ b/Fwk/VizFwk/LibRender/cvfOpenGLContextGroup.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOpenGLContextGroup.h" #include "cvfOpenGL.h" diff --git a/VisualizationModules/LibRender/cvfOpenGLContextGroup.h b/Fwk/VizFwk/LibRender/cvfOpenGLContextGroup.h similarity index 72% rename from VisualizationModules/LibRender/cvfOpenGLContextGroup.h rename to Fwk/VizFwk/LibRender/cvfOpenGLContextGroup.h index 8fd274288a..82268b4ca2 100644 --- a/VisualizationModules/LibRender/cvfOpenGLContextGroup.h +++ b/Fwk/VizFwk/LibRender/cvfOpenGLContextGroup.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfOpenGLResourceManager.cpp b/Fwk/VizFwk/LibRender/cvfOpenGLResourceManager.cpp similarity index 95% rename from VisualizationModules/LibRender/cvfOpenGLResourceManager.cpp rename to Fwk/VizFwk/LibRender/cvfOpenGLResourceManager.cpp index 471eb63f1f..3d1c03346d 100644 --- a/VisualizationModules/LibRender/cvfOpenGLResourceManager.cpp +++ b/Fwk/VizFwk/LibRender/cvfOpenGLResourceManager.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfTrace.h" #include "cvfOpenGL.h" diff --git a/VisualizationModules/LibRender/cvfOpenGLResourceManager.h b/Fwk/VizFwk/LibRender/cvfOpenGLResourceManager.h similarity index 80% rename from VisualizationModules/LibRender/cvfOpenGLResourceManager.h rename to Fwk/VizFwk/LibRender/cvfOpenGLResourceManager.h index a51466b24f..62a4958aa9 100644 --- a/VisualizationModules/LibRender/cvfOpenGLResourceManager.h +++ b/Fwk/VizFwk/LibRender/cvfOpenGLResourceManager.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfOpenGLTypes.h b/Fwk/VizFwk/LibRender/cvfOpenGLTypes.h similarity index 63% rename from VisualizationModules/LibRender/cvfOpenGLTypes.h rename to Fwk/VizFwk/LibRender/cvfOpenGLTypes.h index f29c846a62..3cd3a2d898 100644 --- a/VisualizationModules/LibRender/cvfOpenGLTypes.h +++ b/Fwk/VizFwk/LibRender/cvfOpenGLTypes.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once namespace cvf { diff --git a/VisualizationModules/LibRender/cvfOverlayAxisCross.cpp b/Fwk/VizFwk/LibRender/cvfOverlayAxisCross.cpp similarity index 92% rename from VisualizationModules/LibRender/cvfOverlayAxisCross.cpp rename to Fwk/VizFwk/LibRender/cvfOverlayAxisCross.cpp index 29aca5ac4f..209c02c162 100644 --- a/VisualizationModules/LibRender/cvfOverlayAxisCross.cpp +++ b/Fwk/VizFwk/LibRender/cvfOverlayAxisCross.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOverlayAxisCross.h" #include "cvfOpenGL.h" diff --git a/VisualizationModules/LibRender/cvfOverlayAxisCross.h b/Fwk/VizFwk/LibRender/cvfOverlayAxisCross.h similarity index 72% rename from VisualizationModules/LibRender/cvfOverlayAxisCross.h rename to Fwk/VizFwk/LibRender/cvfOverlayAxisCross.h index a48eb08c8b..0dc8bb5524 100644 --- a/VisualizationModules/LibRender/cvfOverlayAxisCross.h +++ b/Fwk/VizFwk/LibRender/cvfOverlayAxisCross.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfOverlayItem.h" diff --git a/VisualizationModules/LibRender/cvfOverlayColorLegend.cpp b/Fwk/VizFwk/LibRender/cvfOverlayColorLegend.cpp similarity index 95% rename from VisualizationModules/LibRender/cvfOverlayColorLegend.cpp rename to Fwk/VizFwk/LibRender/cvfOverlayColorLegend.cpp index 8359f33a11..715b16c405 100644 --- a/VisualizationModules/LibRender/cvfOverlayColorLegend.cpp +++ b/Fwk/VizFwk/LibRender/cvfOverlayColorLegend.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOverlayColorLegend.h" #include "cvfOpenGL.h" diff --git a/VisualizationModules/LibRender/cvfOverlayColorLegend.h b/Fwk/VizFwk/LibRender/cvfOverlayColorLegend.h similarity index 79% rename from VisualizationModules/LibRender/cvfOverlayColorLegend.h rename to Fwk/VizFwk/LibRender/cvfOverlayColorLegend.h index f4188d3de6..6bccec27d3 100644 --- a/VisualizationModules/LibRender/cvfOverlayColorLegend.h +++ b/Fwk/VizFwk/LibRender/cvfOverlayColorLegend.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfOverlayItem.h" diff --git a/VisualizationModules/LibRender/cvfOverlayImage.cpp b/Fwk/VizFwk/LibRender/cvfOverlayImage.cpp similarity index 92% rename from VisualizationModules/LibRender/cvfOverlayImage.cpp rename to Fwk/VizFwk/LibRender/cvfOverlayImage.cpp index ce7fc16063..dd1a09311c 100644 --- a/VisualizationModules/LibRender/cvfOverlayImage.cpp +++ b/Fwk/VizFwk/LibRender/cvfOverlayImage.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOverlayImage.h" #include "cvfMatrixState.h" diff --git a/VisualizationModules/LibRender/cvfOverlayImage.h b/Fwk/VizFwk/LibRender/cvfOverlayImage.h similarity index 70% rename from VisualizationModules/LibRender/cvfOverlayImage.h rename to Fwk/VizFwk/LibRender/cvfOverlayImage.h index 421a84edb1..5e5508df2b 100644 --- a/VisualizationModules/LibRender/cvfOverlayImage.h +++ b/Fwk/VizFwk/LibRender/cvfOverlayImage.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfOverlayItem.h" diff --git a/VisualizationModules/LibRender/cvfOverlayItem.cpp b/Fwk/VizFwk/LibRender/cvfOverlayItem.cpp similarity index 64% rename from VisualizationModules/LibRender/cvfOverlayItem.cpp rename to Fwk/VizFwk/LibRender/cvfOverlayItem.cpp index 129f6eec8b..e8e4f6fbf6 100644 --- a/VisualizationModules/LibRender/cvfOverlayItem.cpp +++ b/Fwk/VizFwk/LibRender/cvfOverlayItem.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOverlayTextBox.h" #include "cvfDrawableText.h" diff --git a/VisualizationModules/LibRender/cvfOverlayItem.h b/Fwk/VizFwk/LibRender/cvfOverlayItem.h similarity index 65% rename from VisualizationModules/LibRender/cvfOverlayItem.h rename to Fwk/VizFwk/LibRender/cvfOverlayItem.h index a419c93015..910433a20c 100644 --- a/VisualizationModules/LibRender/cvfOverlayItem.h +++ b/Fwk/VizFwk/LibRender/cvfOverlayItem.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfOverlayNavigationCube.cpp b/Fwk/VizFwk/LibRender/cvfOverlayNavigationCube.cpp similarity index 98% rename from VisualizationModules/LibRender/cvfOverlayNavigationCube.cpp rename to Fwk/VizFwk/LibRender/cvfOverlayNavigationCube.cpp index 6caa550c3e..58f1f8170b 100644 --- a/VisualizationModules/LibRender/cvfOverlayNavigationCube.cpp +++ b/Fwk/VizFwk/LibRender/cvfOverlayNavigationCube.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOverlayNavigationCube.h" #include "cvfOpenGL.h" diff --git a/VisualizationModules/LibRender/cvfOverlayNavigationCube.h b/Fwk/VizFwk/LibRender/cvfOverlayNavigationCube.h similarity index 88% rename from VisualizationModules/LibRender/cvfOverlayNavigationCube.h rename to Fwk/VizFwk/LibRender/cvfOverlayNavigationCube.h index 1a5750f47d..674a35bd46 100644 --- a/VisualizationModules/LibRender/cvfOverlayNavigationCube.h +++ b/Fwk/VizFwk/LibRender/cvfOverlayNavigationCube.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfOverlayItem.h" diff --git a/VisualizationModules/LibRender/cvfOverlayScalarMapperLegend.cpp b/Fwk/VizFwk/LibRender/cvfOverlayScalarMapperLegend.cpp similarity index 96% rename from VisualizationModules/LibRender/cvfOverlayScalarMapperLegend.cpp rename to Fwk/VizFwk/LibRender/cvfOverlayScalarMapperLegend.cpp index 9e56d64a00..6d24a75628 100644 --- a/VisualizationModules/LibRender/cvfOverlayScalarMapperLegend.cpp +++ b/Fwk/VizFwk/LibRender/cvfOverlayScalarMapperLegend.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOverlayScalarMapperLegend.h" #include "cvfOpenGL.h" diff --git a/VisualizationModules/LibRender/cvfOverlayScalarMapperLegend.h b/Fwk/VizFwk/LibRender/cvfOverlayScalarMapperLegend.h similarity index 79% rename from VisualizationModules/LibRender/cvfOverlayScalarMapperLegend.h rename to Fwk/VizFwk/LibRender/cvfOverlayScalarMapperLegend.h index 30a045622a..ac2be99352 100644 --- a/VisualizationModules/LibRender/cvfOverlayScalarMapperLegend.h +++ b/Fwk/VizFwk/LibRender/cvfOverlayScalarMapperLegend.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfOverlayItem.h" diff --git a/VisualizationModules/LibRender/cvfOverlayTextBox.cpp b/Fwk/VizFwk/LibRender/cvfOverlayTextBox.cpp similarity index 93% rename from VisualizationModules/LibRender/cvfOverlayTextBox.cpp rename to Fwk/VizFwk/LibRender/cvfOverlayTextBox.cpp index c436320f2a..e7f452216b 100644 --- a/VisualizationModules/LibRender/cvfOverlayTextBox.cpp +++ b/Fwk/VizFwk/LibRender/cvfOverlayTextBox.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOverlayTextBox.h" #include "cvfDrawableText.h" diff --git a/VisualizationModules/LibRender/cvfOverlayTextBox.h b/Fwk/VizFwk/LibRender/cvfOverlayTextBox.h similarity index 72% rename from VisualizationModules/LibRender/cvfOverlayTextBox.h rename to Fwk/VizFwk/LibRender/cvfOverlayTextBox.h index 61725f7d30..08529566fe 100644 --- a/VisualizationModules/LibRender/cvfOverlayTextBox.h +++ b/Fwk/VizFwk/LibRender/cvfOverlayTextBox.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfOverlayItem.h" diff --git a/VisualizationModules/LibRender/cvfPrimitiveSet.cpp b/Fwk/VizFwk/LibRender/cvfPrimitiveSet.cpp similarity index 85% rename from VisualizationModules/LibRender/cvfPrimitiveSet.cpp rename to Fwk/VizFwk/LibRender/cvfPrimitiveSet.cpp index 9580597267..d38b2beb09 100644 --- a/VisualizationModules/LibRender/cvfPrimitiveSet.cpp +++ b/Fwk/VizFwk/LibRender/cvfPrimitiveSet.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfAssert.h" #include "cvfMath.h" diff --git a/VisualizationModules/LibRender/cvfPrimitiveSet.h b/Fwk/VizFwk/LibRender/cvfPrimitiveSet.h similarity index 63% rename from VisualizationModules/LibRender/cvfPrimitiveSet.h rename to Fwk/VizFwk/LibRender/cvfPrimitiveSet.h index f3a9d1650f..9df2c752f0 100644 --- a/VisualizationModules/LibRender/cvfPrimitiveSet.h +++ b/Fwk/VizFwk/LibRender/cvfPrimitiveSet.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfPrimitiveSetDirect.cpp b/Fwk/VizFwk/LibRender/cvfPrimitiveSetDirect.cpp similarity index 78% rename from VisualizationModules/LibRender/cvfPrimitiveSetDirect.cpp rename to Fwk/VizFwk/LibRender/cvfPrimitiveSetDirect.cpp index 87eea32afa..f24c9556aa 100644 --- a/VisualizationModules/LibRender/cvfPrimitiveSetDirect.cpp +++ b/Fwk/VizFwk/LibRender/cvfPrimitiveSetDirect.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfAssert.h" #include "cvfMath.h" diff --git a/VisualizationModules/LibRender/cvfPrimitiveSetDirect.h b/Fwk/VizFwk/LibRender/cvfPrimitiveSetDirect.h similarity index 59% rename from VisualizationModules/LibRender/cvfPrimitiveSetDirect.h rename to Fwk/VizFwk/LibRender/cvfPrimitiveSetDirect.h index 8c92d0d7af..f459e4ed66 100644 --- a/VisualizationModules/LibRender/cvfPrimitiveSetDirect.h +++ b/Fwk/VizFwk/LibRender/cvfPrimitiveSetDirect.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfPrimitiveSet.h" diff --git a/VisualizationModules/LibRender/cvfPrimitiveSetIndexedUInt.cpp b/Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUInt.cpp similarity index 87% rename from VisualizationModules/LibRender/cvfPrimitiveSetIndexedUInt.cpp rename to Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUInt.cpp index 4fef0bed47..223172aa5e 100644 --- a/VisualizationModules/LibRender/cvfPrimitiveSetIndexedUInt.cpp +++ b/Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUInt.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfAssert.h" #include "cvfMath.h" diff --git a/VisualizationModules/LibRender/cvfPrimitiveSetIndexedUInt.h b/Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUInt.h similarity index 63% rename from VisualizationModules/LibRender/cvfPrimitiveSetIndexedUInt.h rename to Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUInt.h index 7fd216b7e0..58d5dad946 100644 --- a/VisualizationModules/LibRender/cvfPrimitiveSetIndexedUInt.h +++ b/Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUInt.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfPrimitiveSet.h" diff --git a/VisualizationModules/LibRender/cvfPrimitiveSetIndexedUIntScoped.cpp b/Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUIntScoped.cpp similarity index 87% rename from VisualizationModules/LibRender/cvfPrimitiveSetIndexedUIntScoped.cpp rename to Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUIntScoped.cpp index 0909aab6ad..d91236729f 100644 --- a/VisualizationModules/LibRender/cvfPrimitiveSetIndexedUIntScoped.cpp +++ b/Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUIntScoped.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfAssert.h" #include "cvfMath.h" diff --git a/VisualizationModules/LibRender/cvfPrimitiveSetIndexedUIntScoped.h b/Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUIntScoped.h similarity index 64% rename from VisualizationModules/LibRender/cvfPrimitiveSetIndexedUIntScoped.h rename to Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUIntScoped.h index d4d126f8c3..815faccee5 100644 --- a/VisualizationModules/LibRender/cvfPrimitiveSetIndexedUIntScoped.h +++ b/Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUIntScoped.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfPrimitiveSet.h" diff --git a/VisualizationModules/LibRender/cvfPrimitiveSetIndexedUShort.cpp b/Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUShort.cpp similarity index 87% rename from VisualizationModules/LibRender/cvfPrimitiveSetIndexedUShort.cpp rename to Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUShort.cpp index ac731d4c4f..24a3c8ef5d 100644 --- a/VisualizationModules/LibRender/cvfPrimitiveSetIndexedUShort.cpp +++ b/Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUShort.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfAssert.h" #include "cvfMath.h" diff --git a/VisualizationModules/LibRender/cvfPrimitiveSetIndexedUShort.h b/Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUShort.h similarity index 64% rename from VisualizationModules/LibRender/cvfPrimitiveSetIndexedUShort.h rename to Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUShort.h index 5d84dd034b..a842d712c0 100644 --- a/VisualizationModules/LibRender/cvfPrimitiveSetIndexedUShort.h +++ b/Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUShort.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfPrimitiveSet.h" diff --git a/VisualizationModules/LibRender/cvfPrimitiveSetIndexedUShortScoped.cpp b/Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUShortScoped.cpp similarity index 87% rename from VisualizationModules/LibRender/cvfPrimitiveSetIndexedUShortScoped.cpp rename to Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUShortScoped.cpp index fb9d70f86e..a622226f9e 100644 --- a/VisualizationModules/LibRender/cvfPrimitiveSetIndexedUShortScoped.cpp +++ b/Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUShortScoped.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfAssert.h" #include "cvfMath.h" diff --git a/VisualizationModules/LibRender/cvfPrimitiveSetIndexedUShortScoped.h b/Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUShortScoped.h similarity index 64% rename from VisualizationModules/LibRender/cvfPrimitiveSetIndexedUShortScoped.h rename to Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUShortScoped.h index 0283446d99..25767144ce 100644 --- a/VisualizationModules/LibRender/cvfPrimitiveSetIndexedUShortScoped.h +++ b/Fwk/VizFwk/LibRender/cvfPrimitiveSetIndexedUShortScoped.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfPrimitiveSet.h" diff --git a/VisualizationModules/LibRender/cvfRenderState.cpp b/Fwk/VizFwk/LibRender/cvfRenderState.cpp similarity index 68% rename from VisualizationModules/LibRender/cvfRenderState.cpp rename to Fwk/VizFwk/LibRender/cvfRenderState.cpp index cb75c82104..be2f1c0bf0 100644 --- a/VisualizationModules/LibRender/cvfRenderState.cpp +++ b/Fwk/VizFwk/LibRender/cvfRenderState.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfAssert.h" #include "cvfRenderState.h" diff --git a/VisualizationModules/LibRender/cvfRenderState.h b/Fwk/VizFwk/LibRender/cvfRenderState.h similarity index 65% rename from VisualizationModules/LibRender/cvfRenderState.h rename to Fwk/VizFwk/LibRender/cvfRenderState.h index 57cfee46a8..4ddcac7bd2 100644 --- a/VisualizationModules/LibRender/cvfRenderState.h +++ b/Fwk/VizFwk/LibRender/cvfRenderState.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateBlending.cpp b/Fwk/VizFwk/LibRender/cvfRenderStateBlending.cpp similarity index 89% rename from VisualizationModules/LibRender/cvfRenderStateBlending.cpp rename to Fwk/VizFwk/LibRender/cvfRenderStateBlending.cpp index cc778df42d..5ffb8d9713 100644 --- a/VisualizationModules/LibRender/cvfRenderStateBlending.cpp +++ b/Fwk/VizFwk/LibRender/cvfRenderStateBlending.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRenderStateBlending.h" #include "cvfAssert.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateBlending.h b/Fwk/VizFwk/LibRender/cvfRenderStateBlending.h similarity index 72% rename from VisualizationModules/LibRender/cvfRenderStateBlending.h rename to Fwk/VizFwk/LibRender/cvfRenderStateBlending.h index 3277163fc4..bc787277f4 100644 --- a/VisualizationModules/LibRender/cvfRenderStateBlending.h +++ b/Fwk/VizFwk/LibRender/cvfRenderStateBlending.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfRenderState.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateColorMask.cpp b/Fwk/VizFwk/LibRender/cvfRenderStateColorMask.cpp similarity index 80% rename from VisualizationModules/LibRender/cvfRenderStateColorMask.cpp rename to Fwk/VizFwk/LibRender/cvfRenderStateColorMask.cpp index 3f849b22d2..cd84855636 100644 --- a/VisualizationModules/LibRender/cvfRenderStateColorMask.cpp +++ b/Fwk/VizFwk/LibRender/cvfRenderStateColorMask.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRenderStateColorMask.h" #include "cvfAssert.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateColorMask.h b/Fwk/VizFwk/LibRender/cvfRenderStateColorMask.h similarity index 60% rename from VisualizationModules/LibRender/cvfRenderStateColorMask.h rename to Fwk/VizFwk/LibRender/cvfRenderStateColorMask.h index a9a3e8ce14..a1b6b4252b 100644 --- a/VisualizationModules/LibRender/cvfRenderStateColorMask.h +++ b/Fwk/VizFwk/LibRender/cvfRenderStateColorMask.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfRenderState.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateCullFace.cpp b/Fwk/VizFwk/LibRender/cvfRenderStateCullFace.cpp similarity index 76% rename from VisualizationModules/LibRender/cvfRenderStateCullFace.cpp rename to Fwk/VizFwk/LibRender/cvfRenderStateCullFace.cpp index f99eec4777..484bebea29 100644 --- a/VisualizationModules/LibRender/cvfRenderStateCullFace.cpp +++ b/Fwk/VizFwk/LibRender/cvfRenderStateCullFace.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRenderStateCullFace.h" #include "cvfAssert.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateCullFace.h b/Fwk/VizFwk/LibRender/cvfRenderStateCullFace.h similarity index 61% rename from VisualizationModules/LibRender/cvfRenderStateCullFace.h rename to Fwk/VizFwk/LibRender/cvfRenderStateCullFace.h index 627045a1b6..fb5935bae3 100644 --- a/VisualizationModules/LibRender/cvfRenderStateCullFace.h +++ b/Fwk/VizFwk/LibRender/cvfRenderStateCullFace.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfRenderState.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateDepth.cpp b/Fwk/VizFwk/LibRender/cvfRenderStateDepth.cpp similarity index 84% rename from VisualizationModules/LibRender/cvfRenderStateDepth.cpp rename to Fwk/VizFwk/LibRender/cvfRenderStateDepth.cpp index 40ccb00928..b01757b7cb 100644 --- a/VisualizationModules/LibRender/cvfRenderStateDepth.cpp +++ b/Fwk/VizFwk/LibRender/cvfRenderStateDepth.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRenderStateDepth.h" #include "cvfAssert.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateDepth.h b/Fwk/VizFwk/LibRender/cvfRenderStateDepth.h similarity index 70% rename from VisualizationModules/LibRender/cvfRenderStateDepth.h rename to Fwk/VizFwk/LibRender/cvfRenderStateDepth.h index 2cb95125ec..eaced266de 100644 --- a/VisualizationModules/LibRender/cvfRenderStateDepth.h +++ b/Fwk/VizFwk/LibRender/cvfRenderStateDepth.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfRenderState.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateFrontFace.cpp b/Fwk/VizFwk/LibRender/cvfRenderStateFrontFace.cpp similarity index 72% rename from VisualizationModules/LibRender/cvfRenderStateFrontFace.cpp rename to Fwk/VizFwk/LibRender/cvfRenderStateFrontFace.cpp index 236ab1ae8f..5fb15973ed 100644 --- a/VisualizationModules/LibRender/cvfRenderStateFrontFace.cpp +++ b/Fwk/VizFwk/LibRender/cvfRenderStateFrontFace.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRenderStateFrontFace.h" #include "cvfAssert.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateFrontFace.h b/Fwk/VizFwk/LibRender/cvfRenderStateFrontFace.h similarity index 56% rename from VisualizationModules/LibRender/cvfRenderStateFrontFace.h rename to Fwk/VizFwk/LibRender/cvfRenderStateFrontFace.h index 46c4004a4e..b39adc8f79 100644 --- a/VisualizationModules/LibRender/cvfRenderStateFrontFace.h +++ b/Fwk/VizFwk/LibRender/cvfRenderStateFrontFace.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfRenderState.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateLine.cpp b/Fwk/VizFwk/LibRender/cvfRenderStateLine.cpp similarity index 74% rename from VisualizationModules/LibRender/cvfRenderStateLine.cpp rename to Fwk/VizFwk/LibRender/cvfRenderStateLine.cpp index 99bf80e56e..5c6458fb7e 100644 --- a/VisualizationModules/LibRender/cvfRenderStateLine.cpp +++ b/Fwk/VizFwk/LibRender/cvfRenderStateLine.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRenderStateLine.h" #include "cvfAssert.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateLine.h b/Fwk/VizFwk/LibRender/cvfRenderStateLine.h similarity index 57% rename from VisualizationModules/LibRender/cvfRenderStateLine.h rename to Fwk/VizFwk/LibRender/cvfRenderStateLine.h index 16d2135559..d0228c2eec 100644 --- a/VisualizationModules/LibRender/cvfRenderStateLine.h +++ b/Fwk/VizFwk/LibRender/cvfRenderStateLine.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfRenderState.h" diff --git a/VisualizationModules/LibRender/cvfRenderStatePoint.cpp b/Fwk/VizFwk/LibRender/cvfRenderStatePoint.cpp similarity index 81% rename from VisualizationModules/LibRender/cvfRenderStatePoint.cpp rename to Fwk/VizFwk/LibRender/cvfRenderStatePoint.cpp index 006dc81fbf..b6bff4dcf6 100644 --- a/VisualizationModules/LibRender/cvfRenderStatePoint.cpp +++ b/Fwk/VizFwk/LibRender/cvfRenderStatePoint.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRenderStatePoint.h" #include "cvfAssert.h" diff --git a/VisualizationModules/LibRender/cvfRenderStatePoint.h b/Fwk/VizFwk/LibRender/cvfRenderStatePoint.h similarity index 63% rename from VisualizationModules/LibRender/cvfRenderStatePoint.h rename to Fwk/VizFwk/LibRender/cvfRenderStatePoint.h index b77e266693..cd63fd5aba 100644 --- a/VisualizationModules/LibRender/cvfRenderStatePoint.h +++ b/Fwk/VizFwk/LibRender/cvfRenderStatePoint.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfRenderState.h" diff --git a/VisualizationModules/LibRender/cvfRenderStatePolygonMode.cpp b/Fwk/VizFwk/LibRender/cvfRenderStatePolygonMode.cpp similarity index 79% rename from VisualizationModules/LibRender/cvfRenderStatePolygonMode.cpp rename to Fwk/VizFwk/LibRender/cvfRenderStatePolygonMode.cpp index f6fef78c5f..4224172e94 100644 --- a/VisualizationModules/LibRender/cvfRenderStatePolygonMode.cpp +++ b/Fwk/VizFwk/LibRender/cvfRenderStatePolygonMode.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRenderStatePolygonMode.h" #include "cvfOpenGL.h" diff --git a/VisualizationModules/LibRender/cvfRenderStatePolygonMode.h b/Fwk/VizFwk/LibRender/cvfRenderStatePolygonMode.h similarity index 63% rename from VisualizationModules/LibRender/cvfRenderStatePolygonMode.h rename to Fwk/VizFwk/LibRender/cvfRenderStatePolygonMode.h index 3d7b1c6d84..0bd73200fb 100644 --- a/VisualizationModules/LibRender/cvfRenderStatePolygonMode.h +++ b/Fwk/VizFwk/LibRender/cvfRenderStatePolygonMode.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfRenderState.h" diff --git a/VisualizationModules/LibRender/cvfRenderStatePolygonOffset.cpp b/Fwk/VizFwk/LibRender/cvfRenderStatePolygonOffset.cpp similarity index 85% rename from VisualizationModules/LibRender/cvfRenderStatePolygonOffset.cpp rename to Fwk/VizFwk/LibRender/cvfRenderStatePolygonOffset.cpp index ce0f893b30..f799eb25fa 100644 --- a/VisualizationModules/LibRender/cvfRenderStatePolygonOffset.cpp +++ b/Fwk/VizFwk/LibRender/cvfRenderStatePolygonOffset.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfAssert.h" #include "cvfRenderStatePolygonOffset.h" diff --git a/VisualizationModules/LibRender/cvfRenderStatePolygonOffset.h b/Fwk/VizFwk/LibRender/cvfRenderStatePolygonOffset.h similarity index 65% rename from VisualizationModules/LibRender/cvfRenderStatePolygonOffset.h rename to Fwk/VizFwk/LibRender/cvfRenderStatePolygonOffset.h index 85f6fa97d8..677d49614f 100644 --- a/VisualizationModules/LibRender/cvfRenderStatePolygonOffset.h +++ b/Fwk/VizFwk/LibRender/cvfRenderStatePolygonOffset.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfRenderState.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateSet.cpp b/Fwk/VizFwk/LibRender/cvfRenderStateSet.cpp similarity index 80% rename from VisualizationModules/LibRender/cvfRenderStateSet.cpp rename to Fwk/VizFwk/LibRender/cvfRenderStateSet.cpp index ad7cffd705..7865167ac6 100644 --- a/VisualizationModules/LibRender/cvfRenderStateSet.cpp +++ b/Fwk/VizFwk/LibRender/cvfRenderStateSet.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfAssert.h" #include "cvfRenderStateSet.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateSet.h b/Fwk/VizFwk/LibRender/cvfRenderStateSet.h similarity index 58% rename from VisualizationModules/LibRender/cvfRenderStateSet.h rename to Fwk/VizFwk/LibRender/cvfRenderStateSet.h index 3915561290..a5cd22fee3 100644 --- a/VisualizationModules/LibRender/cvfRenderStateSet.h +++ b/Fwk/VizFwk/LibRender/cvfRenderStateSet.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateStencil.cpp b/Fwk/VizFwk/LibRender/cvfRenderStateStencil.cpp similarity index 83% rename from VisualizationModules/LibRender/cvfRenderStateStencil.cpp rename to Fwk/VizFwk/LibRender/cvfRenderStateStencil.cpp index db875c2057..ece30ab66b 100644 --- a/VisualizationModules/LibRender/cvfRenderStateStencil.cpp +++ b/Fwk/VizFwk/LibRender/cvfRenderStateStencil.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRenderStateStencil.h" #include "cvfAssert.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateStencil.h b/Fwk/VizFwk/LibRender/cvfRenderStateStencil.h similarity index 78% rename from VisualizationModules/LibRender/cvfRenderStateStencil.h rename to Fwk/VizFwk/LibRender/cvfRenderStateStencil.h index 1ef2bacb1f..0b6623feec 100644 --- a/VisualizationModules/LibRender/cvfRenderStateStencil.h +++ b/Fwk/VizFwk/LibRender/cvfRenderStateStencil.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfRenderState.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateTextureBindings.cpp b/Fwk/VizFwk/LibRender/cvfRenderStateTextureBindings.cpp similarity index 89% rename from VisualizationModules/LibRender/cvfRenderStateTextureBindings.cpp rename to Fwk/VizFwk/LibRender/cvfRenderStateTextureBindings.cpp index 5c3279916a..c65f157e8c 100644 --- a/VisualizationModules/LibRender/cvfRenderStateTextureBindings.cpp +++ b/Fwk/VizFwk/LibRender/cvfRenderStateTextureBindings.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRenderStateTextureBindings.h" #include "cvfAssert.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateTextureBindings.h b/Fwk/VizFwk/LibRender/cvfRenderStateTextureBindings.h similarity index 68% rename from VisualizationModules/LibRender/cvfRenderStateTextureBindings.h rename to Fwk/VizFwk/LibRender/cvfRenderStateTextureBindings.h index d33447aa5f..7ece016631 100644 --- a/VisualizationModules/LibRender/cvfRenderStateTextureBindings.h +++ b/Fwk/VizFwk/LibRender/cvfRenderStateTextureBindings.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfRenderState.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateTracker.cpp b/Fwk/VizFwk/LibRender/cvfRenderStateTracker.cpp similarity index 87% rename from VisualizationModules/LibRender/cvfRenderStateTracker.cpp rename to Fwk/VizFwk/LibRender/cvfRenderStateTracker.cpp index 20100cbc62..250b9e5f5a 100644 --- a/VisualizationModules/LibRender/cvfRenderStateTracker.cpp +++ b/Fwk/VizFwk/LibRender/cvfRenderStateTracker.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRenderStateTracker.h" #include "cvfRenderStateSet.h" diff --git a/VisualizationModules/LibRender/cvfRenderStateTracker.h b/Fwk/VizFwk/LibRender/cvfRenderStateTracker.h similarity index 60% rename from VisualizationModules/LibRender/cvfRenderStateTracker.h rename to Fwk/VizFwk/LibRender/cvfRenderStateTracker.h index b85daeba1e..36b21596de 100644 --- a/VisualizationModules/LibRender/cvfRenderStateTracker.h +++ b/Fwk/VizFwk/LibRender/cvfRenderStateTracker.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfRenderState.h" diff --git a/VisualizationModules/LibRender/cvfRenderState_FF.cpp b/Fwk/VizFwk/LibRender/cvfRenderState_FF.cpp similarity index 96% rename from VisualizationModules/LibRender/cvfRenderState_FF.cpp rename to Fwk/VizFwk/LibRender/cvfRenderState_FF.cpp index f7b87e423e..86374ea4f7 100644 --- a/VisualizationModules/LibRender/cvfRenderState_FF.cpp +++ b/Fwk/VizFwk/LibRender/cvfRenderState_FF.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfOpenGL.h" #include "cvfColor4.h" diff --git a/VisualizationModules/LibRender/cvfRenderState_FF.h b/Fwk/VizFwk/LibRender/cvfRenderState_FF.h similarity index 88% rename from VisualizationModules/LibRender/cvfRenderState_FF.h rename to Fwk/VizFwk/LibRender/cvfRenderState_FF.h index 11227ba2bd..48a1b92981 100644 --- a/VisualizationModules/LibRender/cvfRenderState_FF.h +++ b/Fwk/VizFwk/LibRender/cvfRenderState_FF.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfRenderState.h" diff --git a/VisualizationModules/LibRender/cvfRenderbufferObject.cpp b/Fwk/VizFwk/LibRender/cvfRenderbufferObject.cpp similarity index 82% rename from VisualizationModules/LibRender/cvfRenderbufferObject.cpp rename to Fwk/VizFwk/LibRender/cvfRenderbufferObject.cpp index e190c2011b..29bfc7d24d 100644 --- a/VisualizationModules/LibRender/cvfRenderbufferObject.cpp +++ b/Fwk/VizFwk/LibRender/cvfRenderbufferObject.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRenderbufferObject.h" #include "cvfOpenGL.h" diff --git a/VisualizationModules/LibRender/cvfRenderbufferObject.h b/Fwk/VizFwk/LibRender/cvfRenderbufferObject.h similarity index 64% rename from VisualizationModules/LibRender/cvfRenderbufferObject.h rename to Fwk/VizFwk/LibRender/cvfRenderbufferObject.h index fe7a4e347c..13beed9f78 100644 --- a/VisualizationModules/LibRender/cvfRenderbufferObject.h +++ b/Fwk/VizFwk/LibRender/cvfRenderbufferObject.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfSampler.cpp b/Fwk/VizFwk/LibRender/cvfSampler.cpp similarity index 80% rename from VisualizationModules/LibRender/cvfSampler.cpp rename to Fwk/VizFwk/LibRender/cvfSampler.cpp index 7a439ffcf2..7419b17302 100644 --- a/VisualizationModules/LibRender/cvfSampler.cpp +++ b/Fwk/VizFwk/LibRender/cvfSampler.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfSampler.h" diff --git a/VisualizationModules/LibRender/cvfSampler.h b/Fwk/VizFwk/LibRender/cvfSampler.h similarity index 73% rename from VisualizationModules/LibRender/cvfSampler.h rename to Fwk/VizFwk/LibRender/cvfSampler.h index f9d5428c58..bc5e191deb 100644 --- a/VisualizationModules/LibRender/cvfSampler.h +++ b/Fwk/VizFwk/LibRender/cvfSampler.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfScalarMapper.cpp b/Fwk/VizFwk/LibRender/cvfScalarMapper.cpp similarity index 92% rename from VisualizationModules/LibRender/cvfScalarMapper.cpp rename to Fwk/VizFwk/LibRender/cvfScalarMapper.cpp index c707cf5748..974116937e 100644 --- a/VisualizationModules/LibRender/cvfScalarMapper.cpp +++ b/Fwk/VizFwk/LibRender/cvfScalarMapper.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfScalarMapper.h" diff --git a/VisualizationModules/LibRender/cvfScalarMapper.h b/Fwk/VizFwk/LibRender/cvfScalarMapper.h similarity index 73% rename from VisualizationModules/LibRender/cvfScalarMapper.h rename to Fwk/VizFwk/LibRender/cvfScalarMapper.h index ea98e04b3d..13e82d0be4 100644 --- a/VisualizationModules/LibRender/cvfScalarMapper.h +++ b/Fwk/VizFwk/LibRender/cvfScalarMapper.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfBase.h" diff --git a/VisualizationModules/LibRender/cvfScalarMapperContinuousLinear.cpp b/Fwk/VizFwk/LibRender/cvfScalarMapperContinuousLinear.cpp similarity index 65% rename from VisualizationModules/LibRender/cvfScalarMapperContinuousLinear.cpp rename to Fwk/VizFwk/LibRender/cvfScalarMapperContinuousLinear.cpp index f4849e3deb..4aca519def 100644 --- a/VisualizationModules/LibRender/cvfScalarMapperContinuousLinear.cpp +++ b/Fwk/VizFwk/LibRender/cvfScalarMapperContinuousLinear.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfScalarMapperContinuousLinear.h" #include "cvfMath.h" diff --git a/VisualizationModules/LibRender/cvfScalarMapperContinuousLinear.h b/Fwk/VizFwk/LibRender/cvfScalarMapperContinuousLinear.h similarity index 55% rename from VisualizationModules/LibRender/cvfScalarMapperContinuousLinear.h rename to Fwk/VizFwk/LibRender/cvfScalarMapperContinuousLinear.h index 774798afbe..e462e4441a 100644 --- a/VisualizationModules/LibRender/cvfScalarMapperContinuousLinear.h +++ b/Fwk/VizFwk/LibRender/cvfScalarMapperContinuousLinear.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfScalarMapperRangeBased.h" diff --git a/VisualizationModules/LibRender/cvfScalarMapperContinuousLog.cpp b/Fwk/VizFwk/LibRender/cvfScalarMapperContinuousLog.cpp similarity index 76% rename from VisualizationModules/LibRender/cvfScalarMapperContinuousLog.cpp rename to Fwk/VizFwk/LibRender/cvfScalarMapperContinuousLog.cpp index 8cccdcae42..ebb43da216 100644 --- a/VisualizationModules/LibRender/cvfScalarMapperContinuousLog.cpp +++ b/Fwk/VizFwk/LibRender/cvfScalarMapperContinuousLog.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfScalarMapperContinuousLog.h" #include "cvfMath.h" diff --git a/VisualizationModules/LibRender/cvfScalarMapperContinuousLog.h b/Fwk/VizFwk/LibRender/cvfScalarMapperContinuousLog.h similarity index 57% rename from VisualizationModules/LibRender/cvfScalarMapperContinuousLog.h rename to Fwk/VizFwk/LibRender/cvfScalarMapperContinuousLog.h index eda29b7339..ba095b27fc 100644 --- a/VisualizationModules/LibRender/cvfScalarMapperContinuousLog.h +++ b/Fwk/VizFwk/LibRender/cvfScalarMapperContinuousLog.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfScalarMapperRangeBased.h" diff --git a/VisualizationModules/LibRender/cvfScalarMapperDiscreteLinear.cpp b/Fwk/VizFwk/LibRender/cvfScalarMapperDiscreteLinear.cpp similarity index 76% rename from VisualizationModules/LibRender/cvfScalarMapperDiscreteLinear.cpp rename to Fwk/VizFwk/LibRender/cvfScalarMapperDiscreteLinear.cpp index febea0c299..38d7cb2376 100644 --- a/VisualizationModules/LibRender/cvfScalarMapperDiscreteLinear.cpp +++ b/Fwk/VizFwk/LibRender/cvfScalarMapperDiscreteLinear.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfScalarMapperDiscreteLinear.h" #include "cvfMath.h" #include "cvfTextureImage.h" diff --git a/VisualizationModules/LibRender/cvfScalarMapperDiscreteLinear.h b/Fwk/VizFwk/LibRender/cvfScalarMapperDiscreteLinear.h similarity index 60% rename from VisualizationModules/LibRender/cvfScalarMapperDiscreteLinear.h rename to Fwk/VizFwk/LibRender/cvfScalarMapperDiscreteLinear.h index da8fcb5fd9..b1fa923487 100644 --- a/VisualizationModules/LibRender/cvfScalarMapperDiscreteLinear.h +++ b/Fwk/VizFwk/LibRender/cvfScalarMapperDiscreteLinear.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfScalarMapperRangeBased.h" diff --git a/VisualizationModules/LibRender/cvfScalarMapperDiscreteLog.cpp b/Fwk/VizFwk/LibRender/cvfScalarMapperDiscreteLog.cpp similarity index 80% rename from VisualizationModules/LibRender/cvfScalarMapperDiscreteLog.cpp rename to Fwk/VizFwk/LibRender/cvfScalarMapperDiscreteLog.cpp index 564ec95c9c..204a02c817 100644 --- a/VisualizationModules/LibRender/cvfScalarMapperDiscreteLog.cpp +++ b/Fwk/VizFwk/LibRender/cvfScalarMapperDiscreteLog.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfScalarMapperDiscreteLog.h" #include "cvfScalarMapperDiscreteLinear.h" #include diff --git a/VisualizationModules/LibRender/cvfScalarMapperDiscreteLog.h b/Fwk/VizFwk/LibRender/cvfScalarMapperDiscreteLog.h similarity index 59% rename from VisualizationModules/LibRender/cvfScalarMapperDiscreteLog.h rename to Fwk/VizFwk/LibRender/cvfScalarMapperDiscreteLog.h index bba36fbbea..d7bc22fd58 100644 --- a/VisualizationModules/LibRender/cvfScalarMapperDiscreteLog.h +++ b/Fwk/VizFwk/LibRender/cvfScalarMapperDiscreteLog.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfScalarMapperRangeBased.h" diff --git a/VisualizationModules/LibRender/cvfScalarMapperRangeBased.cpp b/Fwk/VizFwk/LibRender/cvfScalarMapperRangeBased.cpp similarity index 90% rename from VisualizationModules/LibRender/cvfScalarMapperRangeBased.cpp rename to Fwk/VizFwk/LibRender/cvfScalarMapperRangeBased.cpp index f2c41620e5..80ea76a0a6 100644 --- a/VisualizationModules/LibRender/cvfScalarMapperRangeBased.cpp +++ b/Fwk/VizFwk/LibRender/cvfScalarMapperRangeBased.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfScalarMapperRangeBased.h" #include "cvfMath.h" #include "cvfTextureImage.h" diff --git a/VisualizationModules/LibRender/cvfScalarMapperRangeBased.h b/Fwk/VizFwk/LibRender/cvfScalarMapperRangeBased.h similarity index 71% rename from VisualizationModules/LibRender/cvfScalarMapperRangeBased.h rename to Fwk/VizFwk/LibRender/cvfScalarMapperRangeBased.h index 2a818fb75f..a4954b9847 100644 --- a/VisualizationModules/LibRender/cvfScalarMapperRangeBased.h +++ b/Fwk/VizFwk/LibRender/cvfScalarMapperRangeBased.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfScalarMapper.h" diff --git a/VisualizationModules/LibRender/cvfScalarMapperUniformLevels.cpp b/Fwk/VizFwk/LibRender/cvfScalarMapperUniformLevels.cpp similarity index 91% rename from VisualizationModules/LibRender/cvfScalarMapperUniformLevels.cpp rename to Fwk/VizFwk/LibRender/cvfScalarMapperUniformLevels.cpp index 696cbadc75..9f7f36cb0e 100644 --- a/VisualizationModules/LibRender/cvfScalarMapperUniformLevels.cpp +++ b/Fwk/VizFwk/LibRender/cvfScalarMapperUniformLevels.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfMath.h" #include "cvfScalarMapperUniformLevels.h" diff --git a/VisualizationModules/LibRender/cvfScalarMapperUniformLevels.h b/Fwk/VizFwk/LibRender/cvfScalarMapperUniformLevels.h similarity index 67% rename from VisualizationModules/LibRender/cvfScalarMapperUniformLevels.h rename to Fwk/VizFwk/LibRender/cvfScalarMapperUniformLevels.h index f871277610..62af26473a 100644 --- a/VisualizationModules/LibRender/cvfScalarMapperUniformLevels.h +++ b/Fwk/VizFwk/LibRender/cvfScalarMapperUniformLevels.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfShader.cpp b/Fwk/VizFwk/LibRender/cvfShader.cpp similarity index 88% rename from VisualizationModules/LibRender/cvfShader.cpp rename to Fwk/VizFwk/LibRender/cvfShader.cpp index 057b15d75c..ca6ac8f549 100644 --- a/VisualizationModules/LibRender/cvfShader.cpp +++ b/Fwk/VizFwk/LibRender/cvfShader.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfShaderProgram.h" #include "cvfLogger.h" diff --git a/VisualizationModules/LibRender/cvfShader.h b/Fwk/VizFwk/LibRender/cvfShader.h similarity index 68% rename from VisualizationModules/LibRender/cvfShader.h rename to Fwk/VizFwk/LibRender/cvfShader.h index 44acac0233..be9e1a0ff5 100644 --- a/VisualizationModules/LibRender/cvfShader.h +++ b/Fwk/VizFwk/LibRender/cvfShader.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfShaderProgram.cpp b/Fwk/VizFwk/LibRender/cvfShaderProgram.cpp similarity index 96% rename from VisualizationModules/LibRender/cvfShaderProgram.cpp rename to Fwk/VizFwk/LibRender/cvfShaderProgram.cpp index 2ac80e90f1..a38b280a70 100644 --- a/VisualizationModules/LibRender/cvfShaderProgram.cpp +++ b/Fwk/VizFwk/LibRender/cvfShaderProgram.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfShaderProgram.h" #include "cvfOpenGL.h" diff --git a/VisualizationModules/LibRender/cvfShaderProgram.h b/Fwk/VizFwk/LibRender/cvfShaderProgram.h similarity index 83% rename from VisualizationModules/LibRender/cvfShaderProgram.h rename to Fwk/VizFwk/LibRender/cvfShaderProgram.h index 13df60d2e9..ce3cb06044 100644 --- a/VisualizationModules/LibRender/cvfShaderProgram.h +++ b/Fwk/VizFwk/LibRender/cvfShaderProgram.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfShader.h" diff --git a/VisualizationModules/LibRender/cvfShaderProgramGenerator.cpp b/Fwk/VizFwk/LibRender/cvfShaderProgramGenerator.cpp similarity index 92% rename from VisualizationModules/LibRender/cvfShaderProgramGenerator.cpp rename to Fwk/VizFwk/LibRender/cvfShaderProgramGenerator.cpp index 3bc0024782..6ddea19c88 100644 --- a/VisualizationModules/LibRender/cvfShaderProgramGenerator.cpp +++ b/Fwk/VizFwk/LibRender/cvfShaderProgramGenerator.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfShaderProgramGenerator.h" #include "cvfShaderProgram.h" diff --git a/VisualizationModules/LibRender/cvfShaderProgramGenerator.h b/Fwk/VizFwk/LibRender/cvfShaderProgramGenerator.h similarity index 73% rename from VisualizationModules/LibRender/cvfShaderProgramGenerator.h rename to Fwk/VizFwk/LibRender/cvfShaderProgramGenerator.h index 80cd8139ac..de5ae931e7 100644 --- a/VisualizationModules/LibRender/cvfShaderProgramGenerator.h +++ b/Fwk/VizFwk/LibRender/cvfShaderProgramGenerator.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfShaderSourceRepository.h" diff --git a/VisualizationModules/LibRender/cvfShaderSourceProvider.cpp b/Fwk/VizFwk/LibRender/cvfShaderSourceProvider.cpp similarity index 81% rename from VisualizationModules/LibRender/cvfShaderSourceProvider.cpp rename to Fwk/VizFwk/LibRender/cvfShaderSourceProvider.cpp index ed3b82fbfe..0563a03643 100644 --- a/VisualizationModules/LibRender/cvfShaderSourceProvider.cpp +++ b/Fwk/VizFwk/LibRender/cvfShaderSourceProvider.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfShaderSourceProvider.h" #include "cvfShaderProgram.h" diff --git a/VisualizationModules/LibRender/cvfShaderSourceProvider.h b/Fwk/VizFwk/LibRender/cvfShaderSourceProvider.h similarity index 61% rename from VisualizationModules/LibRender/cvfShaderSourceProvider.h rename to Fwk/VizFwk/LibRender/cvfShaderSourceProvider.h index 0acdb0020d..6658d16861 100644 --- a/VisualizationModules/LibRender/cvfShaderSourceProvider.h +++ b/Fwk/VizFwk/LibRender/cvfShaderSourceProvider.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfShaderSourceRepository.h" diff --git a/VisualizationModules/LibRender/cvfShaderSourceRepository.cpp b/Fwk/VizFwk/LibRender/cvfShaderSourceRepository.cpp similarity index 87% rename from VisualizationModules/LibRender/cvfShaderSourceRepository.cpp rename to Fwk/VizFwk/LibRender/cvfShaderSourceRepository.cpp index e5a4709b87..66a011a8c3 100644 --- a/VisualizationModules/LibRender/cvfShaderSourceRepository.cpp +++ b/Fwk/VizFwk/LibRender/cvfShaderSourceRepository.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfString.h" #include "cvfShaderSourceRepository.h" diff --git a/VisualizationModules/LibRender/cvfShaderSourceRepository.h b/Fwk/VizFwk/LibRender/cvfShaderSourceRepository.h similarity index 69% rename from VisualizationModules/LibRender/cvfShaderSourceRepository.h rename to Fwk/VizFwk/LibRender/cvfShaderSourceRepository.h index 24ab80841f..e20c7a4870 100644 --- a/VisualizationModules/LibRender/cvfShaderSourceRepository.h +++ b/Fwk/VizFwk/LibRender/cvfShaderSourceRepository.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfShaderSourceRepositoryFile.cpp b/Fwk/VizFwk/LibRender/cvfShaderSourceRepositoryFile.cpp similarity index 72% rename from VisualizationModules/LibRender/cvfShaderSourceRepositoryFile.cpp rename to Fwk/VizFwk/LibRender/cvfShaderSourceRepositoryFile.cpp index 9a2b2543b2..f4730e2146 100644 --- a/VisualizationModules/LibRender/cvfShaderSourceRepositoryFile.cpp +++ b/Fwk/VizFwk/LibRender/cvfShaderSourceRepositoryFile.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfShaderSourceRepositoryFile.h" diff --git a/VisualizationModules/LibRender/cvfShaderSourceRepositoryFile.h b/Fwk/VizFwk/LibRender/cvfShaderSourceRepositoryFile.h similarity index 54% rename from VisualizationModules/LibRender/cvfShaderSourceRepositoryFile.h rename to Fwk/VizFwk/LibRender/cvfShaderSourceRepositoryFile.h index 6f011a5ccd..5b6395d172 100644 --- a/VisualizationModules/LibRender/cvfShaderSourceRepositoryFile.h +++ b/Fwk/VizFwk/LibRender/cvfShaderSourceRepositoryFile.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfString.h" diff --git a/VisualizationModules/LibRender/cvfShaderSourceStrings.h b/Fwk/VizFwk/LibRender/cvfShaderSourceStrings.h similarity index 100% rename from VisualizationModules/LibRender/cvfShaderSourceStrings.h rename to Fwk/VizFwk/LibRender/cvfShaderSourceStrings.h diff --git a/VisualizationModules/LibRender/cvfTextDrawer.cpp b/Fwk/VizFwk/LibRender/cvfTextDrawer.cpp similarity index 95% rename from VisualizationModules/LibRender/cvfTextDrawer.cpp rename to Fwk/VizFwk/LibRender/cvfTextDrawer.cpp index 86a635d9a0..f7af237a07 100644 --- a/VisualizationModules/LibRender/cvfTextDrawer.cpp +++ b/Fwk/VizFwk/LibRender/cvfTextDrawer.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfTextDrawer.h" #include "cvfFont.h" diff --git a/VisualizationModules/LibRender/cvfTextDrawer.h b/Fwk/VizFwk/LibRender/cvfTextDrawer.h similarity index 74% rename from VisualizationModules/LibRender/cvfTextDrawer.h rename to Fwk/VizFwk/LibRender/cvfTextDrawer.h index 208bf507b2..00c4da1a35 100644 --- a/VisualizationModules/LibRender/cvfTextDrawer.h +++ b/Fwk/VizFwk/LibRender/cvfTextDrawer.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfTexture.cpp b/Fwk/VizFwk/LibRender/cvfTexture.cpp similarity index 95% rename from VisualizationModules/LibRender/cvfTexture.cpp rename to Fwk/VizFwk/LibRender/cvfTexture.cpp index b2eb74c5b6..c14b002bf2 100644 --- a/VisualizationModules/LibRender/cvfTexture.cpp +++ b/Fwk/VizFwk/LibRender/cvfTexture.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfTexture.h" #include "cvfTextureImage.h" diff --git a/VisualizationModules/LibRender/cvfTexture.h b/Fwk/VizFwk/LibRender/cvfTexture.h similarity index 79% rename from VisualizationModules/LibRender/cvfTexture.h rename to Fwk/VizFwk/LibRender/cvfTexture.h index 58353d1f3a..65155c6d88 100644 --- a/VisualizationModules/LibRender/cvfTexture.h +++ b/Fwk/VizFwk/LibRender/cvfTexture.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfTexture2D_FF.cpp b/Fwk/VizFwk/LibRender/cvfTexture2D_FF.cpp similarity index 88% rename from VisualizationModules/LibRender/cvfTexture2D_FF.cpp rename to Fwk/VizFwk/LibRender/cvfTexture2D_FF.cpp index c42339a723..4619ce446f 100644 --- a/VisualizationModules/LibRender/cvfTexture2D_FF.cpp +++ b/Fwk/VizFwk/LibRender/cvfTexture2D_FF.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfTexture2D_FF.h" #include "cvfTextureImage.h" diff --git a/VisualizationModules/LibRender/cvfTexture2D_FF.h b/Fwk/VizFwk/LibRender/cvfTexture2D_FF.h similarity index 68% rename from VisualizationModules/LibRender/cvfTexture2D_FF.h rename to Fwk/VizFwk/LibRender/cvfTexture2D_FF.h index 632a394c2c..17ada2503c 100644 --- a/VisualizationModules/LibRender/cvfTexture2D_FF.h +++ b/Fwk/VizFwk/LibRender/cvfTexture2D_FF.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfTextureImage.cpp b/Fwk/VizFwk/LibRender/cvfTextureImage.cpp similarity index 90% rename from VisualizationModules/LibRender/cvfTextureImage.cpp rename to Fwk/VizFwk/LibRender/cvfTextureImage.cpp index 9f44347604..2b5da3aae5 100644 --- a/VisualizationModules/LibRender/cvfTextureImage.cpp +++ b/Fwk/VizFwk/LibRender/cvfTextureImage.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfTextureImage.h" diff --git a/VisualizationModules/LibRender/cvfTextureImage.h b/Fwk/VizFwk/LibRender/cvfTextureImage.h similarity index 66% rename from VisualizationModules/LibRender/cvfTextureImage.h rename to Fwk/VizFwk/LibRender/cvfTextureImage.h index b50dc533e4..1d20933997 100644 --- a/VisualizationModules/LibRender/cvfTextureImage.h +++ b/Fwk/VizFwk/LibRender/cvfTextureImage.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/cvfUniform.cpp b/Fwk/VizFwk/LibRender/cvfUniform.cpp similarity index 92% rename from VisualizationModules/LibRender/cvfUniform.cpp rename to Fwk/VizFwk/LibRender/cvfUniform.cpp index 90e7b812ab..8b61c8317f 100644 --- a/VisualizationModules/LibRender/cvfUniform.cpp +++ b/Fwk/VizFwk/LibRender/cvfUniform.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfAssert.h" #include "cvfUniform.h" diff --git a/VisualizationModules/LibRender/cvfUniform.h b/Fwk/VizFwk/LibRender/cvfUniform.h similarity index 79% rename from VisualizationModules/LibRender/cvfUniform.h rename to Fwk/VizFwk/LibRender/cvfUniform.h index 7c7345cf8d..a849cd7936 100644 --- a/VisualizationModules/LibRender/cvfUniform.h +++ b/Fwk/VizFwk/LibRender/cvfUniform.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfVector4.h" diff --git a/VisualizationModules/LibRender/cvfUniformSet.cpp b/Fwk/VizFwk/LibRender/cvfUniformSet.cpp similarity index 78% rename from VisualizationModules/LibRender/cvfUniformSet.cpp rename to Fwk/VizFwk/LibRender/cvfUniformSet.cpp index 65e4b6d4fc..0064386b85 100644 --- a/VisualizationModules/LibRender/cvfUniformSet.cpp +++ b/Fwk/VizFwk/LibRender/cvfUniformSet.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfAssert.h" #include "cvfUniformSet.h" diff --git a/VisualizationModules/LibRender/cvfUniformSet.h b/Fwk/VizFwk/LibRender/cvfUniformSet.h similarity index 55% rename from VisualizationModules/LibRender/cvfUniformSet.h rename to Fwk/VizFwk/LibRender/cvfUniformSet.h index a4e57691f5..83844ca220 100644 --- a/VisualizationModules/LibRender/cvfUniformSet.h +++ b/Fwk/VizFwk/LibRender/cvfUniformSet.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfCollection.h" diff --git a/VisualizationModules/LibRender/cvfVertexAttribute.cpp b/Fwk/VizFwk/LibRender/cvfVertexAttribute.cpp similarity index 89% rename from VisualizationModules/LibRender/cvfVertexAttribute.cpp rename to Fwk/VizFwk/LibRender/cvfVertexAttribute.cpp index 176b320ad4..51c65fcd09 100644 --- a/VisualizationModules/LibRender/cvfVertexAttribute.cpp +++ b/Fwk/VizFwk/LibRender/cvfVertexAttribute.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfVertexAttribute.h" #include "cvfBufferObjectManaged.h" diff --git a/VisualizationModules/LibRender/cvfVertexAttribute.h b/Fwk/VizFwk/LibRender/cvfVertexAttribute.h similarity index 87% rename from VisualizationModules/LibRender/cvfVertexAttribute.h rename to Fwk/VizFwk/LibRender/cvfVertexAttribute.h index 4ebff0c65e..ee2fab4e50 100644 --- a/VisualizationModules/LibRender/cvfVertexAttribute.h +++ b/Fwk/VizFwk/LibRender/cvfVertexAttribute.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfVector4.h" diff --git a/VisualizationModules/LibRender/cvfVertexBundle.cpp b/Fwk/VizFwk/LibRender/cvfVertexBundle.cpp similarity index 96% rename from VisualizationModules/LibRender/cvfVertexBundle.cpp rename to Fwk/VizFwk/LibRender/cvfVertexBundle.cpp index eb0d559d64..1cb478310a 100644 --- a/VisualizationModules/LibRender/cvfVertexBundle.cpp +++ b/Fwk/VizFwk/LibRender/cvfVertexBundle.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfVertexBundle.h" #include "cvfBufferObjectManaged.h" diff --git a/VisualizationModules/LibRender/cvfVertexBundle.h b/Fwk/VizFwk/LibRender/cvfVertexBundle.h similarity index 82% rename from VisualizationModules/LibRender/cvfVertexBundle.h rename to Fwk/VizFwk/LibRender/cvfVertexBundle.h index a1ac1f1c31..1d1d398977 100644 --- a/VisualizationModules/LibRender/cvfVertexBundle.h +++ b/Fwk/VizFwk/LibRender/cvfVertexBundle.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfCollection.h" diff --git a/VisualizationModules/LibRender/cvfViewport.cpp b/Fwk/VizFwk/LibRender/cvfViewport.cpp similarity index 90% rename from VisualizationModules/LibRender/cvfViewport.cpp rename to Fwk/VizFwk/LibRender/cvfViewport.cpp index fdb6e9c99f..37ad09d3dd 100644 --- a/VisualizationModules/LibRender/cvfViewport.cpp +++ b/Fwk/VizFwk/LibRender/cvfViewport.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfViewport.h" #include "cvfOpenGL.h" diff --git a/VisualizationModules/LibRender/cvfViewport.h b/Fwk/VizFwk/LibRender/cvfViewport.h similarity index 65% rename from VisualizationModules/LibRender/cvfViewport.h rename to Fwk/VizFwk/LibRender/cvfViewport.h index b85899e8cb..d7d29981c1 100644 --- a/VisualizationModules/LibRender/cvfViewport.h +++ b/Fwk/VizFwk/LibRender/cvfViewport.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibRender/glew/GL/glew.h b/Fwk/VizFwk/LibRender/glew/GL/glew.h similarity index 100% rename from VisualizationModules/LibRender/glew/GL/glew.h rename to Fwk/VizFwk/LibRender/glew/GL/glew.h diff --git a/VisualizationModules/LibRender/glew/GL/glxew.h b/Fwk/VizFwk/LibRender/glew/GL/glxew.h similarity index 100% rename from VisualizationModules/LibRender/glew/GL/glxew.h rename to Fwk/VizFwk/LibRender/glew/GL/glxew.h diff --git a/VisualizationModules/LibRender/glew/GL/wglew.h b/Fwk/VizFwk/LibRender/glew/GL/wglew.h similarity index 100% rename from VisualizationModules/LibRender/glew/GL/wglew.h rename to Fwk/VizFwk/LibRender/glew/GL/wglew.h diff --git a/VisualizationModules/LibRender/glew/glew.c b/Fwk/VizFwk/LibRender/glew/glew.c similarity index 100% rename from VisualizationModules/LibRender/glew/glew.c rename to Fwk/VizFwk/LibRender/glew/glew.c diff --git a/VisualizationModules/LibRender/glsl/!AddingAndModifyingGlslFiles.txt b/Fwk/VizFwk/LibRender/glsl/!AddingAndModifyingGlslFiles.txt similarity index 100% rename from VisualizationModules/LibRender/glsl/!AddingAndModifyingGlslFiles.txt rename to Fwk/VizFwk/LibRender/glsl/!AddingAndModifyingGlslFiles.txt diff --git a/VisualizationModules/LibRender/glsl/calcClipDistances.glsl b/Fwk/VizFwk/LibRender/glsl/calcClipDistances.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/calcClipDistances.glsl rename to Fwk/VizFwk/LibRender/glsl/calcClipDistances.glsl diff --git a/VisualizationModules/LibRender/glsl/calcShadowCoord.glsl b/Fwk/VizFwk/LibRender/glsl/calcShadowCoord.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/calcShadowCoord.glsl rename to Fwk/VizFwk/LibRender/glsl/calcShadowCoord.glsl diff --git a/VisualizationModules/LibRender/glsl/checkDiscard_ClipDistances.glsl b/Fwk/VizFwk/LibRender/glsl/checkDiscard_ClipDistances.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/checkDiscard_ClipDistances.glsl rename to Fwk/VizFwk/LibRender/glsl/checkDiscard_ClipDistances.glsl diff --git a/VisualizationModules/LibRender/glsl/fs_CenterLitSpherePoints.glsl b/Fwk/VizFwk/LibRender/glsl/fs_CenterLitSpherePoints.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/fs_CenterLitSpherePoints.glsl rename to Fwk/VizFwk/LibRender/glsl/fs_CenterLitSpherePoints.glsl diff --git a/VisualizationModules/LibRender/glsl/fs_FixedColorMagenta.glsl b/Fwk/VizFwk/LibRender/glsl/fs_FixedColorMagenta.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/fs_FixedColorMagenta.glsl rename to Fwk/VizFwk/LibRender/glsl/fs_FixedColorMagenta.glsl diff --git a/VisualizationModules/LibRender/glsl/fs_GaussianBlur.glsl b/Fwk/VizFwk/LibRender/glsl/fs_GaussianBlur.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/fs_GaussianBlur.glsl rename to Fwk/VizFwk/LibRender/glsl/fs_GaussianBlur.glsl diff --git a/VisualizationModules/LibRender/glsl/fs_GradientTopBottom.glsl b/Fwk/VizFwk/LibRender/glsl/fs_GradientTopBottom.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/fs_GradientTopBottom.glsl rename to Fwk/VizFwk/LibRender/glsl/fs_GradientTopBottom.glsl diff --git a/VisualizationModules/LibRender/glsl/fs_GradientTopMiddleBottom.glsl b/Fwk/VizFwk/LibRender/glsl/fs_GradientTopMiddleBottom.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/fs_GradientTopMiddleBottom.glsl rename to Fwk/VizFwk/LibRender/glsl/fs_GradientTopMiddleBottom.glsl diff --git a/VisualizationModules/LibRender/glsl/fs_HighlightMix.glsl b/Fwk/VizFwk/LibRender/glsl/fs_HighlightMix.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/fs_HighlightMix.glsl rename to Fwk/VizFwk/LibRender/glsl/fs_HighlightMix.glsl diff --git a/VisualizationModules/LibRender/glsl/fs_HighlightStencilBlur_v33.glsl b/Fwk/VizFwk/LibRender/glsl/fs_HighlightStencilBlur_v33.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/fs_HighlightStencilBlur_v33.glsl rename to Fwk/VizFwk/LibRender/glsl/fs_HighlightStencilBlur_v33.glsl diff --git a/VisualizationModules/LibRender/glsl/fs_HighlightStencilDraw.glsl b/Fwk/VizFwk/LibRender/glsl/fs_HighlightStencilDraw.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/fs_HighlightStencilDraw.glsl rename to Fwk/VizFwk/LibRender/glsl/fs_HighlightStencilDraw.glsl diff --git a/VisualizationModules/LibRender/glsl/fs_HighlightStencilMix_v33.glsl b/Fwk/VizFwk/LibRender/glsl/fs_HighlightStencilMix_v33.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/fs_HighlightStencilMix_v33.glsl rename to Fwk/VizFwk/LibRender/glsl/fs_HighlightStencilMix_v33.glsl diff --git a/VisualizationModules/LibRender/glsl/fs_ParticleTraceComets.glsl b/Fwk/VizFwk/LibRender/glsl/fs_ParticleTraceComets.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/fs_ParticleTraceComets.glsl rename to Fwk/VizFwk/LibRender/glsl/fs_ParticleTraceComets.glsl diff --git a/VisualizationModules/LibRender/glsl/fs_Shadow_v33.glsl b/Fwk/VizFwk/LibRender/glsl/fs_Shadow_v33.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/fs_Shadow_v33.glsl rename to Fwk/VizFwk/LibRender/glsl/fs_Shadow_v33.glsl diff --git a/VisualizationModules/LibRender/glsl/fs_Standard.glsl b/Fwk/VizFwk/LibRender/glsl/fs_Standard.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/fs_Standard.glsl rename to Fwk/VizFwk/LibRender/glsl/fs_Standard.glsl diff --git a/VisualizationModules/LibRender/glsl/fs_Text.glsl b/Fwk/VizFwk/LibRender/glsl/fs_Text.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/fs_Text.glsl rename to Fwk/VizFwk/LibRender/glsl/fs_Text.glsl diff --git a/VisualizationModules/LibRender/glsl/fs_Unlit.glsl b/Fwk/VizFwk/LibRender/glsl/fs_Unlit.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/fs_Unlit.glsl rename to Fwk/VizFwk/LibRender/glsl/fs_Unlit.glsl diff --git a/VisualizationModules/LibRender/glsl/fs_VectorDrawer.glsl b/Fwk/VizFwk/LibRender/glsl/fs_VectorDrawer.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/fs_VectorDrawer.glsl rename to Fwk/VizFwk/LibRender/glsl/fs_VectorDrawer.glsl diff --git a/VisualizationModules/LibRender/glsl/fs_Void.glsl b/Fwk/VizFwk/LibRender/glsl/fs_Void.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/fs_Void.glsl rename to Fwk/VizFwk/LibRender/glsl/fs_Void.glsl diff --git a/VisualizationModules/LibRender/glsl/gs_PassThroughTriangle_v33.glsl b/Fwk/VizFwk/LibRender/glsl/gs_PassThroughTriangle_v33.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/gs_PassThroughTriangle_v33.glsl rename to Fwk/VizFwk/LibRender/glsl/gs_PassThroughTriangle_v33.glsl diff --git a/VisualizationModules/LibRender/glsl/light_Headlight.glsl b/Fwk/VizFwk/LibRender/glsl/light_Headlight.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/light_Headlight.glsl rename to Fwk/VizFwk/LibRender/glsl/light_Headlight.glsl diff --git a/VisualizationModules/LibRender/glsl/light_Phong.glsl b/Fwk/VizFwk/LibRender/glsl/light_Phong.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/light_Phong.glsl rename to Fwk/VizFwk/LibRender/glsl/light_Phong.glsl diff --git a/VisualizationModules/LibRender/glsl/light_PhongDual.glsl b/Fwk/VizFwk/LibRender/glsl/light_PhongDual.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/light_PhongDual.glsl rename to Fwk/VizFwk/LibRender/glsl/light_PhongDual.glsl diff --git a/VisualizationModules/LibRender/glsl/light_SimpleHeadlight.glsl b/Fwk/VizFwk/LibRender/glsl/light_SimpleHeadlight.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/light_SimpleHeadlight.glsl rename to Fwk/VizFwk/LibRender/glsl/light_SimpleHeadlight.glsl diff --git a/VisualizationModules/LibRender/glsl/src_Color.glsl b/Fwk/VizFwk/LibRender/glsl/src_Color.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/src_Color.glsl rename to Fwk/VizFwk/LibRender/glsl/src_Color.glsl diff --git a/VisualizationModules/LibRender/glsl/src_Texture.glsl b/Fwk/VizFwk/LibRender/glsl/src_Texture.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/src_Texture.glsl rename to Fwk/VizFwk/LibRender/glsl/src_Texture.glsl diff --git a/VisualizationModules/LibRender/glsl/src_TextureFromPointCoord.glsl b/Fwk/VizFwk/LibRender/glsl/src_TextureFromPointCoord.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/src_TextureFromPointCoord.glsl rename to Fwk/VizFwk/LibRender/glsl/src_TextureFromPointCoord.glsl diff --git a/VisualizationModules/LibRender/glsl/src_TextureGlobalAlpha.glsl b/Fwk/VizFwk/LibRender/glsl/src_TextureGlobalAlpha.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/src_TextureGlobalAlpha.glsl rename to Fwk/VizFwk/LibRender/glsl/src_TextureGlobalAlpha.glsl diff --git a/VisualizationModules/LibRender/glsl/src_TextureRectFromFragCoord_v33.glsl b/Fwk/VizFwk/LibRender/glsl/src_TextureRectFromFragCoord_v33.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/src_TextureRectFromFragCoord_v33.glsl rename to Fwk/VizFwk/LibRender/glsl/src_TextureRectFromFragCoord_v33.glsl diff --git a/VisualizationModules/LibRender/glsl/src_TwoSidedColor.glsl b/Fwk/VizFwk/LibRender/glsl/src_TwoSidedColor.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/src_TwoSidedColor.glsl rename to Fwk/VizFwk/LibRender/glsl/src_TwoSidedColor.glsl diff --git a/VisualizationModules/LibRender/glsl/vs_DistanceScaledPoints.glsl b/Fwk/VizFwk/LibRender/glsl/vs_DistanceScaledPoints.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/vs_DistanceScaledPoints.glsl rename to Fwk/VizFwk/LibRender/glsl/vs_DistanceScaledPoints.glsl diff --git a/VisualizationModules/LibRender/glsl/vs_EnvironmentMapping.glsl b/Fwk/VizFwk/LibRender/glsl/vs_EnvironmentMapping.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/vs_EnvironmentMapping.glsl rename to Fwk/VizFwk/LibRender/glsl/vs_EnvironmentMapping.glsl diff --git a/VisualizationModules/LibRender/glsl/vs_FullScreenQuad.glsl b/Fwk/VizFwk/LibRender/glsl/vs_FullScreenQuad.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/vs_FullScreenQuad.glsl rename to Fwk/VizFwk/LibRender/glsl/vs_FullScreenQuad.glsl diff --git a/VisualizationModules/LibRender/glsl/vs_Minimal.glsl b/Fwk/VizFwk/LibRender/glsl/vs_Minimal.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/vs_Minimal.glsl rename to Fwk/VizFwk/LibRender/glsl/vs_Minimal.glsl diff --git a/VisualizationModules/LibRender/glsl/vs_MinimalTexture.glsl b/Fwk/VizFwk/LibRender/glsl/vs_MinimalTexture.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/vs_MinimalTexture.glsl rename to Fwk/VizFwk/LibRender/glsl/vs_MinimalTexture.glsl diff --git a/VisualizationModules/LibRender/glsl/vs_ParticleTraceComets.glsl b/Fwk/VizFwk/LibRender/glsl/vs_ParticleTraceComets.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/vs_ParticleTraceComets.glsl rename to Fwk/VizFwk/LibRender/glsl/vs_ParticleTraceComets.glsl diff --git a/VisualizationModules/LibRender/glsl/vs_Standard.glsl b/Fwk/VizFwk/LibRender/glsl/vs_Standard.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/vs_Standard.glsl rename to Fwk/VizFwk/LibRender/glsl/vs_Standard.glsl diff --git a/VisualizationModules/LibRender/glsl/vs_VectorDrawer.glsl b/Fwk/VizFwk/LibRender/glsl/vs_VectorDrawer.glsl similarity index 100% rename from VisualizationModules/LibRender/glsl/vs_VectorDrawer.glsl rename to Fwk/VizFwk/LibRender/glsl/vs_VectorDrawer.glsl diff --git a/VisualizationModules/LibViewing/CMakeLists.txt b/Fwk/VizFwk/LibViewing/CMakeLists.txt similarity index 100% rename from VisualizationModules/LibViewing/CMakeLists.txt rename to Fwk/VizFwk/LibViewing/CMakeLists.txt diff --git a/VisualizationModules/LibViewing/cvfClipPlaneSet.cpp b/Fwk/VizFwk/LibViewing/cvfClipPlaneSet.cpp similarity index 82% rename from VisualizationModules/LibViewing/cvfClipPlaneSet.cpp rename to Fwk/VizFwk/LibViewing/cvfClipPlaneSet.cpp index 1b76aab4c3..5f0aba5f0a 100644 --- a/VisualizationModules/LibViewing/cvfClipPlaneSet.cpp +++ b/Fwk/VizFwk/LibViewing/cvfClipPlaneSet.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfClipPlaneSet.h" #include "cvfUniformSet.h" diff --git a/VisualizationModules/LibViewing/cvfClipPlaneSet.h b/Fwk/VizFwk/LibViewing/cvfClipPlaneSet.h similarity index 61% rename from VisualizationModules/LibViewing/cvfClipPlaneSet.h rename to Fwk/VizFwk/LibViewing/cvfClipPlaneSet.h index 287d3e7a6c..54964765ff 100644 --- a/VisualizationModules/LibViewing/cvfClipPlaneSet.h +++ b/Fwk/VizFwk/LibViewing/cvfClipPlaneSet.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfPlane.h" diff --git a/VisualizationModules/LibViewing/cvfConstantFrameRate.cpp b/Fwk/VizFwk/LibViewing/cvfConstantFrameRate.cpp similarity index 89% rename from VisualizationModules/LibViewing/cvfConstantFrameRate.cpp rename to Fwk/VizFwk/LibViewing/cvfConstantFrameRate.cpp index cd0101fcf2..6fe6a3b3b7 100644 --- a/VisualizationModules/LibViewing/cvfConstantFrameRate.cpp +++ b/Fwk/VizFwk/LibViewing/cvfConstantFrameRate.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfConstantFrameRate.h" #include "cvfTrace.h" @@ -132,7 +150,7 @@ void ConstantFrameRate::attachRendering(Rendering* rendering) RenderQueueSorterTargetFramerate* rqs = new RenderQueueSorterTargetFramerate; m_rendering->setRenderQueueSorter(rqs); - // Currently, we need to enable pixel size culling in order to get CeeViz to + // Currently, we need to enable pixel size culling in order to // compute the screen projected areas of the part's bounding boxes m_rendering->cullSettings()->enablePixelSizeCulling(true); diff --git a/VisualizationModules/LibViewing/cvfConstantFrameRate.h b/Fwk/VizFwk/LibViewing/cvfConstantFrameRate.h similarity index 67% rename from VisualizationModules/LibViewing/cvfConstantFrameRate.h rename to Fwk/VizFwk/LibViewing/cvfConstantFrameRate.h index 1f85c12aa9..9270afe024 100644 --- a/VisualizationModules/LibViewing/cvfConstantFrameRate.h +++ b/Fwk/VizFwk/LibViewing/cvfConstantFrameRate.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfRendering.h" diff --git a/VisualizationModules/LibViewing/cvfCullSettings.cpp b/Fwk/VizFwk/LibViewing/cvfCullSettings.cpp similarity index 75% rename from VisualizationModules/LibViewing/cvfCullSettings.cpp rename to Fwk/VizFwk/LibViewing/cvfCullSettings.cpp index 50b1db232d..6ff0083bbb 100644 --- a/VisualizationModules/LibViewing/cvfCullSettings.cpp +++ b/Fwk/VizFwk/LibViewing/cvfCullSettings.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfCullSettings.h" diff --git a/VisualizationModules/LibViewing/cvfCullSettings.h b/Fwk/VizFwk/LibViewing/cvfCullSettings.h similarity index 60% rename from VisualizationModules/LibViewing/cvfCullSettings.h rename to Fwk/VizFwk/LibViewing/cvfCullSettings.h index 421fb0cf60..f716a90a43 100644 --- a/VisualizationModules/LibViewing/cvfCullSettings.h +++ b/Fwk/VizFwk/LibViewing/cvfCullSettings.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibViewing/cvfDynamicUniformSet.cpp b/Fwk/VizFwk/LibViewing/cvfDynamicUniformSet.cpp similarity index 59% rename from VisualizationModules/LibViewing/cvfDynamicUniformSet.cpp rename to Fwk/VizFwk/LibViewing/cvfDynamicUniformSet.cpp index f68a027fb4..f9f19d4211 100644 --- a/VisualizationModules/LibViewing/cvfDynamicUniformSet.cpp +++ b/Fwk/VizFwk/LibViewing/cvfDynamicUniformSet.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfDynamicUniformSet.h" #include "cvfRendering.h" diff --git a/VisualizationModules/LibViewing/cvfDynamicUniformSet.h b/Fwk/VizFwk/LibViewing/cvfDynamicUniformSet.h similarity index 53% rename from VisualizationModules/LibViewing/cvfDynamicUniformSet.h rename to Fwk/VizFwk/LibViewing/cvfDynamicUniformSet.h index d133664e7e..d716e17e68 100644 --- a/VisualizationModules/LibViewing/cvfDynamicUniformSet.h +++ b/Fwk/VizFwk/LibViewing/cvfDynamicUniformSet.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibViewing/cvfEffect.cpp b/Fwk/VizFwk/LibViewing/cvfEffect.cpp similarity index 89% rename from VisualizationModules/LibViewing/cvfEffect.cpp rename to Fwk/VizFwk/LibViewing/cvfEffect.cpp index 9ce3c26a31..9711a02503 100644 --- a/VisualizationModules/LibViewing/cvfEffect.cpp +++ b/Fwk/VizFwk/LibViewing/cvfEffect.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfEffect.h" #include "cvfTexture.h" diff --git a/VisualizationModules/LibViewing/cvfEffect.h b/Fwk/VizFwk/LibViewing/cvfEffect.h similarity index 69% rename from VisualizationModules/LibViewing/cvfEffect.h rename to Fwk/VizFwk/LibViewing/cvfEffect.h index adbc123a3d..3aff88f455 100644 --- a/VisualizationModules/LibViewing/cvfEffect.h +++ b/Fwk/VizFwk/LibViewing/cvfEffect.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibViewing/cvfFixedSizeTransform.cpp b/Fwk/VizFwk/LibViewing/cvfFixedSizeTransform.cpp similarity index 76% rename from VisualizationModules/LibViewing/cvfFixedSizeTransform.cpp rename to Fwk/VizFwk/LibViewing/cvfFixedSizeTransform.cpp index 6c0e754bda..fed21720d3 100644 --- a/VisualizationModules/LibViewing/cvfFixedSizeTransform.cpp +++ b/Fwk/VizFwk/LibViewing/cvfFixedSizeTransform.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfFixedSizeTransform.h" diff --git a/VisualizationModules/LibViewing/cvfFixedSizeTransform.h b/Fwk/VizFwk/LibViewing/cvfFixedSizeTransform.h similarity index 55% rename from VisualizationModules/LibViewing/cvfFixedSizeTransform.h rename to Fwk/VizFwk/LibViewing/cvfFixedSizeTransform.h index 6d5cd3bb9b..ba95891ed0 100644 --- a/VisualizationModules/LibViewing/cvfFixedSizeTransform.h +++ b/Fwk/VizFwk/LibViewing/cvfFixedSizeTransform.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfMatrix4.h" diff --git a/VisualizationModules/LibViewing/cvfGaussianBlur.cpp b/Fwk/VizFwk/LibViewing/cvfGaussianBlur.cpp similarity index 88% rename from VisualizationModules/LibViewing/cvfGaussianBlur.cpp rename to Fwk/VizFwk/LibViewing/cvfGaussianBlur.cpp index 80a02d785c..f2e30469e0 100644 --- a/VisualizationModules/LibViewing/cvfGaussianBlur.cpp +++ b/Fwk/VizFwk/LibViewing/cvfGaussianBlur.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfGaussianBlur.h" #include "cvfTexture.h" diff --git a/VisualizationModules/LibViewing/cvfGaussianBlur.h b/Fwk/VizFwk/LibViewing/cvfGaussianBlur.h similarity index 67% rename from VisualizationModules/LibViewing/cvfGaussianBlur.h rename to Fwk/VizFwk/LibViewing/cvfGaussianBlur.h index 19d1d98dc6..d4d0842a29 100644 --- a/VisualizationModules/LibViewing/cvfGaussianBlur.h +++ b/Fwk/VizFwk/LibViewing/cvfGaussianBlur.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibViewing/cvfHitItem.cpp b/Fwk/VizFwk/LibViewing/cvfHitItem.cpp similarity index 76% rename from VisualizationModules/LibViewing/cvfHitItem.cpp rename to Fwk/VizFwk/LibViewing/cvfHitItem.cpp index 30edf05c65..e5e892e236 100644 --- a/VisualizationModules/LibViewing/cvfHitItem.cpp +++ b/Fwk/VizFwk/LibViewing/cvfHitItem.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfHitItem.h" #include "cvfPart.h" diff --git a/VisualizationModules/LibViewing/cvfHitItem.h b/Fwk/VizFwk/LibViewing/cvfHitItem.h similarity index 61% rename from VisualizationModules/LibViewing/cvfHitItem.h rename to Fwk/VizFwk/LibViewing/cvfHitItem.h index 8cde3051f4..12df67ca40 100644 --- a/VisualizationModules/LibViewing/cvfHitItem.h +++ b/Fwk/VizFwk/LibViewing/cvfHitItem.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibViewing/cvfHitItemCollection.cpp b/Fwk/VizFwk/LibViewing/cvfHitItemCollection.cpp similarity index 80% rename from VisualizationModules/LibViewing/cvfHitItemCollection.cpp rename to Fwk/VizFwk/LibViewing/cvfHitItemCollection.cpp index a09b781205..eb658d50d6 100644 --- a/VisualizationModules/LibViewing/cvfHitItemCollection.cpp +++ b/Fwk/VizFwk/LibViewing/cvfHitItemCollection.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfHitItemCollection.h" diff --git a/VisualizationModules/LibViewing/cvfHitItemCollection.h b/Fwk/VizFwk/LibViewing/cvfHitItemCollection.h similarity index 57% rename from VisualizationModules/LibViewing/cvfHitItemCollection.h rename to Fwk/VizFwk/LibViewing/cvfHitItemCollection.h index 1c707c446c..342d108398 100644 --- a/VisualizationModules/LibViewing/cvfHitItemCollection.h +++ b/Fwk/VizFwk/LibViewing/cvfHitItemCollection.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibViewing/cvfLibViewing.h b/Fwk/VizFwk/LibViewing/cvfLibViewing.h similarity index 57% rename from VisualizationModules/LibViewing/cvfLibViewing.h rename to Fwk/VizFwk/LibViewing/cvfLibViewing.h index 6e224a6415..2a872c6354 100644 --- a/VisualizationModules/LibViewing/cvfLibViewing.h +++ b/Fwk/VizFwk/LibViewing/cvfLibViewing.h @@ -1,24 +1,42 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + // Doxygen module definition -/// \ingroup CeeVizFramework +/// \ingroup VizFramework /// @{ /// \defgroup Viewing Viewing module /// @} diff --git a/VisualizationModules/LibViewing/cvfLocators.cpp b/Fwk/VizFwk/LibViewing/cvfLocators.cpp similarity index 90% rename from VisualizationModules/LibViewing/cvfLocators.cpp rename to Fwk/VizFwk/LibViewing/cvfLocators.cpp index 85e42c33c5..4b5a00668c 100644 --- a/VisualizationModules/LibViewing/cvfLocators.cpp +++ b/Fwk/VizFwk/LibViewing/cvfLocators.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfLocators.h" #include "cvfCamera.h" diff --git a/VisualizationModules/LibViewing/cvfLocators.h b/Fwk/VizFwk/LibViewing/cvfLocators.h similarity index 74% rename from VisualizationModules/LibViewing/cvfLocators.h rename to Fwk/VizFwk/LibViewing/cvfLocators.h index 1ccd5cccff..089a07f051 100644 --- a/VisualizationModules/LibViewing/cvfLocators.h +++ b/Fwk/VizFwk/LibViewing/cvfLocators.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfPlane.h" diff --git a/VisualizationModules/LibViewing/cvfManipulatorTrackball.cpp b/Fwk/VizFwk/LibViewing/cvfManipulatorTrackball.cpp similarity index 94% rename from VisualizationModules/LibViewing/cvfManipulatorTrackball.cpp rename to Fwk/VizFwk/LibViewing/cvfManipulatorTrackball.cpp index c522ccd120..5eeeaf2dfd 100644 --- a/VisualizationModules/LibViewing/cvfManipulatorTrackball.cpp +++ b/Fwk/VizFwk/LibViewing/cvfManipulatorTrackball.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfManipulatorTrackball.h" #include "cvfCamera.h" diff --git a/VisualizationModules/LibViewing/cvfManipulatorTrackball.h b/Fwk/VizFwk/LibViewing/cvfManipulatorTrackball.h similarity index 71% rename from VisualizationModules/LibViewing/cvfManipulatorTrackball.h rename to Fwk/VizFwk/LibViewing/cvfManipulatorTrackball.h index b444844050..6da737324e 100644 --- a/VisualizationModules/LibViewing/cvfManipulatorTrackball.h +++ b/Fwk/VizFwk/LibViewing/cvfManipulatorTrackball.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibViewing/cvfModel.cpp b/Fwk/VizFwk/LibViewing/cvfModel.cpp similarity index 79% rename from VisualizationModules/LibViewing/cvfModel.cpp rename to Fwk/VizFwk/LibViewing/cvfModel.cpp index d8333d2429..bed66bb88d 100644 --- a/VisualizationModules/LibViewing/cvfModel.cpp +++ b/Fwk/VizFwk/LibViewing/cvfModel.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfModel.h" #include "cvfOpenGLContext.h" diff --git a/VisualizationModules/LibViewing/cvfModel.h b/Fwk/VizFwk/LibViewing/cvfModel.h similarity index 67% rename from VisualizationModules/LibViewing/cvfModel.h rename to Fwk/VizFwk/LibViewing/cvfModel.h index 52c9f5bb48..cd303f1da1 100644 --- a/VisualizationModules/LibViewing/cvfModel.h +++ b/Fwk/VizFwk/LibViewing/cvfModel.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfCollection.h" diff --git a/VisualizationModules/LibViewing/cvfModelBasicList.cpp b/Fwk/VizFwk/LibViewing/cvfModelBasicList.cpp similarity index 93% rename from VisualizationModules/LibViewing/cvfModelBasicList.cpp rename to Fwk/VizFwk/LibViewing/cvfModelBasicList.cpp index 085ff6188a..946aaa64f3 100644 --- a/VisualizationModules/LibViewing/cvfModelBasicList.cpp +++ b/Fwk/VizFwk/LibViewing/cvfModelBasicList.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfModelBasicList.h" #include "cvfPart.h" diff --git a/VisualizationModules/LibViewing/cvfModelBasicList.h b/Fwk/VizFwk/LibViewing/cvfModelBasicList.h similarity index 69% rename from VisualizationModules/LibViewing/cvfModelBasicList.h rename to Fwk/VizFwk/LibViewing/cvfModelBasicList.h index 20537e3214..4f26a5c04b 100644 --- a/VisualizationModules/LibViewing/cvfModelBasicList.h +++ b/Fwk/VizFwk/LibViewing/cvfModelBasicList.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfModel.h" diff --git a/VisualizationModules/LibViewing/cvfModelBasicTree.cpp b/Fwk/VizFwk/LibViewing/cvfModelBasicTree.cpp similarity index 95% rename from VisualizationModules/LibViewing/cvfModelBasicTree.cpp rename to Fwk/VizFwk/LibViewing/cvfModelBasicTree.cpp index 3b5ff97ff4..3c314f2310 100644 --- a/VisualizationModules/LibViewing/cvfModelBasicTree.cpp +++ b/Fwk/VizFwk/LibViewing/cvfModelBasicTree.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfModelBasicTree.h" #include "cvfPart.h" diff --git a/VisualizationModules/LibViewing/cvfModelBasicTree.h b/Fwk/VizFwk/LibViewing/cvfModelBasicTree.h similarity index 79% rename from VisualizationModules/LibViewing/cvfModelBasicTree.h rename to Fwk/VizFwk/LibViewing/cvfModelBasicTree.h index 9853eb999d..008be0e30d 100644 --- a/VisualizationModules/LibViewing/cvfModelBasicTree.h +++ b/Fwk/VizFwk/LibViewing/cvfModelBasicTree.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfModelBasicList.h" diff --git a/VisualizationModules/LibViewing/cvfPart.cpp b/Fwk/VizFwk/LibViewing/cvfPart.cpp similarity index 93% rename from VisualizationModules/LibViewing/cvfPart.cpp rename to Fwk/VizFwk/LibViewing/cvfPart.cpp index 1096f366f7..77ca76d751 100644 --- a/VisualizationModules/LibViewing/cvfPart.cpp +++ b/Fwk/VizFwk/LibViewing/cvfPart.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfPart.h" #include "cvfDrawable.h" diff --git a/VisualizationModules/LibViewing/cvfPart.h b/Fwk/VizFwk/LibViewing/cvfPart.h similarity index 77% rename from VisualizationModules/LibViewing/cvfPart.h rename to Fwk/VizFwk/LibViewing/cvfPart.h index 4cdf404caf..997a4dba52 100644 --- a/VisualizationModules/LibViewing/cvfPart.h +++ b/Fwk/VizFwk/LibViewing/cvfPart.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibViewing/cvfPartHighlighter.cpp b/Fwk/VizFwk/LibViewing/cvfPartHighlighter.cpp similarity index 94% rename from VisualizationModules/LibViewing/cvfPartHighlighter.cpp rename to Fwk/VizFwk/LibViewing/cvfPartHighlighter.cpp index 3570c13617..8ba35959fb 100644 --- a/VisualizationModules/LibViewing/cvfPartHighlighter.cpp +++ b/Fwk/VizFwk/LibViewing/cvfPartHighlighter.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfPartHighlighter.h" #include "cvfRenderSequence.h" diff --git a/VisualizationModules/LibViewing/cvfPartHighlighter.h b/Fwk/VizFwk/LibViewing/cvfPartHighlighter.h similarity index 79% rename from VisualizationModules/LibViewing/cvfPartHighlighter.h rename to Fwk/VizFwk/LibViewing/cvfPartHighlighter.h index ea88af85d8..2b48495eba 100644 --- a/VisualizationModules/LibViewing/cvfPartHighlighter.h +++ b/Fwk/VizFwk/LibViewing/cvfPartHighlighter.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibViewing/cvfPartRenderHintCollection.cpp b/Fwk/VizFwk/LibViewing/cvfPartRenderHintCollection.cpp similarity index 85% rename from VisualizationModules/LibViewing/cvfPartRenderHintCollection.cpp rename to Fwk/VizFwk/LibViewing/cvfPartRenderHintCollection.cpp index 04a70c172b..7044cf5c17 100644 --- a/VisualizationModules/LibViewing/cvfPartRenderHintCollection.cpp +++ b/Fwk/VizFwk/LibViewing/cvfPartRenderHintCollection.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfPartRenderHintCollection.h" diff --git a/VisualizationModules/LibViewing/cvfPartRenderHintCollection.h b/Fwk/VizFwk/LibViewing/cvfPartRenderHintCollection.h similarity index 68% rename from VisualizationModules/LibViewing/cvfPartRenderHintCollection.h rename to Fwk/VizFwk/LibViewing/cvfPartRenderHintCollection.h index 29d07d7142..d49e922155 100644 --- a/VisualizationModules/LibViewing/cvfPartRenderHintCollection.h +++ b/Fwk/VizFwk/LibViewing/cvfPartRenderHintCollection.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfCollection.h" diff --git a/VisualizationModules/LibViewing/cvfPerformanceInfo.cpp b/Fwk/VizFwk/LibViewing/cvfPerformanceInfo.cpp similarity index 80% rename from VisualizationModules/LibViewing/cvfPerformanceInfo.cpp rename to Fwk/VizFwk/LibViewing/cvfPerformanceInfo.cpp index 9232a7da13..490e875325 100644 --- a/VisualizationModules/LibViewing/cvfPerformanceInfo.cpp +++ b/Fwk/VizFwk/LibViewing/cvfPerformanceInfo.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfPerformanceInfo.h" #include "cvfMath.h" diff --git a/VisualizationModules/LibViewing/cvfPerformanceInfo.h b/Fwk/VizFwk/LibViewing/cvfPerformanceInfo.h similarity index 69% rename from VisualizationModules/LibViewing/cvfPerformanceInfo.h rename to Fwk/VizFwk/LibViewing/cvfPerformanceInfo.h index 275c6c16c9..1143de9b07 100644 --- a/VisualizationModules/LibViewing/cvfPerformanceInfo.h +++ b/Fwk/VizFwk/LibViewing/cvfPerformanceInfo.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once namespace cvf { diff --git a/VisualizationModules/LibViewing/cvfRayIntersectSpec.cpp b/Fwk/VizFwk/LibViewing/cvfRayIntersectSpec.cpp similarity index 77% rename from VisualizationModules/LibViewing/cvfRayIntersectSpec.cpp rename to Fwk/VizFwk/LibViewing/cvfRayIntersectSpec.cpp index 011a20a707..74087bf214 100644 --- a/VisualizationModules/LibViewing/cvfRayIntersectSpec.cpp +++ b/Fwk/VizFwk/LibViewing/cvfRayIntersectSpec.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRayIntersectSpec.h" #include "cvfRay.h" diff --git a/VisualizationModules/LibViewing/cvfRayIntersectSpec.h b/Fwk/VizFwk/LibViewing/cvfRayIntersectSpec.h similarity index 59% rename from VisualizationModules/LibViewing/cvfRayIntersectSpec.h rename to Fwk/VizFwk/LibViewing/cvfRayIntersectSpec.h index 146089fefb..3e7c12b96c 100644 --- a/VisualizationModules/LibViewing/cvfRayIntersectSpec.h +++ b/Fwk/VizFwk/LibViewing/cvfRayIntersectSpec.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibViewing/cvfRenderEngine.cpp b/Fwk/VizFwk/LibViewing/cvfRenderEngine.cpp similarity index 93% rename from VisualizationModules/LibViewing/cvfRenderEngine.cpp rename to Fwk/VizFwk/LibViewing/cvfRenderEngine.cpp index 2c9ef45986..1869342b8f 100644 --- a/VisualizationModules/LibViewing/cvfRenderEngine.cpp +++ b/Fwk/VizFwk/LibViewing/cvfRenderEngine.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRenderEngine.h" #include "cvfRenderQueue.h" diff --git a/VisualizationModules/LibViewing/cvfRenderEngine.h b/Fwk/VizFwk/LibViewing/cvfRenderEngine.h similarity index 71% rename from VisualizationModules/LibViewing/cvfRenderEngine.h rename to Fwk/VizFwk/LibViewing/cvfRenderEngine.h index d1d15afeb1..7ecf542883 100644 --- a/VisualizationModules/LibViewing/cvfRenderEngine.h +++ b/Fwk/VizFwk/LibViewing/cvfRenderEngine.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfMatrix4.h" diff --git a/VisualizationModules/LibViewing/cvfRenderQueue.cpp b/Fwk/VizFwk/LibViewing/cvfRenderQueue.cpp similarity index 82% rename from VisualizationModules/LibViewing/cvfRenderQueue.cpp rename to Fwk/VizFwk/LibViewing/cvfRenderQueue.cpp index e5895c7888..3264d240e5 100644 --- a/VisualizationModules/LibViewing/cvfRenderQueue.cpp +++ b/Fwk/VizFwk/LibViewing/cvfRenderQueue.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRenderQueue.h" diff --git a/VisualizationModules/LibViewing/cvfRenderQueue.h b/Fwk/VizFwk/LibViewing/cvfRenderQueue.h similarity index 73% rename from VisualizationModules/LibViewing/cvfRenderQueue.h rename to Fwk/VizFwk/LibViewing/cvfRenderQueue.h index 79899e0e6b..f1e2d553c3 100644 --- a/VisualizationModules/LibViewing/cvfRenderQueue.h +++ b/Fwk/VizFwk/LibViewing/cvfRenderQueue.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibViewing/cvfRenderQueueBuilder.cpp b/Fwk/VizFwk/LibViewing/cvfRenderQueueBuilder.cpp similarity index 88% rename from VisualizationModules/LibViewing/cvfRenderQueueBuilder.cpp rename to Fwk/VizFwk/LibViewing/cvfRenderQueueBuilder.cpp index 6f1f608668..fc39e82522 100644 --- a/VisualizationModules/LibViewing/cvfRenderQueueBuilder.cpp +++ b/Fwk/VizFwk/LibViewing/cvfRenderQueueBuilder.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRenderQueueBuilder.h" #include "cvfRenderQueue.h" diff --git a/VisualizationModules/LibViewing/cvfRenderQueueBuilder.h b/Fwk/VizFwk/LibViewing/cvfRenderQueueBuilder.h similarity index 66% rename from VisualizationModules/LibViewing/cvfRenderQueueBuilder.h rename to Fwk/VizFwk/LibViewing/cvfRenderQueueBuilder.h index f2124f900b..f93e4e38e3 100644 --- a/VisualizationModules/LibViewing/cvfRenderQueueBuilder.h +++ b/Fwk/VizFwk/LibViewing/cvfRenderQueueBuilder.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibViewing/cvfRenderQueueSorter.cpp b/Fwk/VizFwk/LibViewing/cvfRenderQueueSorter.cpp similarity index 92% rename from VisualizationModules/LibViewing/cvfRenderQueueSorter.cpp rename to Fwk/VizFwk/LibViewing/cvfRenderQueueSorter.cpp index 324ba49b01..d1c8341909 100644 --- a/VisualizationModules/LibViewing/cvfRenderQueueSorter.cpp +++ b/Fwk/VizFwk/LibViewing/cvfRenderQueueSorter.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRenderQueueSorter.h" #include "cvfRenderQueue.h" diff --git a/VisualizationModules/LibViewing/cvfRenderQueueSorter.h b/Fwk/VizFwk/LibViewing/cvfRenderQueueSorter.h similarity index 74% rename from VisualizationModules/LibViewing/cvfRenderQueueSorter.h rename to Fwk/VizFwk/LibViewing/cvfRenderQueueSorter.h index 158281483d..9eb439eb0e 100644 --- a/VisualizationModules/LibViewing/cvfRenderQueueSorter.h +++ b/Fwk/VizFwk/LibViewing/cvfRenderQueueSorter.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibViewing/cvfRenderSequence.cpp b/Fwk/VizFwk/LibViewing/cvfRenderSequence.cpp similarity index 91% rename from VisualizationModules/LibViewing/cvfRenderSequence.cpp rename to Fwk/VizFwk/LibViewing/cvfRenderSequence.cpp index 13982c6ba8..b510222bc7 100644 --- a/VisualizationModules/LibViewing/cvfRenderSequence.cpp +++ b/Fwk/VizFwk/LibViewing/cvfRenderSequence.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRenderSequence.h" #include "cvfRendering.h" @@ -318,7 +336,7 @@ void RenderSequence::preRenderApplyExpectedOpenGLState(OpenGLContext* oglContext // These settings differ from OpenGL defaults, - // but form a suitable starting point for rendering with CeeViz + // but form a suitable starting point for rendering // ------------------------------------------------ // TODO Work out a proper solution for this diff --git a/VisualizationModules/LibViewing/cvfRenderSequence.h b/Fwk/VizFwk/LibViewing/cvfRenderSequence.h similarity index 67% rename from VisualizationModules/LibViewing/cvfRenderSequence.h rename to Fwk/VizFwk/LibViewing/cvfRenderSequence.h index 8902ef8a35..95ca1a5411 100644 --- a/VisualizationModules/LibViewing/cvfRenderSequence.h +++ b/Fwk/VizFwk/LibViewing/cvfRenderSequence.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibViewing/cvfRendering.cpp b/Fwk/VizFwk/LibViewing/cvfRendering.cpp similarity index 97% rename from VisualizationModules/LibViewing/cvfRendering.cpp rename to Fwk/VizFwk/LibViewing/cvfRendering.cpp index 013d5769ec..bf931824d1 100644 --- a/VisualizationModules/LibViewing/cvfRendering.cpp +++ b/Fwk/VizFwk/LibViewing/cvfRendering.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfRendering.h" #include "cvfScene.h" diff --git a/VisualizationModules/LibViewing/cvfRendering.h b/Fwk/VizFwk/LibViewing/cvfRendering.h similarity index 86% rename from VisualizationModules/LibViewing/cvfRendering.h rename to Fwk/VizFwk/LibViewing/cvfRendering.h index e652e8b482..f70a3f1cab 100644 --- a/VisualizationModules/LibViewing/cvfRendering.h +++ b/Fwk/VizFwk/LibViewing/cvfRendering.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfRenderEngine.h" diff --git a/VisualizationModules/LibViewing/cvfScene.cpp b/Fwk/VizFwk/LibViewing/cvfScene.cpp similarity index 86% rename from VisualizationModules/LibViewing/cvfScene.cpp rename to Fwk/VizFwk/LibViewing/cvfScene.cpp index 8ba50f9211..acc1275c9f 100644 --- a/VisualizationModules/LibViewing/cvfScene.cpp +++ b/Fwk/VizFwk/LibViewing/cvfScene.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfScene.h" #include "cvfModel.h" diff --git a/VisualizationModules/LibViewing/cvfScene.h b/Fwk/VizFwk/LibViewing/cvfScene.h similarity index 65% rename from VisualizationModules/LibViewing/cvfScene.h rename to Fwk/VizFwk/LibViewing/cvfScene.h index 3f922b9c84..e86272bc56 100644 --- a/VisualizationModules/LibViewing/cvfScene.h +++ b/Fwk/VizFwk/LibViewing/cvfScene.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfObject.h" diff --git a/VisualizationModules/LibViewing/cvfSingleQuadRenderingGenerator.cpp b/Fwk/VizFwk/LibViewing/cvfSingleQuadRenderingGenerator.cpp similarity index 86% rename from VisualizationModules/LibViewing/cvfSingleQuadRenderingGenerator.cpp rename to Fwk/VizFwk/LibViewing/cvfSingleQuadRenderingGenerator.cpp index a145745f8d..2eceecb98c 100644 --- a/VisualizationModules/LibViewing/cvfSingleQuadRenderingGenerator.cpp +++ b/Fwk/VizFwk/LibViewing/cvfSingleQuadRenderingGenerator.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfSingleQuadRenderingGenerator.h" #include "cvfPrimitiveSetIndexedUShort.h" diff --git a/VisualizationModules/LibViewing/cvfSingleQuadRenderingGenerator.h b/Fwk/VizFwk/LibViewing/cvfSingleQuadRenderingGenerator.h similarity index 62% rename from VisualizationModules/LibViewing/cvfSingleQuadRenderingGenerator.h rename to Fwk/VizFwk/LibViewing/cvfSingleQuadRenderingGenerator.h index 9d75aaf8f2..d5798cf54e 100644 --- a/VisualizationModules/LibViewing/cvfSingleQuadRenderingGenerator.h +++ b/Fwk/VizFwk/LibViewing/cvfSingleQuadRenderingGenerator.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfCollection.h" diff --git a/VisualizationModules/LibViewing/cvfTransform.cpp b/Fwk/VizFwk/LibViewing/cvfTransform.cpp similarity index 85% rename from VisualizationModules/LibViewing/cvfTransform.cpp rename to Fwk/VizFwk/LibViewing/cvfTransform.cpp index c69146e7b2..c86c0e5752 100644 --- a/VisualizationModules/LibViewing/cvfTransform.cpp +++ b/Fwk/VizFwk/LibViewing/cvfTransform.cpp @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #include "cvfBase.h" #include "cvfTransform.h" #include "cvfBoundingBox.h" diff --git a/VisualizationModules/LibViewing/cvfTransform.h b/Fwk/VizFwk/LibViewing/cvfTransform.h similarity index 65% rename from VisualizationModules/LibViewing/cvfTransform.h rename to Fwk/VizFwk/LibViewing/cvfTransform.h index d60bd393dd..8f4f88c307 100644 --- a/VisualizationModules/LibViewing/cvfTransform.h +++ b/Fwk/VizFwk/LibViewing/cvfTransform.h @@ -1,22 +1,40 @@ //################################################################################################## // // Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. +// Copyright (C) 2011-2013 Ceetron AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. // //################################################################################################## + #pragma once #include "cvfMatrix4.h" diff --git a/ResInsightVersion.cmake b/ResInsightVersion.cmake index f728820177..b87183677a 100644 --- a/ResInsightVersion.cmake +++ b/ResInsightVersion.cmake @@ -1,7 +1,7 @@ set(CMAKE_MAJOR_VERSION 0) set(CMAKE_MINOR_VERSION 9) -set(CMAKE_PATCH_VERSION 28) +set(CMAKE_PATCH_VERSION 29) set(PRODUCTVER ${CMAKE_MAJOR_VERSION},${CMAKE_MINOR_VERSION},0,${CMAKE_PATCH_VERSION}) set(STRPRODUCTVER ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}) diff --git a/VisualizationModules/LibCore/cvfVector2.cpp b/VisualizationModules/LibCore/cvfVector2.cpp deleted file mode 100644 index 05b6299b7a..0000000000 --- a/VisualizationModules/LibCore/cvfVector2.cpp +++ /dev/null @@ -1,32 +0,0 @@ -//################################################################################################## -// -// Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. -// -//################################################################################################## - -#include "cvfBase.h" -#include "cvfVector2.h" - -namespace cvf { - - -template<> Vector2 const Vector2::UNDEFINED(UNDEFINED_DOUBLE, UNDEFINED_DOUBLE); -template<> Vector2 const Vector2::UNDEFINED(UNDEFINED_FLOAT, UNDEFINED_FLOAT); -template<> Vector2 const Vector2::UNDEFINED(UNDEFINED_INT, UNDEFINED_INT); - - -} // namespace cvf - diff --git a/VisualizationModules/LibCore/cvfVersion.h b/VisualizationModules/LibCore/cvfVersion.h deleted file mode 100644 index 3b2e8ff665..0000000000 --- a/VisualizationModules/LibCore/cvfVersion.h +++ /dev/null @@ -1,27 +0,0 @@ -//################################################################################################## -// -// Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. -// -//################################################################################################## - -#pragma once - - - -#define CVF_MAJOR_VERSION "0" // Major version number -#define CVF_MINOR_VERSION "9" // Minor version number -#define CVF_SPECIAL_BUILD "" // Special build description -#define CVF_BUILD_NUMBER "5" // Build number. Increase for each shipment diff --git a/VisualizationModules/LibGuiQt/cvfqtUtils.h b/VisualizationModules/LibGuiQt/cvfqtUtils.h deleted file mode 100644 index 6b45dc6d67..0000000000 --- a/VisualizationModules/LibGuiQt/cvfqtUtils.h +++ /dev/null @@ -1,41 +0,0 @@ -//################################################################################################## -// -// Custom Visualization Core library -// Copyright (C) 2011-2012 Ceetron AS -// -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. -// -//################################################################################################## - -#pragma once - -#include "cvfString.h" - -#include - -namespace cvfqt { - - -//================================================================================================== -// -// Static helper class for CeeViz/Qt interop -// -//================================================================================================== -class Utils -{ -public: - static QString toQString(const cvf::String& ceeString); - static cvf::String fromQString(const QString& qtString); -}; - -}