Merge pull request #230 from PauloCarvalhoRJ/NextVersion

MCRFSim

GammaRay.pro

@@ -110,7 +110,6 @@ SOURCES += main.cpp\
     domain/univariatecategoryclassification.cpp \
     widgets/categoryselector.cpp \
     widgets/intervalandcategorywidget.cpp \
-    spatialindex/spatialindexpoints.cpp \
     softindiccalib/softindicatorcalibrationdialog.cpp \
     softindiccalib/softindicatorcalibplot.cpp \
     softindiccalib/softindicatorcalibcanvaspicker.cpp \
@@ -241,7 +240,33 @@ SOURCES += main.cpp\
     imagejockey/ijvariographicmodel2d.cpp \
     dialogs/automaticvarfitdialog.cpp \
     dialogs/emptydialog.cpp \
-    geostats/nestedvariogramstructuresparameters.cpp
+    geostats/nestedvariogramstructuresparameters.cpp \
+    dialogs/segmentsetdialog.cpp \
+    domain/segmentset.cpp \
+    domain/quintuplets.cpp \
+    gslib/gslibparams/gslibparcustomcolor.cpp \
+    gslib/gslibparams/widgets/widgetgslibcustomcolor.cpp \
+    dialogs/choosecategorydialog.cpp \
+    domain/faciestransitionmatrix.cpp \
+    dialogs/projectfilechoosedialog.cpp \
+    dialogs/entropycyclicityanalysisdialog.cpp \
+    dialogs/faciesrelationshipdiagramdialog.cpp \
+    graphviz/graphviz.cpp \
+    dialogs/transiogramdialog.cpp \
+    domain/auxiliary/faciestransitionmatrixmaker.cpp \
+    domain/auxiliary/thicknesscalculator.cpp \
+    widgets/transiogramchartview.cpp \
+    domain/verticaltransiogrammodel.cpp \
+    dialogs/dynamicfaciesrelationshipdiagramdialog.cpp \
+    viewer3d/view3dconfigwidgets/v3dcfgwidforattributeinsegmentset.cpp \
+    geostats/segmentsetcell.cpp \
+    domain/auxiliary/valuestransferer.cpp \
+    dialogs/mcrfsimdialog.cpp \
+    dialogs/lvadatasetdialog.cpp \
+    geostats/mcrfsim.cpp \
+    gslib/gslibparameterfiles/commonsimulationparameters.cpp \
+    spatialindex/spatialindex.cpp \
+    geostats/taumodel.cpp
 
 HEADERS  += mainwindow.h \
     domain/project.h \
@@ -326,7 +351,6 @@ HEADERS  += mainwindow.h \
     domain/univariatecategoryclassification.h \
     widgets/categoryselector.h \
     widgets/intervalandcategorywidget.h \
-    spatialindex/spatialindexpoints.h \
     softindiccalib/softindicatorcalibrationdialog.h \
     softindiccalib/softindicatorcalibplot.h \
     softindiccalib/softindicatorcalibcanvaspicker.h \
@@ -460,7 +484,33 @@ HEADERS  += mainwindow.h \
     imagejockey/ijvariographicmodel2d.h \
     dialogs/automaticvarfitdialog.h \
     dialogs/emptydialog.h \
-    geostats/nestedvariogramstructuresparameters.h
+    geostats/nestedvariogramstructuresparameters.h \
+    dialogs/segmentsetdialog.h \
+    domain/segmentset.h \
+    domain/quintuplets.h \
+    gslib/gslibparams/gslibparcustomcolor.h \
+    gslib/gslibparams/widgets/widgetgslibcustomcolor.h \
+    dialogs/choosecategorydialog.h \
+    domain/faciestransitionmatrix.h \
+    dialogs/projectfilechoosedialog.h \
+    dialogs/entropycyclicityanalysisdialog.h \
+    dialogs/faciesrelationshipdiagramdialog.h \
+    graphviz/graphviz.h \
+    dialogs/transiogramdialog.h \
+    domain/auxiliary/faciestransitionmatrixmaker.h \
+    domain/auxiliary/thicknesscalculator.h \
+    widgets/transiogramchartview.h \
+    domain/verticaltransiogrammodel.h \
+    dialogs/dynamicfaciesrelationshipdiagramdialog.h \
+    viewer3d/view3dconfigwidgets/v3dcfgwidforattributeinsegmentset.h \
+    geostats/segmentsetcell.h \
+    domain/auxiliary/valuestransferer.h \
+    dialogs/mcrfsimdialog.h \
+    dialogs/lvadatasetdialog.h \
+    geostats/mcrfsim.h \
+    gslib/gslibparameterfiles/commonsimulationparameters.h \
+    spatialindex/spatialindex.h \
+    geostats/taumodel.h
 
 
 FORMS    += mainwindow.ui \
@@ -544,7 +594,18 @@ FORMS    += mainwindow.ui \
     imagejockey/gabor/gaborscandialog.ui \
     imagejockey/wavelet/wavelettransformdialog.ui \
     dialogs/automaticvarfitdialog.ui \
