Merge pull request #252 from PauloCarvalhoRJ/NextRelease

Next release

Author: PauloCarvalhoRJ

GammaRay.pro

@@ -93,6 +93,7 @@ SOURCES += main.cpp\
     vertpropcurves/verticalproportioncurvescanvaspicker.cpp \
     vertpropcurves/verticalproportioncurvesplot.cpp \
     viewer3d/v3dmouseinteractor.cpp \
+    viewer3d/view3dtextconfigwidget.cpp \
     widgets/linechartwidget.cpp \
     widgets/qlistwidgetdnd.cpp \
     widgets/variogrammodellist.cpp \
@@ -353,6 +354,7 @@ HEADERS  += mainwindow.h \
     vertpropcurves/verticalproportioncurvescanvaspicker.h \
     vertpropcurves/verticalproportioncurvesplot.h \
     viewer3d/v3dmouseinteractor.h \
+    viewer3d/view3dtextconfigwidget.h \
     widgets/linechartwidget.h \
     widgets/qlistwidgetdnd.h \
     widgets/variogrammodellist.h \
@@ -569,6 +571,7 @@ FORMS    += mainwindow.ui \
     gslib/gslibparams/widgets/widgetgslibpargrid.ui \
     gslib/gslibparams/widgets/widgetgslibparrepeat.ui \
     gslib/gslibparams/widgets/widgetgslibparcolor.ui \
+    viewer3d/view3dtextconfigwidget.ui \
     widgets/linechartwidget.ui \
     vertpropcurves/verticalproportioncurvedialog.ui \
     widgets/variogrammodellist.ui \
@@ -804,7 +807,7 @@ win32 {
 # The application version
 # Don't forget to update the Util::importSettingsFromPreviousVersion() method to
 # enable the import of registry/user settings of previous versions.
-VERSION = 6.5
+VERSION = 6.6
 
 # Define a preprocessor macro so we can get the application version in application code.
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"

README.md

@@ -12,6 +12,7 @@ If you enjoyed this project, you might also enjoy GeostatsPy: https://github.com
 Python script to convert Eclipse grids to Paraview-compatible VTU format: https://github.com/BinWang0213/PyGRDECL
 
 VERSION HISTORY:<br>
+&nbsp;&nbsp;&nbsp;Version 6.6   - Mean, median and Gaussian filters, improvements and bug fixes.<br>
 &nbsp;&nbsp;&nbsp;Version 6.5   - vertical proportion curves, improvements Automatic Variogram Fitting, enhancements and several fixes.<br>
 &nbsp;&nbsp;&nbsp;Version 6.3   - improvements to data imputation with MCMC and parameter experiments for Automatic Variogram Fitting.<br>
 &nbsp;&nbsp;&nbsp;Version 6.2   - data imputation with Markov Chains-Monte Carlo simulation and filtering of data sets.<br>

art/iconsHD/v3Dfont32.png

@@ -14,3 +14,8 @@ FaciesTransitionMatrixOptionsDialog::~FaciesTransitionMatrixOptionsDialog()
 {
     delete ui;
 }
+
+bool FaciesTransitionMatrixOptionsDialog::isIgnoreGapsChecked()
+{
+    return ui->chkIgnoreGaps->isChecked();
+}

dialogs/faciestransitionmatrixoptionsdialog.cpp

@@ -15,6 +15,8 @@ class FaciesTransitionMatrixOptionsDialog : public QDialog
     explicit FaciesTransitionMatrixOptionsDialog(QWidget *parent = nullptr);
     ~FaciesTransitionMatrixOptionsDialog();
 
+    bool isIgnoreGapsChecked();
+
 private:
     Ui::FaciesTransitionMatrixOptionsDialog *ui;
 };

dialogs/faciestransitionmatrixoptionsdialog.h

@@ -17,7 +17,7 @@
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>Options to make a Facies Transition Matrix file (currently fixed):</string>
+      <string>Options to make a Facies Transition Matrix file (some are currently fixed):</string>
      </property>
     </widget>
    </item>
@@ -35,6 +35,13 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QCheckBox" name="chkIgnoreGaps">
+     <property name="text">
+      <string>Ignore gaps (disconnected samples will be treated as connected in sequence)</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">

dialogs/faciestransitionmatrixoptionsdialog.ui

@@ -40,7 +40,7 @@ class Attribute : public ProjectComponent, public IJAbstractVariable, public ICa
 	virtual QString getPresentationName();
     virtual QString getObjectLocator();
     virtual View3DViewData build3DViewObjects( View3DWidget * widget3D );
-    virtual QString getTypeName(){ return "Attribute"; }
+    virtual QString getTypeName() const { return "Attribute"; }
     virtual View3DConfigWidget* build3DViewerConfigWidget(View3DViewData viewObjects);
 
 //IJAbstractVariable interface

docs/GammaRayManual.docx

