-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019 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
//
// 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
+// 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>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "XGUI_ContextMenuMgr.h"
#include <ModelAPI_ResultField.h>
#include <ModelAPI_Folder.h>
#include <ModelAPI_AttributeReference.h>
+#include <ModelAPI_ResultField.h>
#include <Config_DataModelReader.h>
aAction = ModuleBase_Tools::createAction(QIcon(""), tr("Deflection..."), aDesktop);
addAction("DEFLECTION_CMD", aAction);
-#ifdef USE_TRANSPARENCY
aAction = ModuleBase_Tools::createAction(QIcon(":pictures/transparency.png"),
tr("Transparency..."), aDesktop);
addAction("TRANSPARENCY_CMD", aAction);
-#endif
aAction = ModuleBase_Tools::createAction(QIcon(":pictures/eye_pencil.png"), tr("Show"), aDesktop);
addAction("SHOW_CMD", aAction);
mySeparator3 = ModuleBase_Tools::createAction(QIcon(), "", aDesktop);
mySeparator3->setSeparator(true);
- //mySelectActions = new QActionGroup(this);
- //mySelectActions->setExclusive(true);
-
aAction = ModuleBase_Tools::createAction(QIcon(":pictures/vertex.png"), tr("Vertices"), aDesktop,
this, SLOT(onShapeSelection(bool)));
aAction->setCheckable(true);
addAction("SELECT_VERTEX_CMD", aAction);
- //mySelectActions->addAction(aAction);
aAction = ModuleBase_Tools::createAction(QIcon(":pictures/edge.png"), tr("Edges"), aDesktop,
this, SLOT(onShapeSelection(bool)));
aAction->setCheckable(true);
addAction("SELECT_EDGE_CMD", aAction);
- //mySelectActions->addAction(aAction);
aAction = ModuleBase_Tools::createAction(QIcon(":pictures/face.png"), tr("Faces"), aDesktop,
this, SLOT(onShapeSelection(bool)));
aAction->setCheckable(true);
addAction("SELECT_FACE_CMD", aAction);
- //mySelectActions->addAction(aAction);
aAction = ModuleBase_Tools::createAction(QIcon(":pictures/result.png"), tr("Results"), aDesktop,
this, SLOT(onResultSelection(bool)));
aAction->setCheckable(true);
addAction("SELECT_RESULT_CMD", aAction);
- //mySelectActions->addAction(aAction);
aAction->setChecked(true);
tr("Move out after the folder"), aDesktop);
addAction("ADD_OUT_FOLDER_AFTER_CMD", aAction);
+ aAction = ModuleBase_Tools::createAction(QIcon(":pictures/normal-view-inversed.png"),
+ tr("Set view by inverted normal to face"), aDesktop);
+ addAction("SET_VIEW_INVERTEDNORMAL_CMD", aAction);
+
+ aAction = ModuleBase_Tools::createAction(QIcon(":pictures/normal-view.png"),
+ tr("Set view by normal to face"), aDesktop);
+ addAction("SET_VIEW_NORMAL_CMD", aAction);
+
buildObjBrowserMenu();
buildViewerMenu();
}
bool hasCompositeOwner = false;
bool hasResultInHistory = false;
bool hasFolder = false;
+ bool canBeDeleted = true;
ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter,
hasCompositeOwner, hasResultInHistory, hasFolder);
//Process Feature
if( aMgr->activeDocument() == aObject->document() )
{
action("RENAME_CMD")->setEnabled(true);
- action("DELETE_CMD")->setEnabled(!hasCompositeOwner);
+ if (aObject->groupName() == ModelAPI_ResultConstruction::group()) {
+ FeaturePtr aFeature = ModelAPI_Feature::feature(aObject);
+ canBeDeleted = aFeature->isInHistory();
+ action("DELETE_CMD")->setEnabled(canBeDeleted);
+ }
+ else
+ action("DELETE_CMD")->setEnabled(!hasCompositeOwner);
action("CLEAN_HISTORY_CMD")->setEnabled(!hasCompositeOwner &&
(hasFeature || hasParameter));
}
}
// end single selection
- } else { // multiselection
+ } else { // multi-selection
// parameter is commented because the actions are not in the list of result parameter actions
if (hasResult /*&& (!hasParameter)*/) {
action("SHOW_CMD")->setEnabled(true);
action("SHOW_ONLY_CMD")->setEnabled(true);
action("SHADING_CMD")->setEnabled(true);
action("WIREFRAME_CMD")->setEnabled(true);
+
+ foreach(ObjectPtr aObj, aObjects) {
+ FeaturePtr aFeature = ModelAPI_Feature::feature(aObj);
+ if (!aFeature->isInHistory()) {
+ canBeDeleted = false;
+ break;
+ }
+ }
+ action("DELETE_CMD")->setEnabled(canBeDeleted);
}
- } // end multiselection
+ } // end multi-selection
// Check folder management commands state if only features are selected
if ((!hasResult) && hasFeature && (!hasParameter) && (!hasCompositeOwner) &&
break;
}
if (!hasCompositeOwner && allActive ) {
- if (hasFeature || hasParameter)
- action("DELETE_CMD")->setEnabled(true);
+ if (hasResult || hasFeature || hasParameter) // #2924 results can be erased
+ action("DELETE_CMD")->setEnabled(canBeDeleted);
}
if (!hasCompositeOwner && allActive && (hasFeature|| hasParameter))
action("CLEAN_HISTORY_CMD")->setEnabled(true);
}
}
if (aDeactivate) {
- // If at leas a one objec can not be edited then Show/Hide has to be disabled
+ // If at leas a one object can not be edited then Show/Hide has to be disabled
action("SHOW_CMD")->setEnabled(false);
action("HIDE_CMD")->setEnabled(false);
action("SHOW_ONLY_CMD")->setEnabled(false);
action("COLOR_CMD")->setEnabled(myWorkshop->canChangeProperty("COLOR_CMD"));
action("DEFLECTION_CMD")->setEnabled(myWorkshop->canChangeProperty("DEFLECTION_CMD"));
-#ifdef USE_TRANSPARENCY
action("TRANSPARENCY_CMD")->setEnabled(myWorkshop->canChangeProperty("TRANSPARENCY_CMD"));
-#endif
#ifdef _DEBUG
#ifdef TINSPECTOR
action("TINSPECTOR_VIEW")->setEnabled(true);
bool isVisible = false;
bool isShading = false;
bool canBeShaded = false;
+ bool hasPlanar = false;
ObjectPtr aObject;
foreach(ModuleBase_ViewerPrsPtr aPrs, aPrsList) {
aObject = aPrs->object();
- ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aObject);
- if (aRes && aRes->isDisplayed()) {
+ if (!aObject.get())
+ continue;
+ GeomShapePtr aShape = aPrs->shape();
+ if (aObject->isDisplayed()) {
isVisible = true;
canBeShaded = myWorkshop->displayer()->canBeShaded(aObject);
isShading =
(myWorkshop->displayer()->displayMode(aObject) == XGUI_Displayer::Shading);
- break;
+ }
+ if (aShape.get()) {
+ if (aShape->isPlanar()) {
+ hasPlanar = true;
+ }
}
}
if (isVisible) {
action("HIDE_CMD")->setEnabled(true);
} else
action("SHOW_CMD")->setEnabled(true);
+
+ action("SET_VIEW_NORMAL_CMD")->setEnabled(hasPlanar);
+ action("SET_VIEW_INVERTEDNORMAL_CMD")->setEnabled(hasPlanar);
}
//issue #2159 Hide all incomplete behavior
#ifdef HAVE_SALOME
if (myWorkshop->canChangeProperty("DEFLECTION_CMD"))
action("DEFLECTION_CMD")->setEnabled(true);
-#ifdef USE_TRANSPARENCY
if (myWorkshop->canChangeProperty("TRANSPARENCY_CMD"))
action("TRANSPARENCY_CMD")->setEnabled(true);
-#endif
- action("DELETE_CMD")->setEnabled(true);
+ // Delete command is not used in viewer pop-up menu
+ action("DELETE_CMD")->setEnabled(false);
}
void XGUI_ContextMenuMgr::connectObjectBrowser()
aList.append(action("RENAME_CMD"));
aList.append(action("COLOR_CMD"));
aList.append(action("DEFLECTION_CMD"));
-#ifdef USE_TRANSPARENCY
aList.append(action("TRANSPARENCY_CMD"));
-#endif
aList.append(action("SHOW_FEATURE_CMD"));
+ aList.append(mySeparator2);
+ aList.append(action("DELETE_CMD"));
myObjBrowserMenus[ModelAPI_ResultConstruction::group()] = aList;
//-------------------------------------
aList.append(action("RENAME_CMD"));
aList.append(action("COLOR_CMD"));
aList.append(action("DEFLECTION_CMD"));
-#ifdef USE_TRANSPARENCY
aList.append(action("TRANSPARENCY_CMD"));
-#endif
aList.append(action("SHOW_FEATURE_CMD"));
+ aList.append(mySeparator3);
+ aList.append(action("DELETE_CMD"));
myObjBrowserMenus[ModelAPI_ResultBody::group()] = aList;
// Group menu
myObjBrowserMenus[ModelAPI_ResultGroup::group()] = aList;
aList.append(action("DELETE_CMD"));
myObjBrowserMenus[ModelAPI_Folder::group()] = aList;
+ //---------------------------------------
+ // Step objects menu
+ aList.clear();
+ aList.append(action("SHOW_CMD"));
+ aList.append(action("HIDE_CMD"));
+ aList.append(action("SHOW_ONLY_CMD"));
+ myObjBrowserMenus[ModelAPI_ResultField::ModelAPI_FieldStep::group()] = aList;
}
void XGUI_ContextMenuMgr::buildViewerMenu()
{
QActionsList aList;
// Result construction menu
- aList.append(action("HIDE_CMD"));
- aList.append(action("SHOW_ONLY_CMD"));
- aList.append(mySeparator1);
aList.append(action("COLOR_CMD"));
aList.append(action("DEFLECTION_CMD"));
-#ifdef USE_TRANSPARENCY
aList.append(action("TRANSPARENCY_CMD"));
-#endif
+ aList.append(mySeparator3);
+ aList.append(action("SET_VIEW_NORMAL_CMD"));
+ aList.append(action("SET_VIEW_INVERTEDNORMAL_CMD"));
+ aList.append(mySeparator1);
+ aList.append(action("SHOW_ONLY_CMD"));
+ aList.append(action("HIDE_CMD"));
myViewerMenu[ModelAPI_ResultConstruction::group()] = aList;
// Result part menu
myViewerMenu[ModelAPI_ResultPart::group()] = aList;
aList.clear();
aList.append(action("WIREFRAME_CMD"));
aList.append(action("SHADING_CMD"));
- aList.append(mySeparator1);
- aList.append(action("HIDE_CMD"));
- aList.append(action("SHOW_ONLY_CMD"));
aList.append(mySeparator2);
aList.append(action("COLOR_CMD"));
aList.append(action("DEFLECTION_CMD"));
-#ifdef USE_TRANSPARENCY
aList.append(action("TRANSPARENCY_CMD"));
-#endif
+ aList.append(mySeparator3);
+ aList.append(action("SET_VIEW_NORMAL_CMD"));
+ aList.append(action("SET_VIEW_INVERTEDNORMAL_CMD"));
+ aList.append(mySeparator1);
+ aList.append(action("SHOW_ONLY_CMD"));
+ aList.append(action("HIDE_CMD"));
myViewerMenu[ModelAPI_ResultBody::group()] = aList;
// Group menu
myViewerMenu[ModelAPI_ResultGroup::group()] = aList;
myViewerMenu[ModelAPI_ResultField::group()] = aList;
//-------------------------------------
+ // Step objects menu
+ aList.clear();
+ aList.append(action("HIDE_CMD"));
+ myViewerMenu[ModelAPI_ResultField::ModelAPI_FieldStep::group()] = aList;
}
//aActions.append(action("MOVE_CMD"));
aActions.append(action("COLOR_CMD"));
aActions.append(action("DEFLECTION_CMD"));
-#ifdef USE_TRANSPARENCY
aActions.append(action("TRANSPARENCY_CMD"));
-#endif
aActions.append(action("CLEAN_HISTORY_CMD"));
aActions.append(action("DELETE_CMD"));
}
aActions = myViewerMenu[aName];
}
} else if (aSelected > 1) {
+ aActions.append(action("COLOR_CMD"));
+ aActions.append(action("DEFLECTION_CMD"));
+ aActions.append(action("TRANSPARENCY_CMD"));
+ aActions.append(mySeparator1);
aActions.append(action("SHOW_ONLY_CMD"));
aActions.append(action("HIDE_CMD"));
}
// 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"));
-#ifdef USE_TRANSPARENCY
- aActions.append(action("TRANSPARENCY_CMD"));
-#endif
theMenu->addActions(aActions);
QMap<int, QAction*> aMenuActions;
// 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();
