X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOME_PYQT%2FSalomePyQt%2FSalomePyQt.sip;h=a01c11840039498faeac65312de6d38996c640c9;hb=762985eadccf3505768f6136929d50ca76e8c1aa;hp=6344657816e1e62c498d642b6204e8e49eaaaf68;hpb=b330d1f023e897cfddde5a0cb7efd949c317d5a5;p=modules%2Fgui.git diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip index 634465781..a01c11840 100644 --- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip +++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -26,16 +26,25 @@ %Module SalomePyQt %Feature ENABLE_CORBA +%Feature ENABLE_PLOT2D -%Import QtGuimod.sip -%Import QtXmlmod.sip +%Import QtCore/QtCoremod.sip +%Import QtGui/QtGuimod.sip +%If (Qt_5_0_0 -) +%Import QtWidgets/QtWidgetsmod.sip +%End +%Import QtXml/QtXmlmod.sip + +%If (ENABLE_PLOT2D) +%Include SalomePyQt_Plot2d.sip +%End %ExportedHeaderCode #include #include #include +#include #include -#include %End class SALOME_Selection : QObject @@ -106,13 +115,6 @@ enum Action { SplitAt = 2 }; -enum Axis { - yLeft, - yRight, - xBottom, - xTop, -}; - class QtxAction : QWidgetAction { %TypeHeaderCode @@ -209,76 +211,30 @@ private: QtxActionGroup( const QtxActionGroup& ); }; -enum ObjectType -{ - MainTitle, - XTitle, - YTitle, - Y2Title, - XAxis, - YAxis, - Y2Axis -}; - -class Plot2d_Curve +class QtxTreeView : public QTreeView { %TypeHeaderCode -#include +#include %End %ConvertToSubClassCode - if ( dynamic_cast( sipCpp ) ) - sipClass = sipClass_Plot2d_Curve; + if ( qobject_cast( sipCpp ) ) + sipClass = sipClass_QtxTreeView; else sipClass = NULL; %End public: - Plot2d_Curve(); - virtual ~Plot2d_Curve(); - void setName( const QString& ); - void addPoint( double, double ); - void addPoints(SIP_PYLIST X, SIP_PYLIST Y); -%MethodCode - int nx = PyList_Size(a0); - int ny = PyList_Size(a1); - - if( nx != ny ) { - PyErr_Format(PyExc_TypeError,"The dimension of x and y should be the same. It is %d and %d currently.", nx, ny); - } - - int i; - PyObject *pX, *pY; - - for (i=0; iaddPoint(aX, aY); - } -%End - void insertPoint( int, double, double ); - void deletePoint( int ); - void clearAllPoints(); - void setXAxis( Axis ); -%MethodCode - int ax = int(a0); - sipCpp->setXAxis(QwtPlot::Axis(ax)); -%End - Axis getXAxis() const; -%MethodCode - sipRes = Axis(sipCpp->getXAxis()); -%End - void setYAxis( Axis ); -%MethodCode - int ay = int(a0); - sipCpp->setYAxis(QwtPlot::Axis(ay)); -%End - Axis getYAxis() const; -%MethodCode - sipRes = Axis(sipCpp->getYAxis()); -%End + explicit QtxTreeView( QWidget* /TransferThis/ = 0 ); + QtxTreeView( const bool, QWidget* /TransferThis/ = 0 ); + virtual ~QtxTreeView(); + +signals: + void sortingEnabled( bool ); + void selectionChanged(); + +private: + QtxTreeView( const QtxTreeView& ); }; enum VisibilityState @@ -288,7 +244,6 @@ enum VisibilityState UnpresentableState }; - class SalomePyQt { %TypeHeaderCode @@ -316,6 +271,7 @@ public: static QMenu* getPopupMenu( const QString& ) /ReleaseGIL/ ; static QTreeView* getObjectBrowser() /ReleaseGIL/ ; static SALOME_Selection* getSelection() /Factory,ReleaseGIL/ ; + static void setSelection( const QStringList& ) /ReleaseGIL/ ; static int getStudyId() /ReleaseGIL/ ; static void putInfo( const QString&, const int = 0 ) /ReleaseGIL/ ; static const QString getActiveComponent() /ReleaseGIL/ ; @@ -330,6 +286,7 @@ public: static QStringList getOpenFileNames ( QWidget*, const QString&, const QStringList&, const QString& ) /ReleaseGIL/ ; static QString getExistingDirectory( QWidget*, const QString&, const QString& ) /ReleaseGIL/ ; + static void createRoot() /ReleaseGIL/ ; static QString createObject( const QString& = QString("") ) /ReleaseGIL/ ; static QString createObject( const QString&, const QString&, @@ -395,18 +352,24 @@ public: static QAction* action( const int ) /ReleaseGIL/ ; static int actionId( const QAction* ) /ReleaseGIL/ ; + static QString constant ( const QString& ) /ReleaseGIL/ ; + static void setConstant ( const QString&, const QString& ) /ReleaseGIL/ ; static void addSetting ( const QString&, const QString&, const double ) /ReleaseGIL/ ; static void addSetting ( const QString&, const QString&, const int /Constrained/ ) /ReleaseGIL/ ; static void addSetting ( const QString&, const QString&, const bool, const int ) /ReleaseGIL/ ; static void addSetting ( const QString&, const QString&, const QString& ) /ReleaseGIL/ ; static void addSetting ( const QString&, const QString&, const QColor& ) /ReleaseGIL/ ; + static void addSetting ( const QString&, const QString&, const QByteArray& ) /ReleaseGIL/ ; static int integerSetting( const QString&, const QString&, const int = 0 ) /ReleaseGIL/ ; static double doubleSetting ( const QString&, const QString&, const double = 0 ) /ReleaseGIL/ ; static bool boolSetting ( const QString&, const QString&, const bool = false ) /ReleaseGIL/ ; - static QString stringSetting ( const QString&, const QString&, const QString& = QString("") ) /ReleaseGIL/ ; + static QString stringSetting ( const QString&, const QString&, const QString& = QString(""), const bool = true ) /ReleaseGIL/ ; static QColor colorSetting ( const QString&, const QString&, const QColor& = QColor() ) /ReleaseGIL/ ; + static QByteArray byteArraySetting( const QString&, const QString&, const QByteArray& = QByteArray() ) /ReleaseGIL/ ; static void removeSetting ( const QString&, const QString& ) /ReleaseGIL/ ; static bool hasSetting ( const QString&, const QString& ) /ReleaseGIL/ ; + static QStringList parameters ( const QString& ) /ReleaseGIL/ ; + static QStringList parameters ( const QStringList& ) /ReleaseGIL/ ; // obsolete static void addStringSetting( const QString&, const QString&, bool = true ) /ReleaseGIL/ ; @@ -439,8 +402,11 @@ public: static QString getViewType( const int ) /ReleaseGIL/ ; static bool setViewTitle( const int, const QString& ) /ReleaseGIL/ ; static QString getViewTitle( const int ) /ReleaseGIL/ ; + static bool setViewSize( const int, const int, const int = 0 ) /ReleaseGIL/ ; static QList findViews( const QString& ) /ReleaseGIL/ ; static bool activateView( const int ) /ReleaseGIL/ ; + static bool activateViewManagerAndView( const int ) /ReleaseGIL/ ; + static QWidget* getViewWidget( const int ) /ReleaseGIL/ ; static int createView( const QString&, bool visible = true, const int width = 0, const int height = 0 ) /ReleaseGIL/ ; static int createView( const QString&, QWidget* ) /ReleaseGIL/ ; static bool closeView( const int ) /ReleaseGIL/ ; @@ -455,6 +421,8 @@ public: static bool moveView( const int, const int, const bool ) /ReleaseGIL/ ; static QList neighbourViews( const int ) /ReleaseGIL/ ; +%If (ENABLE_PLOT2D) +// start Plot2d-related functionality static void displayCurve(const int, Plot2d_Curve*) /ReleaseGIL/ ; static void eraseCurve(const int, Plot2d_Curve*) /ReleaseGIL/ ; static void eraseCurve(Plot2d_Curve*) /ReleaseGIL/ ; @@ -464,9 +432,10 @@ public: static QList getPlot2dFitRangeByCurves(const int) /ReleaseGIL/ ; static QList getPlot2dFitRangeCurrent(const int) /ReleaseGIL/ ; static void setPlot2dFitRange(const int, const double XMin, const double XMax, const double YMin, const double YMax ) /ReleaseGIL/ ; +// end of Plot2d-related functionality +%End static void processEvents(); - static void startPyLog(const QString&) /ReleaseGIL/ ; static void stopPyLog() /ReleaseGIL/ ;