diff --git a/src/plotsbuilder.cpp b/src/plotsbuilder.cpp
--- a/src/plotsbuilder.cpp
+++ b/src/plotsbuilder.cpp
@@ -131,17 +131,17 @@
switch (pt)
{
//2D
- caseType(CartesianGraphCurve);
- caseType(CartesianImplicitCurve);
- caseType(CartesianParametricCurve2D);
- caseType(PolarGraphCurve);
+ caseType(CartesianGraphCurve)
+ caseType(CartesianImplicitCurve)
+ caseType(CartesianParametricCurve2D)
+ caseType(PolarGraphCurve)
//3D
- caseType(CartesianParametricCurve3D);
- caseType(CartesianGraphSurface);
- caseType(CartesianImplicitSurface);
- caseType(CartesianParametricSurface);
- caseType(CylindricalGraphSurface);
- caseType(SphericalGraphSurface);
+ caseType(CartesianParametricCurve3D)
+ caseType(CartesianGraphSurface)
+ caseType(CartesianImplicitSurface)
+ caseType(CartesianParametricSurface)
+ caseType(CylindricalGraphSurface)
+ caseType(SphericalGraphSurface)
case(None): break;
}
}
@@ -151,18 +151,18 @@
#define showType(tname) m_widget->build##tname->show();
//2D
- showType(CartesianGraphCurve);
- showType(CartesianGraphCurve);
- showType(CartesianImplicitCurve);
- showType(CartesianParametricCurve2D);
- showType(PolarGraphCurve);
+ showType(CartesianGraphCurve)
+ showType(CartesianGraphCurve)
+ showType(CartesianImplicitCurve)
+ showType(CartesianParametricCurve2D)
+ showType(PolarGraphCurve)
//3D
- showType(CartesianParametricCurve3D);
- showType(CartesianGraphSurface);
- showType(CartesianImplicitSurface);
- showType(CartesianParametricSurface);
- showType(CylindricalGraphSurface);
- showType(SphericalGraphSurface);
+ showType(CartesianParametricCurve3D)
+ showType(CartesianGraphSurface)
+ showType(CartesianImplicitSurface)
+ showType(CartesianParametricSurface)
+ showType(CylindricalGraphSurface)
+ showType(SphericalGraphSurface)
m_widget->cartesianCurvesLinks->show();
m_widget->polarCurvesLinks->show();
@@ -177,18 +177,18 @@
#define hideType(tname) m_widget->build##tname->hide();
//2D
- hideType(CartesianGraphCurve);
- hideType(CartesianGraphCurve);
- hideType(CartesianImplicitCurve);
- hideType(CartesianParametricCurve2D);
- hideType(PolarGraphCurve);
+ hideType(CartesianGraphCurve)
+ hideType(CartesianGraphCurve)
+ hideType(CartesianImplicitCurve)
+ hideType(CartesianParametricCurve2D)
+ hideType(PolarGraphCurve)
//3D
- hideType(CartesianParametricCurve3D);
- hideType(CartesianGraphSurface);
- hideType(CartesianImplicitSurface);
- hideType(CartesianParametricSurface);
- hideType(CylindricalGraphSurface);
- hideType(SphericalGraphSurface);
+ hideType(CartesianParametricCurve3D)
+ hideType(CartesianGraphSurface)
+ hideType(CartesianImplicitSurface)
+ hideType(CartesianParametricSurface)
+ hideType(CylindricalGraphSurface)
+ hideType(SphericalGraphSurface)
m_widget->cartesianCurvesLinks->hide();
m_widget->polarCurvesLinks->hide();
@@ -203,18 +203,18 @@
#define testType(tname) if (m_types.testFlag( tname )) m_widget->build##tname->show(); else m_widget->build##tname->hide();
//2D
- testType(CartesianGraphCurve);
- testType(CartesianGraphCurve);
- testType(CartesianImplicitCurve);
- testType(CartesianParametricCurve2D);
- testType(PolarGraphCurve);
+ testType(CartesianGraphCurve)
+ testType(CartesianGraphCurve)
+ testType(CartesianImplicitCurve)
+ testType(CartesianParametricCurve2D)
+ testType(PolarGraphCurve)
//3D
- testType(CartesianParametricCurve3D);
- testType(CartesianGraphSurface);
- testType(CartesianImplicitSurface);
- testType(CartesianParametricSurface);
- testType(CylindricalGraphSurface);
- testType(SphericalGraphSurface);
+ testType(CartesianParametricCurve3D)
+ testType(CartesianGraphSurface)
+ testType(CartesianImplicitSurface)
+ testType(CartesianParametricSurface)
+ testType(CylindricalGraphSurface)
+ testType(SphericalGraphSurface)
if (m_types.testFlag(CartesianGraphCurve) || m_types.testFlag(CartesianImplicitCurve) || m_types.testFlag(CartesianParametricCurve2D))
m_widget->cartesianCurvesLinks->show();
diff --git a/src/plotseditor.ui b/src/plotseditor.ui
--- a/src/plotseditor.ui
+++ b/src/plotseditor.ui
@@ -6,8 +6,8 @@
0
0
- 304
- 800
+ 330
+ 817
@@ -24,7 +24,7 @@
-
- 0
+ 2
@@ -40,8 +40,7 @@
-
-
+ ..
@@ -96,8 +95,7 @@
-
-
+ ..
@@ -114,7 +112,8 @@
Edit
-
+
+ ..
@@ -124,7 +123,8 @@
Remove
-
+
+ ..
@@ -664,27 +664,21 @@
-
- KColorCombo
- QComboBox
-
-
KDialogButtonBox
QDialogButtonBox
+
+ KColorCombo
+ QComboBox
+
+
Analitza::ExpressionEdit
QPlainTextEdit
analitzagui/expressionedit.h
-
- QLabel
- QFrame
-
- 1
-
PlotsBuilder
QWidget