Merge pull request #79 from OPM/internal

Update dev branch to latest

.gitignore

@@ -32,3 +32,4 @@ CTest*.cmake
 
 # Target program
 /ApplicationCode/ResInsight
+/.project

ApplicationCode/Adm/ResInsightLicenseText.txt

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,3 +19,17 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################

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();

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} )

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_numLevels, "NumberOfLevels", 8, "Number of levels", "", "A hint on how many tick marks you whish.","");
-    CAF_PDM_InitField(&m_precision, "Precision", 2, "Precision", "", "","");
+    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<RimLegendConfig::NumberFormatType>(FIXED), "Precision", "", "","");
+    CAF_PDM_InitField(&m_tickNumberFormat, "TickNumberFormat", caf::AppEnum<RimLegendConfig::NumberFormatType>(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<RimLegendConfig::RangeModeType>(AUTOMATIC_ALLTIMESTEPS), "Legend range type", "", "Switches between automatic and user defined range on the legend", "");
+    CAF_PDM_InitField(&m_rangeMode, "RangeType", caf::AppEnum<RimLegendConfig::RangeModeType>(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);
+       adjustedMin = roundToNumSignificantDigits(m_globalAutoMin, m_precision);
-       adjustedMax = adjust(m_globalAutoMax, 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);
+       adjustedMin = roundToNumSignificantDigits(m_localAutoMin, m_precision);
-       adjustedMax = adjust(m_localAutoMax, m_precision);
+       adjustedMax = roundToNumSignificantDigits(m_localAutoMax, m_precision);
 
        posClosestToZero = m_localAutoPosClosestToZero;
        negClosestToZero = m_localAutoNegClosestToZero;
    }
    else
    {
-       adjustedMin = adjust(m_userDefinedMinValue, m_precision);
+       adjustedMin = roundToNumSignificantDigits(m_userDefinedMinValue, m_precision);
-       adjustedMax = adjust(m_userDefinedMaxValue, 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_globalAutoMin = roundToNumSignificantDigits(globalMin, m_precision);
-    m_globalAutoMax = adjust(globalMax, m_precision);
+    m_globalAutoMax = roundToNumSignificantDigits(globalMax, m_precision);
 
-    m_localAutoMin = adjust(localMin, m_precision);
+    m_localAutoMin = roundToNumSignificantDigits(localMin, m_precision);
-    m_localAutoMax = adjust(localMax, 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);
+}
+

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<ColorRangesType> ColorRangeEnum;
@@ -96,10 +98,13 @@ 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<cvf::Color3ubArray>                interpolateColorArray(const cvf::Color3ubArray& colorArray, cvf::uint targetColorCount);
-    double                                      adjust(double value, double precision);
+    double                                      roundToNumSignificantDigits(double value, double precision);
+
+ 
 
 private:
     caf::PdmPointer<RimReservoirView>           m_reservoirView;

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();
     }
 }
 

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

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;
 

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}/../../Fwk/AppFwk/cafProjectDataModel 
-	${CMAKE_CURRENT_SOURCE_DIR}/../../cafUserInterface
+	${CMAKE_CURRENT_SOURCE_DIR}/../../Fwk/AppFwk/cafUserInterface
 )
 
 

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", "", "", "");
 
 }
 

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<QString>                      name;
     caf::PdmField<bool>                         selected;
     caf::PdmPointersField<RimOilFieldEntry*>    fields;
 
-private:
-    void updateState();
 };
 
 

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<caf::PdmUiTreeViewEditorAttribute*>(attribute);
+    if (myAttr)
+    {
+        QStringList colHeaders;
+        colHeaders << "Region";
+        myAttr->columnHeaders = colHeaders;
+    }
+}
+
+
+

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();
 
+
+
 };
 

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_myProgressDialog = new QProgressDialog(this);
-    m_progressDialog = new QProgressDialog(this);
     m_firstTimeRequestingAuthentication = true;
 
 
@@ -64,8 +64,6 @@ RiuWellImportWizard::RiuWellImportWizard(const QString& webServiceAddress, const
         this, SLOT(sslErrors(QNetworkReply*,QList<QSslError>)));
 #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,10 +446,8 @@ void RiuWellImportWizard::downloadWellPaths()
                     for (size_t wIdx = 0; wIdx < oilField->wells.size(); wIdx++)
                     {
                         RimWellPathEntry* wellPathEntry = oilField->wells[wIdx];
-                        
+                        if (wellPathEntry->selected && wellPathEntry->isWellPathValid())
-                        if (!wellPathEntry->isWellPathValid())
+                        {
-                            continue;
-                        
                             DownloadEntity urlToFile;
 
                             urlToFile.requestUrl = wellPathEntry->requestUrl;
@@ -470,9 +459,15 @@ 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<WellSelectionPage*>(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<caf::PdmUiTreeViewEditorAttribute*>(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_regionsWithVisibleWells = new ObjectGroupWithHeaders;
-
-    //m_wellSelectionTreeView->setPdmObject(wellPathImport);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -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<caf::PdmObjectGroup*>(m_regionsWithVisibleWells->objects[rIdx]);
+        if (!regGroup)
+            continue;
+
+        for (size_t fIdx = 0; fIdx < regGroup->objects.size(); fIdx++)
+        {
+            caf::PdmObjectGroup* fieldGroup = dynamic_cast<caf::PdmObjectGroup*>(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,7 +1003,8 @@ void WellSummaryPage::updateSummaryPage()
                     for (size_t wIdx = 0; wIdx < oilField->wells.size(); wIdx++)
                     {
                         RimWellPathEntry* wellPathEntry = oilField->wells[wIdx];
-
+                        if (wellPathEntry->selected)
+                        {
                             if (QFile::exists(oilField->wells[wIdx]->wellPathFilePath))
                             {
                                 wellPathCount++;
@@ -949,9 +1020,10 @@ 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()
 {
+    if (m_listView->isHidden())
+    {
         m_listView->show();
+    }
+    else
+    {
+        m_listView->hide();
+    }
 }
 

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;

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(../../Fwk/AppFwk/cafProjectDataModel "${CMAKE_CURRENT_BINARY_DIR}/cafProjectDataModel")
-add_subdirectory(../../cafUserInterface "${CMAKE_CURRENT_BINARY_DIR}/cafUserInterface")
+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 
+	${WellPathImportSsihub_SOURCE_DIR}/../../Fwk/AppFwk/cafProjectDataModel 
-	${CMAKE_CURRENT_SOURCE_DIR}/../../cafUserInterface
+	${WellPathImportSsihub_SOURCE_DIR}/../../Fwk/AppFwk/cafUserInterface
 )
 
 

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(Fwk/AppFwk/cafProjectDataModel)
-add_subdirectory(CommonCode)
+add_subdirectory(Fwk/AppFwk/CommonCode)
-add_subdirectory(cafAnimControl)
+add_subdirectory(Fwk/AppFwk/cafAnimControl)
-add_subdirectory(cafViewer)
+add_subdirectory(Fwk/AppFwk/cafViewer)
-add_subdirectory(cafUserInterface)
+add_subdirectory(Fwk/AppFwk/cafUserInterface)
-add_subdirectory(cafPdmCvf)
+add_subdirectory(Fwk/AppFwk/cafPdmCvf)
 
 include_directories(
     ${cafUserInterface_SOURCE_DIR}

CommonCode/cvfStructGridScalarDataAccess.h

@@ -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 <<http://www.gnu.org/licenses/gpl.html>> 
-//   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

Fwk/AppFwk/CommonCode/cafEffectCache.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cafEffectGenerator.h"
 #include "cafEffectCache.h"
 

Fwk/AppFwk/CommonCode/cafEffectCache.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 #include "cvfBase.h"

Fwk/AppFwk/CommonCode/cafEffectGenerator.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   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"

Fwk/AppFwk/CommonCode/cafEffectGenerator.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 #include "cvfBase.h"

Fwk/AppFwk/CommonCode/cafLog.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cvfBase.h"
 #include "cvfTrace.h"
 

Fwk/AppFwk/CommonCode/cafLog.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 class QString;

Fwk/AppFwk/CommonCode/cafMessagePanel.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cafMessagePanel.h"
 
 #include <QtGui/QWidget>

Fwk/AppFwk/CommonCode/cafMessagePanel.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 #include <QtGui/QWidget>

Fwk/AppFwk/CommonCode/cafMouseState.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cvfBase.h"
 #include "cvfMath.h"
 #include "cafMouseState.h"

Fwk/AppFwk/CommonCode/cafMouseState.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 class QMouseEvent;

Fwk/AppFwk/CommonCode/cafUtils.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cafUtils.h"
 
 #include <QtCore/QFileInfo>

Fwk/AppFwk/CommonCode/cafUtils.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 class QLineEdit;

Fwk/AppFwk/CommonCode/cvfStructGrid.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,9 +19,23 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
 
+
 #include "cvfBase.h"
 #include "cvfStructGrid.h"
 

Fwk/AppFwk/CommonCode/cvfStructGrid.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 #include "cvfObject.h"

Fwk/AppFwk/CommonCode/cvfStructGridGeometryGenerator.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cvfBase.h"
 
 #include "cvfStructGrid.h"

Fwk/AppFwk/CommonCode/cvfStructGridGeometryGenerator.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 #include "cvfObject.h"

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 <<http://www.gnu.org/licenses/gpl.html>>
+//   for more details.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   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

Fwk/AppFwk/cafAnimControl/cafAnimationToolBar.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cafAnimationToolBar.h"
 
 #include <QAction>

Fwk/AppFwk/cafAnimControl/cafAnimationToolBar.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 #include <QToolBar>

Fwk/AppFwk/cafAnimControl/cafFrameAnimationControl.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cafFrameAnimationControl.h"
 
 #include "qtimer.h"

Fwk/AppFwk/cafAnimControl/cafFrameAnimationControl.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 #include <QObject>

Fwk/AppFwk/cafPdmCvf/cafPdmFieldCvfColor.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include <QTextStream>
 
 #include "cvfBase.h"

Fwk/AppFwk/cafPdmCvf/cafPdmFieldCvfColor.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 #include <QVariant>
 #include <QList>

Fwk/AppFwk/cafPdmCvf/cafPdmFieldCvfMat4d.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include <QTextStream>
 
 // Includes needed for field editor registration

Fwk/AppFwk/cafPdmCvf/cafPdmFieldCvfMat4d.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 #include <QVariant>
 #include <QList>

Fwk/AppFwk/cafProjectDataModel/cafAppEnum.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 #include <vector>

Fwk/AppFwk/cafProjectDataModel/cafFactory.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 #include <assert.h>

Fwk/AppFwk/cafProjectDataModel/cafFixedArray.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 namespace caf

Fwk/AppFwk/cafProjectDataModel/cafOmpMutex.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 #include <omp.h>

Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cafPdmDocument.h"
 
 #include <QFile>

Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 #include "cafPdmField.h"
 #include "cafPdmObject.h"

Fwk/AppFwk/cafProjectDataModel/cafPdmField.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 

Fwk/AppFwk/cafProjectDataModel/cafPdmField.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 #include "cafPdmUiItem.h"

Fwk/AppFwk/cafProjectDataModel/cafPdmField.inl

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cafPdmObject.h"
 #include <vector>
 #include <iostream>

Fwk/AppFwk/cafProjectDataModel/cafPdmFieldImpl.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 #include <QVariant>
 #include <QList>

Fwk/AppFwk/cafProjectDataModel/cafPdmObject.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   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<PdmObject*> 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<PdmObject*> fieldsChildObjects;
                 root->m_field->childObjects(&fieldsChildObjects);

Fwk/AppFwk/cafProjectDataModel/cafPdmObject.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 #include "cafPdmUiItem.h"

Fwk/AppFwk/cafProjectDataModel/cafPdmObjectFactory.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 #include <assert.h>

Fwk/AppFwk/cafProjectDataModel/cafPdmPointer.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,7 +19,21 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
+
 #include "cafPdmObject.h"
 #include "cafPdmPointer.h"
 

Fwk/AppFwk/cafProjectDataModel/cafPdmPointer.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 

Fwk/AppFwk/cafProjectDataModel/cafPdmUiEditorHandle.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cafPdmUiEditorHandle.h"
 #include "cafPdmUiItem.h"
 

Fwk/AppFwk/cafProjectDataModel/cafPdmUiEditorHandle.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 #include <vector>
 #include <QString>

Fwk/AppFwk/cafProjectDataModel/cafPdmUiFieldEditorHandle.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cafPdmUiFieldEditorHandle.h"
 #include "cafPdmField.h"
 

Fwk/AppFwk/cafProjectDataModel/cafPdmUiFieldEditorHandle.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 #include <vector>
 #include <QString>

Fwk/AppFwk/cafProjectDataModel/cafPdmUiItem.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cafPdmUiItem.h"
 #include "cafPdmUiEditorHandle.h"
 

Fwk/AppFwk/cafProjectDataModel/cafPdmUiItem.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 #include <QString>
 #include <QIcon>

Fwk/AppFwk/cafProjectDataModel/cafPdmUiObjectEditorHandle.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cafPdmUiObjectEditorHandle.h"
 #include "cafPdmObject.h"
 

Fwk/AppFwk/cafProjectDataModel/cafPdmUiObjectEditorHandle.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 #include <vector>
 #include <QString>

Fwk/AppFwk/cafProjectDataModel/cafPdmUiOrdering.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cafPdmUiOrdering.h"
 
 

Fwk/AppFwk/cafProjectDataModel/cafPdmUiOrdering.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 #include <vector>
 #include <QString>

Fwk/AppFwk/cafProjectDataModel/cafPdmUiTreeOrdering.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   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<PdmUiTreeOrdering*>(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<PdmUiTreeOrdering*>(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
 

Fwk/AppFwk/cafProjectDataModel/cafPdmUiTreeOrdering.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 #include <vector>
 #include <QString>
@@ -39,6 +57,7 @@ class PdmFieldHandle;
 
 class PdmUiTreeOrdering : public UiTreeItem< PdmPointer<PdmObject> >
 {
+public:
     PdmUiTreeOrdering(PdmUiTreeOrdering* parent = NULL, int position = -1, PdmObject* dataObject = NULL);
 
     void                add(PdmFieldHandle * field);
@@ -50,11 +69,14 @@ class PdmUiTreeOrdering : public UiTreeItem< PdmPointer<PdmObject> >
     /// 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;

Fwk/AppFwk/cafProjectDataModel/cafUiTreeItem.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 //#include <QAbstractItemModel>

Fwk/AppFwk/cafUserInterface/cafBasicAboutDialog.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cafBasicAboutDialog.h"
 
 #include <QtCore/QVariant>

Fwk/AppFwk/cafUserInterface/cafBasicAboutDialog.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 #include <QtGui/QDialog>

Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxEditor.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   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);

Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxEditor.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 #include "cafPdmUiFieldEditorHandle.h"
 

Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cafPdmUiColorEditor.h"
 
 #include "cafPdmUiDefaultObjectEditor.h"

Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 #include "cafPdmUiFieldEditorHandle.h"

Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cafPdmUiComboBoxEditor.h"
 
 #include "cafPdmObject.h"

Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 
 #include "cafPdmUiFieldEditorHandle.h"

Fwk/AppFwk/cafUserInterface/cafPdmUiDefaultObjectEditor.cpp

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #include "cafPdmUiDefaultObjectEditor.h"
 
 #include "cafPdmObject.h"

Fwk/AppFwk/cafUserInterface/cafPdmUiDefaultObjectEditor.h

@@ -1,8 +1,12 @@
 //##################################################################################################
 //
 //   Custom Visualization Core library
-//   Copyright (C) 2011-2012 Ceetron AS
+//   Copyright (C) 2011-2013 Ceetron AS
 //
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
 //   This library is free software: you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +19,22 @@
 //   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
 //   for more details.
 //
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
 //##################################################################################################
 
+
 #pragma once
 #include "cafPdmUiObjectEditorHandle.h"
 #include <map>