Merge pull request #28 from PauloCarvalhoRJ/IndicatorKrigingCategorical

Indicator kriging categorical

Author: PauloCarvalhoRJ

.gitignore

@@ -1,2 +1,5 @@
 # These files are kept by Qt Creator and does not actually belong to the source file set. 
 GammaRay.pro.user*
+
+# Temporary file created by Microsoft Word when editing GammaRayManual.docx
+docs/~*.docx

GammaRay.pro

@@ -118,6 +118,12 @@ SOURCES += main.cpp\
     scripting.cpp \
     gslib/gslibparams/gslibparvmodel.cpp \
     gslib/gslibparams/widgets/widgetgslibparvmodel.cpp \
+    domain/triads.cpp \
+    domain/categorydefinition.cpp \
+    triadseditordialog.cpp \
+    domain/univariatecategoryclassification.cpp \
+    widgets/categoryselector.cpp \
+    widgets/intervalandcategorywidget.cpp \
     spatialindex/spatialindexpoints.cpp
 
 HEADERS  += mainwindow.h \
@@ -218,6 +224,12 @@ HEADERS  += mainwindow.h \
     exprtk.hpp \
     gslib/gslibparams/gslibparvmodel.h \
     gslib/gslibparams/widgets/widgetgslibparvmodel.h \
+    domain/triads.h \
+    domain/categorydefinition.h \
+    triadseditordialog.h \
+    domain/univariatecategoryclassification.h \
+    widgets/categoryselector.h \
+    widgets/intervalandcategorywidget.h \
     spatialindex/spatialindexpoints.h
 
 FORMS    += mainwindow.ui \
@@ -263,7 +275,10 @@ FORMS    += mainwindow.ui \
     valuespairsdialog.ui \
     indicatorkrigingdialog.ui \
     widgets/fileselectorwidget.ui \
-    gslib/gslibparams/widgets/widgetgslibparvmodel.ui
+    gslib/gslibparams/widgets/widgetgslibparvmodel.ui \
+    triadseditordialog.ui \
+    widgets/categoryselector.ui \
+    widgets/intervalandcategorywidget.ui
 
 # The Boost include path.
 BOOST_INSTALL = $$(BOOST_ROOT)
@@ -275,7 +290,7 @@ INCLUDEPATH += $$BOOST_INSTALL
 # The application version
 # Don't forget to update the Util::importSettingsFromPreviousVersion() method to
 # enable the import of registry/user settings of previous versions.
-VERSION = 1.2.1
+VERSION = 1.3
 
 # Define a preprocessor macro so we can get the application version in application code.
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"

LICENSE.md

@@ -7,7 +7,7 @@ Authors:
 Original: Paulo R. M. de Carvalho (paulo.r.m.carvalho@gmail.com)
 Code contributors:
 
-=========================================Complete transcription of the Licence====================================================
+=========================================Complete transcription of the License====================================================
 
 License
 
@@ -30,6 +30,7 @@ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE B
 "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
 
 2. Fair Dealing Rights. 
+
 Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
 
 3. License Grant. 

art/catdef16x16.png

@@ -17,6 +17,12 @@ class Attribute : public ProjectComponent
      */
     File* getContainingFile();
 
+    /**
+     * Returns the GEO-EAS index passed in the constructor,
+     * so this is not necessarily read from a GEO-EAS file.
+     */
+    int getAttributeGEOEASgivenIndex(){ return _index; }
+
     // ProjectComponent interface
 public:
     QString getName();

art/catuniclass16x16.png

@@ -0,0 +1,79 @@
+#include "categorydefinition.h"
+#include "gslib/gslibparameterfiles/gslibparamtypes.h"
+#include "gslib/gslibparams/widgets/widgetgslibparmultivaluedfixed.h"
+
+CategoryDefinition::CategoryDefinition(QString path) : IntIntQStringTriplets ( path )
+{
+}
+
+CategoryDefinition::~CategoryDefinition()
+{
+    //TODO: delete the objects in m_createdParameters here.
+}
+
+void CategoryDefinition::save(QTextStream *txt_stream)
+{
+    (*txt_stream) << this->getFileType() << ":" << this->getFileName() << '\n';
+}
+
+QWidget *CategoryDefinition::createContentElementWidget()
+{
+    //create a parameter set with default values to represent a triplet of code, color, name.
+    GSLibParMultiValuedFixed* par = new GSLibParMultiValuedFixed("","","");
+    GSLibParInt *pint = new GSLibParInt("","","");
+    int num_cats = m_stashOfCreatedParameters.size() + 1;
+    pint->_value = num_cats;
+    par->_parameters.append( pint );
+    GSLibParColor *pcol = new GSLibParColor("","","");
+    pcol->_color_code = num_cats % 25; //max. color code is 24.
+    par->_parameters.append( pcol );
+    GSLibParString *pstr = new GSLibParString("","","");
+    pstr->_value = QString("Category ") + QString::number( num_cats );
+    par->_parameters.append( pstr );
+    //store the pointer to delete some time later.
+    m_stashOfCreatedParameters.append( par );
+    //return the widget tailored for the data types of the triplet.
+    return par->getWidget();
+}
+
+QWidget *CategoryDefinition::createWidgetFilledWithContentElement(uint iContent)
+{
+    //create a parameter set with the code, color and name values.
+    GSLibParMultiValuedFixed* par = new GSLibParMultiValuedFixed("","","");
+    GSLibParInt *pint = new GSLibParInt("","","");
+    pint->_value = get1stValue( iContent ); // the category code
+    par->_parameters.append( pint );
+    GSLibParColor *pcol = new GSLibParColor("","","");
+    pcol->_color_code = get2ndValue( iContent ); // the GSLib color code
+    par->_parameters.append( pcol );
+    GSLibParString *pstr = new GSLibParString("","","");
+    pstr->_value = get3rdValue( iContent ); //the Category name
+    par->_parameters.append( pstr );
+    //store the pointer to delete some time later.
+    m_stashOfCreatedParameters.append( par );
+    //return the widget tailored for the data types of the triplet.
+    return par->getWidget();
+}
+
+void CategoryDefinition::addContentElementFromWidget(QWidget *w)
+{
+    //surely the widget is a WidgetGSLibParMultiValuedFixed.
+    WidgetGSLibParMultiValuedFixed *widget = (WidgetGSLibParMultiValuedFixed*)w;
+
+    //build a parameter set adequate to read the user-entered values in the passed widget.
+    GSLibParMultiValuedFixed* par = new GSLibParMultiValuedFixed("","","");
+    par->_parameters.append( new GSLibParInt("","","") );
+    par->_parameters.append( new GSLibParColor("","","") );
+    par->_parameters.append( new GSLibParString("","","") );
+
+    //read the values from the widget into the parameter set object.
+    widget->updateValue( par );
+
+    //add the triplet of the values read.
+    addTriplet( ((GSLibParInt*)par->_parameters[0])->_value,
+                ((GSLibParColor*)par->_parameters[1])->_color_code,
+                ((GSLibParString*)par->_parameters[2])->_value );
+
+    //store the parameter set pointer to delete some time later.
+    m_stashOfCreatedParameters.append( par );
+}