Merge pull request #129 from PauloCarvalhoRJ/SGSIM

SGSIM

GammaRay.pro

@@ -168,7 +168,9 @@ SOURCES += main.cpp\
     imagejockey/spectrogram1dplot.cpp \
     imagejockey/spectrogram1dplotpicker.cpp \
     imagejockey/equalizer/equalizerwidget.cpp \
-    imagejockey/equalizer/equalizerslider.cpp
+    imagejockey/equalizer/equalizerslider.cpp \
+    dialogs/sgsimdialog.cpp \
+    widgets/distributionfieldselector.cpp
 
 HEADERS  += mainwindow.h \
     domain/project.h \
@@ -316,7 +318,9 @@ HEADERS  += mainwindow.h \
     imagejockey/spectrogram1dplot.h \
     imagejockey/spectrogram1dplotpicker.h \
     imagejockey/equalizer/equalizerwidget.h \
-    imagejockey/equalizer/equalizerslider.h
+    imagejockey/equalizer/equalizerslider.h \
+    dialogs/sgsimdialog.h \
+    widgets/distributionfieldselector.h
 
 FORMS    += mainwindow.ui \
     gslib/gslibparams/widgets/widgetgslibpardouble.ui \
@@ -377,7 +381,9 @@ FORMS    += mainwindow.ui \
     dialogs/multivariogramdialog.ui \
     imagejockey/imagejockeydialog.ui \
     imagejockey/equalizer/equalizerwidget.ui \
-    imagejockey/equalizer/equalizerslider.ui
+    imagejockey/equalizer/equalizerslider.ui \
+    dialogs/sgsimdialog.ui \
+    widgets/distributionfieldselector.ui
 
 #==================== The Boost include path.==================
 _BOOST_INCLUDE = $$(BOOST_INCLUDE)
@@ -442,7 +448,7 @@ LIBS        += -lvtkGUISupportQt$$_VTK_VERSION_SUFFIX \
 # The application version
 # Don't forget to update the Util::importSettingsFromPreviousVersion() method to
 # enable the import of registry/user settings of previous versions.
-VERSION = 2.7.2
+VERSION = 3.0
 
 # Define a preprocessor macro so we can get the application version in application code.
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"

dialogs/creategriddialog.ui

@@ -237,7 +237,7 @@
                <string/>
               </property>
               <property name="icon">
-               <iconset resource="resources.qrc">
+               <iconset resource="../resources.qrc">
                 <normaloff>:/icons/gbar16</normaloff>:/icons/gbar16</iconset>
               </property>
              </widget>
@@ -325,7 +325,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="resources.qrc"/>
+  <include location="../resources.qrc"/>
  </resources>
  <connections>
   <connection>

dialogs/multivariogramdialog.cpp

@@ -230,7 +230,7 @@ void MultiVariogramDialog::onVargplt( std::vector<QString> &expVarFilePaths )
         for(uint iVariable = 0; iVariable < nVariables; ++iVariable){
             for(uint iVar = 0; iVar < nVariograms; ++iVar){
                 for(uint iDir = 0; iDir < nDirections; ++iDir){
-                    int i = iVar + iDir*nVariograms + iVariable*nDirections*nVariograms;
+                    int i = iDir + iVar*nDirections + iVariable*nDirections*nVariograms;
                     par6->getParameter<GSLibParFile*>(i, 0)->_path = expVarFilePaths[iVariable];
                     GSLibParMultiValuedFixed *par6_0_1 = par6->getParameter<GSLibParMultiValuedFixed*>(i, 1);
                     par6_0_1->getParameter<GSLibParUInt*>(0)->_value = iDir+iVar*nDirections + 1;

dialogs/sgsimdialog.h

@@ -0,0 +1,71 @@
+#ifndef SGSIMDIALOG_H
+#define SGSIMDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+class SGSIMDialog;
+}
+
+class GSLibParGrid;
+class WidgetGSLibParGrid;
+class PointSetSelector;
+class VariableSelector;
+class UnivariateDistributionSelector;
+class DistributionFieldSelector;
+class CartesianGridSelector;
+class VariogramModelSelector;
+class DataFile;
+class GSLibParameterFile;
+class VariogramModel;
+class CartesianGrid;
+
+
+class SGSIMDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit SGSIMDialog( QWidget *parent = 0);
+    ~SGSIMDialog();
+
+private:
+    Ui::SGSIMDialog *ui;
+    GSLibParGrid* m_par;
+    WidgetGSLibParGrid* m_gridParameters;
+    PointSetSelector *m_primVarPSetSelector;
+    VariableSelector *m_primVarSelector;
+    VariableSelector *m_primVarWgtSelector;
+    VariableSelector *m_primVarSecVarSelector;
+    UnivariateDistributionSelector *m_refDistFileSelector;
+    DistributionFieldSelector *m_refDistValuesSelector;
+    DistributionFieldSelector *m_refDistFreqSelector;
+    CartesianGridSelector *m_gridCopySpecsSelector;
+    CartesianGridSelector *m_secVarGridSelector;
+    VariableSelector *m_secVarVariableSelector;
+    VariogramModelSelector *m_vModelSelector;
+    GSLibParameterFile* m_gpf_sgsim;
+    CartesianGrid* m_cg_simulation;
+    GSLibParameterFile* m_gpf_gam;
+    GSLibParameterFile* m_gpf_postsim;
+    CartesianGrid* m_cg_postsim;
+    /** Called when the user changes the variogram model, so the variogram parameters
+     * in m_gpf_kt3d are read from the newly selected variogram model.*/
+    void updateVariogramParameters(VariogramModel *vm );
+    void preview();
+    void previewPostsim();
+
+private slots:
+    void onGridCopySpectsSelected( DataFile* grid );
+    void onConfigAndRun();
+    void onVariogramChanged();
+    void onSgsimCompletes();
+    void onRealizationHistogram();
+    void onEnsembleHistogram();
+    void onEnsembleVariogram();
+    void onSaveEnsemble();
+    void onPostsim();
+    void onSavePostsim();
+};
+
+#endif // SGSIMDIALOG_H