-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+//
+// 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, or (at your option) any later version.
+//
+// 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<mailto:webmaster.salome@opencascade.com>
+//
#include "XGUI_ContextMenuMgr.h"
#include "XGUI_Workshop.h"
#include <ModelAPI_ResultConstruction.h>
#include <ModelAPI_ResultBody.h>
#include <ModelAPI_Tools.h>
+#include <ModelAPI_ResultField.h>
#include <Config_DataModelReader.h>
#include <QMainWindow>
#include <QModelIndex>
-
XGUI_ContextMenuMgr::XGUI_ContextMenuMgr(XGUI_Workshop* theParent)
: QObject(theParent),
myWorkshop(theParent),
aAction = ModuleBase_Tools::createAction(QIcon(":pictures/color.png"), tr("Color..."), aDesktop);
addAction("COLOR_CMD", aAction);
+ aAction = ModuleBase_Tools::createAction(QIcon(""), tr("Deflection..."), aDesktop);
+ addAction("DEFLECTION_CMD", aAction);
+
aAction = ModuleBase_Tools::createAction(QIcon(":pictures/eye_pencil.png"), tr("Show"), aDesktop);
addAction("SHOW_CMD", aAction);
addAction("SELECT_FACE_CMD", aAction);
//mySelectActions->addAction(aAction);
- aAction = ModuleBase_Tools::createAction(QIcon(":pictures/result.png"), tr("Result"), aDesktop,
+ aAction = ModuleBase_Tools::createAction(QIcon(":pictures/result.png"), tr("Results"), aDesktop,
this, SLOT(onResultSelection(bool)));
aAction->setCheckable(true);
addAction("SELECT_RESULT_CMD", aAction);
tr("Select parent feature"), aDesktop);
addAction("SHOW_FEATURE_CMD", aAction);
+#ifdef TINSPECTOR
+ aAction = ModuleBase_Tools::createAction(QIcon(), tr("TInspector"), aDesktop);
+ addAction("TINSPECTOR_VIEW", aAction);
+#endif
+
buildObjBrowserMenu();
buildViewerMenu();
}
}
}
-void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
+void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
{
foreach(QAction* aAction, myActions)
aAction->setEnabled(false);
bool hasFeature = false;
bool hasParameter = false;
bool hasCompositeOwner = false;
+ bool hasResultInHistory = false;
ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter,
- hasCompositeOwner);
+ hasCompositeOwner, hasResultInHistory);
//Process Feature
if (aSelected == 1) {
ObjectPtr aObject = aObjects.first();
action("CLEAN_HISTORY_CMD")->setEnabled(true);
action("SHOW_RESULTS_CMD")->setEnabled(hasFeature);
- action("SHOW_FEATURE_CMD")->setEnabled(hasResult);
+ action("SHOW_FEATURE_CMD")->setEnabled(hasResult && hasResultInHistory);
}
// Show/Hide command has to be disabled for objects from non active document
if (myWorkshop->canChangeColor())
action("COLOR_CMD")->setEnabled(true);
+ if (myWorkshop->canChangeDeflection())
+ action("DEFLECTION_CMD")->setEnabled(true);
+
+ #ifdef _DEBUG
+ #ifdef TINSPECTOR
+ action("TINSPECTOR_VIEW")->setEnabled(true);
+ #endif
+ #endif
+
+
ModuleBase_IModule* aModule = myWorkshop->module();
if (aModule)
aModule->updateObjectBrowserMenu(myActions);
XGUI_SelectionMgr* aSelMgr = myWorkshop->selector();
XGUI_Displayer* aDisplayer = myWorkshop->displayer();
- QList<ModuleBase_ViewerPrsPtr> aPrsList = aSelMgr->selection()->getSelected(ModuleBase_ISelection::Viewer);
+ QList<ModuleBase_ViewerPrsPtr> aPrsList =
+ aSelMgr->selection()->getSelected(ModuleBase_ISelection::Viewer);
if (aPrsList.size() > 0) {
bool isVisible = false;
bool isShading = false;
if (aRes && aRes->isDisplayed()) {
isVisible = true;
canBeShaded = myWorkshop->displayer()->canBeShaded(aObject);
- isShading = (myWorkshop->displayer()->displayMode(aObject) == XGUI_Displayer::Shading);
+ isShading =
+ (myWorkshop->displayer()->displayMode(aObject) == XGUI_Displayer::Shading);
break;
}
}
} else
action("SHOW_CMD")->setEnabled(true);
}
+ //issue #2159 Hide all incomplete behavior
+#ifdef HAVE_SALOME
+ action("HIDEALL_CMD")->setEnabled(true);
+#else
if (myWorkshop->displayer()->objectsCount() > 0)
action("HIDEALL_CMD")->setEnabled(true);
+#endif
// Update selection menu
QIntList aModes = aDisplayer->activeSelectionModes();
} else {
foreach(int aMode, aModes) {
switch (aMode) {
- case TopAbs_VERTEX:
+ case TopAbs_VERTEX:
action("SELECT_VERTEX_CMD")->setChecked(true);
break;
- case TopAbs_EDGE:
+ case TopAbs_EDGE:
action("SELECT_EDGE_CMD")->setChecked(true);
break;
case TopAbs_FACE:
action("SELECT_RESULT_CMD")->setChecked(true);
}
}
- }
+ }
ModuleBase_IModule* aModule = myWorkshop->module();
if (aModule)
if (myWorkshop->canChangeColor())
action("COLOR_CMD")->setEnabled(true);
+ if (myWorkshop->canChangeDeflection())
+ action("DEFLECTION_CMD")->setEnabled(true);
+
action("DELETE_CMD")->setEnabled(true);
}
aList.append(mySeparator);
aList.append(action("RENAME_CMD"));
aList.append(action("COLOR_CMD"));
+ aList.append(action("DEFLECTION_CMD"));
aList.append(action("SHOW_FEATURE_CMD"));
myObjBrowserMenus[ModelAPI_ResultConstruction::group()] = aList;
aList.append(mySeparator);
aList.append(action("RENAME_CMD"));
aList.append(action("COLOR_CMD"));
+ aList.append(action("DEFLECTION_CMD"));
aList.append(action("SHOW_FEATURE_CMD"));
myObjBrowserMenus[ModelAPI_ResultBody::group()] = aList;
// Group menu
myObjBrowserMenus[ModelAPI_ResultGroup::group()] = aList;
+ myObjBrowserMenus[ModelAPI_ResultField::group()] = aList;
// Result part menu
myObjBrowserMenus[ModelAPI_ResultPart::group()] = aList;
//-------------------------------------
aList.append(action("SHOW_ONLY_CMD"));
aList.append(mySeparator);
aList.append(action("COLOR_CMD"));
+ aList.append(action("DEFLECTION_CMD"));
myViewerMenu[ModelAPI_ResultConstruction::group()] = aList;
// Result part menu
myViewerMenu[ModelAPI_ResultPart::group()] = aList;
aList.append(action("SHOW_ONLY_CMD"));
aList.append(mySeparator);
aList.append(action("COLOR_CMD"));
+ aList.append(action("DEFLECTION_CMD"));
myViewerMenu[ModelAPI_ResultBody::group()] = aList;
// Group menu
myViewerMenu[ModelAPI_ResultGroup::group()] = aList;
+ myViewerMenu[ModelAPI_ResultField::group()] = aList;
//-------------------------------------
}
aActions.append(mySeparator);
//aActions.append(action("MOVE_CMD"));
aActions.append(action("COLOR_CMD"));
+ aActions.append(action("DEFLECTION_CMD"));
+
aActions.append(action("CLEAN_HISTORY_CMD"));
aActions.append(action("DELETE_CMD"));
}
+#ifdef _DEBUG
+ if (aSelected == 0) {
+ #ifdef TINSPECTOR
+ aActions.append(action("TINSPECTOR_VIEW"));
+ #endif
+ }
+#endif
theMenu->addActions(aActions);
addFeatures(theMenu);
void XGUI_ContextMenuMgr::addViewerMenu(QMenu* theMenu) const
{
XGUI_SelectionMgr* aSelMgr = myWorkshop->selector();
- QList<ModuleBase_ViewerPrsPtr> aPrsList = aSelMgr->selection()->getSelected(ModuleBase_ISelection::Viewer);
+ QList<ModuleBase_ViewerPrsPtr> aPrsList =
+ aSelMgr->selection()->getSelected(ModuleBase_ISelection::Viewer);
int aSelected = aPrsList.size();
QActionsList aActions;
aSelMenu->addAction(action("SELECT_VERTEX_CMD"));
aSelMenu->addAction(action("SELECT_EDGE_CMD"));
aSelMenu->addAction(action("SELECT_FACE_CMD"));
- aSelMenu->addSeparator();
+ //IMP: an attempt to use result selection with other selection modes
+ //aSelMenu->addSeparator();
aSelMenu->addAction(action("SELECT_RESULT_CMD"));
theMenu->addMenu(aSelMenu);
theMenu->addSeparator();
// hide all is shown always even if selection in the viewer is empty
aActions.append(action("HIDEALL_CMD"));
aActions.append(action("COLOR_CMD"));
+ aActions.append(action("DEFLECTION_CMD"));
theMenu->addActions(aActions);
void XGUI_ContextMenuMgr::onRename()
{
QObjectPtrList anObjects = myWorkshop->selector()->selection()->selectedObjects();
- if (!myWorkshop->abortAllOperations())
- return;
+ if (!myWorkshop->operationMgr()->abortAllOperations())
+ return;
// restore selection in case if dialog box was shown
myWorkshop->objectBrowser()->setObjectsSelected(anObjects);
myWorkshop->objectBrowser()->onEditItem();
bool aIsRoot = false;
foreach(QModelIndex aIdx, aSelectedIndexes) {
// Process only first column
- if (aIdx.column() == 0) {
+ if (aIdx.column() == 1) {
aIsRoot = !aIdx.parent().isValid();
// Exit if the selected index belongs to non active document
if (aIsRoot && (aActiveDoc != aMgr->moduleDocument()))
return;
if ((!aIsRoot) && (aIdx.internalPointer() != aActiveDoc.get()))
return;
-
+
// Get name of the selected index
aName = aIdx.data().toString();
aLen = aName.indexOf('(');
if (aLen != -1) {
aName = aName.left(--aLen);
}
- std::string aFeaturesStr = aIsRoot?
+ std::string aFeaturesStr = aIsRoot?
aDataModelXML->rootFolderFeatures(aName.toStdString()) :
aDataModelXML->subFolderFeatures(aName.toStdString());
if (aFeaturesStr.length() > 0) {
- QStringList aFeturesList =
+ QStringList aFeturesList =
QString(aFeaturesStr.c_str()).split(",", QString::SkipEmptyParts);
foreach(QString aFea, aFeturesList) {
QAction* aAction = aActionMgr->action(aFea);