-    dialogs/emptydialog.ui
+    dialogs/emptydialog.ui \
+    dialogs/segmentsetdialog.ui \
+    gslib/gslibparams/widgets/widgetgslibcustomcolor.ui \
+    dialogs/choosecategorydialog.ui \
+    dialogs/projectfilechoosedialog.ui \
+    dialogs/entropycyclicityanalysisdialog.ui \
+    dialogs/faciesrelationshipdiagramdialog.ui \
+    dialogs/transiogramdialog.ui \
+    dialogs/dynamicfaciesrelationshipdiagramdialog.ui \
+    viewer3d/view3dconfigwidgets/v3dcfgwidforattributeinsegmentset.ui \
+    dialogs/mcrfsimdialog.ui \
+    dialogs/lvadatasetdialog.ui
 
 #==================== The Boost include path.==================
 _BOOST_INCLUDE = $$(BOOST_INCLUDE)
@@ -688,7 +749,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 = 5.7.1
+VERSION = 6.0
 
 # Define a preprocessor macro so we can get the application version in application code.
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"

README.md

@@ -8,6 +8,7 @@ GammaRay is a graphical user interface (GUI) that automates geostatistical workf
 If you enjoyed this project, you might also enjoy GeostatsPy: https://github.com/GeostatsGuy/GeostatsPy<br>
 
 VERSION HISTORY:<br>
+<strong>Version 6.0   - Markov Chain Random Field Simulation and numerous new features and enhancements<br></strong>
 &nbsp;&nbsp;&nbsp;Version 5.7   - full 2d automatic variogram fitting and analysis<br>
 &nbsp;&nbsp;&nbsp;Version 5.5   - wavelet transform<br>
 &nbsp;&nbsp;&nbsp;Version 5.3   - Gabor analysis<br>

dialogs/choosecategorydialog.cpp

@@ -0,0 +1,25 @@
+#include "choosecategorydialog.h"
+#include "ui_choosecategorydialog.h"
+#include "widgets/categoryselector.h"
+
+uint ChooseCategoryDialog::getSelectedCategoryCode()
+{
+    return m_cdSelector->getSelectedCategoryCode();
+}
+
+ChooseCategoryDialog::ChooseCategoryDialog(CategoryDefinition *cd, const QString title, const QString caption, QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::ChooseCategoryDialog),
+    m_cd(cd)
+{
+    ui->setupUi(this);
+    m_cdSelector = new CategorySelector( m_cd );
+    ui->layoutForCategorySelector->addWidget( m_cdSelector );
+    ui->lblCaption->setText( caption );
+    setWindowTitle( title );
+}
+
+ChooseCategoryDialog::~ChooseCategoryDialog()
+{
+    delete ui;
+}

dialogs/choosecategorydialog.h

@@ -0,0 +1,29 @@
+#ifndef CHOOSECATEGORYDIALOG_H
+#define CHOOSECATEGORYDIALOG_H
+
+#include <QDialog>
+
+class CategoryDefinition;
+class CategorySelector;
+
+namespace Ui {
+class ChooseCategoryDialog;
+}
+
+class ChooseCategoryDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit ChooseCategoryDialog( CategoryDefinition* cd, const QString title, const QString caption, QWidget *parent = nullptr);
+    ~ChooseCategoryDialog();
+
+    uint getSelectedCategoryCode();
+
+private:
+    Ui::ChooseCategoryDialog *ui;
+    CategoryDefinition* m_cd;
+    CategorySelector* m_cdSelector;
+};
+
+#endif // CHOOSECATEGORYDIALOG_H

dialogs/choosecategorydialog.ui

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ChooseCategoryDialog</class>
+ <widget class="QDialog" name="ChooseCategoryDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>402</width>
+    <height>119</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="lblCaption">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="layoutForCategorySelector">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>ChooseCategoryDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>ChooseCategoryDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

dialogs/datafiledialog.cpp

@@ -35,6 +35,8 @@ void DataFileDialog::accept()
         this->_file_type = DataFileDialog::CARTESIANGRID;
     if ( this->ui->radioXYZ->isChecked() )
         this->_file_type = DataFileDialog::POINTSET;
+    if ( this->ui->radioSegmentSet->isChecked() )
+        this->_file_type = DataFileDialog::SEGMENTSET;
     //close the dialog
     this->done( QDialog::Accepted );
 }

dialogs/datafiledialog.h

@@ -12,10 +12,10 @@ class DataFileDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit DataFileDialog(QWidget *parent = 0, const QString file_path = "");
+    explicit DataFileDialog(QWidget *parent = nullptr, const QString file_path = "");
     ~DataFileDialog();
 
-    enum { UNDEFINED, CARTESIANGRID, POINTSET} iDataFileType;
+    enum { UNDEFINED, CARTESIANGRID, POINTSET, SEGMENTSET } iDataFileType;
 
     int getDataFileType();
 

dialogs/datafiledialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>506</width>
-    <height>412</height>
+    <width>553</width>
+    <height>388</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -37,6 +37,13 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QRadioButton" name="radioSegmentSet">
+        <property name="text">
+         <string>Segment set (GEO-EAS point set w/ 6 XYZ fields)</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>

dialogs/displayplotdialog.cpp

@@ -67,10 +67,10 @@ void DisplayPlotDialog::onChangeParameters()
 
 void DisplayPlotDialog::onSavePlot()
 {
-    if( _gpf.isEmpty() )
-        return;
     bool ok;
-    QString proposed_name( _gpf.getProgramName() );
+    QString proposed_name = "Some";
+    if( ! _gpf.isEmpty() )
+        proposed_name = _gpf.getProgramName() ;
     proposed_name = proposed_name.append("_plot");
     QString new_plot_name = QInputDialog::getText(this, "Name the new plot file",
                                              "New plot file name:", QLineEdit::Normal,