@@ -98,7 +98,8 @@ namespace FTMMakerAdapters {
                                      SegmentSet* segmentSet,
                                      int dataColumnWithFaciesCodes,
                                      DataSetOrderForFaciesString dataIndexOrder,
-                                     int groupByVariableIndex ){
+                                     int groupByVariableIndex,
+                                     bool ignoreGaps ){
 
         std::vector< std::vector< int > > result;
 
@@ -167,10 +168,10 @@ namespace FTMMakerAdapters {
                         faciesSequence.push_back( faciesCode );
                 }else{ // for the other segments...
                     //if the current segment doesn't connect to the previous...
-                    if( ! Util::areConnected(  currentHeadX,  currentHeadY,  currentHeadZ,
-                                               currentTailX,  currentTailY,  currentTailZ,
-                                              previousHeadX, previousHeadY, previousHeadZ,
-                                              previousTailX, previousTailY, previousTailZ ) ){
+                    if( ! ignoreGaps && ! Util::areConnected(  currentHeadX,  currentHeadY,  currentHeadZ,
+                                                               currentTailX,  currentTailY,  currentTailZ,
+                                                              previousHeadX, previousHeadY, previousHeadZ,
+                                                              previousTailX, previousTailY, previousTailZ ) ){
                         // ...append the previous string to the result to be returned.
                         if( ! faciesSequence.empty() )
                             result.push_back( faciesSequence );
@@ -261,10 +262,15 @@ namespace FTMMakerAdapters {
                                      DataFile* dataFile,
                                      int dataColumnWithFaciesCodes,
                                      DataSetOrderForFaciesString dataIndexOrder,
-                                     int groupByVariableIndex ){
+                                     int groupByVariableIndex,
+                                     bool ignoreGaps ){
         if( dataFile->getFileType() == "SEGMENTSET" ){
             SegmentSet* segmentSet = dynamic_cast<SegmentSet*>( dataFile );
-            return getFaciesSequence<SegmentSet>( segmentSet, dataColumnWithFaciesCodes, dataIndexOrder, groupByVariableIndex );
+            return getFaciesSequence<SegmentSet>( segmentSet,
+                                                  dataColumnWithFaciesCodes,
+                                                  dataIndexOrder,
+                                                  groupByVariableIndex,
+                                                  ignoreGaps );
         } else {
             Application::instance()->logError("FTMMakerAdapters::getFaciesSequence<DataFile>(): Unsupported data file type: "
                                               + dataFile->getFileType() + ". Returned empty sequence." );

domain/attribute.h

@@ -43,12 +43,15 @@ namespace FTMMakerAdapters {
      *        to be used to group the data.  That is, to treat each group as a separate data set.  This is
      *        mainly useful with single files that contains data from multiple sources (e.g. drill holes).
      *        The variable is normally some interger valued id (e.g. well number).
+     * @param ignoreGaps If true, samples not connected in space are treated as if they were connected
+     *                   in the sequence.
      */
     template <typename Klass> std::vector< std::vector< int > > getFaciesSequence(
                                                 Klass* dataFile,
                                                 int dataColumnWithFaciesCodes,
                                                 DataSetOrderForFaciesString dataIndexOrder,
-                                                int groupByVariableIndex = -1 );
+                                                int groupByVariableIndex = -1,
+                                                bool ignoreGaps = false );
 }
 
 /** This is a template class used to make facies transition matrices for different
@@ -107,9 +110,10 @@ class FaciesTransitionMatrixMaker
     /**
      * Computes a facies transition matrix by simply counting facies changes between data elements
      * along some sequence (e.g. from last to first) of the object passed in the constructor.
-     *
+     * @param ignoreGaps If true, samples not connected in space are treated as if they were connected
+     *                   in the sequence.
      */
-    FaciesTransitionMatrix makeSimple( DataSetOrderForFaciesString dataIndexOrder ){
+    FaciesTransitionMatrix makeSimple( DataSetOrderForFaciesString dataIndexOrder, bool ignoreGaps ){
         //retrieve category definition
         CategoryDefinition* cd = FTMMakerAdapters::getAssociatedCategoryDefinition( m_dataFileWithFacies, m_variableIndex );
         assert( cd && "FaciesTransitionMatrixMaker::makeSimple(): null CategoryDefinition." );
@@ -119,7 +123,11 @@ class FaciesTransitionMatrixMaker
         ftm.initialize();
 
         std::vector< std::vector< int > > faciesStrings =
-                FTMMakerAdapters::getFaciesSequence( m_dataFileWithFacies, m_variableIndex, dataIndexOrder, m_groupByColumn );
+                FTMMakerAdapters::getFaciesSequence( m_dataFileWithFacies,
+                                                     m_variableIndex,
+                                                     dataIndexOrder,
+                                                     m_groupByColumn,
+                                                     ignoreGaps );
 
         //each facies string is treated separately (e.g. traces of a seismic volume)
         for( const std::vector< int >& faciesString : faciesStrings ){