#include <ModelAPI_AttributeDocRef.h>
#include <ModelAPI_Object.h>
#include <ModelAPI_Validator.h>
-#include <ModelAPI_ResultPart.h>
+#include <ModelAPI_ResultConstruction.h>
+#include <ModelAPI_ResultBody.h>
#include <PartSetPlugin_Part.h>
#include <Events_Loop.h>
#include <Events_Error.h>
+#include <Events_LongOp.h>
#include <ModuleBase_Operation.h>
#include <ModuleBase_Operation.h>
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_CREATED));
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_DELETED));
+ aLoop->registerListener(this, Events_Loop::eventByName("LongOperation"));
registerValidators();
activateModule();
void XGUI_Workshop::processEvent(const Events_Message* theMessage)
{
//A message to start feature creation received.
- static Events_ID aFeatureLoadedId = Events_Loop::loop()->eventByName(EVENT_FEATURE_LOADED);
- if (theMessage->eventID() == aFeatureLoadedId) {
+ if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_FEATURE_LOADED)) {
const Config_FeatureMessage* aFeatureMsg = dynamic_cast<const Config_FeatureMessage*>(theMessage);
if(!aFeatureMsg->isInternal()) {
addFeature(aFeatureMsg);
return;
}
+ if (theMessage->eventID() == Events_LongOp::eventID()) {
+ if (Events_LongOp::isPerformed())
+ QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+ //QTimer::singleShot(10, this, SLOT(onStartWaiting()));
+ else
+ QApplication::restoreOverrideCursor();
+ return;
+ }
+
//An operation passed by message. Start it, process and commit.
if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OPERATION_LAUNCHED)) {
const Config_PointerMessage* aPartSetMsg = dynamic_cast<const Config_PointerMessage*>(theMessage);
}
}
+//******************************************************
+void XGUI_Workshop::onStartWaiting()
+{
+ if (Events_LongOp::isPerformed()) {
+ QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+ }
+}
+
//******************************************************
void XGUI_Workshop::onFeatureUpdatedMsg(const ModelAPI_ObjectUpdatedMessage* theMsg)
{
std::set<ObjectPtr>::const_iterator aIt;
for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
ObjectPtr aObj = (*aIt);
- if (!aObj->data() )
+ if (!aObj->data() || !aObj->data()->isValid())
myDisplayer->erase(aObj, false);
else {
if (myDisplayer->isVisible(aObj)) // TODO VSV: Correction sketch drawing
myDisplayer->display(aObj, false); // In order to update presentation
+ else {
+ if(myOperationMgr->hasOperation()) {
+ ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
+ if (aOperation->hasObject(aObj)) { // Display only current operation results
+ myDisplayer->display(aObj, false);
+ }
+ }
+ }
}
}
myDisplayer->updateViewer();
}
QApplication::setOverrideCursor(Qt::WaitCursor);
aDoc->load(myCurrentDir.toLatin1().constData());
- updateCommandStatus();
myObjectBrowser->rebuildDataTree();
+ displayAllResults();
+ updateCommandStatus();
QApplication::restoreOverrideCursor();
}
PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
XGUI_Selection* aSelection = mySelector->selection();
+ if (aSelection->getSelected().size() == 0)
+ return;
QList<QAction*> aActions = getModuleCommands();
foreach(QAction* aAction, aActions) {
PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
- aFactory->registerValidator("ModuleBase_ResulPointValidator", new ModuleBase_ResulPointValidator);
- aFactory->registerValidator("ModuleBase_ResulLineValidator", new ModuleBase_ResulLineValidator);
- aFactory->registerValidator("ModuleBase_ResulArcValidator", new ModuleBase_ResulArcValidator);
+ aFactory->registerValidator("ModuleBase_ResultPointValidator", new ModuleBase_ResultPointValidator);
+ aFactory->registerValidator("ModuleBase_ResultLineValidator", new ModuleBase_ResultLineValidator);
+ aFactory->registerValidator("ModuleBase_ResultArcValidator", new ModuleBase_ResultArcValidator);
+}
+
+
+//**************************************************************
+void XGUI_Workshop::displayAllResults()
+{
+ PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
+ DocumentPtr aRootDoc = aMgr->rootDocument();
+ displayDocumentResults(aRootDoc);
+ for (int i = 0; i < aRootDoc->size(ModelAPI_ResultPart::group()); i++) {
+ ObjectPtr aObject = aRootDoc->object(ModelAPI_ResultPart::group(), i);
+ ResultPartPtr aPart = boost::dynamic_pointer_cast<ModelAPI_ResultPart>(aObject);
+ displayDocumentResults(aPart->partDoc());
+ }
+ myDisplayer->updateViewer();
+}
+
+//**************************************************************
+void XGUI_Workshop::displayDocumentResults(DocumentPtr theDoc)
+{
+ displayGroupResults(theDoc, ModelAPI_ResultConstruction::group());
+ displayGroupResults(theDoc, ModelAPI_ResultBody::group());
}
+
+//**************************************************************
+void XGUI_Workshop::displayGroupResults(DocumentPtr theDoc, std::string theGroup)
+{
+ for (int i = 0; i < theDoc->size(theGroup); i++)
+ myDisplayer->display(theDoc->object(theGroup, i), false);
+}
\ No newline at end of file