#endif
#include <ModuleBase_IModule.h>
+#include <ModuleBase_Events.h>
#include <ModelAPI_Object.h>
#include <ModelAPI_Events.h>
#include <ModelAPI_Tools.h>
#include <Events_Loop.h>
-#include <Events_Error.h>
#include <Events_LongOp.h>
#include <ModuleBase_IWorkshop.h>
#include <ModuleBase_OperationFeature.h>
#include <ModuleBase_Tools.h>
#include <ModuleBase_IViewer.h>
-#include <ModuleBase_FilterFactory.h>
+#include <ModuleBase_WidgetSelector.h>
#include <Config_FeatureMessage.h>
#include <Config_PointerMessage.h>
-#include <Config_SelectionFilterMessage.h>
#include <Config_Keywords.h>
+#include <Events_InfoMessage.h>
#include <QApplication>
#include <QMainWindow>
{
//Initialize event listening
Events_Loop* aLoop = Events_Loop::loop();
- aLoop->registerListener(this, Events_Error::errorID()); //!< Listening application errors.
- aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OPERATION_LAUNCHED));
+ aLoop->registerListener(this, Events_InfoMessage::errorID()); //!< Listening application errors.
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_CREATED));
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
aLoop->registerListener(this, Events_LongOp::eventID());
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_PLUGIN_LOADED));
- aLoop->registerListener(this, Events_Loop::eventByName(EVENT_SELFILTER_LOADED));
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_UPDATE_VIEWER_BLOCKED));
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_UPDATE_VIEWER_UNBLOCKED));
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_EMPTY_AIS_PRESENTATION));
- aLoop->registerListener(this, Events_Loop::eventByName(EVENT_EMPTY_OPERATION_PRESENTATION));
+ aLoop->registerListener(this, Events_Loop::eventByName(EVENT_UPDATE_BY_WIDGET_SELECTION));
}
//******************************************************
std::shared_ptr<ModelAPI_ObjectUpdatedMessage> aUpdMsg =
std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
onFeatureEmptyPresentationMsg(aUpdMsg);
+ } else if (theMessage->eventID() == Events_Loop::eventByName(EVENT_UPDATE_BY_WIDGET_SELECTION)) {
+ ModuleBase_ModelWidget* aWidget = workshop()->propertyPanel()->activeWidget();
+ if (aWidget) {
+ ModuleBase_WidgetSelector* aWidgetSelector =
+ dynamic_cast<ModuleBase_WidgetSelector*>(aWidget);
+ if (aWidgetSelector)
+ myWorkshop->setSelected(aWidgetSelector->getAttributeSelection());
+ }
}
+
//Update property panel on corresponding message. If there is no current operation (no
//property panel), or received message has different feature to the current - do nothing.
else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_UPDATED)) {
} else {
QApplication::restoreOverrideCursor();
}
- }
- //An operation passed by message. Start it, process and commit.
- else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OPERATION_LAUNCHED)) {
- std::shared_ptr<Config_PointerMessage> aPartSetMsg =
- std::dynamic_pointer_cast<Config_PointerMessage>(theMessage);
- //myPropertyPanel->cleanContent();
- ModuleBase_Operation* anOperation = (ModuleBase_Operation*) aPartSetMsg->pointer();
- XGUI_OperationMgr* anOperationMgr = workshop()->operationMgr();
-
- if (anOperationMgr->startOperation(anOperation)) {
- ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(anOperation);
- if (aFOperation) {
- workshop()->propertyPanel()->updateContentWidget(aFOperation->feature());
- workshop()->propertyPanel()->createContentPanel(aFOperation->feature());
- }
- if (!anOperation->getDescription()->hasXmlRepresentation()) {
- if (anOperation->commit())
- workshop()->updateCommandStatus();
- }
- }
- }
- else if (theMessage->eventID() == Events_Loop::eventByName(EVENT_SELFILTER_LOADED)) {
- std::shared_ptr<Config_SelectionFilterMessage> aMsg =
- std::dynamic_pointer_cast<Config_SelectionFilterMessage>(theMessage);
- if (aMsg) {
- ModuleBase_FilterFactory* aFactory = myWorkshop->selectionFilters();
- if (!aMsg->attributeId().empty()) {
- aFactory->assignFilter(aMsg->selectionFilterId(), aMsg->featureId(), aMsg->attributeId(),
- aMsg->parameters());
- }
- }
} else if (theMessage->eventID() == Events_Loop::eventByName(EVENT_UPDATE_VIEWER_BLOCKED)) {
// the viewer's update context will not happens until viewer updated is emitted
workshop()->displayer()->enableUpdateViewer(false);
aDisplayer->enableUpdateViewer(true);
} else {
//Show error dialog if error message received.
- std::shared_ptr<Events_Error> anAppError = std::dynamic_pointer_cast<Events_Error>(theMessage);
- if (anAppError) {
- emit errorOccurred(QString::fromLatin1(anAppError->description()));
+ std::shared_ptr<Events_InfoMessage> anIngfoMsg =
+ std::dynamic_pointer_cast<Events_InfoMessage>(theMessage);
+ if (anIngfoMsg) {
+ emit errorOccurred(anIngfoMsg);
}
return;
}
anInfo.append(ModuleBase_Tools::objectInfo((*aIt)));
}
QString anInfoStr = anInfo.join(";\t");
- qDebug(QString("onFeatureUpdatedMsg: %1, %2").arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
+ qDebug(QString("onFeatureUpdatedMsg: %1, %2")
+ .arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
#endif
std::set<ObjectPtr> aFeatures = theMsg->objects();
XGUI_OperationMgr* anOperationMgr = workshop()->operationMgr();
}
//******************************************************
-void XGUI_WorkshopListener::onFeatureRedisplayMsg(const std::shared_ptr<ModelAPI_ObjectUpdatedMessage>& theMsg)
+void XGUI_WorkshopListener::
+ onFeatureRedisplayMsg(const std::shared_ptr<ModelAPI_ObjectUpdatedMessage>& theMsg)
{
std::set<ObjectPtr> anObjects = theMsg->objects();
std::set<ObjectPtr>::const_iterator aIt;
anInfo.append(ModuleBase_Tools::objectInfo((*aIt)));
}
QString anInfoStr = anInfo.join(";\t");
- qDebug(QString("onFeatureRedisplayMsg: %1, %2").arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
+ qDebug(QString("onFeatureRedisplayMsg: %1, %2")
+ .arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
#endif
XGUI_Workshop* aWorkshop = workshop();
XGUI_Displayer* aDisplayer = aWorkshop->displayer();
- bool aFirstVisualizedBody = false;
-
+ //bool aFirstVisualizedBody = false;
+ bool aDoFitAll = false;
+ int aNbOfShownObjects = workshop()->displayer()->objectsCount();
bool aRedisplayed = false;
//std::list<ObjectPtr> aHiddenObjects;
for (aIt = anObjects.begin(); aIt != anObjects.end(); ++aIt) {
ObjectPtr aObj = (*aIt);
// Hide the object if it is invalid or concealed one
- bool aHide = !aObj->data() || !aObj->data()->isValid() ||
+ bool aHide = !aObj->data() || !aObj->data()->isValid() ||
aObj->isDisabled() || (!aObj->isDisplayed());
if (!aHide) { // check that this is not hidden result
ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aObj);
if (aRes.get()) {
ResultCompSolidPtr aCompSolidRes = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aRes);
if (aCompSolidRes.get()) {
- qDebug(QString("COMPSOLID, numberOfSubs = %1").arg(aCompSolidRes->numberOfSubs()).toStdString().c_str());
+ qDebug(QString("COMPSOLID, numberOfSubs = %1")
+ .arg(aCompSolidRes->numberOfSubs()).toStdString().c_str());
}
if (ModelAPI_Tools::compSolidOwner(aRes))
qDebug("COMPSOLID sub-object");
}
#endif
if (aHide) {
- //we should provide objects which are hidden in the viewer, e.g. sketch always should visualizes
- // all sub-features, if some features are to be hidden, sould be proposed may be to removed #1223
- //aHiddenObjects.push_back(aObj);
+ //we should provide objects which are hidden in the viewer, e.g. sketch always should
+ // visualizes all sub-features, if some features are to be hidden, sould be proposed may
+ // be to removed #1223
+ // aHiddenObjects.push_back(aObj);
aRedisplayed = aDisplayer->erase(aObj, false) || aRedisplayed;
#ifdef DEBUG_FEATURE_REDISPLAY
// Redisplay the visible object or the object of the current operation
bool isVisibleObject = aDisplayer->isVisible(aObj);
QString anObjInfo = ModuleBase_Tools::objectInfo((aObj));
- //qDebug(QString("visible=%1 : erase = %2").arg(isVisibleObject).arg(anObjInfo).toStdString().c_str());
#endif
}
else {
bool isVisibleObject = aDisplayer->isVisible(aObj);
#ifdef DEBUG_FEATURE_REDISPLAY
QString anObjInfo = ModuleBase_Tools::objectInfo((aObj));
- //qDebug(QString("visible=%1 : display= %2").arg(isVisibleObject).arg(anObjInfo).toStdString().c_str());
#endif
if (isVisibleObject) { // redisplay visible object
aWorkshop->deactivateActiveObject(aObj, false);
}
} else { // display object if the current operation has it
- if (displayObject(aObj, aFirstVisualizedBody)) {
+ if (displayObject(aObj)) {
+ aDoFitAll = aDoFitAll || neededFitAll(aObj, aNbOfShownObjects);
+
aRedisplayed = true;
// Deactivate object of current operation from selection
aWorkshop->deactivateActiveObject(aObj, false);
if (aRedisplayed || isCustomized) {
Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_EMPTY_AIS_PRESENTATION));
- //VSV FitAll updated viewer by it self
- if (aFirstVisualizedBody)
+ //VSV FitAll updated viewer by itself
+ if (aDoFitAll)
myWorkshop->viewer()->fitAll();
- else
+ else
aDisplayer->updateViewer();
}
}
//******************************************************
-void XGUI_WorkshopListener::onFeatureCreatedMsg(const std::shared_ptr<ModelAPI_ObjectUpdatedMessage>& theMsg)
+void XGUI_WorkshopListener::
+ onFeatureCreatedMsg(const std::shared_ptr<ModelAPI_ObjectUpdatedMessage>& theMsg)
{
std::set<ObjectPtr> anObjects = theMsg->objects();
std::set<ObjectPtr>::const_iterator aIt;
anInfo.append(ModuleBase_Tools::objectInfo((*aIt)));
}
QString anInfoStr = anInfo.join(";\t");
- qDebug(QString("onFeatureCreatedMsg: %1, %2").arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
+ qDebug(QString("onFeatureCreatedMsg: %1, %2")
+ .arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
#endif
- bool aFirstVisualizedBody = false;
+ bool aDoFitAll = false;
+ int aNbOfShownObjects = workshop()->displayer()->objectsCount();
//bool aHasPart = false;
bool aDisplayed = false;
if (aRes.get()) {
ResultCompSolidPtr aCompSolidRes = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aRes);
if (aCompSolidRes.get()) {
- qDebug(QString("COMPSOLID, numberOfSubs = %1").arg(aCompSolidRes->numberOfSubs()).toStdString().c_str());
+ qDebug(QString("COMPSOLID, numberOfSubs = %1")
+ .arg(aCompSolidRes->numberOfSubs()).toStdString().c_str());
}
if (ModelAPI_Tools::compSolidOwner(aRes))
qDebug("COMPSOLID sub-object");
// the validity of the data should be checked here in order to avoid display of the objects,
// which were created, then deleted, but flush for the creation event happens after that
// we should not display disabled objects
- bool aHide = !anObject->data()->isValid() ||
+ bool aHide = !anObject->data()->isValid() ||
anObject->isDisabled() ||
!anObject->isDisplayed();
if (!aHide) { // check that this is not hidden result
aHide = !aRes->shape().get() || aRes->shape()->isNull();
}
if (!aHide) {
- // setDisplayed has to be called in order to synchronize internal state of the object
+ // setDisplayed has to be called in order to synchronize internal state of the object
// with list of displayed objects
if (myWorkshop->module()->canDisplayObject(anObject)) {
anObject->setDisplayed(true);
- aDisplayed = displayObject(*aIt, aFirstVisualizedBody);
- } else
+ aDisplayed = displayObject(anObject);
+ if (aDisplayed)
+ aDoFitAll = aDoFitAll || neededFitAll(anObject, aNbOfShownObjects);
+ } else
anObject->setDisplayed(false);
}
}
// myObjectBrowser->processEvent(theMsg);
if (aDisplayed) {
Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_EMPTY_AIS_PRESENTATION));
- //VSV FitAll updated viewer by it self
- if (aFirstVisualizedBody)
+ //VSV FitAll updated viewer by itself
+ if (aDoFitAll)
myWorkshop->viewer()->fitAll();
else
workshop()->displayer()->updateViewer();
anInfo.append(ModuleBase_Tools::objectInfo((*aIt)));
}
QString anInfoStr = anInfo.join(";\t");
- qDebug(QString("onFeatureEmptyPresentationMsg: %1, %2").arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
+ qDebug(QString("onFeatureEmptyPresentationMsg: %1, %2")
+ .arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
#endif
XGUI_Workshop* aWorkshop = workshop();
}
//**************************************************************
-bool XGUI_WorkshopListener::displayObject(ObjectPtr theObj, bool& theFirstVisualizedBody)
+bool XGUI_WorkshopListener::displayObject(ObjectPtr theObj)
{
#ifdef DEBUG_RESULT_COMPSOLID
ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(theObj);
XGUI_Displayer* aDisplayer = aWorkshop->displayer();
int aNb = aDisplayer->objectsCount();
- aDisplayed = aDisplayer->display(theObj, false);
-
- ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theObj);
- if (aNb == 0 && aResult.get()) {
- std::string aResultGroupName = aResult->groupName();
- if (aResultGroupName == ModelAPI_ResultBody::group() ||
- aResultGroupName == ModelAPI_ResultGroup::group()) {
- std::shared_ptr<GeomAPI_Shape> aShapePtr = ModelAPI_Tools::shape(aResult);
- theFirstVisualizedBody = aShapePtr.get() != NULL;
+ return aDisplayer->display(theObj, false);
+}
+
+//**************************************************************
+bool XGUI_WorkshopListener::neededFitAll(ObjectPtr theObj, const int theNbOfShownObjects)
+{
+ bool aFirstVisualizedBody = false;
+
+ if (theNbOfShownObjects == 0) {
+ ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theObj);
+ if (aResult.get()) {
+ std::string aResultGroupName = aResult->groupName();
+ if (aResultGroupName == ModelAPI_ResultBody::group() ||
+ aResultGroupName == ModelAPI_ResultGroup::group()) {
+ std::shared_ptr<GeomAPI_Shape> aShapePtr = ModelAPI_Tools::shape(aResult);
+ aFirstVisualizedBody = aShapePtr.get() != NULL;
+ }
}
}
- return aDisplayed;
+ return aFirstVisualizedBody;
}
bool XGUI_WorkshopListener::customizeCurrentObject(const std::set<ObjectPtr>& theObjects,
// e.g. extrusion is hidden(h=0) but sketch is chosen
if (theForceRedisplay || theObjects.find(aCurrentFeature) != theObjects.end()) {
aCustomized = myWorkshop->module()->customizeObject(aCurrentFeature,
- ModuleBase_IModule::CustomizeArguments, false);
+ ModuleBase_IModule::CustomizeArguments, false) || aCustomized;
aCustomized = myWorkshop->module()->customizeObject(aCurrentFeature,
- ModuleBase_IModule::CustomizeResults, false);
+ ModuleBase_IModule::CustomizeResults, false) || aCustomized;
aCustomized = myWorkshop->module()->customizeObject(aCurrentFeature,
- ModuleBase_IModule::CustomizeHighlightedObjects, false);
+ ModuleBase_IModule::CustomizeHighlightedObjects, false) || aCustomized;
}
}
return aCustomized;
