From 6fad14e92dfda30c10dd3fe34b592d521d2ead63 Mon Sep 17 00:00:00 2001 From: rnv Date: Tue, 17 Jan 2012 09:33:05 +0000 Subject: [PATCH] Fix remarks for the "0021383: [CEA 507] Plot2d Add analytic functions on curves" issue. --- .../gui/images/analytical_curves_dlg.png | Bin 0 -> 17057 bytes doc/salome/gui/input/plot2d_viewer.doc | 29 ++ src/LightApp/LightApp_Plot2dSelector.cxx | 8 + src/LightApp/LightApp_Plot2dSelector.h | 1 + src/Plot2d/Plot2d_AnalyticalCurveDlg.cxx | 2 +- src/Plot2d/Plot2d_AnalyticalCurveDlg.h | 129 ++++++++ src/Plot2d/Plot2d_AnalyticalParser.cxx | 276 ++++++++++++++++++ src/Plot2d/Plot2d_AnalyticalParser.h | 52 ++++ src/Plot2d/Plot2d_ViewFrame.cxx | 169 ++++++----- src/Plot2d/Plot2d_ViewFrame.h | 32 +- src/Plot2d/Plot2d_ViewWindow.cxx | 19 +- src/Plot2d/Plot2d_ViewWindow.h | 2 +- src/Plot2d/resources/Plot2d_images.ts | 4 +- src/Plot2d/resources/Plot2d_msg_en.ts | 31 +- src/Plot2d/resources/Plot2d_msg_fr.ts | 10 +- ..._curve.png => plot2d_analytical_curve.png} | Bin src/SPlot2d/SPlot2d_ViewModel.cxx | 28 +- src/SPlot2d/SPlot2d_ViewModel.h | 3 + 18 files changed, 680 insertions(+), 115 deletions(-) create mode 100755 doc/salome/gui/images/analytical_curves_dlg.png create mode 100755 src/Plot2d/Plot2d_AnalyticalCurveDlg.h create mode 100755 src/Plot2d/Plot2d_AnalyticalParser.cxx create mode 100755 src/Plot2d/Plot2d_AnalyticalParser.h rename src/Plot2d/resources/{plot2d_analitic_curve.png => plot2d_analytical_curve.png} (100%) diff --git a/doc/salome/gui/images/analytical_curves_dlg.png b/doc/salome/gui/images/analytical_curves_dlg.png new file mode 100755 index 0000000000000000000000000000000000000000..6bddc84cc03a4fe216828446993d2dc58ea22c12 GIT binary patch literal 17057 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 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/input/plot2d_viewer.doc b/doc/salome/gui/input/plot2d_viewer.doc index 17efc2c4c..1c664f75e 100644 --- a/doc/salome/gui/input/plot2d_viewer.doc +++ b/doc/salome/gui/input/plot2d_viewer.doc @@ -144,8 +144,37 @@ or ordinate) of all points displayed in the viewer is greater than zero. XY plots will be displayed with these defined properties.
+\anchor analytical_curve +\image html plot2d_analytical_curve.png +
Analytical curves - provides an access to the analytical curves dialog box, +that allows to add, remove and modify analytical curves for the Plot 2d Viewer.
+ +
+ +\image html analytical_curves_dlg.png + +The options are as follows:
+Curve parameters: +
    +
  • y(x)= allows to specify python expression, which used to calculate coordinates of the points of the curve.
    • +
  • Nb. itervals allows to specify number of the points of the curve.
    • +
+Curve properties: +
    +
  • Auto assign if it is checked, properties of the curves (Line type, Line width, Marker type and Color) +assigned automatically.To define the properties of the curve manually remove the checkmark from this control.
    • +
  • Line type allows to choose curve's line type from (None, Solid, Dash, Dot, Dash - Dot, Dash - Dot - Dot).
    • +
  • Line width allows to specify line width of the curve.
    • +
  • Marker type allows to choose curve's marker type from (Circle, Rectangle, Diamond, Rightward, +Leftward, Downward & Upward Triangle, Cross or Diagonal Cross).
    • +
  • Color allows to specify color of the curve.
    • +
