Skip to content

Commit ebb9128

Browse files
PauloCarvalhoRJPauloCarvalhoRJ
authored
Merge pull request #292 from PauloCarvalhoRJ/MCRF_bayesian
MCRFSim for Bayesian approach.
2 parents 384bf3a + 3e54a82 commit ebb9128

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+4062
-205
lines changed

‎GammaRay.pro

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,21 @@ win32 {
3434
SOURCES += main.cpp\
3535
dialogs/choosevariabledialog.cpp \
3636
dialogs/faciestransitionmatrixoptionsdialog.cpp \
37+
dialogs/listbuilderdialog.cpp \
38+
dialogs/mcrfbayesiansimdialog.cpp \
3739
dialogs/populatewithproportionsfromvpcdialog.cpp \
3840
dialogs/sectiondialog.cpp \
3941
dialogs/subgriddialog.cpp \
42+
dialogs/transiogrambanddialog.cpp \
4043
domain/auxiliary/verticalproportioncurvemaker.cpp \
4144
domain/section.cpp \
4245
domain/verticalproportioncurve.cpp \
4346
geometry/intersectionfinder.cpp \
4447
geometry/quadrilateral.cpp \
4548
geometry/triangle.cpp \
4649
geostats/mcmcdataimputation.cpp \
50+
gslib/gslibparams/gslibpardir.cpp \
51+
gslib/gslibparams/widgets/widgetgslibpardir.cpp \
4752
mainwindow.cpp \
4853
domain/project.cpp \
4954
domain/application.cpp \
@@ -99,10 +104,14 @@ SOURCES += main.cpp\
99104
vertpropcurves/verticalproportioncurvescanvaspicker.cpp \
100105
vertpropcurves/verticalproportioncurvesplot.cpp \
101106
viewer3d/v3dmouseinteractor.cpp \
107+
viewer3d/view3dconfigwidgets/v3dcfgwidforattributeascontourlines.cpp \
102108
viewer3d/view3dconfigwidgets/v3dcfgwidforattributeinpointset.cpp \
103109
viewer3d/view3dtextconfigwidget.cpp \
104110
widgets/linechartwidget.cpp \
111+
widgets/listbuilder.cpp \
105112
widgets/qlistwidgetdnd.cpp \
113+
widgets/transiogrambandchartview.cpp \
114+
widgets/variablelistbuilder.cpp \
106115
widgets/variogrammodellist.cpp \
107116
domain/weight.cpp \
108117
domain/normalvariable.cpp \
@@ -297,9 +306,12 @@ SOURCES += main.cpp\
297306
HEADERS += mainwindow.h \
298307
dialogs/choosevariabledialog.h \
299308
dialogs/faciestransitionmatrixoptionsdialog.h \
309+
dialogs/listbuilderdialog.h \
310+
dialogs/mcrfbayesiansimdialog.h \
300311
dialogs/populatewithproportionsfromvpcdialog.h \
301312
dialogs/sectiondialog.h \
302313
dialogs/subgriddialog.h \
314+
dialogs/transiogrambanddialog.h \
303315
domain/auxiliary/verticalproportioncurvemaker.h \
304316
domain/project.h \
305317
domain/application.h \
@@ -312,6 +324,8 @@ HEADERS += mainwindow.h \
312324
geometry/quadrilateral.h \
313325
geometry/triangle.h \
314326
geostats/mcmcdataimputation.h \
327+
gslib/gslibparams/gslibpardir.h \
328+
gslib/gslibparams/widgets/widgetgslibpardir.h \
315329
util.h \
316330
exceptions/invalidgslibdatafileexception.h \
317331
domain/pointset.h \
@@ -366,10 +380,14 @@ HEADERS += mainwindow.h \
366380
vertpropcurves/verticalproportioncurvescanvaspicker.h \
367381
vertpropcurves/verticalproportioncurvesplot.h \
368382
viewer3d/v3dmouseinteractor.h \
383+
viewer3d/view3dconfigwidgets/v3dcfgwidforattributeascontourlines.h \
369384
viewer3d/view3dconfigwidgets/v3dcfgwidforattributeinpointset.h \
370385
viewer3d/view3dtextconfigwidget.h \
371386
widgets/linechartwidget.h \
387+
widgets/listbuilder.h \
372388
widgets/qlistwidgetdnd.h \
389+
widgets/transiogrambandchartview.h \
390+
widgets/variablelistbuilder.h \
373391
widgets/variogrammodellist.h \
374392
domain/weight.h \
375393
domain/normalvariable.h \
@@ -568,9 +586,12 @@ HEADERS += mainwindow.h \
568586
FORMS += mainwindow.ui \
569587
dialogs/choosevariabledialog.ui \
570588
dialogs/faciestransitionmatrixoptionsdialog.ui \
589+
dialogs/listbuilderdialog.ui \
590+
dialogs/mcrfbayesiansimdialog.ui \
571591
dialogs/populatewithproportionsfromvpcdialog.ui \
572592
dialogs/sectiondialog.ui \
573593
dialogs/subgriddialog.ui \
594+
gslib/gslibparams/widgets/widgetgslibpardir.ui \
574595
gslib/gslibparams/widgets/widgetgslibpardouble.ui \
575596
gslib/gslibparams/widgets/widgetgslibparfile.ui \
576597
gslib/gslibparams/widgets/widgetgslibparinputdata.ui \
@@ -586,10 +607,12 @@ FORMS += mainwindow.ui \
586607
gslib/gslibparams/widgets/widgetgslibpargrid.ui \
587608
gslib/gslibparams/widgets/widgetgslibparrepeat.ui \
588609
gslib/gslibparams/widgets/widgetgslibparcolor.ui \
610+
viewer3d/view3dconfigwidgets/v3dcfgwidforattributeascontourlines.ui \
589611
viewer3d/view3dconfigwidgets/v3dcfgwidforattributeinpointset.ui \
590612
viewer3d/view3dtextconfigwidget.ui \
591613
widgets/linechartwidget.ui \
592614
vertpropcurves/verticalproportioncurvedialog.ui \
615+
widgets/variablelistbuilder.ui \
593616
widgets/variogrammodellist.ui \
594617
widgets/univariatedistributionselector.ui \
595618
widgets/distributioncolumnroleselector.ui \
@@ -824,7 +847,7 @@ win32 {
824847
# The application version
825848
# Don't forget to update the Util::importSettingsFromPreviousVersion() method to
826849
# enable the import of registry/user settings of previous versions.
827-
VERSION = 6.16
850+
VERSION = 6.17
828851

829852
# Define a preprocessor macro so we can get the application version in application code.
830853
DEFINES += APP_VERSION=\\\"$$VERSION\\\"

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ If you enjoyed this project, you might also enjoy GeostatsPy: https://github.com
1515
Python script to convert Eclipse grids to Paraview-compatible VTU format: https://github.com/BinWang0213/PyGRDECL
1616

1717
VERSION HISTORY:<br>
18+
&nbsp;&nbsp;&nbsp;Version 6.17 - Transiography and MCRFSim for Bayesian approach; some fixes and improvements.<br>
1819
&nbsp;&nbsp;&nbsp;Version 6.16 - Upgrade of VTK to 9.1 and other years-old dependencies; some fixes.<br>
1920
&nbsp;&nbsp;&nbsp;Version 6.14 - Several improvements mainly involving the 3D Viewer and dataset processing.<br>
2021
&nbsp;&nbsp;&nbsp;Version 6.12 - Several new methods to work with grids. Several fixes and enhancements.<br>

‎dialogs/listbuilderdialog.cpp

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#include "listbuilderdialog.h"
2+
#include "ui_listbuilderdialog.h"
3+
4+
#include "widgets/listbuilder.h"
5+
6+
ListBuilderDialog::ListBuilderDialog(QWidget *parent) :
7+
QDialog(parent),
8+
ui(new Ui::ListBuilderDialog)
9+
{
10+
ui->setupUi(this);
11+
12+
m_listBuilder = new ListBuilder(this); //this will be deallocated by Qt
13+
ui->frmForListBuilder->layout()->addWidget( m_listBuilder );
14+
}
15+
16+
ListBuilderDialog::~ListBuilderDialog()
17+
{
18+
delete ui;
19+
}

‎dialogs/listbuilderdialog.h

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#ifndef LISTBUILDERDIALOG_H
2+
#define LISTBUILDERDIALOG_H
3+
4+
#include <QDialog>
5+
6+
class ListBuilder;
7+
8+
namespace Ui {
9+
class ListBuilderDialog;
10+
}
11+
12+
/**
13+
* This wraps a list builder widget in a dialog window with ok/cancel buttons.
14+
*/
15+
class ListBuilderDialog : public QDialog
16+
{
17+
Q_OBJECT
18+
19+
public:
20+
explicit ListBuilderDialog(QWidget *parent = nullptr);
21+
~ListBuilderDialog();
22+
23+
24+
/** Returns the pointer to the internal list builder widget. */
25+
ListBuilder* getListBuilder(){ return m_listBuilder; }
26+
27+
private:
28+
Ui::ListBuilderDialog *ui;
29+
30+
ListBuilder* m_listBuilder;
31+
};
32+
33+
#endif // LISTBUILDERDIALOG_H

‎dialogs/listbuilderdialog.ui

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<class>ListBuilderDialog</class>
4+
<widget class="QDialog" name="ListBuilderDialog">
5+
<property name="geometry">
6+
<rect>
7+
<x>0</x>
8+
<y>0</y>
9+
<width>497</width>
10+
<height>340</height>
11+
</rect>
12+
</property>
13+
<property name="windowTitle">
14+
<string>Dialog</string>
15+
</property>
16+
<layout class="QVBoxLayout" name="verticalLayout">
17+
<item>
18+
<widget class="QFrame" name="frmForListBuilder">
19+
<property name="sizePolicy">
20+
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
21+
<horstretch>0</horstretch>
22+
<verstretch>0</verstretch>
23+
</sizepolicy>
24+
</property>
25+
<property name="frameShape">
26+
<enum>QFrame::StyledPanel</enum>
27+
</property>
28+
<property name="frameShadow">
29+
<enum>QFrame::Raised</enum>
30+
</property>
31+
<layout class="QVBoxLayout" name="verticalLayout_2"/>
32+
</widget>
33+
</item>
34+
<item>
35+
<layout class="QHBoxLayout" name="horizontalLayout">
36+
<item>
37+
<widget class="QPushButton" name="btnCancel">
38+
<property name="text">
39+
<string>Cancel</string>
40+
</property>
41+
</widget>
42+
</item>
43+
<item>
44+
<spacer name="horizontalSpacer">
45+
<property name="orientation">
46+
<enum>Qt::Horizontal</enum>
47+
</property>
48+
<property name="sizeHint" stdset="0">
49+
<size>
50+
<width>40</width>
51+
<height>20</height>
52+
</size>
53+
</property>
54+
</spacer>
55+
</item>
56+
<item>
57+
<widget class="QPushButton" name="btnOK">
58+
<property name="text">
59+
<string>OK</string>
60+
</property>
61+
</widget>
62+
</item>
63+
</layout>
64+
</item>
65+
</layout>
66+
</widget>
67+
<resources/>
68+
<connections>
69+
<connection>
70+
<sender>btnOK</sender>
71+
<signal>clicked()</signal>
72+
<receiver>ListBuilderDialog</receiver>
73+
<slot>accept()</slot>
74+
<hints>
75+
<hint type="sourcelabel">
76+
<x>435</x>
77+
<y>301</y>
78+
</hint>
79+
<hint type="destinationlabel">
80+
<x>350</x>
81+
<y>304</y>
82+
</hint>
83+
</hints>
84+
</connection>
85+
<connection>
86+
<sender>btnCancel</sender>
87+
<signal>clicked()</signal>
88+
<receiver>ListBuilderDialog</receiver>
89+
<slot>reject()</slot>
90+
<hints>
91+
<hint type="sourcelabel">
92+
<x>84</x>
93+
<y>305</y>
94+
</hint>
95+
<hint type="destinationlabel">
96+
<x>137</x>
97+
<y>305</y>
98+
</hint>
99+
</hints>
100+
</connection>
101+
</connections>
102+
</ui>

0 commit comments

Comments
 (0)