Skip to content

Commit

Permalink
Merge pull request #292 from PauloCarvalhoRJ/MCRF_bayesian
Browse files Browse the repository at this point in the history
MCRFSim for Bayesian approach.
  • Loading branch information
PauloCarvalhoRJ authored Apr 22, 2023
2 parents 384bf3a + 3e54a82 commit ebb9128
Show file tree
Hide file tree
Showing 61 changed files with 4,062 additions and 205 deletions.
25 changes: 24 additions & 1 deletion GammaRay.pro
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,21 @@ win32 {
SOURCES += main.cpp\
dialogs/choosevariabledialog.cpp \
dialogs/faciestransitionmatrixoptionsdialog.cpp \
dialogs/listbuilderdialog.cpp \
dialogs/mcrfbayesiansimdialog.cpp \
dialogs/populatewithproportionsfromvpcdialog.cpp \
dialogs/sectiondialog.cpp \
dialogs/subgriddialog.cpp \
dialogs/transiogrambanddialog.cpp \
domain/auxiliary/verticalproportioncurvemaker.cpp \
domain/section.cpp \
domain/verticalproportioncurve.cpp \
geometry/intersectionfinder.cpp \
geometry/quadrilateral.cpp \
geometry/triangle.cpp \
geostats/mcmcdataimputation.cpp \
gslib/gslibparams/gslibpardir.cpp \
gslib/gslibparams/widgets/widgetgslibpardir.cpp \
mainwindow.cpp \
domain/project.cpp \
domain/application.cpp \
Expand Down Expand Up @@ -99,10 +104,14 @@ SOURCES += main.cpp\
vertpropcurves/verticalproportioncurvescanvaspicker.cpp \
vertpropcurves/verticalproportioncurvesplot.cpp \
viewer3d/v3dmouseinteractor.cpp \
viewer3d/view3dconfigwidgets/v3dcfgwidforattributeascontourlines.cpp \
viewer3d/view3dconfigwidgets/v3dcfgwidforattributeinpointset.cpp \
viewer3d/view3dtextconfigwidget.cpp \
widgets/linechartwidget.cpp \
widgets/listbuilder.cpp \
widgets/qlistwidgetdnd.cpp \
widgets/transiogrambandchartview.cpp \
widgets/variablelistbuilder.cpp \
widgets/variogrammodellist.cpp \
domain/weight.cpp \
domain/normalvariable.cpp \
Expand Down Expand Up @@ -297,9 +306,12 @@ SOURCES += main.cpp\
HEADERS += mainwindow.h \
dialogs/choosevariabledialog.h \
dialogs/faciestransitionmatrixoptionsdialog.h \
dialogs/listbuilderdialog.h \
dialogs/mcrfbayesiansimdialog.h \
dialogs/populatewithproportionsfromvpcdialog.h \
dialogs/sectiondialog.h \
dialogs/subgriddialog.h \
dialogs/transiogrambanddialog.h \
domain/auxiliary/verticalproportioncurvemaker.h \
domain/project.h \
domain/application.h \
Expand All @@ -312,6 +324,8 @@ HEADERS += mainwindow.h \
geometry/quadrilateral.h \
geometry/triangle.h \
geostats/mcmcdataimputation.h \
gslib/gslibparams/gslibpardir.h \
gslib/gslibparams/widgets/widgetgslibpardir.h \
util.h \
exceptions/invalidgslibdatafileexception.h \
domain/pointset.h \
Expand Down Expand Up @@ -366,10 +380,14 @@ HEADERS += mainwindow.h \
vertpropcurves/verticalproportioncurvescanvaspicker.h \
vertpropcurves/verticalproportioncurvesplot.h \
viewer3d/v3dmouseinteractor.h \
viewer3d/view3dconfigwidgets/v3dcfgwidforattributeascontourlines.h \
viewer3d/view3dconfigwidgets/v3dcfgwidforattributeinpointset.h \
viewer3d/view3dtextconfigwidget.h \
widgets/linechartwidget.h \
widgets/listbuilder.h \
widgets/qlistwidgetdnd.h \
widgets/transiogrambandchartview.h \
widgets/variablelistbuilder.h \
widgets/variogrammodellist.h \
domain/weight.h \
domain/normalvariable.h \
Expand Down Expand Up @@ -568,9 +586,12 @@ HEADERS += mainwindow.h \
FORMS += mainwindow.ui \
dialogs/choosevariabledialog.ui \
dialogs/faciestransitionmatrixoptionsdialog.ui \
dialogs/listbuilderdialog.ui \
dialogs/mcrfbayesiansimdialog.ui \
dialogs/populatewithproportionsfromvpcdialog.ui \
dialogs/sectiondialog.ui \
dialogs/subgriddialog.ui \
gslib/gslibparams/widgets/widgetgslibpardir.ui \
gslib/gslibparams/widgets/widgetgslibpardouble.ui \
gslib/gslibparams/widgets/widgetgslibparfile.ui \
gslib/gslibparams/widgets/widgetgslibparinputdata.ui \
Expand All @@ -586,10 +607,12 @@ FORMS += mainwindow.ui \
gslib/gslibparams/widgets/widgetgslibpargrid.ui \
gslib/gslibparams/widgets/widgetgslibparrepeat.ui \
gslib/gslibparams/widgets/widgetgslibparcolor.ui \
viewer3d/view3dconfigwidgets/v3dcfgwidforattributeascontourlines.ui \
viewer3d/view3dconfigwidgets/v3dcfgwidforattributeinpointset.ui \
viewer3d/view3dtextconfigwidget.ui \
widgets/linechartwidget.ui \
vertpropcurves/verticalproportioncurvedialog.ui \
widgets/variablelistbuilder.ui \
widgets/variogrammodellist.ui \
widgets/univariatedistributionselector.ui \
widgets/distributioncolumnroleselector.ui \
Expand Down Expand Up @@ -824,7 +847,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.16
VERSION = 6.17

# Define a preprocessor macro so we can get the application version in application code.
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,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.17 - Transiography and MCRFSim for Bayesian approach; some fixes and improvements.<br>
&nbsp;&nbsp;&nbsp;Version 6.16 - Upgrade of VTK to 9.1 and other years-old dependencies; some fixes.<br>
&nbsp;&nbsp;&nbsp;Version 6.14 - Several improvements mainly involving the 3D Viewer and dataset processing.<br>
&nbsp;&nbsp;&nbsp;Version 6.12 - Several new methods to work with grids. Several fixes and enhancements.<br>
Expand Down
19 changes: 19 additions & 0 deletions dialogs/listbuilderdialog.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#include "listbuilderdialog.h"
#include "ui_listbuilderdialog.h"

#include "widgets/listbuilder.h"

ListBuilderDialog::ListBuilderDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::ListBuilderDialog)
{
ui->setupUi(this);

m_listBuilder = new ListBuilder(this); //this will be deallocated by Qt
ui->frmForListBuilder->layout()->addWidget( m_listBuilder );
}