+ +
+ \image html plot2d_clone.png
Clone view - opens a new duplicate scene.
+
\image html plot2d_print.png diff --git a/src/LightApp/LightApp_Plot2dSelector.cxx b/src/LightApp/LightApp_Plot2dSelector.cxx index 05b7c514d..88f4f9327 100755 --- a/src/LightApp/LightApp_Plot2dSelector.cxx +++ b/src/LightApp/LightApp_Plot2dSelector.cxx @@ -22,6 +22,7 @@ #include "LightApp_DataOwner.h" #include "LightApp_DataObject.h" #include "LightApp_Application.h" +#include "SUIT_SelectionMgr.h" #include @@ -36,6 +37,7 @@ LightApp_Plot2dSelector::LightApp_Plot2dSelector( Plot2d_Viewer* v, SUIT_Selecti { if ( v ) connect( v, SIGNAL( legendSelected( const QString& ) ), this, SLOT( onSelectionChanged( const QString& ) ) ); + connect( v, SIGNAL( clearSelected() ), this, SLOT( onClearSelected( ) ) ); } /*! @@ -81,3 +83,9 @@ void LightApp_Plot2dSelector::onSelectionChanged( const QString& entry ) selectionChanged(); myCurEntry = QString(); } + +/*!On clear selected.*/ +void LightApp_Plot2dSelector::onClearSelected( ) +{ + selectionMgr()->clearSelected(); +} \ No newline at end of file diff --git a/src/LightApp/LightApp_Plot2dSelector.h b/src/LightApp/LightApp_Plot2dSelector.h index 4032fa8ed..7a39fa04b 100755 --- a/src/LightApp/LightApp_Plot2dSelector.h +++ b/src/LightApp/LightApp_Plot2dSelector.h @@ -45,6 +45,7 @@ public: private slots: void onSelectionChanged( const QString& ); + void onClearSelected(); protected: virtual void getSelection( SUIT_DataOwnerPtrList& ) const; diff --git a/src/Plot2d/Plot2d_AnalyticalCurveDlg.cxx b/src/Plot2d/Plot2d_AnalyticalCurveDlg.cxx index a57dd27a7..580d5d68d 100755 --- a/src/Plot2d/Plot2d_AnalyticalCurveDlg.cxx +++ b/src/Plot2d/Plot2d_AnalyticalCurveDlg.cxx @@ -499,7 +499,7 @@ void Plot2d_AnalyticalCurveDlg::help() { SUIT_Application* app = SUIT_Session::session()->activeApplication(); if ( app ) - app->onHelpContextModule( "GUI", "plot2d_analytical_curves.html" ); + app->onHelpContextModule( "GUI", "plot2d_viewer_page.html", "analytical_curve" ); } /*! diff --git a/src/Plot2d/Plot2d_AnalyticalCurveDlg.h b/src/Plot2d/Plot2d_AnalyticalCurveDlg.h new file mode 100755 index 000000000..d49ff754d --- /dev/null +++ b/src/Plot2d/Plot2d_AnalyticalCurveDlg.h @@ -0,0 +1,129 @@ +// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : Plot2d_AnalyticalCurveDlg.h +// Author : Roman NIKOLAEV, Open CASCADE S.A.S. (roman.nikolaev@opencascade.com) + + +#ifndef PLOT2D_ANALYTICAL_CURVE_DLG_H +#define PLOT2D_ANALYTICAL_CURVE_DLG_H + +#include "Plot2d.h" +#include "Plot2d_AnalyticalCurve.h" + +#include +#include + +class QListWidget; +class QListWidgetItem; +class QGroupBox; +class QLineEdit; +class QCheckBox; +class QComboBox; +class QPushButton; + +class QtxIntSpinBox; +class QtxColorButton; +class QwtPlot; + +class Plot2d_AnalyticalCurve; +class Plot2d_CurveContainer; +class Plot2d_ViewFrame; + +class PLOT2D_EXPORT Plot2d_AnalyticalCurveDlg : public QDialog +{ + Q_OBJECT + + class Updater; + class UpdateLocker; + + enum { ItemExisting, ItemAdded, ItemRemoved }; + +public: + Plot2d_AnalyticalCurveDlg( Plot2d_CurveContainer*, QWidget* ); + ~Plot2d_AnalyticalCurveDlg(); + + void accept(); + void reject(); + +private: + + void init(); + void initPropsFromCurve(Plot2d_AnalyticalCurve*); + QListWidgetItem* selected() const; + Plot2d_AnalyticalCurve* selectedCurve() const; + QListWidgetItem* getItem(Plot2d_AnalyticalCurve*) const; + bool processCurves(); + QwtPlot* getPlot(); + int propStatus( Plot2d_AnalyticalCurve* = 0, const int def = ItemExisting ); + QString propTitle( Plot2d_AnalyticalCurve* = 0, const QString& def = "" ); + bool propVisible( Plot2d_AnalyticalCurve* = 0, bool def = true ); + QString propFormula( Plot2d_AnalyticalCurve* = 0, const QString& def = "" ); + int propIntervals( Plot2d_AnalyticalCurve* = 0, int def = 100 ); + Plot2d::MarkerType propMarkerType( Plot2d_AnalyticalCurve* = 0, Plot2d::MarkerType def = Plot2d::None ); + Plot2d::LineType propLineType( Plot2d_AnalyticalCurve* = 0, Plot2d::LineType def = Plot2d::NoPen ); + int propLineWidth( Plot2d_AnalyticalCurve* = 0, int def = 0 ); + QColor propColor( Plot2d_AnalyticalCurve* = 0, const QColor& def = QColor() ); + bool propAutoAssign( Plot2d_AnalyticalCurve* = 0, bool def = true ); + +private slots: + void addCurve(); + void removeCurve(); + void updateCurve(); + void updateState(); + void selectionChanged(); + void help(); + void apply(); + +private: + typedef QMap CurveProps; + typedef QMap PropMap; + + Plot2d_CurveContainer* myContainer; + PropMap myProperties; + Updater* myUpdater; + + QListWidget* myCurvesList; + QGroupBox* myCurveParams; + QLineEdit* myFormula; + QtxIntSpinBox* myNbIntervals; + QGroupBox* myCurveProps; + QCheckBox* myAutoAssign; + QWidget* myPropsGrp; + QComboBox* myMarkerType; + QComboBox* myLineType; + QtxIntSpinBox* myLineWidth; + QtxColorButton* myColor; + QPushButton* myAddButton; + QPushButton* myRemoveButton; +}; + +class Plot2d_AnalyticalCurveDlg::Updater : public QObject +{ + Q_OBJECT +public: + Updater( QWidget* parent ); + ~Updater(); +signals: + void update(); +}; + +#endif //PLOT2D_ANALYTICAL_CURVE_DLG_H diff --git a/src/Plot2d/Plot2d_AnalyticalParser.cxx b/src/Plot2d/Plot2d_AnalyticalParser.cxx new file mode 100755 index 000000000..f10a562f0 --- /dev/null +++ b/src/Plot2d/Plot2d_AnalyticalParser.cxx @@ -0,0 +1,276 @@ +// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : Plot2d_AnalyticalParser.cxx +// Author : Roman NIKOLAEV, Open CASCADE S.A.S. (roman.nikolaev@opencascade.com) +#include "Plot2d_AnalyticalParser.h" +#include + + +/* ================================== + * =========== PYTHON ============== + * ==================================*/ + +typedef struct { + PyObject_HEAD + int softspace; + std::string *out; + } PyStdOut; + +static void +PyStdOut_dealloc(PyStdOut *self) +{ + PyObject_Del(self); +} + +static PyObject * +PyStdOut_write(PyStdOut *self, PyObject *args) +{ + char *c; + int l; + if (!PyArg_ParseTuple(args, "t#:write",&c, &l)) + return NULL; + + //std::cerr << c ; + *(self->out)=*(self->out)+c; + + Py_INCREF(Py_None); + return Py_None; +} + +static PyMethodDef PyStdOut_methods[] = { + {"write", (PyCFunction)PyStdOut_write, METH_VARARGS, + PyDoc_STR("write(string) -> None")}, + {NULL, NULL} /* sentinel */ +}; + +static PyMemberDef PyStdOut_memberlist[] = { + {(char*)"softspace", T_INT, offsetof(PyStdOut, softspace), 0, + (char*)"flag indicating that a space needs to be printed; used by print"}, + {NULL} /* Sentinel */ +}; + +static PyTypeObject PyStdOut_Type = { + /* The ob_type field must be initialized in the module init function + * to be portable to Windows without using C++. */ + PyObject_HEAD_INIT(NULL) + 0, /*ob_size*/ + "PyOut", /*tp_name*/ + sizeof(PyStdOut), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + /* methods */ + (destructor)PyStdOut_dealloc, /*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_compare*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash*/ + 0, /*tp_call*/ + 0, /*tp_str*/ + PyObject_GenericGetAttr, /*tp_getattro*/ + /* softspace is writable: we must supply tp_setattro */ + PyObject_GenericSetAttr, /* tp_setattro */ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT, /*tp_flags*/ + 0, /*tp_doc*/ + 0, /*tp_traverse*/ + 0, /*tp_clear*/ + 0, /*tp_richcompare*/ + 0, /*tp_weaklistoffset*/ + 0, /*tp_iter*/ + 0, /*tp_iternext*/ + PyStdOut_methods, /*tp_methods*/ + PyStdOut_memberlist, /*tp_members*/ + 0, /*tp_getset*/ + 0, /*tp_base*/ + 0, /*tp_dict*/ + 0, /*tp_descr_get*/ + 0, /*tp_descr_set*/ + 0, /*tp_dictoffset*/ + 0, /*tp_init*/ + 0, /*tp_alloc*/ + 0, /*tp_new*/ + 0, /*tp_free*/ + 0, /*tp_is_gc*/ +}; + +PyObject * newPyStdOut( std::string& out ) +{ + PyStdOut *self; + self = PyObject_New(PyStdOut, &PyStdOut_Type); + if (self == NULL) + return NULL; + self->softspace = 0; + self->out=&out; + return (PyObject*)self; +} + + +////////////////////////END PYTHON/////////////////////////// + + +//! The only one instance of Parser +Plot2d_AnalyticalParser* Plot2d_AnalyticalParser::myParser = 0; + +//Define the script +QString Plot2d_AnalyticalParser::myScript = QString(""); + +/*! + \brief Return the only instance of the Plot2d_AnalyticalParser + \return instance of the Plot2d_AnalyticalParser +*/ +Plot2d_AnalyticalParser* Plot2d_AnalyticalParser::parser() +{ + if ( !myParser ) + myParser = new Plot2d_AnalyticalParser(); + return myParser; +} + +/*! + \brief Constructor. + + Construct the Parser and initialize python interpritator. +*/ +Plot2d_AnalyticalParser::Plot2d_AnalyticalParser() +{ + /* Initialize the Python interpreter */ + if (Py_IsInitialized()) { + PyGILState_STATE gstate = PyGILState_Ensure(); + myMainMod = PyImport_AddModule("__main__"); + myMainDict = PyModule_GetDict(myMainMod); + PyGILState_Release(gstate); + initScript(); + } +} + +int Plot2d_AnalyticalParser::calculate( const QString& theExpr, + const double theMin, + const double theMax, + const int theNbStep, + double** theX, + double** theY) { + + QString aPyScript = myScript; + aPyScript = aPyScript.arg(theExpr); + int result = -1; + PyGILState_STATE gstate = PyGILState_Ensure(); + PyObject* obj = PyRun_String(qPrintable(aPyScript), Py_file_input, myMainDict, NULL); + + if(obj == NULL) { + PyErr_Print(); + PyGILState_Release(gstate); + return result; + + } else { + Py_DECREF(obj); + } + + PyObject* func = NULL; + PyObject* f_y = NULL; + + if(PyObject_HasAttrString(myMainMod, "Y")) { + f_y = PyObject_GetAttrString(myMainMod, "Y"); + } + + if(PyObject_HasAttrString(myMainMod, "coordCalculator")) { + func = PyObject_GetAttrString(myMainMod, "coordCalculator"); + } + + PyObject* new_stderr = NULL; + + if( f_y == NULL || func == NULL ) { + fflush(stderr); + std::string err_description=""; + new_stderr = newPyStdOut(err_description); + PySys_SetObject((char*)"stderr", new_stderr); + PyErr_Print(); + PySys_SetObject((char*)"stderr", PySys_GetObject((char*)"__stderr__")); + Py_DECREF(new_stderr); + PyGILState_Release(gstate); + return result; + } + + PyObject* coords; + coords = PyObject_CallFunction(func,(char*)"(d, d, i)", theMin, theMax, theNbStep ); + + new_stderr = NULL; + + if (coords == NULL){ + fflush(stderr); + std::string err_description=""; + new_stderr = newPyStdOut(err_description); + PySys_SetObject((char*)"stderr", new_stderr); + PyErr_Print(); + PySys_SetObject((char*)"stderr", PySys_GetObject((char*)"__stderr__")); + Py_DECREF(new_stderr); + PyGILState_Release(gstate); + return result; + } + + Py_ssize_t size = PyList_Size( coords ); + if( size <= 0 ) { + Py_DECREF(coords); + return result; + } + + result = size; + + *theX = new double[size]; + *theY = new double[size]; + + for ( Py_ssize_t i = 0; i< size; ++i ) { + PyObject* coord = PyList_GetItem( coords, i ); + (*theX)[i] = PyFloat_AsDouble(PyList_GetItem(coord, 0)); + (*theY)[i] = PyFloat_AsDouble(PyList_GetItem(coord, 1)); + } + + PyGILState_Release(gstate); + return result; +} + +/*! + \brief Initialize python script. +*/ +void Plot2d_AnalyticalParser::initScript() { + myScript.clear(); + myScript += "from math import * \n"; + myScript += "def Y(x): \n"; + myScript += " return "; + myScript += "%1\n"; + + myScript += "def coordCalculator(xmin, xmax, nstep): \n"; + myScript += " coords = [] \n"; + myScript += " xstep = (xmax - xmin) / nstep \n"; + myScript += " n = 0 \n"; + myScript += " while n <= nstep : \n"; + myScript += " x = xmin + n*xstep \n"; + myScript += " try: \n"; + myScript += " y = Y(x) \n"; + myScript += " coords.append([x,y]) \n"; + myScript += " except ValueError, ZeroDivisionError: \n"; + myScript += " pass \n"; + myScript += " n = n+1 \n"; + myScript += " return coords \n"; +} diff --git a/src/Plot2d/Plot2d_AnalyticalParser.h b/src/Plot2d/Plot2d_AnalyticalParser.h new file mode 100755 index 000000000..37b55d981 --- /dev/null +++ b/src/Plot2d/Plot2d_AnalyticalParser.h @@ -0,0 +1,52 @@ +// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : Plot2d_AnalyticalParser.h +// Author : Roman NIKOLAEV, Open CASCADE S.A.S. (roman.nikolaev@opencascade.com) + +#ifndef PLOT2D_ANALYTICAL_Parser_H +#define PLOT2D_ANALYTICAL_Parser_H +#include + +#include "Plot2d.h" + +class PLOT2D_EXPORT Plot2d_AnalyticalParser { +public: + ~Plot2d_AnalyticalParser(); + + + static Plot2d_AnalyticalParser* parser(); + int calculate( const QString&, const double, + const double, const int, + double**, double**); + +private: + Plot2d_AnalyticalParser(); + void initScript(); + +private: + static Plot2d_AnalyticalParser* myParser; //!< instance of the Parser + PyObject* myMainMod; //!< main python module + PyObject* myMainDict; //!< main python dictionary + static QString myScript; //!< python script +}; + +#endif //PLOT2D_ANALYTICAL_Parser_H diff --git a/src/Plot2d/Plot2d_ViewFrame.cxx b/src/Plot2d/Plot2d_ViewFrame.cxx index ff36d6b5d..3bb45f3de 100755 --- a/src/Plot2d/Plot2d_ViewFrame.cxx +++ b/src/Plot2d/Plot2d_ViewFrame.cxx @@ -28,10 +28,8 @@ #include "Plot2d_FitDataDlg.h" #include "Plot2d_ViewWindow.h" #include "Plot2d_SetupViewDlg.h" -#ifndef DISABLE_PYCONSOLE -#include "Plot2d_AnaliticCurveDlg.h" -#include "Plot2d_AnaliticCurve.h" -#endif +#include "Plot2d_AnalyticalCurveDlg.h" +#include "Plot2d_AnalyticalCurve.h" #include "Plot2d_ToolTip.h" #include "SUIT_Tools.h" @@ -66,7 +64,6 @@ #include #include -#include #include #include @@ -1602,24 +1599,38 @@ void Plot2d_ViewFrame::onSettings() delete dlg; } -#ifndef DISABLE_PYCONSOLE /*! - "Analitic Curves" toolbar action slot + "Analytical Curves" toolbar action slot */ -void Plot2d_ViewFrame::onAnaliticCurve() { - Plot2d_AnaliticCurveDlg* dlg = new Plot2d_AnaliticCurveDlg(this, myPlot); - dlg->setCurveList(myAnaliticCurves); - dlg->exec(); - delete dlg; -} +void Plot2d_ViewFrame::onAnalyticalCurve() +{ +#ifndef DISABLE_PYCONSOLE + Plot2d_AnalyticalCurveDlg dlg( this, this ); + dlg.exec(); + updateAnalyticalCurves(); #endif +} +void Plot2d_ViewFrame::addAnalyticalCurve( Plot2d_AnalyticalCurve* theCurve) +{ +#ifndef DISABLE_PYCONSOLE + myAnalyticalCurves.append(theCurve); +#endif +} +void Plot2d_ViewFrame::removeAnalyticalCurve( Plot2d_AnalyticalCurve* theCurve) +{ #ifndef DISABLE_PYCONSOLE + theCurve->setAction(Plot2d_AnalyticalCurve::ActRemoveFromView); +#endif +} + /* - Update analitic curve + Update Analytical curve */ -void Plot2d_ViewFrame::updateAnaliticCurve(Plot2d_AnaliticCurve* c, bool updateView){ +void Plot2d_ViewFrame::updateAnalyticalCurve(Plot2d_AnalyticalCurve* c, bool updateView) +{ +#ifndef DISABLE_PYCONSOLE if(!c) return; QwtScaleDiv* div = myPlot->axisScaleDiv(QwtPlot::xBottom); c->setRangeBegin(div->lowerBound()); @@ -1629,17 +1640,17 @@ void Plot2d_ViewFrame::updateAnaliticCurve(Plot2d_AnaliticCurve* c, bool updateV QwtPlotItem* item = c->plotItem(); switch( c->getAction() ) { - case Plot2d_AnaliticCurve::ActAddInView: + case Plot2d_AnalyticalCurve::ActAddInView: if( c->isActive() ) { + c->updatePlotItem(); item->attach( myPlot ); + item->show(); } - myAnaliticCurves.append(c); - c->setAction(Plot2d_AnaliticCurve::ActNothing); + c->setAction(Plot2d_AnalyticalCurve::ActNothing); break; - case Plot2d_AnaliticCurve::ActUpdateInView: + case Plot2d_AnalyticalCurve::ActUpdateInView: if(c->isActive()) { - item->attach( myPlot ); c->updatePlotItem(); item->show(); } else { @@ -1647,33 +1658,56 @@ void Plot2d_ViewFrame::updateAnaliticCurve(Plot2d_AnaliticCurve* c, bool updateV item->detach(); } - c->setAction(Plot2d_AnaliticCurve::ActNothing); + c->setAction(Plot2d_AnalyticalCurve::ActNothing); break; - case Plot2d_AnaliticCurve::ActRemoveFromView: + case Plot2d_AnalyticalCurve::ActRemoveFromView: item->hide(); item->detach(); - myAnaliticCurves.removeAll(c); + myAnalyticalCurves.removeAll(c); delete c; break; } if(updateView) myPlot->replot(); -} #endif +} -#ifndef DISABLE_PYCONSOLE /* - Update analitic curves + Update Analytical curves */ -void Plot2d_ViewFrame::updateAnaliticCurves() { - AnaliticCurveList::iterator it = myAnaliticCurves.begin(); - for( ; it != myAnaliticCurves.end(); it++) { - updateAnaliticCurve(*it); +void Plot2d_ViewFrame::updateAnalyticalCurves() +{ +#ifndef DISABLE_PYCONSOLE + AnalyticalCurveList::iterator it = myAnalyticalCurves.begin(); + for( ; it != myAnalyticalCurves.end(); it++) { + updateAnalyticalCurve(*it); } myPlot->replot(); +#endif } + +/*! + Return list of the alalytical curves. +*/ +AnalyticalCurveList Plot2d_ViewFrame::getAnalyticalCurves() const +{ + return myAnalyticalCurves; +} + +/*! + Get analytical curve by plot item. +*/ +Plot2d_AnalyticalCurve* Plot2d_ViewFrame::getAnalyticalCurve(QwtPlotItem * theItem) { +#ifndef DISABLE_PYCONSOLE + AnalyticalCurveList::iterator it = myAnalyticalCurves.begin(); + for( ; it != myAnalyticalCurves.end(); it++) { + if((*it)->plotItem() == theItem); + return (*it); + } + return 0; #endif +} /*! "Fit Data" command slot @@ -1690,9 +1724,7 @@ void Plot2d_ViewFrame::onFitData() fitData(mode,xMin,xMax,yMin,yMax,y2Min,y2Max); } delete dlg; -#ifndef DISABLE_PYCONSOLE - updateAnaliticCurves(); -#endif + updateAnalyticalCurves(); } /*! @@ -2362,11 +2394,9 @@ void Plot2d_ViewFrame::plotMouseReleased( const QMouseEvent& me ) me.pos(), me.globalPos() ); emit contextMenuRequested( &aEvent ); } -#ifndef DISABLE_PYCONSOLE else { - updateAnaliticCurves(); + updateAnalyticalCurves(); } -#endif myPlot->canvas()->setCursor( QCursor( Qt::CrossCursor ) ); myPlot->defaultPicker(); @@ -2399,9 +2429,7 @@ void Plot2d_ViewFrame::wheelEvent(QWheelEvent* event) myPlot->replot(); if ( myPlot->zoomer() ) myPlot->zoomer()->setZoomBase(); myPnt = event->pos(); -#ifndef DISABLE_PYCONSOLE - updateAnaliticCurves(); -#endif + updateAnalyticalCurves(); } /*! @@ -3217,15 +3245,14 @@ QString Plot2d_ViewFrame::getVisualParameters() myLegendFont.italic(), myLegendFont.underline(),myLegendColor.red(), myLegendColor.green(), myLegendColor.blue()); -#ifndef DISABLE_PYCONSOLE - //store all analitic curves + //store all Analytical curves //store each curve in the following format // ...*Name|isActive|Expresion|NbInervals|isAutoAssign[|MarkerType|LineType|LineWidth|r:g:b] // parameters in the [ ] is optional in case if isAutoAssign == true - AnaliticCurveList::iterator it = myAnaliticCurves.begin(); - Plot2d_AnaliticCurve* c = 0; + AnalyticalCurveList::iterator it = myAnalyticalCurves.begin(); + Plot2d_AnalyticalCurve* c = 0; bool isAuto; - for( ; it != myAnaliticCurves.end(); it++) { + for( ; it != myAnalyticalCurves.end(); it++) { c = (*it); if(!c) continue; QString curveString(""); @@ -3250,7 +3277,6 @@ QString Plot2d_ViewFrame::getVisualParameters() retStr+=optCurveString; } } -#endif return retStr; } @@ -3308,14 +3334,13 @@ void Plot2d_ViewFrame::setVisualParameters( const QString& parameters ) } } -#ifndef DISABLE_PYCONSOLE - //Restore all analitical curves + //Restore all Analyticalal curves int startCurveIndex = 10; if( paramsLst.size() >= startCurveIndex+1 ) { for( int i=startCurveIndex; isetName(curveLst[0]); c->setActive(curveLst[1].toInt()); c->setExpression(curveLst[2]); @@ -3334,13 +3359,12 @@ void Plot2d_ViewFrame::setVisualParameters( const QString& parameters ) } else { c->autoFill( myPlot ); } - c->setAction(Plot2d_AnaliticCurve::ActAddInView); - updateAnaliticCurve(c); + addAnalyticalCurve(c); + updateAnalyticalCurve(c); } } myPlot->replot(); } -#endif } /*! @@ -3449,6 +3473,25 @@ Plot2d_Curve* Plot2d_ViewFrame::getClosestCurve( QPoint p, double& distance, int return 0; } +/*! + \brief Deselect all analytical curves. +*/ +void Plot2d_ViewFrame::deselectAnalyticalCurves() { + foreach(Plot2d_AnalyticalCurve* c, myAnalyticalCurves) { + c->setSelected(false); + } +} + +/*! + \brief Deselect all objects, except analytical curves. +*/ +void Plot2d_ViewFrame::deselectObjects() { + ObjectDict::const_iterator it = myObjects.begin(), aLast = myObjects.end(); + for ( ; it != aLast; it++ ) { + it.value()->setSelected(false); + } +} + #define INCREMENT_FOR_OP 10 /*! @@ -3457,9 +3500,7 @@ Plot2d_Curve* Plot2d_ViewFrame::getClosestCurve( QPoint p, double& distance, int void Plot2d_ViewFrame::onPanLeft() { this->incrementalPan( -INCREMENT_FOR_OP, 0 ); -#ifndef DISABLE_PYCONSOLE - updateAnaliticCurves(); -#endif + updateAnalyticalCurves(); } /*! @@ -3468,9 +3509,7 @@ void Plot2d_ViewFrame::onPanLeft() void Plot2d_ViewFrame::onPanRight() { this->incrementalPan( INCREMENT_FOR_OP, 0 ); -#ifndef DISABLE_PYCONSOLE - updateAnaliticCurves(); -#endif + updateAnalyticalCurves(); } /*! @@ -3479,9 +3518,7 @@ void Plot2d_ViewFrame::onPanRight() void Plot2d_ViewFrame::onPanUp() { this->incrementalPan( 0, -INCREMENT_FOR_OP ); -#ifndef DISABLE_PYCONSOLE - updateAnaliticCurves(); -#endif + updateAnalyticalCurves(); } /*! @@ -3490,9 +3527,7 @@ void Plot2d_ViewFrame::onPanUp() void Plot2d_ViewFrame::onPanDown() { this->incrementalPan( 0, INCREMENT_FOR_OP ); -#ifndef DISABLE_PYCONSOLE - updateAnaliticCurves(); -#endif + updateAnalyticalCurves(); } /*! @@ -3501,9 +3536,7 @@ void Plot2d_ViewFrame::onPanDown() void Plot2d_ViewFrame::onZoomIn() { this->incrementalZoom( INCREMENT_FOR_OP, INCREMENT_FOR_OP ); -#ifndef DISABLE_PYCONSOLE - updateAnaliticCurves(); -#endif + updateAnalyticalCurves(); } /*! @@ -3512,9 +3545,7 @@ void Plot2d_ViewFrame::onZoomIn() void Plot2d_ViewFrame::onZoomOut() { this->incrementalZoom( -INCREMENT_FOR_OP, -INCREMENT_FOR_OP ); -#ifndef DISABLE_PYCONSOLE - updateAnaliticCurves(); -#endif + updateAnalyticalCurves(); } /*! diff --git a/src/Plot2d/Plot2d_ViewFrame.h b/src/Plot2d/Plot2d_ViewFrame.h index 69eb8bfdd..63a10e25c 100755 --- a/src/Plot2d/Plot2d_ViewFrame.h +++ b/src/Plot2d/Plot2d_ViewFrame.h @@ -25,9 +25,7 @@ #include "Plot2d.h" #include "Plot2d_Curve.h" -#ifndef DISABLE_PYCONSOLE -#include "Plot2d_AnaliticCurve.h" -#endif +#include "Plot2d_AnalyticalCurve.h" #include "Plot2d_NormalizeAlgorithm.h" #include @@ -58,7 +56,7 @@ class Plot2d_QwtPlotPicker; typedef QMultiHash CurveDict; typedef QMultiHash ObjectDict; -class PLOT2D_EXPORT Plot2d_ViewFrame : public QWidget +class PLOT2D_EXPORT Plot2d_ViewFrame : public QWidget, public Plot2d_CurveContainer { Q_OBJECT @@ -153,10 +151,16 @@ public: void getFitRangeByCurves( double&, double&, double&, double&, double&, double& ); -#ifndef DISABLE_PYCONSOLE - void updateAnaliticCurves(); - void updateAnaliticCurve( Plot2d_AnaliticCurve*, bool = false ); -#endif + + void addAnalyticalCurve( Plot2d_AnalyticalCurve* ); + void removeAnalyticalCurve( Plot2d_AnalyticalCurve* ); + void updateAnalyticalCurve( Plot2d_AnalyticalCurve*, bool = false ); + void updateAnalyticalCurves(); + void deselectAnalyticalCurves(); + void deselectObjects(); + + AnalyticalCurveList getAnalyticalCurves() const; + Plot2d_AnalyticalCurve* getAnalyticalCurve(QwtPlotItem *); /* view parameters */ void copyPreferences( Plot2d_ViewFrame* ); @@ -241,6 +245,10 @@ protected: void setCurveType( QwtPlotCurve*, int ); bool hasPlotObject( Plot2d_Object* ) const; + + + + public slots: void onViewPan(); void onViewZoom(); @@ -248,9 +256,7 @@ public slots: void onViewFitArea(); void onViewGlobalPan(); void onSettings(); -#ifndef DISABLE_PYCONSOLE - void onAnaliticCurve(); -#endif + void onAnalyticalCurve(); void onFitData(); void onChangeBackground(); void onPanLeft(); @@ -298,9 +304,7 @@ protected: double myXDistance, myYDistance, myYDistance2; bool mySecondY; ObjectDict myObjects; -#ifndef DISABLE_PYCONSOLE - AnaliticCurveList myAnaliticCurves; -#endif + AnalyticalCurveList myAnalyticalCurves; Plot2d_NormalizeAlgorithm* myLNormAlgo; Plot2d_NormalizeAlgorithm* myRNormAlgo; bool myIsDefTitle; diff --git a/src/Plot2d/Plot2d_ViewWindow.cxx b/src/Plot2d/Plot2d_ViewWindow.cxx index a9cfe63b7..1dfa2d22a 100755 --- a/src/Plot2d/Plot2d_ViewWindow.cxx +++ b/src/Plot2d/Plot2d_ViewWindow.cxx @@ -432,16 +432,17 @@ void Plot2d_ViewWindow::createActions() connect( aAction, SIGNAL( triggered( bool ) ), myViewFrame, SLOT( onSettings() ) ); mgr->registerAction( aAction, CurvSettingsId ); - // 9. Analitic curves - aAction = new QtxAction( tr( "TOT_PLOT2D_ANALITIC_CURVES" ), - aResMgr->loadPixmap( "Plot2d", tr( "ICON_PLOT2D_ANALITIC_CURVES" ) ), - tr( "MEN_PLOT2D_ANALITIC_CURVES" ), + // 9. Analytical curves +#ifndef DISABLE_PYCONSOLE + aAction = new QtxAction( tr( "TOT_PLOT2D_ANALYTICAL_CURVES" ), + aResMgr->loadPixmap( "Plot2d", tr( "ICON_PLOT2D_ANALYTICAL_CURVES" ) ), + tr( "MEN_PLOT2D_ANALYTICAL_CURVES" ), 0, this ); - aAction->setStatusTip( tr( "PRP_PLOT2D_ANALITIC_CURVES" ) ); - connect( aAction, SIGNAL( triggered( bool ) ), myViewFrame, SLOT( onAnaliticCurve() ) ); - mgr->registerAction( aAction, AnaliticCurveId ); - + aAction->setStatusTip( tr( "PRP_PLOT2D_ANALYTICAL_CURVES" ) ); + connect( aAction, SIGNAL( triggered( bool ) ), myViewFrame, SLOT( onAnalyticalCurve() ) ); + mgr->registerAction( aAction, AnalyticalCurveId ); +#endif // 10. Clone aAction = new QtxAction( tr( "MNU_CLONE_VIEW" ), @@ -499,7 +500,7 @@ void Plot2d_ViewWindow::createToolBar() mgr->append( toolMgr()->separator(), myToolBar ); mgr->append( LegendId, myToolBar ); mgr->append( CurvSettingsId, myToolBar ); - mgr->append( AnaliticCurveId, myToolBar ); + mgr->append( AnalyticalCurveId, myToolBar ); mgr->append( CloneId, myToolBar ); mgr->append( PrintId, myToolBar ); } diff --git a/src/Plot2d/Plot2d_ViewWindow.h b/src/Plot2d/Plot2d_ViewWindow.h index 66975732d..ffa44da2c 100755 --- a/src/Plot2d/Plot2d_ViewWindow.h +++ b/src/Plot2d/Plot2d_ViewWindow.h @@ -59,7 +59,7 @@ public: LegendId, CurvSettingsId, CloneId, PrintId, - AnaliticCurveId }; + AnalyticalCurveId }; public: Plot2d_ViewWindow( SUIT_Desktop*, Plot2d_Viewer* ); diff --git a/src/Plot2d/resources/Plot2d_images.ts b/src/Plot2d/resources/Plot2d_images.ts index 5841ec8a0..33028818f 100644 --- a/src/Plot2d/resources/Plot2d_images.ts +++ b/src/Plot2d/resources/Plot2d_images.ts @@ -72,8 +72,8 @@ plot2d_settings.png - ICON_PLOT2D_ANALITIC_CURVES - plot2d_analitic_curve.png + ICON_PLOT2D_ANALYTICAL_CURVES + plot2d_analytical_curve.png ICON_PLOT2D_CURVES_LINES diff --git a/src/Plot2d/resources/Plot2d_msg_en.ts b/src/Plot2d/resources/Plot2d_msg_en.ts index d312ff17d..b363b48e8 100644 --- a/src/Plot2d/resources/Plot2d_msg_en.ts +++ b/src/Plot2d/resources/Plot2d_msg_en.ts @@ -228,8 +228,8 @@ Settings - TOT_PLOT2D_ANALITIC_CURVES - Analytic curves + TOT_PLOT2D_ANALYTICAL_CURVES + Analytical curves TOT_PLOT2D_NORMALIZE_MODE_LMAX @@ -394,8 +394,8 @@ Logarithmic scale for ordinate axis is not allowed. Zoom the view - PRP_PLOT2D_ANALITIC_CURVES - Setups analytic curves properties + PRP_PLOT2D_ANALYTICAL_CURVES + Setups analytical curves properties PRP_PLOT2D_NORMALIZE_MODE_LMAX @@ -522,8 +522,8 @@ Logarithmic scale for ordinate axis is not allowed. &Settings - MEN_PLOT2D_ANALITIC_CURVES - Analytic curves + MEN_PLOT2D_ANALYTICAL_CURVES + Analytical curves CIRCLE_MARKER_LBL @@ -673,10 +673,10 @@ Logarithmic scale for ordinate axis is not allowed. - Plot2d_AnaliticCurveDlg + Plot2d_AnalyticalCurveDlg - ANALITIC_CURVE_TLT - Analitic curves properties + ANALYTICAL_CURVE_TLT + Analytical curves properties AC_CURVE_PARAMS @@ -723,9 +723,13 @@ Logarithmic scale for ordinate axis is not allowed. Remove curve - AC_UPD_BTN - Update Curve + AC_OK_BTN + Ok + + AC_APPLY_BTN + Apply + AC_CANT_CALCULATE Can't calculate curve. @@ -735,6 +739,11 @@ Please, check input parameters!!! AC_CLOSE_BTN &Close + + AC_HELP_BTN + Help + + Plot2d_SetupCurveScaleDlg diff --git a/src/Plot2d/resources/Plot2d_msg_fr.ts b/src/Plot2d/resources/Plot2d_msg_fr.ts index 53be6d0ac..8ba2de9b1 100755 --- a/src/Plot2d/resources/Plot2d_msg_fr.ts +++ b/src/Plot2d/resources/Plot2d_msg_fr.ts @@ -204,7 +204,7 @@ Paramètres - TOT_PLOT2D_ANALITIC_CURVES + TOT_PLOT2D_ANALYTICAL_CURVES Courbes analytiques @@ -354,7 +354,7 @@ L'échelle logarithmique de l'ordonnée n'est pas permise.Zoomer la vue - PRP_PLOT2D_ANALITIC_CURVES + PRP_PLOT2D_ANALYTICAL_CURVES Réglage des propriétés des courbes analytiques @@ -450,7 +450,7 @@ L'échelle logarithmique de l'ordonnée n'est pas permise.&Paramètres - MEN_PLOT2D_ANALITIC_CURVES + MEN_PLOT2D_ANALYTICAL_CURVES Courbes analytiques @@ -601,9 +601,9 @@ L'échelle logarithmique de l'ordonnée n'est pas permise. - Plot2d_AnaliticCurveDlg + Plot2d_AnalyticalCurveDlg - ANALITIC_CURVE_TLT + ANALYTICAL_CURVE_TLT Propriétés des courbes analytiques diff --git a/src/Plot2d/resources/plot2d_analitic_curve.png b/src/Plot2d/resources/plot2d_analytical_curve.png similarity index 100% rename from src/Plot2d/resources/plot2d_analitic_curve.png rename to src/Plot2d/resources/plot2d_analytical_curve.png diff --git a/src/SPlot2d/SPlot2d_ViewModel.cxx b/src/SPlot2d/SPlot2d_ViewModel.cxx index 0c4d53a9b..c1e8b6cce 100644 --- a/src/SPlot2d/SPlot2d_ViewModel.cxx +++ b/src/SPlot2d/SPlot2d_ViewModel.cxx @@ -79,7 +79,8 @@ using namespace std; Constructor */ SPlot2d_Viewer::SPlot2d_Viewer( bool theAutoDel ) -: Plot2d_Viewer( theAutoDel ) +: Plot2d_Viewer( theAutoDel ), + myDeselectAnalytical(true) { } @@ -406,6 +407,23 @@ void SPlot2d_Viewer::onLegendClicked( QwtPlotItem* plotItem ) Plot2d_ViewFrame* aViewFrame = getActiveViewFrame(); if(aViewFrame == NULL) return; + bool isAnalytical = false; + AnalyticalCurveList curves = aViewFrame->getAnalyticalCurves(); + foreach ( Plot2d_AnalyticalCurve* curve, curves ) { + if(plotItem == curve->plotItem()) { + isAnalytical = true; + curve->setSelected(true); + } else { + curve->setSelected(false); + } + } + if(isAnalytical) { + myDeselectAnalytical = false; + emit clearSelected(); + aViewFrame->updateAnalyticalCurves(); + myDeselectAnalytical = true; + return; + } Plot2d_Object* anObject = aViewFrame->getPlotObject(plotItem); @@ -423,7 +441,7 @@ void SPlot2d_Viewer::onLegendClicked( QwtPlotItem* plotItem ) if(!anEntry.isEmpty()) emit legendSelected( anEntry ); - } + } } /*! @@ -473,7 +491,11 @@ void SPlot2d_Viewer::setObjectsSelected( SALOME_ListIO& theList ) { o->setSelected(false); aViewFrame->updateObject(o); } - } + } + if( myDeselectAnalytical ) { + aViewFrame->deselectAnalyticalCurves(); + aViewFrame->updateAnalyticalCurves(); + } aViewFrame->Repaint(); } } diff --git a/src/SPlot2d/SPlot2d_ViewModel.h b/src/SPlot2d/SPlot2d_ViewModel.h index f29904fd8..8a31b3da1 100644 --- a/src/SPlot2d/SPlot2d_ViewModel.h +++ b/src/SPlot2d/SPlot2d_ViewModel.h @@ -88,6 +88,9 @@ protected slots: signals: void legendSelected( const QString& ); + void clearSelected(); +private: + bool myDeselectAnalytical; }; -- 2.39.2