[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [analitza/aucahuasi/analitzaplot] /: Put the analitzaplot API inside an Analitza namespace
From: Aleix Pol <aleixpol () kde ! org>
Date: 2012-10-01 0:22:09
Message-ID: 20121001002209.65B87A6094 () git ! kde ! org
[Download RAW message or body]
Git commit 8df830e3d8eb28447a0887756e79102a27664e97 by Aleix Pol.
Committed on 01/10/2012 at 01:43.
Pushed by apol into branch 'aucahuasi/analitzaplot'.
Put the analitzaplot API inside an Analitza namespace
Helps to unify with the rest of the analitza API.
M +2 -0 analitzagui/CMakeLists.txt
M +2 -0 analitzagui/plotsview2d.cpp
M +5 -0 analitzagui/plotsview2d.h
M +2 -0 analitzagui/plotsview3d.cpp
M +6 -3 analitzagui/plotsview3d.h
M +0 -2 analitzaplot/CMakeLists.txt
M +3 -1 analitzaplot/examples/plots2ddemo.cpp
M +3 -1 analitzaplot/examples/plots3ddemo.cpp
M +2 -0 analitzaplot/examples/plotsdictionarydemo.cpp
M +2 -1 analitzaplot/functiongraph.cpp
M +4 -1 analitzaplot/functiongraph.h
M +1 -0 analitzaplot/planecurve.cpp
M +2 -1 analitzaplot/planecurve.h
M +2 -0 analitzaplot/plotitem.cpp
M +5 -1 analitzaplot/plotitem.h
M +2 -0 analitzaplot/plotsdictionarymodel.cpp
M +5 -1 analitzaplot/plotsdictionarymodel.h
M +2 -0 analitzaplot/plotsfactory.cpp
M +6 -6 analitzaplot/plotsfactory.h
M +2 -0 analitzaplot/plotsmodel.cpp
M +5 -1 analitzaplot/plotsmodel.h
M +8 -4 analitzaplot/plotter2d.cpp
M +10 -7 analitzaplot/plotter2d.h
M +3 -2 analitzaplot/plotter3d.cpp
M +9 -5 analitzaplot/plotter3d.h
M +4 -9 analitzaplot/plottingenums.h
M +2 -0 analitzaplot/private/abstractfunctiongraph.cpp
M +2 -0 analitzaplot/private/abstractfunctiongraph.h
M +2 -0 analitzaplot/private/abstractplanecurve.cpp
M +4 -1 analitzaplot/private/abstractplanecurve.h
M +1 -0 analitzaplot/private/abstractplotitem.cpp
M +3 -5 analitzaplot/private/abstractplotitem.h
M +2 -0 analitzaplot/private/abstractspacecurve.cpp
M +3 -1 analitzaplot/private/abstractspacecurve.h
M +2 -0 analitzaplot/private/abstractsurface.cpp
M +4 -0 analitzaplot/private/abstractsurface.h
M +2 -0 analitzaplot/private/backends/cartesiancurve.cpp
M +2 -0 analitzaplot/private/backends/cartesiansurface.cpp
M +2 -0 analitzaplot/private/backends/cylindricalsurface.cpp
M +2 -1 analitzaplot/private/backends/implicitcurve.cpp
M +2 -0 analitzaplot/private/backends/implicitpolarcurve.cpp
M +2 -0 analitzaplot/private/backends/implicitsurface.cpp
M +2 -3 analitzaplot/private/backends/parametricsurface.cpp
M +2 -0 analitzaplot/private/backends/polarcurve.cpp
M +2 -0 analitzaplot/private/backends/sphericalsurface.cpp
M +2 -0 analitzaplot/private/functiongraphfactory.cpp
M +6 -6 analitzaplot/private/functiongraphfactory.h
M +2 -1 analitzaplot/spacecurve.cpp
M +4 -0 analitzaplot/spacecurve.h
M +2 -0 analitzaplot/surface.cpp
M +4 -0 analitzaplot/surface.h
M +1 -1 analitzaplot/tests/planecurvetest.cpp
M +2 -0 analitzaplot/tests/plotsdictionarymodeltest.cpp
M +1 -1 analitzaplot/tests/plotsmodeltest.cpp
M +2 -4 analitzaplot/tests/plotsmodeltest.h
M +1 -1 analitzaplot/tests/spacecurvetest.cpp
M +1 -1 analitzaplot/tests/surfacetest.cpp
http://commits.kde.org/analitza/8df830e3d8eb28447a0887756e79102a27664e97
diff --git a/analitzagui/CMakeLists.txt b/analitzagui/CMakeLists.txt
index 7197160..6111a46 100644
--- a/analitzagui/CMakeLists.txt
+++ b/analitzagui/CMakeLists.txt
@@ -40,6 +40,8 @@ install(FILES
operatorsmodel.h
variablesmodel.h
expressionedit.h
+ plotsview2d.h
+ plotsview3d.h
DESTINATION ${INCLUDE_INSTALL_DIR}/analitzagui/ COMPONENT Devel
)
diff --git a/analitzagui/plotsview2d.cpp b/analitzagui/plotsview2d.cpp
index e79bdc5..56b688e 100644
--- a/analitzagui/plotsview2d.cpp
+++ b/analitzagui/plotsview2d.cpp
@@ -40,6 +40,8 @@
#include <cmath>
#include <KColorUtils>
+using namespace Analitza;
+
PlotsView2D::PlotsView2D(QWidget *parent)
: QWidget(parent)
, Plotter2D(size())
diff --git a/analitzagui/plotsview2d.h b/analitzagui/plotsview2d.h
index 7b6df2d..af83d06 100644
--- a/analitzagui/plotsview2d.h
+++ b/analitzagui/plotsview2d.h
@@ -40,6 +40,9 @@
*/
class QItemSelectionModel;
+
+namespace Analitza
+{
class PlotsModel;
class ANALITZAGUI_EXPORT PlotsView2D : public QWidget, public Plotter2D
@@ -155,4 +158,6 @@ private:
QAbstractItemModel *m_currentModel; // use this pointer to disconnect signals \
when change the model };
+}
+
#endif
diff --git a/analitzagui/plotsview3d.cpp b/analitzagui/plotsview3d.cpp
index 5f99a75..0e850d3 100644
--- a/analitzagui/plotsview3d.cpp
+++ b/analitzagui/plotsview3d.cpp
@@ -27,6 +27,8 @@
#include <QVector>
#include <QDebug>
+using namespace Analitza;
+
PlotsView3D::PlotsView3D(QWidget *parent)
: QGLWidget(parent), m_selection(0)
{
diff --git a/analitzagui/plotsview3d.h b/analitzagui/plotsview3d.h
index 091ed78..2c12eac 100644
--- a/analitzagui/plotsview3d.h
+++ b/analitzagui/plotsview3d.h
@@ -28,9 +28,12 @@
#include "analitzaguiexport.h"
#include <analitzaplot/plotter3d.h>
+class QItemSelectionModel;
+
+namespace Analitza
+{
class Surface;
class PlotItem;
-class QItemSelectionModel;
class ANALITZAGUI_EXPORT PlotsView3D : public QGLWidget, public Plotter3D
{
@@ -69,6 +72,6 @@ private:
double old_x, old_y;
};
-#endif
-
+}
+#endif
diff --git a/analitzaplot/CMakeLists.txt b/analitzaplot/CMakeLists.txt
index c9372a6..7189957 100644
--- a/analitzaplot/CMakeLists.txt
+++ b/analitzaplot/CMakeLists.txt
@@ -84,9 +84,7 @@ install(FILES
plotsmodel.h
plotsdictionarymodel.h
plotter2d.h
- plotsview2d.h
plotter3d.h
- plotsview3d.h
plottingenums.h
plotsfactory.h
diff --git a/analitzaplot/examples/plots2ddemo.cpp \
b/analitzaplot/examples/plots2ddemo.cpp index 78edcfc..fd83e0b 100644
--- a/analitzaplot/examples/plots2ddemo.cpp
+++ b/analitzaplot/examples/plots2ddemo.cpp
@@ -28,11 +28,13 @@
#include "analitzaplot/planecurve.h"
#include "analitzaplot/surface.h"
-#include "analitzaplot/plotsview2d.h"
+#include "analitzagui//plotsview2d.h"
#include "analitzaplot/plotsmodel.h"
#include <plotsfactory.h>
#include <analitza/expression.h>
+using namespace Analitza;
+
int main(int argc, char *argv[])
{
KAboutData aboutData("PlotView2DTest",
diff --git a/analitzaplot/examples/plots3ddemo.cpp \
b/analitzaplot/examples/plots3ddemo.cpp index 1623324..7d576a4 100644
--- a/analitzaplot/examples/plots3ddemo.cpp
+++ b/analitzaplot/examples/plots3ddemo.cpp
@@ -29,10 +29,12 @@
#include "analitzaplot/surface.h"
#include "analitzaplot/spacecurve.h"
#include "analitzaplot/plotsmodel.h"
-#include "analitzaplot/plotsview3d.h"
+#include <analitzagui/plotsview3d.h>
#include <plotsfactory.h>
#include <analitza/expression.h>
+using namespace Analitza;
+
int main(int argc, char *argv[])
{
KAboutData aboutData("PlotView3DTest",
diff --git a/analitzaplot/examples/plotsdictionarydemo.cpp \
b/analitzaplot/examples/plotsdictionarydemo.cpp index d43c636..10516e8 100644
--- a/analitzaplot/examples/plotsdictionarydemo.cpp
+++ b/analitzaplot/examples/plotsdictionarydemo.cpp
@@ -26,6 +26,8 @@
#include <plotsdictionarymodel.h>
#include <plotsmodel.h>
+using namespace Analitza;
+
int main(int argc, char *argv[])
{
KAboutData aboutData("PlotsDictionaryDemo",
diff --git a/analitzaplot/functiongraph.cpp b/analitzaplot/functiongraph.cpp
index d4d1a2b..f9a1471 100644
--- a/analitzaplot/functiongraph.cpp
+++ b/analitzaplot/functiongraph.cpp
@@ -20,9 +20,10 @@
#include "functiongraph.h"
#include "private/abstractfunctiongraph.h"
-
#include "private/functiongraphfactory.h"
+using namespace Analitza;
+
FunctionGraph::FunctionGraph(AbstractFunctionGraph *g)
: PlotItem("123123213123", Qt::black)
, m_functionGraph(g)
diff --git a/analitzaplot/functiongraph.h b/analitzaplot/functiongraph.h
index 8ea5cb8..925eed4 100644
--- a/analitzaplot/functiongraph.h
+++ b/analitzaplot/functiongraph.h
@@ -24,6 +24,9 @@
#include "plotitem.h"
#include <QPair>
+namespace Analitza
+{
+
class AbstractFunctionGraph;
class ANALITZAPLOT_EXPORT FunctionGraph : public PlotItem
@@ -70,6 +73,6 @@ private:
QString m_display;
};
-
+}
#endif // FUNCTIONGRAPH2_H
diff --git a/analitzaplot/planecurve.cpp b/analitzaplot/planecurve.cpp
index 2702c2c..8b6350f 100644
--- a/analitzaplot/planecurve.cpp
+++ b/analitzaplot/planecurve.cpp
@@ -26,6 +26,7 @@
#include "private/functiongraphfactory.h"
+using namespace Analitza;
PlaneCurve::PlaneCurve(AbstractFunctionGraph* g )
: FunctionGraph(g)
diff --git a/analitzaplot/planecurve.h b/analitzaplot/planecurve.h
index e13b4f9..bb8c897 100644
--- a/analitzaplot/planecurve.h
+++ b/analitzaplot/planecurve.h
@@ -32,7 +32,6 @@ namespace Analitza
{
class Variables;
class Expression;
-}
class AbstractPlaneCurve;
class AbstractSurface;
@@ -49,4 +48,6 @@ public:
QLineF tangent(const QPointF &mousepos);// calculate the tangent to the curve \
based on the mouse };
+}
+
#endif // ANALITZAPLOT_FUNCTION_H
diff --git a/analitzaplot/plotitem.cpp b/analitzaplot/plotitem.cpp
index b6f7679..c741ff9 100644
--- a/analitzaplot/plotitem.cpp
+++ b/analitzaplot/plotitem.cpp
@@ -20,6 +20,8 @@
#include "plotitem.h"
#include "plotsmodel.h"
+using namespace Analitza;
+
PlotItem::PlotItem(const QString &n, const QColor& col)
: m_name(n)
, m_color(col)
diff --git a/analitzaplot/plotitem.h b/analitzaplot/plotitem.h
index 940f2b7..f2050f4 100644
--- a/analitzaplot/plotitem.h
+++ b/analitzaplot/plotitem.h
@@ -26,7 +26,9 @@
#include "analitzaplotexport.h"
#include "plottingenums.h"
-namespace Analitza { class Variables; class Expression; }
+namespace Analitza {
+class Variables;
+class Expression;
class PlotsModel;
class DictionaryItem;
@@ -65,4 +67,6 @@ private:
PlotsModel *m_model;
};
+}
+
#endif // ANALITZAPLOT_PLOTITEM_H
diff --git a/analitzaplot/plotsdictionarymodel.cpp \
b/analitzaplot/plotsdictionarymodel.cpp index 02a99b9..e87b81f 100644
--- a/analitzaplot/plotsdictionarymodel.cpp
+++ b/analitzaplot/plotsdictionarymodel.cpp
@@ -26,6 +26,8 @@
#include <analitzaplot/plotsfactory.h>
#include <QFile>
+using namespace Analitza;
+
PlotsDictionaryModel::PlotsDictionaryModel(QObject* parent)
: QStandardItemModel(parent)
, m_currentItem(-1)
diff --git a/analitzaplot/plotsdictionarymodel.h \
b/analitzaplot/plotsdictionarymodel.h index 3c5da06..908b605 100644
--- a/analitzaplot/plotsdictionarymodel.h
+++ b/analitzaplot/plotsdictionarymodel.h
@@ -25,7 +25,10 @@
#include "analitzaplotexport.h"
+namespace Analitza
+{
class PlotsModel;
+
class ANALITZAPLOT_EXPORT PlotsDictionaryModel : public QStandardItemModel
{
Q_OBJECT
@@ -51,5 +54,6 @@ private:
int m_currentItem;
};
-#endif
+}
+#endif
diff --git a/analitzaplot/plotsfactory.cpp b/analitzaplot/plotsfactory.cpp
index 70eacbe..68851b8 100644
--- a/analitzaplot/plotsfactory.cpp
+++ b/analitzaplot/plotsfactory.cpp
@@ -24,6 +24,8 @@
#include <analitza/analyzer.h>
#include <QStringList>
+using namespace Analitza;
+
K_GLOBAL_STATIC(PlotsFactory, factoryInstance)
PlotsFactory::PlotsFactory()
diff --git a/analitzaplot/plotsfactory.h b/analitzaplot/plotsfactory.h
index 9b0a2b4..3e0d998 100644
--- a/analitzaplot/plotsfactory.h
+++ b/analitzaplot/plotsfactory.h
@@ -22,15 +22,13 @@
#include "plottingenums.h"
#include "analitzaplotexport.h"
#include <analitza/expression.h>
-#include <QColor>
+class QColor;
+
+namespace Analitza {
+class Variables;
class FunctionGraph;
class PlotsModel;
-namespace Analitza {
- class Expression;
- class Variables;
-}
-
class PlotItem;
class ANALITZAPLOT_EXPORT PlotBuilder
@@ -62,4 +60,6 @@ class ANALITZAPLOT_EXPORT PlotsFactory
QStringList examples(Dimensions s) const;
};
+}
+
#endif // PLOTSFACTORY_H
diff --git a/analitzaplot/plotsmodel.cpp b/analitzaplot/plotsmodel.cpp
index 4518774..bb98757 100644
--- a/analitzaplot/plotsmodel.cpp
+++ b/analitzaplot/plotsmodel.cpp
@@ -29,6 +29,8 @@
#include <KIcon>
#include <analitzaplot/functiongraph.h>
+using namespace Analitza;
+
Q_DECLARE_METATYPE(PlotItem*);
PlotsModel::PlotsModel(QObject* parent)
diff --git a/analitzaplot/plotsmodel.h b/analitzaplot/plotsmodel.h
index 2378b20..4478f5a 100644
--- a/analitzaplot/plotsmodel.h
+++ b/analitzaplot/plotsmodel.h
@@ -24,6 +24,8 @@
#include "analitzaplot/analitzaplotexport.h"
+namespace Analitza
+{
class PlotItem;
class ANALITZAPLOT_EXPORT PlotsModel : public QAbstractListModel
@@ -62,4 +64,6 @@ private:
int m_resolution;
};
-#endif // FUNCTIONGRAPHMODEL_H
+}
+
+#endif // PLOTSMODEL_H
diff --git a/analitzaplot/plotter2d.cpp b/analitzaplot/plotter2d.cpp
index 73ed8b8..4a10b34 100644
--- a/analitzaplot/plotter2d.cpp
+++ b/analitzaplot/plotter2d.cpp
@@ -38,6 +38,8 @@
// bool isinf(double x) { return !finite(x) && x==x; }
#endif
+using namespace Analitza;
+
Q_DECLARE_METATYPE(PlotItem*);
using namespace std;
@@ -47,10 +49,12 @@ using namespace std;
QColor const Plotter2D::m_axeColor(100,100,255);
QColor const Plotter2D::m_derivativeColor(90,90,160);
-struct GridInfo
-{
- qreal inc, xini, yini, xend, yend;
-};
+namespace Analitza {
+ struct GridInfo
+ {
+ qreal inc, xini, yini, xend, yend;
+ };
+}
Plotter2D::Plotter2D(const QSizeF& size)
: m_squares(true), m_keepRatio(true), m_dirty(true), m_size(size), m_model(0)
diff --git a/analitzaplot/plotter2d.h b/analitzaplot/plotter2d.h
index 54d7545..b290d41 100644
--- a/analitzaplot/plotter2d.h
+++ b/analitzaplot/plotter2d.h
@@ -17,9 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA \
*
*************************************************************************************/
-
-#ifndef FUNCTIONSPAINTER_H
-#define FUNCTIONSPAINTER_H
+#ifndef PLOTTER2D_H
+#define PLOTTER2D_H
#include <QRectF>
#include <QLineF>
@@ -30,14 +29,16 @@
#include "analitzaplotexport.h"
#include <analitzaplot/plottingenums.h>
-struct GridInfo;
-class PlotItem;
class QAbstractItemModel;
class QPainter;
class QPaintDevice;
-
class QModelIndex;
+namespace Analitza
+{
+struct GridInfo;
+class PlotItem;
+
class ANALITZAPLOT_EXPORT Plotter2D
{
public:
@@ -132,4 +133,6 @@ class ANALITZAPLOT_EXPORT Plotter2D
QColor m_gridColor;
};
-#endif // FUNCTIONSPAINTER_H
+}
+
+#endif // PLOTTER2D_H
diff --git a/analitzaplot/plotter3d.cpp b/analitzaplot/plotter3d.cpp
index 79f0919..cf55f2e 100644
--- a/analitzaplot/plotter3d.cpp
+++ b/analitzaplot/plotter3d.cpp
@@ -36,9 +36,10 @@
// bool isinf(double x) { return !finite(x) && x==x; }
#endif
-Q_DECLARE_METATYPE(PlotItem*);
-
using namespace std;
+using namespace Analitza;
+
+Q_DECLARE_METATYPE(PlotItem*);
const GLubyte Plotter3D::XAxisArrowColor[] = {250 -1 , 1, 1};
const GLubyte Plotter3D::YAxisArrowColor[] = {1, 255 - 1, 1};
diff --git a/analitzaplot/plotter3d.h b/analitzaplot/plotter3d.h
index 9d44737..995b67e 100644
--- a/analitzaplot/plotter3d.h
+++ b/analitzaplot/plotter3d.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA \
*
*************************************************************************************/
-#ifndef FUNCTIONSPAINTER3D_H
-#define FUNCTIONSPAINTER3D_H
+#ifndef PLOTTER3D_H
+#define PLOTTER3D_H
#include "plotitem.h"
@@ -35,9 +35,11 @@
class QAbstractItemModel;
class QPainter;
class QPaintDevice;
-
class QModelIndex;
+namespace Analitza
+{
+
/**
* @class Plotter3D
* @author Percy Camilo T. Aucahuasi
@@ -149,7 +151,9 @@ class ANALITZAPLOT_EXPORT Plotter3D
CartesianAxis m_currentAxisIndicator;
bool m_simpleRotation;
QVector3D m_simpleRotationVector;
- QVector3D m_lightpos;
+ QVector3D m_lightpos;
};
-#endif // FUNCTIONSPAINTER3D_H
+}
+
+#endif // PLOTTER3D_H
diff --git a/analitzaplot/plottingenums.h b/analitzaplot/plottingenums.h
index e2a033a..351629b 100644
--- a/analitzaplot/plottingenums.h
+++ b/analitzaplot/plottingenums.h
@@ -22,6 +22,8 @@
#include <QFlags>
+namespace Analitza {
+
enum Dimension {
Dim1D = 1,
Dim2D = 2,
@@ -48,21 +50,14 @@ enum PlotStyle {
Dots = 1,
Wired,
Solid
- //TODO SolidAndWired used by surface to show polygons of the surface mesh
- //SolidAndWired,
};
-//TODO
-// enum PlottingAttributes {
-// Transparent = 1,
-// Decorated = 2, // in case of surfaces normlas ...
-// WithInfo=4 // extra info like singular points, intersetciont with other plots \
etc
-// };
-
enum PlottingFocusPolicy
{
Current,
All
};
+}
+
#endif
diff --git a/analitzaplot/private/abstractfunctiongraph.cpp \
b/analitzaplot/private/abstractfunctiongraph.cpp index e45e228..e63d7a8 100644
--- a/analitzaplot/private/abstractfunctiongraph.cpp
+++ b/analitzaplot/private/abstractfunctiongraph.cpp
@@ -24,6 +24,8 @@
#include "analitza/variable.h"
#include <analitza/variables.h>
+using namespace Analitza;
+
// combobox For 3 or fewer options, use a set of radio buttons.
// no combo para dict For more than 10 options, use a list.
// get new plots
diff --git a/analitzaplot/private/abstractfunctiongraph.h \
b/analitzaplot/private/abstractfunctiongraph.h index eaafa07..83b47df 100644
--- a/analitzaplot/private/abstractfunctiongraph.h
+++ b/analitzaplot/private/abstractfunctiongraph.h
@@ -53,6 +53,7 @@ static QString IconName() { return (name); }
#define EXAMPLES(exs) \
static QStringList Examples() { return (exs); }
+namespace Analitza {
class AbstractFunctionGraph : public AbstractMappingGraph
{
@@ -225,5 +226,6 @@ private:
QMap<QString, RealInterval > m_argumentIntervals;
};
+}
#endif // ABSTRACTFUNCTIONGRAPH_H
diff --git a/analitzaplot/private/abstractplanecurve.cpp \
b/analitzaplot/private/abstractplanecurve.cpp index 2751eb5..10190bc 100644
--- a/analitzaplot/private/abstractplanecurve.cpp
+++ b/analitzaplot/private/abstractplanecurve.cpp
@@ -27,6 +27,8 @@
#include "abstractplanecurve.h"
#include "utils/mathutils.h"
+using namespace Analitza;
+
AbstractPlaneCurve::AbstractPlaneCurve(const Analitza::Expression& e, \
Analitza::Variables* v) : AbstractFunctionGraph(e, v)
{}
diff --git a/analitzaplot/private/abstractplanecurve.h \
b/analitzaplot/private/abstractplanecurve.h index c9662e2..59aa10d 100644
--- a/analitzaplot/private/abstractplanecurve.h
+++ b/analitzaplot/private/abstractplanecurve.h
@@ -26,7 +26,8 @@
#define CONSTRUCTORS(name) \
name (const Analitza::Expression &functionExpression, Analitza::Variables \
*variables) :AbstractPlaneCurve(functionExpression, variables) { }
-namespace Analitza { class Variables; }
+namespace Analitza {
+class Variables;
class AbstractPlaneCurve : public AbstractFunctionGraph
{
@@ -45,4 +46,6 @@ protected:
bool addPoint(const QPointF& p);
};
+}
+
#endif // ANALITZAPLOT_ABSTRACTPLANECURVE_H
diff --git a/analitzaplot/private/abstractplotitem.cpp \
b/analitzaplot/private/abstractplotitem.cpp index 059e4ca..32905ae 100644
--- a/analitzaplot/private/abstractplotitem.cpp
+++ b/analitzaplot/private/abstractplotitem.cpp
@@ -19,6 +19,7 @@
#include "abstractplotitem.h"
+using namespace Analitza;
AbstractMappingGraph::~AbstractMappingGraph()
{
diff --git a/analitzaplot/private/abstractplotitem.h \
b/analitzaplot/private/abstractplotitem.h index bd2ebd7..69d7d1c 100644
--- a/analitzaplot/private/abstractplotitem.h
+++ b/analitzaplot/private/abstractplotitem.h
@@ -23,12 +23,8 @@
#include <plottingenums.h>
-//NOTE
-//para construir estos backends/abstract solo re necesitaa que su ctor tenga exp y \
varmod ...
-//en la funcion y en el metodo factory id es donde se requiere que tenga mas detalle \
ademas de exp y varsmod
-// por ejemolo coordsys en el caso de surf
+namespace Analitza {
-class QString;
class AbstractMappingGraph //strategy pattern
{
public:
@@ -44,4 +40,6 @@ protected:
AbstractMappingGraph() {}
};
+}
+
#endif // ABSTRACTMAPPINGGRAPH_H
diff --git a/analitzaplot/private/abstractspacecurve.cpp \
b/analitzaplot/private/abstractspacecurve.cpp index 9f51045..671939d 100644
--- a/analitzaplot/private/abstractspacecurve.cpp
+++ b/analitzaplot/private/abstractspacecurve.cpp
@@ -29,6 +29,8 @@
#include "abstractspacecurve.h"
#include "utils/mathutils.h"
+using namespace Analitza;
+
using std::atan2;
AbstractSpaceCurve::AbstractSpaceCurve(const Analitza::Expression& e, \
Analitza::Variables* v)
diff --git a/analitzaplot/private/abstractspacecurve.h \
b/analitzaplot/private/abstractspacecurve.h index c36e27e..9a4d0dc 100644
--- a/analitzaplot/private/abstractspacecurve.h
+++ b/analitzaplot/private/abstractspacecurve.h
@@ -24,7 +24,8 @@
#define CONSTRUCTORS(name) \
name (const Analitza::Expression &functionExpression, Analitza::Variables \
*variables) :AbstractSpaceCurve(functionExpression, variables) { }
-namespace Analitza { class Variables; }
+namespace Analitza {
+class Variables;
class AbstractSpaceCurve : public AbstractFunctionGraph
{
@@ -48,5 +49,6 @@ private:
AbstractSpaceCurve();
};
+}
#endif // ABSTRACTSPACECURVE_H
diff --git a/analitzaplot/private/abstractsurface.cpp \
b/analitzaplot/private/abstractsurface.cpp index 27e6445..c5975cd 100644
--- a/analitzaplot/private/abstractsurface.cpp
+++ b/analitzaplot/private/abstractsurface.cpp
@@ -25,6 +25,8 @@
#define MAXSTRIP 32
#define MAXALONG 32
+using namespace Analitza;
+
AbstractSurface::AbstractSurface(const Analitza::Expression& e, Analitza::Variables* \
v) : AbstractFunctionGraph(e, v)
{}
diff --git a/analitzaplot/private/abstractsurface.h \
b/analitzaplot/private/abstractsurface.h index 64abc12..5481954 100644
--- a/analitzaplot/private/abstractsurface.h
+++ b/analitzaplot/private/abstractsurface.h
@@ -25,6 +25,8 @@
#define CONSTRUCTORS(name) \
name (const Analitza::Expression &functionExpression, Analitza::Variables \
*variables) : AbstractSurface(functionExpression, variables) { }
+namespace Analitza {
+
class AbstractSurface : public AbstractFunctionGraph //strategy pattern for curves
{
public:
@@ -51,4 +53,6 @@ private:
void createFace( QVector3D *buffer );
};
+}
+
#endif // ABSTRACTSURFACE_H
diff --git a/analitzaplot/private/backends/cartesiancurve.cpp \
b/analitzaplot/private/backends/cartesiancurve.cpp index 33c0ec6..3f38c35 100644
--- a/analitzaplot/private/backends/cartesiancurve.cpp
+++ b/analitzaplot/private/backends/cartesiancurve.cpp
@@ -27,6 +27,8 @@
#include "analitza/variable.h"
#include "analitza/localize.h"
+using namespace Analitza;
+
class FunctionCartesian : public AbstractPlaneCurve
{
public:
diff --git a/analitzaplot/private/backends/cartesiansurface.cpp \
b/analitzaplot/private/backends/cartesiansurface.cpp index 8062130..90a5e90 100644
--- a/analitzaplot/private/backends/cartesiansurface.cpp
+++ b/analitzaplot/private/backends/cartesiansurface.cpp
@@ -26,6 +26,8 @@
#include <analitza/localize.h>
#include <QVector3D>
+using namespace Analitza;
+
//TODO macros para las prop e abajo
//NOTE
diff --git a/analitzaplot/private/backends/cylindricalsurface.cpp \
b/analitzaplot/private/backends/cylindricalsurface.cpp index 97b3604..d9f4d0a 100644
--- a/analitzaplot/private/backends/cylindricalsurface.cpp
+++ b/analitzaplot/private/backends/cylindricalsurface.cpp
@@ -25,6 +25,8 @@
#include <analitza/vector.h>
#include <analitza/localize.h>
+using namespace Analitza;
+
//TODO macros para las prop e abajo
class Frp : public AbstractSurface/*, static class? better macros FooClass*/
diff --git a/analitzaplot/private/backends/implicitcurve.cpp \
b/analitzaplot/private/backends/implicitcurve.cpp index 9efd499..68103af 100644
--- a/analitzaplot/private/backends/implicitcurve.cpp
+++ b/analitzaplot/private/backends/implicitcurve.cpp
@@ -30,6 +30,7 @@
#include <analitza/expressiontype.h>
#include <analitza/variable.h>
#include <analitza/variables.h>
+#include "private/utils/marchingsquares.h"
#ifndef M_PI
#define M_PI 3.14159265358979323846
@@ -37,7 +38,7 @@
static const double pi=M_PI;
-#include "private/utils/marchingsquares.h"
+using namespace Analitza;
class FunctionImplicit : public AbstractPlaneCurve, public MarchingSquares
{
diff --git a/analitzaplot/private/backends/implicitpolarcurve.cpp \
b/analitzaplot/private/backends/implicitpolarcurve.cpp index e4c7cb8..d7847a0 100644
--- a/analitzaplot/private/backends/implicitpolarcurve.cpp
+++ b/analitzaplot/private/backends/implicitpolarcurve.cpp
@@ -29,6 +29,8 @@
#define M_PI 3.14159265358979323846
#endif
+using namespace Analitza;
+
static const double pi=M_PI;
class ImplicitPolar : public AbstractPlaneCurve, MarchingSquares
diff --git a/analitzaplot/private/backends/implicitsurface.cpp \
b/analitzaplot/private/backends/implicitsurface.cpp index ab2acd7..4c0f281 100644
--- a/analitzaplot/private/backends/implicitsurface.cpp
+++ b/analitzaplot/private/backends/implicitsurface.cpp
@@ -26,6 +26,8 @@
#include "private/utils/marchingcubes.h"
+using namespace Analitza;
+
class ImplicitSurf : public AbstractSurface , public MarchingCubes/*, static class? \
better macros FooClass*/ {
public:
diff --git a/analitzaplot/private/backends/parametricsurface.cpp \
b/analitzaplot/private/backends/parametricsurface.cpp index ce9eb8a..5f66b5b 100644
--- a/analitzaplot/private/backends/parametricsurface.cpp
+++ b/analitzaplot/private/backends/parametricsurface.cpp
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA \
*
*************************************************************************************/
-
-
-
#include "private/abstractsurface.h"
// #include "private/surfacefactory.h"
#include "private/functiongraphfactory.h"
@@ -27,6 +24,8 @@
#include <analitza/value.h>
#include <analitza/vector.h>
+using namespace Analitza;
+
class ParamSurf : public AbstractSurface
{
public:
diff --git a/analitzaplot/private/backends/polarcurve.cpp \
b/analitzaplot/private/backends/polarcurve.cpp index a522bb2..b1e306c 100644
--- a/analitzaplot/private/backends/polarcurve.cpp
+++ b/analitzaplot/private/backends/polarcurve.cpp
@@ -30,6 +30,8 @@
#endif
static const double pi=M_PI;
+using namespace Analitza;
+
class FunctionPolar : public AbstractPlaneCurve
{
public:
diff --git a/analitzaplot/private/backends/sphericalsurface.cpp \
b/analitzaplot/private/backends/sphericalsurface.cpp index 31f2795..471dfec 100644
--- a/analitzaplot/private/backends/sphericalsurface.cpp
+++ b/analitzaplot/private/backends/sphericalsurface.cpp
@@ -25,6 +25,8 @@
#include <analitza/value.h>
#include <analitza/vector.h>
+using namespace Analitza;
+
class SphericalSurface : public AbstractSurface/*, static class? better macros \
FooClass*/ {
public:
diff --git a/analitzaplot/private/functiongraphfactory.cpp \
b/analitzaplot/private/functiongraphfactory.cpp index d1e391a..a636351 100644
--- a/analitzaplot/private/functiongraphfactory.cpp
+++ b/analitzaplot/private/functiongraphfactory.cpp
@@ -24,6 +24,8 @@
#include <analitza/analyzer.h>
#include <KLocalizedString>
+using namespace Analitza;
+
FunctionGraphFactory* FunctionGraphFactory::m_self=0;
QString FunctionGraphFactory::typeName(const QString& id) const
diff --git a/analitzaplot/private/functiongraphfactory.h \
b/analitzaplot/private/functiongraphfactory.h index dbc28ff..3b4fcc4 100644
--- a/analitzaplot/private/functiongraphfactory.h
+++ b/analitzaplot/private/functiongraphfactory.h
@@ -41,14 +41,13 @@ static AbstractFunctionGraph * vcreate##name(const \
Analitza::Expression &exp, An #define REGISTER_PLANECURVE(...) \
REGISTER_FUNCTIONGRAPH_DIM(Dim2D, FunctionGraphFactory::createPlotItem<PlaneCurve>, \
__VA_ARGS__) #define REGISTER_SPACECURVE(...) REGISTER_FUNCTIONGRAPH_DIM(Dim3D, \
FunctionGraphFactory::createPlotItem<SpaceCurve>, __VA_ARGS__) #define \
REGISTER_SURFACE(...) REGISTER_FUNCTIONGRAPH_DIM(Dim3D, \
FunctionGraphFactory::createPlotItem<Surface>, __VA_ARGS__)
-
+
+namespace Analitza {
+class Variables;
+class Expression;
+class ExpressionType;
class AbstractFunctionGraph;
class PlotItem;
-namespace Analitza {
- class Variables;
- class Expression;
- class ExpressionType;
-}
class FunctionGraphFactory
{
@@ -106,5 +105,6 @@ private:
QMap<QString, BuilderFunctionWithVars> builderFunctionsWithVars;
};
+}
#endif // ABSTRACTFUNCTIONGRAPHFACTORY_H
diff --git a/analitzaplot/spacecurve.cpp b/analitzaplot/spacecurve.cpp
index e77891d..6aa64dd 100644
--- a/analitzaplot/spacecurve.cpp
+++ b/analitzaplot/spacecurve.cpp
@@ -16,13 +16,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA \
*
*************************************************************************************/
-
#include "spacecurve.h"
#include <KDE/KLocalizedString>
#include "private/abstractspacecurve.h"
+using namespace Analitza;
+
SpaceCurve::SpaceCurve(AbstractFunctionGraph* g)
: FunctionGraph(g)
{}
diff --git a/analitzaplot/spacecurve.h b/analitzaplot/spacecurve.h
index 78bcb49..8301145 100644
--- a/analitzaplot/spacecurve.h
+++ b/analitzaplot/spacecurve.h
@@ -24,6 +24,8 @@
#include "functiongraph.h"
#include <QVector3D>
+namespace Analitza {
+
class ANALITZAPLOT_EXPORT SpaceCurve : public FunctionGraph
{
public:
@@ -38,4 +40,6 @@ protected:
SpaceCurve();
};
+}
+
#endif // SPACECURVE_H
diff --git a/analitzaplot/surface.cpp b/analitzaplot/surface.cpp
index f38a687..84b9949 100644
--- a/analitzaplot/surface.cpp
+++ b/analitzaplot/surface.cpp
@@ -23,6 +23,8 @@
#include "private/functiongraphfactory.h"
#include "private/abstractsurface.h"
+using namespace Analitza;
+
Surface::Surface(AbstractFunctionGraph* g): FunctionGraph(g)
{}
diff --git a/analitzaplot/surface.h b/analitzaplot/surface.h
index 94f4884..f96fff4 100644
--- a/analitzaplot/surface.h
+++ b/analitzaplot/surface.h
@@ -23,6 +23,8 @@
#include <QVector3D>
+namespace Analitza {
+
class ANALITZAPLOT_EXPORT Surface : public FunctionGraph
{
public:
@@ -41,4 +43,6 @@ public:
const QVector<unsigned int> indexes() const;
};
+}
+
#endif // SURFACE_H
diff --git a/analitzaplot/tests/planecurvetest.cpp \
b/analitzaplot/tests/planecurvetest.cpp index 82a37ee..8a3a782 100644
--- a/analitzaplot/tests/planecurvetest.cpp
+++ b/analitzaplot/tests/planecurvetest.cpp
@@ -26,7 +26,7 @@
#include <cmath>
using namespace std;
-using Analitza::Expression;
+using namespace Analitza;
QTEST_KDEMAIN_CORE( PlaneCurveTest )
diff --git a/analitzaplot/tests/plotsdictionarymodeltest.cpp \
b/analitzaplot/tests/plotsdictionarymodeltest.cpp index 206e79a..23ee2d5 100644
--- a/analitzaplot/tests/plotsdictionarymodeltest.cpp
+++ b/analitzaplot/tests/plotsdictionarymodeltest.cpp
@@ -23,6 +23,8 @@
#include <analitzaplot/plotsmodel.h>
#include <analitzaplot/plotsdictionarymodel.h>
+using namespace Analitza;
+
QTEST_KDEMAIN_CORE( PlotsDictionaryModelTest )
Q_DECLARE_METATYPE(PlotItem*);
diff --git a/analitzaplot/tests/plotsmodeltest.cpp \
b/analitzaplot/tests/plotsmodeltest.cpp index 6507d69..f0710e8 100644
--- a/analitzaplot/tests/plotsmodeltest.cpp
+++ b/analitzaplot/tests/plotsmodeltest.cpp
@@ -31,7 +31,7 @@
#include <cmath>
using namespace std;
-using Analitza::Expression;
+using namespace Analitza;
QTEST_KDEMAIN_CORE( PlotsModelTest )
diff --git a/analitzaplot/tests/plotsmodeltest.h \
b/analitzaplot/tests/plotsmodeltest.h index 9e5c582..2a4e700 100644
--- a/analitzaplot/tests/plotsmodeltest.h
+++ b/analitzaplot/tests/plotsmodeltest.h
@@ -21,9 +21,7 @@
#include <QObject>
-class PlotsModel;
-
-namespace Analitza { class Variables; }
+namespace Analitza { class Variables; class PlotsModel; }
class PlotsModelTest : public QObject
{
@@ -39,7 +37,7 @@ Q_OBJECT
void testExamples2D();
private:
- PlotsModel *m_model;
+ Analitza::PlotsModel *m_model;
};
#endif
diff --git a/analitzaplot/tests/spacecurvetest.cpp \
b/analitzaplot/tests/spacecurvetest.cpp index 9abdc11..d7a6fe5 100644
--- a/analitzaplot/tests/spacecurvetest.cpp
+++ b/analitzaplot/tests/spacecurvetest.cpp
@@ -25,7 +25,7 @@
#include <cmath>
using namespace std;
-using Analitza::Expression;
+using namespace Analitza;
QTEST_KDEMAIN_CORE( SpaceCurveTest )
diff --git a/analitzaplot/tests/surfacetest.cpp b/analitzaplot/tests/surfacetest.cpp
index 4b73f7a..b6f1b92 100644
--- a/analitzaplot/tests/surfacetest.cpp
+++ b/analitzaplot/tests/surfacetest.cpp
@@ -25,7 +25,7 @@
#include <cmath>
using namespace std;
-using Analitza::Expression;
+using namespace Analitza;
QTEST_KDEMAIN_CORE( SurfaceTest )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic