#include <XGUI_CustomPrs.h>
#include <XGUI_HistoryMenu.h>
#include <XGUI_QtEvents.h>
+#include <XGUI_DataModel.h>
#ifndef HAVE_SALOME
#include <AppElements_Button.h>
#include <Events_InfoMessage.h>
#include <Events_LongOp.h>
-#include <ModuleBase_FilterFactory.h>
#include <ModuleBase_IModule.h>
#include <ModuleBase_IViewer.h>
#include <ModuleBase_Operation.h>
#include <Config_ModuleReader.h>
#include <Config_PointerMessage.h>
#include <Config_PropManager.h>
-#include <Config_SelectionFilterMessage.h>
#include <Config_DataModelReader.h>
#include <Config_Translator.h>
#include <SUIT_ResourceMgr.h>
+#include <AIS_Trihedron.hxx>
+#ifdef BEFORE_TRIHEDRON_PATCH
+#include <AIS_Point.hxx>
+#include <AIS_Axis.hxx>
+#endif
+
#include <QApplication>
#include <QFileDialog>
#include <QMessageBox>
#include <iterator>
+#ifdef TINSPECTOR
+#include <CDF_Session.hxx>
+#include <CDF_Application.hxx>
+#include <TInspector_Communicator.hxx>
+#include <VInspector_CallBack.hxx>
+static TInspector_Communicator* MyTCommunicator;
+static Handle(VInspector_CallBack) MyVCallBack;
+
+#endif
+
#ifdef _DEBUG
#include <QDebug>
#include <iostream>
// Has to be defined first in order to get errors and messages from other components
myEventsListener = new XGUI_WorkshopListener(aWorkshop);
+ SUIT_ResourceMgr* aResMgr = ModuleBase_Preferences::resourceMgr();
#ifndef HAVE_SALOME
myMainWindow = new AppElements_MainWindow();
- SUIT_ResourceMgr* aResMgr = ModuleBase_Preferences::resourceMgr();
bool aCloc = aResMgr->booleanValue("language", "locale", true);
if (aCloc)
QLocale::setDefault( QLocale::c() );
- else
+ else
QLocale::setDefault( QLocale::system() );
#endif
QString aPath = Config_XMLReader::pluginConfigFile().c_str();
QDir aDir(aPath);
// Load translations
- QStringList aFilters;
- aFilters << "*_en.ts";
- QStringList aTsFiles = aDir.entryList(aFilters, QDir::Files);
- foreach(QString aFileName, aTsFiles) {
- Config_Translator::load(aFileName.toStdString());
+ QStringList aLangs;
+ aLangs << "*_en.ts"; // load by default eng translations
+ QString aCurrLang = aResMgr->stringValue("language", "language", "en");
+ if(aCurrLang != "en") {
+ aLangs << "*_" + aCurrLang + ".ts"; // then replace with translated files
+ }
+
+ foreach(QString aLang, aLangs) {
+ QStringList aFilters;
+ aFilters << aLang;
+ QStringList aTsFiles = aDir.entryList(aFilters, QDir::Files);
+ foreach(QString aFileName, aTsFiles) {
+ Config_Translator::load(aFileName.toStdString());
+ }
}
myDataModelXMLReader = new Config_DataModelReader();
SLOT(onOperationResumed(ModuleBase_Operation*)));
connect(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)),
SLOT(onOperationStopped(ModuleBase_Operation*)));
- connect(myOperationMgr, SIGNAL(operationCommitted(ModuleBase_Operation*)),
+ connect(myOperationMgr, SIGNAL(operationCommitted(ModuleBase_Operation*)),
SLOT(onOperationCommitted(ModuleBase_Operation*)));
- connect(myOperationMgr, SIGNAL(operationAborted(ModuleBase_Operation*)),
+ connect(myOperationMgr, SIGNAL(operationAborted(ModuleBase_Operation*)),
SLOT(onOperationAborted(ModuleBase_Operation*)));
#ifndef HAVE_SALOME
Config_Prop::Color, ModelAPI_ResultBody::DEFAULT_COLOR());
Config_PropManager::registerProp("Visualization", "result_group_color", "Group color",
Config_Prop::Color, ModelAPI_ResultGroup::DEFAULT_COLOR());
- Config_PropManager::registerProp("Visualization", "result_construction_color", "Construction color",
- Config_Prop::Color, ModelAPI_ResultConstruction::DEFAULT_COLOR());
+ Config_PropManager::registerProp("Visualization", "result_construction_color",
+ "Construction color",
+ Config_Prop::Color,
+ ModelAPI_ResultConstruction::DEFAULT_COLOR());
Config_PropManager::registerProp("Visualization", "result_part_color", "Part color",
Config_Prop::Color, ModelAPI_ResultPart::DEFAULT_COLOR());
- Config_PropManager::registerProp("Visualization", "result_deflection", "Result deflection",
- Config_Prop::Double, "0.001");
+ Config_PropManager::registerProp("Visualization", "body_deflection",
+ "Body deflection coefficient",
+ Config_Prop::Double,
+ ModelAPI_ResultBody::DEFAULT_DEFLECTION());
+
+ Config_PropManager::registerProp("Visualization", "construction_deflection",
+ "Construction deflection coefficient",
+ Config_Prop::Double,
+ ModelAPI_ResultConstruction::DEFAULT_DEFLECTION());
if (ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "face-selection", true))
myViewerSelMode.append(TopAbs_FACE);
myMainWindow->show();
updateCommandStatus();
#endif
-
+
onNew();
myViewerProxy->connectViewProxy();
XGUI_Displayer* aDisplayer = displayer();
QObjectPtrList aDisplayed = aDisplayer->displayedObjects();
aDisplayer->deactivateObjects(aDisplayed, true);
+ Handle(AIS_InteractiveContext) aContext = viewer()->AISContext();
+ Handle(AIS_Trihedron) aTrihedron = Handle(AIS_Trihedron)::DownCast(aDisplayer->getTrihedron());
+ /// deactivate trihedron in selection modes
+ TColStd_ListOfInteger aTColModes;
+ aContext->ActivatedModes(aTrihedron, aTColModes);
+ TColStd_ListIteratorOfListOfInteger itr( aTColModes );
+ for (; itr.More(); itr.Next() ) {
+ Standard_Integer aMode = itr.Value();
+ aContext->Deactivate(aTrihedron, aMode);
+ }
+#ifdef BEFORE_TRIHEDRON_PATCH
+ /// Trihedron problem: objects stayed in the viewer, should be removed manually
+ /// otherwise in SALOME happens crash by HideAll in the viewer
+ aContext->Remove(aTrihedron->Position(), true);
+ aContext->Remove(aTrihedron->Axis(), true);
+ aContext->Remove(aTrihedron->XAxis(), true);
+ aContext->Remove(aTrihedron->YAxis(), true);
+#endif
myOperationMgr->deactivate();
}
QAction* aAction = salomeConnector()->addDesktopCommand("UNDO_CMD", tr("Undo"),
tr("Undo last command"),
QIcon(":pictures/undo.png"),
- QKeySequence::Undo, false, "MEN_DESK_EDIT");
+ QKeySequence::Undo, false,
+ "MEN_DESK_EDIT");
QString aToolBarTitle = tr( "INF_DESK_TOOLBAR_STANDARD" );
salomeConnector()->addActionInToolbar( aAction,aToolBarTitle );
addHistoryMenu(aAction, SIGNAL(updateRedoHistory(const QList<ActionInfo>&)), SLOT(onRedo(int)));
salomeConnector()->addDesktopMenuSeparator("MEN_DESK_EDIT");
- //aAction = salomeConnector()->addDesktopCommand("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"),
+ //aAction = salomeConnector()->addDesktopCommand("REBUILD_CMD", tr("Rebuild"),
+ // tr("Rebuild data objects"),
// QIcon(":pictures/rebuild.png"), QKeySequence(),
// false, "MEN_DESK_EDIT");
//salomeConnector()->addActionInToolbar( aAction, aToolBarTitle );
//connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRebuild()));
//salomeConnector()->addDesktopMenuSeparator("MEN_DESK_EDIT");
- aAction = salomeConnector()->addDesktopCommand("SAVEAS_CMD", tr("Export native..."), tr("Export the current document into a native file"),
+ aAction = salomeConnector()->addDesktopCommand("SAVEAS_CMD", tr("Export native..."),
+ tr("Export the current document into a native file"),
QIcon(), QKeySequence(),
false, "MEN_DESK_FILE");
connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onSaveAs()));
- aAction = salomeConnector()->addDesktopCommand("OPEN_CMD", tr("Import native..."), tr("Import native file"),
+ aAction = salomeConnector()->addDesktopCommand("OPEN_CMD", tr("Import native..."),
+ tr("Import native file"),
QIcon(), QKeySequence(),
false, "MEN_DESK_FILE");
connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onOpen()));
XGUI_SalomeConnector* aSalomeConnector = salomeConnector();
if (aSalomeConnector->isFeatureOfNested(actionsMgr()->action(aFeatureKind.c_str())))
aHasNested = true;
-#else
+#else
AppElements_MainMenu* aMenuBar = mainWindow()->menuObject();
AppElements_Command* aCommand = aMenuBar->feature(aFeatureKind.c_str());
if (aCommand && aCommand->button()->additionalButtonWidget())
void XGUI_Workshop::fillPropertyPanel(ModuleBase_Operation* theOperation)
{
- ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+ ModuleBase_OperationFeature* aFOperation =
+ dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
if (!aFOperation)
return;
if (!aWidget->attributeID().empty() && !aFeature->attribute(aWidget->attributeID()).get()) {
std::string anErrorMsg = "The feature '%1' has no attribute '%2' used by widget '%3'.";
Events_InfoMessage("XGUI_Workshop", anErrorMsg)
- .arg(aFeatureKind).arg(aWidget->attributeID()).arg(aWidget->metaObject()->className()).send();
+ .arg(aFeatureKind).arg(aWidget->attributeID())
+ .arg(aWidget->metaObject()->className()).send();
myPropertyPanel->cleanContent();
return;
}
// update visible state of Preview button
#ifdef HAVE_SALOME
- bool anIsAutoPreview = mySalomeConnector->featureInfo(aFeatureKind.c_str())->isAutoPreview();
+ bool anIsAutoPreview =
+ mySalomeConnector->featureInfo(aFeatureKind.c_str())->isAutoPreview();
#else
AppElements_MainMenu* aMenuBar = mainWindow()->menuObject();
AppElements_Command* aCommand = aMenuBar->feature(aFeatureKind.c_str());
myPropertyPanel->setWindowTitle(theOperation->getDescription()->description());
#else
std::string aFeatureName = aFeature->name();
- myPropertyPanel->setWindowTitle(QString("%1: %2").arg(theOperation->getDescription()->description())
- .arg(aFeatureName.c_str()));
+ myPropertyPanel->setWindowTitle(QString("%1: %2")
+ .arg(theOperation->getDescription()->description())
+ .arg(aFeatureName.c_str()));
#endif
myErrorMgr->setPropertyPanel(myPropertyPanel);
void XGUI_Workshop::setGrantedFeatures(ModuleBase_Operation* theOperation)
{
- ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+ ModuleBase_OperationFeature* aFOperation =
+ dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
if (!aFOperation)
return;
{
QApplication::restoreOverrideCursor();
SessionPtr aMgr = ModelAPI_Session::get();
+
+ std::list<DocumentPtr> aDocList = aMgr->allOpenedDocuments();
+ std::list<DocumentPtr>::const_iterator aIt;
+ for (aIt = aDocList.cbegin(); aIt != aDocList.cend(); aIt++) {
+ std::list<bool> aState = myObjectBrowser->getStateForDoc(*aIt);
+ (*aIt)->storeNodesState(aState);
+ }
+
aMgr->save(theName.toLatin1().constData(), theFileNames);
+
QApplication::restoreOverrideCursor();
}
}
QApplication::setOverrideCursor(Qt::WaitCursor);
+ module()->closeDocument();
SessionPtr aSession = ModelAPI_Session::get();
aSession->closeAll();
aSession->load(myCurrentDir.toLatin1().constData());
myObjectBrowser->rebuildDataTree();
+
+ // Open first level of data tree
+ DocumentPtr aRootDoc = aSession->moduleDocument();
+ std::list<bool> aStates;
+ aRootDoc->restoreNodesState(aStates);
+ myObjectBrowser->setStateForDoc(aRootDoc, aStates);
+
updateCommandStatus();
+#ifndef HAVE_SALOME
+ myMainWindow->setCurrentDir(myCurrentDir, true);
+#endif
QApplication::restoreOverrideCursor();
}
QFileDialog dialog(desktop());
dialog.setWindowTitle(tr("Select directory to save files..."));
dialog.setFileMode(QFileDialog::Directory);
- dialog.setFilter(tr("Directories (*)"));
+ dialog.setFilter(QDir::AllDirs);
dialog.setOptions(QFileDialog::HideNameFilterDetails | QFileDialog::ShowDirsOnly);
dialog.setViewMode(QFileDialog::Detail);
if (aDir.exists() && !aDir.entryInfoList(QDir::NoDotAndDotDot | QDir::AllEntries).isEmpty()) {
int answer = QMessageBox::question(
desktop(),
- //: Title of the dialog which asks user if he wants to save study in existing non-empty folder
+ // Title of the dialog which asks user if he wants to save study
+ // in existing non-empty folder
tr("Save"),
tr("The directory already contains some files, save anyway?"),
QMessageBox::Save | QMessageBox::Cancel);
{
// the viewer update should be blocked in order to avoid the features blinking. For the created
// feature a results are created, the flush of the created signal caused the viewer redisplay for
- // each created result. After a redisplay signal is flushed. So, the viewer update is blocked until
- // redo of all possible objects happens
+ // each created result. After a redisplay signal is flushed. So, the viewer update is blocked
+ // until redo of all possible objects happens
bool isUpdateEnabled = myDisplayer->enableUpdateViewer(false);
objectBrowser()->treeView()->setCurrentIndex(QModelIndex());
QDockWidget* XGUI_Workshop::createObjectBrowser(QWidget* theParent)
{
QDockWidget* aObjDock = new QDockWidget(theParent);
- aObjDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea | Qt::BottomDockWidgetArea);
+ aObjDock->setAllowedAreas(Qt::LeftDockWidgetArea |
+ Qt::RightDockWidgetArea |
+ Qt::BottomDockWidgetArea);
aObjDock->setWindowTitle(tr("Object browser"));
aObjDock->setStyleSheet(
"::title { position: relative; padding-left: 5px; text-align: left center }");
aDesktop->addDockWidget(Qt::LeftDockWidgetArea, aObjDock);
myPropertyPanel = new XGUI_PropertyPanel(aDesktop, myOperationMgr);
myPropertyPanel->setupActions(myActionsMgr);
- myPropertyPanel->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea | Qt::BottomDockWidgetArea);
+ myPropertyPanel->setAllowedAreas(Qt::LeftDockWidgetArea |
+ Qt::RightDockWidgetArea |
+ Qt::BottomDockWidgetArea);
aDesktop->addDockWidget(Qt::LeftDockWidgetArea, myPropertyPanel);
hidePropertyPanel(); ///<! Invisible by default
hideObjectBrowser();
else if (theId == "SHOW_CMD") {
showObjects(aObjects, true);
mySelector->updateSelectionBy(ModuleBase_ISelection::Browser);
+ updateCommandStatus();
}
- else if (theId == "HIDE_CMD")
+ else if (theId == "HIDE_CMD") {
showObjects(aObjects, false);
+ updateCommandStatus();
+ }
else if (theId == "SHOW_ONLY_CMD") {
showOnlyObjects(aObjects);
mySelector->updateSelectionBy(ModuleBase_ISelection::Browser);
+ updateCommandStatus();
}
else if (theId == "SHADING_CMD")
setDisplayMode(aObjects, XGUI_Displayer::Shading);
aObj->setDisplayed(false);
}
Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
+ updateCommandStatus();
} else if (theId == "SELECT_VERTEX_CMD") {
setViewerSelectionMode(TopAbs_VERTEX);
} else if (theId == "SELECT_EDGE_CMD") {
} else if (theId == "SHOW_FEATURE_CMD") {
highlightFeature(aObjects);
}
+#ifdef TINSPECTOR
+ else if (theId == "TINSPECTOR_VIEW") {
+ Handle(CDF_Application) anApplication = CDF_Session::CurrentSession()->CurrentApplication();
+ if (!anApplication.IsNull())
+ {
+ if (!MyTCommunicator)
+ {
+ MyTCommunicator = new TInspector_Communicator();
+
+ NCollection_List<Handle(Standard_Transient)> aParameters;
+ aParameters.Append(anApplication);
+ Handle(AIS_InteractiveContext) aContext = viewer()->AISContext();
+ if (!aContext.IsNull())
+ aParameters.Append(aContext);
+
+ MyVCallBack = new VInspector_CallBack();
+ myDisplayer->setCallBack(MyVCallBack);
+ #ifndef HAVE_SALOME
+ AppElements_Viewer* aViewer = mainWindow()->viewer();
+ if (aViewer)
+ aViewer->setCallBack(MyVCallBack);
+ #endif
+ aParameters.Append(MyVCallBack);
+
+ MyTCommunicator->init(aParameters);
+ MyTCommunicator->Activate("TKVInspector"); // to have filled callback by model
+ MyTCommunicator->Activate("TKDFBrowser");
+ }
+ MyTCommunicator->setVisible(true);
+ }
+ }
+#endif
}
//**************************************************************
anInfo.append(aFeature->name().c_str());
}
QString anInfoStr = anInfo.join(";\t");
- qDebug(QString("cleanHistory for: [%1] - %2").arg(aFeatures.size()).arg(anInfoStr).toStdString().c_str());
+ qDebug(QString("cleanHistory for: [%1] - %2").
+ arg(aFeatures.size()).arg(anInfoStr).toStdString().c_str());
#endif
std::map<FeaturePtr, std::set<FeaturePtr> > aReferences;
ModelAPI_Tools::findAllReferences(aFeatures, aReferences, true, false);
- // find for each object whether all reference values are in the map as key, that means that there is
- // no other reference in the model to this object, so it might be removed by cleaning history
+ // find for each object whether all reference values are in the map as key, that means that there
+ // is no other reference in the model to this object, so it might be removed by cleaning history
// sk_1(ext_1, vertex_1) + (sk_3, bool_1) - cann't be deleted, dependency to bool_1
// ext_1(bool_1, sk_3) - cann't be deleted, dependency to bool_1
// vertex_1()
for (; aMainIt != aMainLast; aMainIt++) {
FeaturePtr aMainListFeature = aMainIt->first;
std::set<FeaturePtr> aMainRefList = aMainIt->second;
- std::set<FeaturePtr>::const_iterator aRefIt = aMainRefList.begin(), aRefLast = aMainRefList.end();
+ std::set<FeaturePtr>::const_iterator aRefIt = aMainRefList.begin(),
+ aRefLast = aMainRefList.end();
bool aFeatureOutOfTheList = false;
for (; aRefIt != aRefLast && !aFeatureOutOfTheList; aRefIt++) {
FeaturePtr aRefFeature = *aRefIt;
FeaturePtr aFeature = *aFIt;
anInfo.append(aFeature->name().c_str());
}
- qDebug(QString("unused objects: [%1] - %2").arg(anInfo.size()).arg(anInfo.join(";\t")).toStdString().c_str());
+ qDebug(QString("unused objects: [%1] - %2").
+ arg(anInfo.size()).arg(anInfo.join(";\t")).toStdString().c_str());
#endif
// warn about the references remove, break the delete operation if the user chose it
aMessageBox.setStandardButtons(QMessageBox::No | QMessageBox::Yes);
aMessageBox.setDefaultButton(QMessageBox::No);
- QString aText = QString(tr("Unused features are the following: %1.\nThese features will be deleted.\nWould you like to continue?")
- .arg(anUnusedNames));
+ const char* aKeyStr = "Unused features are the following: "
+ "%1.\nThese features will be deleted.\nWould you like to continue?";
+ QString aText = QString(tr(aKeyStr).arg(anUnusedNames));
aMessageBox.setText(aText);
if (aMessageBox.exec() == QMessageBox::No)
return;
// 1. start operation
- aDescription += "by deleting of " + aDescription.arg(XGUI_Tools::unionOfObjectNames(anObjects, ", "));
+ aDescription += "by deleting of " +
+ aDescription.arg(XGUI_Tools::unionOfObjectNames(anObjects, ", "));
ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction(aDescription, module());
operationMgr()->startOperation(anOpAction);
DocumentPtr aDocument = theObject->document();
std::list<FeaturePtr> anAllFeatures = allFeatures(aDocument);
// find the object iterator
- std::list<FeaturePtr>::iterator aObjectIt = std::find(anAllFeatures.begin(), anAllFeatures.end(), theObject);
+ std::list<FeaturePtr>::iterator aObjectIt =
+ std::find(anAllFeatures.begin(), anAllFeatures.end(), theObject);
if (aObjectIt == anAllFeatures.end())
return aResult;
// find the current feature iterator
- std::list<FeaturePtr>::iterator aCurrentIt = std::find(anAllFeatures.begin(), anAllFeatures.end(), aDocument->currentFeature(true));
+ std::list<FeaturePtr>::iterator aCurrentIt =
+ std::find(anAllFeatures.begin(), anAllFeatures.end(), aDocument->currentFeature(true));
if (aCurrentIt == anAllFeatures.end())
return aResult;
// check the right order
- if (std::distance(aObjectIt, anAllFeatures.end()) <= std::distance(aCurrentIt, anAllFeatures.end()))
+ if (std::distance(aObjectIt, anAllFeatures.end()) <=
+ std::distance(aCurrentIt, anAllFeatures.end()))
return aResult;
// exclude the object
std::advance(aObjectIt, 1);
QObjectPtrList::const_iterator anIt = aObjects.begin(), aLast = aObjects.end();
for (; anIt != aLast && aCanMove; anIt++) {
ObjectPtr aObject = *anIt;
- // 1. Get features placed between selected and current in the document
+ // 1. Get features placed between selected and current in the document
std::list<FeaturePtr> aFeaturesBetween = toCurrentFeatures(aObject);
// if aFeaturesBetween is empty it means wrong order or aObject is the current feature
if (aFeaturesBetween.empty())
aCanMove = false;
else {
std::set<FeaturePtr> aPlacedFeatures(aFeaturesBetween.begin(), aFeaturesBetween.end());
- // 2. Get all reference features to the selected object in the document
+ // 2. Get all reference features to the selected object in the document
std::set<FeaturePtr> aRefFeatures;
ModuleBase_Tools::refsToFeatureInFeatureDocument(aObject, aRefFeatures);
AttributeIntArrayPtr aColorAttr;
// 1. find the current color of the object. This is a color of AIS presentation
- // The objects are iterated until a first valid color is found
+ // The objects are iterated until a first valid color is found
std::vector<int> aColor;
foreach(ObjectPtr anObject, theObjects) {
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObject);
return;
if (!abortAllOperations())
- return;
+ return;
// 2. show the dialog to change the value
XGUI_ColorDialog* aDlg = new XGUI_ColorDialog(desktop());
aDlg->setColor(aColor);
foreach(ObjectPtr anObj, theObjects) {
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObj);
if (aResult.get() != NULL) {
- ResultCompSolidPtr aCompsolidResult = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aResult);
+ ResultCompSolidPtr aCompsolidResult =
+ std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aResult);
if (aCompsolidResult.get() != NULL) { // change colors for all sub-solids
for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) {
- setColor(aCompsolidResult->subResult(i), !isRandomColor ? aColorResult : aDlg->getRandomColor());
+ setColor(aCompsolidResult->subResult(i), !isRandomColor ? aColorResult :
+ aDlg->getRandomColor());
}
}
setColor(aResult, !isRandomColor ? aColorResult : aDlg->getRandomColor());
{
AttributeDoublePtr aDoubleAttr;
// 1. find the current color of the object. This is a color of AIS presentation
- // The objects are iterated until a first valid color is found
+ // The objects are iterated until a first valid color is found
double aDeflection = -1;
foreach(ObjectPtr anObject, theObjects) {
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObject);
return;
if (!abortAllOperations())
- return;
+ return;
// 2. show the dialog to change the value
XGUI_DeflectionDialog* aDlg = new XGUI_DeflectionDialog(desktop());
aDlg->setDeflection(aDeflection);
foreach(ObjectPtr anObj, theObjects) {
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObj);
if (aResult.get() != NULL) {
- ResultCompSolidPtr aCompsolidResult = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aResult);
+ ResultCompSolidPtr aCompsolidResult =
+ std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aResult);
if (aCompsolidResult.get() != NULL) { // change colors for all sub-solids
for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) {
setDeflection(aCompsolidResult->subResult(i), aDeflection);
void XGUI_Workshop::showObjects(const QObjectPtrList& theList, bool isVisible)
{
foreach (ObjectPtr aObj, theList) {
- /*
- ResultPartPtr aPartRes = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObj);
- if (aPartRes) {
- DocumentPtr aDoc = aPartRes->partDoc();
- SET_DISPLAY_GROUP(ModelAPI_ResultBody::group(), isVisible)
- SET_DISPLAY_GROUP(ModelAPI_ResultConstruction::group(), isVisible)
- SET_DISPLAY_GROUP(ModelAPI_ResultGroup::group(), isVisible)
- } else {
- */
- aObj->setDisplayed(isVisible);
- //}
+ aObj->setDisplayed(isVisible);
}
Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
}
// Show only objects from the list
foreach (ObjectPtr aObj, theList) {
- /*
- ResultPartPtr aPartRes = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObj);
- if (aPartRes) {
- DocumentPtr aDoc = aPartRes->partDoc();
- SET_DISPLAY_GROUP(ModelAPI_ResultBody::group(), true)
- SET_DISPLAY_GROUP(ModelAPI_ResultConstruction::group(), true)
- SET_DISPLAY_GROUP(ModelAPI_ResultGroup::group(), true)
- } else {
- */
- aObj->setDisplayed(true);
- //}
+ aObj->setDisplayed(true);
}
Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
-
}
//**************************************************************
void XGUI_Workshop::displayGroupResults(DocumentPtr theDoc, std::string theGroup)
{
- for (int i = 0; i < theDoc->size(theGroup); i++)
+ for (int i = 0; i < theDoc->size(theGroup); i++)
theDoc->object(theGroup, i)->setDisplayed(true);
//displayObject(theDoc->object(theGroup, i));
Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
anOperation->abort();
anOperation = operationMgr()->currentOperation();
}
- myDisplayer->closeLocalContexts();
+ //myDisplayer->closeLocalContexts();
myDisplayer->eraseAll();
objectBrowser()->clearContent();
module()->closeDocument();
+ // data model need not process the document's signals about objects modifications as
+ // the document is closed
+ //bool isBlocked = objectBrowser()->dataModel()->blockEventsProcessing(true);
+
SessionPtr aMgr = ModelAPI_Session::get();
aMgr->closeAll();
+
+ //objectBrowser()->dataModel()->blockEventsProcessing(isBlocked);
}
void XGUI_Workshop::addHistoryMenu(QObject* theObject, const char* theSignal, const char* theSlot)
synchronizeGroupInViewer(aDoc, ModelAPI_ResultGroup::group(), false);
}
-void XGUI_Workshop::synchronizeGroupInViewer(const DocumentPtr& theDoc,
- const std::string& theGroup,
+void XGUI_Workshop::synchronizeGroupInViewer(const DocumentPtr& theDoc,
+ const std::string& theGroup,
bool theUpdateViewer)
{
ObjectPtr aObj;
{
FeaturePtr aFeature;
QObjectPtrList aSelList = theObjects;
- std::list<ResultPtr> aResList;
bool aHasHidden = false;
foreach(ObjectPtr aObj, theObjects) {
aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
std::list<ResultPtr> aResults;
ModelAPI_Tools::allResults(aFeature, aResults);
std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aIt;
- for(aIt = aResList.cbegin(); aIt != aResList.cend(); aIt++) {
+ for(aIt = aResults.cbegin(); aIt != aResults.cend(); aIt++) {
aHasHidden |= (*aIt)->isConcealed();
aSelList.append(*aIt);
}
objectBrowser()->setObjectsSelected(aSelList);
objectBrowser()->blockSignals(aBlocked);
}
- if (aHasHidden)
- QMessageBox::information(desktop(), tr("Find results"),
+ if (aHasHidden)
+ QMessageBox::information(desktop(), tr("Find results"),
tr("Results not found"), QMessageBox::Ok);
}