ListBuilderDialog::~ListBuilderDialog()
{
delete ui;
}
33 changes: 33 additions & 0 deletions dialogs/listbuilderdialog.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#ifndef LISTBUILDERDIALOG_H
#define LISTBUILDERDIALOG_H

#include <QDialog>

class ListBuilder;

namespace Ui {
class ListBuilderDialog;
}

/**
* This wraps a list builder widget in a dialog window with ok/cancel buttons.
*/
class ListBuilderDialog : public QDialog
{
Q_OBJECT

public:
explicit ListBuilderDialog(QWidget *parent = nullptr);
~ListBuilderDialog();


/** Returns the pointer to the internal list builder widget. */
ListBuilder* getListBuilder(){ return m_listBuilder; }

private:
Ui::ListBuilderDialog *ui;

ListBuilder* m_listBuilder;
};

#endif // LISTBUILDERDIALOG_H
102 changes: 102 additions & 0 deletions dialogs/listbuilderdialog.ui
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ListBuilderDialog</class>
<widget class="QDialog" name="ListBuilderDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>497</width>
<height>340</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QFrame" name="frmForListBuilder">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2"/>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="btnCancel">
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="btnOK">
<property name="text">
<string>OK</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>btnOK</sender>
<signal>clicked()</signal>
<receiver>ListBuilderDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>435</x>
<y>301</y>
</hint>
<hint type="destinationlabel">
<x>350</x>
<y>304</y>
</hint>
</hints>
</connection>
<connection>
<sender>btnCancel</sender>
<signal>clicked()</signal>
<receiver>ListBuilderDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>84</x>
<y>305</y>
</hint>
<hint type="destinationlabel">
<x>137</x>
<y>305</y>
</hint>
</hints>
</connection>
</connections>
</ui>
Loading

0 comments on commit ebb9128

Please sign in to comment.