X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Workshop.h;h=5aa9e7802f64b58ae1de8f4a26e866e5f887b688;hb=7e01af6cfeb76252b3fd062f6a2f35115994a422;hp=60926cf71c6b1b0f2b40d9fa9b36cd37ac32327c;hpb=e9187ec48b7a5a84b13852b96c432e072b2a182c;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Workshop.h b/src/XGUI/XGUI_Workshop.h old mode 100644 new mode 100755 index 60926cf71..5aa9e7802 --- a/src/XGUI/XGUI_Workshop.h +++ b/src/XGUI/XGUI_Workshop.h @@ -16,9 +16,11 @@ #include #include +#ifndef HAVE_SALOME class AppElements_MainWindow; class AppElements_Command; class AppElements_Workbench; +#endif class XGUI_ActionsMgr; class XGUI_ContextMenuMgr; @@ -62,18 +64,23 @@ Q_OBJECT //! Starting of the application void startApplication(); - // Activates the module controls. Should be called after module creation + /// Activates the module controls. Should be called after module creation void activateModule(); - // Deactivates the module controls. Should be called after module creation + /// Deactivates the module controls. Should be called after module creation void deactivateModule(); +#ifndef HAVE_SALOME //! Returns main window (Desktop) of the application AppElements_MainWindow* mainWindow() const { return myMainWindow; } + //! Creates and adds a new workbench (menu group) with the given name and returns it + AppElements_Workbench* addWorkbench(const QString& theName); +#endif + //! Returns selection manager object XGUI_SelectionMgr* selector() const { @@ -92,6 +99,12 @@ Q_OBJECT return myOperationMgr; } + //! ! Returns error manager. + XGUI_ErrorMgr* errorMgr() const + { + return myErrorMgr; + } + //! ! Returns an actions manager XGUI_ActionsMgr* actionsMgr() const { @@ -110,9 +123,6 @@ Q_OBJECT return myContextMenuMgr; } - //! Creates and adds a new workbench (menu group) with the given name and returns it - AppElements_Workbench* addWorkbench(const QString& theName); - //! Returns an object which provides interface to Salome Module (LightApp_Module) XGUI_SalomeConnector* salomeConnector() const { @@ -143,7 +153,7 @@ Q_OBJECT return myViewerProxy; } - /// Returns the module connectory + /// Returns the module connector /// \returns the instance of connector XGUI_ModuleConnector* moduleConnector() const { @@ -184,7 +194,7 @@ Q_OBJECT //! Show the given features in 3d Viewer void showOnlyObjects(const QObjectPtrList& theList); - /// Set display mode for the given onjects + /// Set display mode for the given objects /// \param theList a list of displayed objects /// \param theMode a mode to set (see \ref XGUI_Displayer) void setDisplayMode(const QObjectPtrList& theList, int theMode); @@ -195,10 +205,10 @@ Q_OBJECT return myModule; } - /// Returns current directory whic contains data files + /// Returns current directory which contains data files QString currentDataDir() const { return myCurrentDir; } - /// Returns current directory whic contains data files + /// Returns current directory which contains data files void setCurrentDataDir(const QString& theDir) { myCurrentDir = theDir; } /** @@ -209,12 +219,12 @@ Q_OBJECT void saveDocument(const QString& theName, std::list& theFileNames); /** - * If there is an active (uncommited) operation shows a prompt to abort it + * If there is an active (uncommitted) operation shows a prompt to abort it * and performs abortion if user agreed. Returns true if * - operation aborted successfully * - there is no active operation */ - bool isActiveOperationAborted(); + bool abortAllOperations(); //! Delete features. Delete the referenced features. There can be a question with a list of referenced //! objects. @@ -235,11 +245,24 @@ Q_OBJECT /// \param theUpdateViewer a boolean flag to update viewer immediately void deactivateActiveObject(const ObjectPtr& theObject, const bool theUpdateViewer); + /// Returns true if the action of the feature is created to contain Accept/Cancel button + /// \param theFeature a feature + bool isFeatureOfNested(const FeaturePtr& theFeature); + + /// Has to be called in order to display objects with visibility status = true + void synchronizeViewer(); + + /// Has to be called in order to display objects from a cpecifed group with visibility status = true + /// \param theDoc the document for objects synchronisation + /// \param theGroup the group name + /// \param theUpdateViewer update viewer flag + void synchronizeGroupInViewer(const DocumentPtr& theDoc, const std::string& theGroup, bool theUpdateViewer); + signals: /// Emitted when selection happens in Salome viewer void salomeViewerSelection(); - /// Emitted when error in applivation happens + /// Emitted when error in application happens void errorOccurred(const QString&); //! the signal about the workshop actions states are updated. @@ -261,21 +284,12 @@ signals: /// update history list (undo/redo commands) void updateHistory(); - /// Create a new dokument - void onNew(); - - /// Open document from file - void onOpen(); - /// Save current document bool onSave(); /// Save current document to a file selected by user bool onSaveAs(); - /// Exit application - void onExit(); - /// Undo last command void onUndo(int times = 1); @@ -285,8 +299,9 @@ signals: /// Rebuild data tree void onRebuild(); - /// Open preferences dialog box - void onPreferences(); + /// Validates the operation to change the "Apply" button state. + /// \param thePreviousState the previous state of the widget + void onWidgetStateChanged(int thePreviousState); /// Show property panel void showPropertyPanel(); @@ -303,21 +318,40 @@ signals: /// Close document void closeDocument(); + /// Open document from file + void onOpen(); + + /// Create a new document + void onNew(); + +#ifndef HAVE_SALOME + /// Exit application + void onExit(); + + /// Open preferences dialog box + void onPreferences(); +#endif + protected: - /// Find the nested features and set them into the operation + /// Sets the granted operations for the parameter operation. Firstly, it finds the nested features + /// and set them into the operation. Secondly, it asks the module about ids of granted operations. /// \param theOperation an operation - void setNestedFeatures(ModuleBase_Operation* theOperation); + void setGrantedFeatures(ModuleBase_Operation* theOperation); /// Update the property panel content by the XML description of the operation and set the panel /// into the operation /// \param theOperation an operation void setPropertyPanel(ModuleBase_Operation* theOperation); + /// Connects or disconnects to the value changed signal of the property panel widgets + /// \param isToConnect a boolean value whether connect or disconnect + void connectToPropertyPanel(const bool isToConnect); + private: /// Display all results //void displayAllResults(); - /// Displau results from document + /// Display results from document /// \param theDoc a document void displayDocumentResults(DocumentPtr theDoc); @@ -336,12 +370,12 @@ private: virtual void onOperationResumed(ModuleBase_Operation* theOperation); /// SLOT, that is called after the operation is stopped. Update workshop state, e.g. - /// hides the property panel and udpate the command status. + /// hides the property panel and update the command status. /// \param theOpertion a stopped operation virtual void onOperationStopped(ModuleBase_Operation* theOperation); /// SLOT, that is called after the operation is committed. - /// \param theOpertion a commmitted operation + /// \param theOpertion a committed operation virtual void onOperationCommitted(ModuleBase_Operation* theOperation); /// SLOT, that is called after the operation is aborted. @@ -356,6 +390,19 @@ private: /// Set waiting cursor void onStartWaiting(); + /// Called by Ok button clicked in the property panel. Asks the error manager whether + /// the operation can be committed and do it if it returns true. + void onAcceptActionClicked(); + + /// Listens the corresponded signal from operation manager and send it with the Ok + /// action to operation manager. + /// \param theEnabled an enabled state for the action + //void onValidationStateChanged(bool theEnabled); + + //connect(myOperationMgr, SIGNAL(validationStateChanged(bool)), + // aOkAct, SLOT(setEnabled(bool))); + + private: /// Init menu void initMenu(); @@ -392,7 +439,10 @@ private: QList processHistoryList(const std::list&) const; private: +#ifndef HAVE_SALOME AppElements_MainWindow* myMainWindow; +#endif + ModuleBase_IModule* myModule; XGUI_ErrorMgr* myErrorMgr; XGUI_ObjectsBrowser* myObjectBrowser;