#include <Config_WidgetAPI.h>
-#include <Events_Error.h>
+#include <Events_InfoMessage.h>
#include <QStringList>
std::shared_ptr<ModuleBase_WidgetCreatorFactory> ModuleBase_WidgetCreatorFactory::get()
{
if (!MY_WIDGET_CREATOR_FACTORY) {
- MY_WIDGET_CREATOR_FACTORY = std::shared_ptr<ModuleBase_WidgetCreatorFactory>(new ModuleBase_WidgetCreatorFactory());
+ MY_WIDGET_CREATOR_FACTORY =
+ std::shared_ptr<ModuleBase_WidgetCreatorFactory>(new ModuleBase_WidgetCreatorFactory());
}
return MY_WIDGET_CREATOR_FACTORY;
}
{
std::set<std::string>::const_iterator anIt, aLast;
/// fill map of panels
- const std::set<std::string>& aPanelTypes = theCreator->panelTypes();
+ std::set<std::string> aPanelTypes;
+ theCreator->panelTypes(aPanelTypes);
for (anIt = aPanelTypes.begin(), aLast = aPanelTypes.end(); anIt != aLast; anIt++) {
std::string aKey = *anIt;
if (!myPanelToCreator.contains(aKey))
myPanelToCreator[aKey] = theCreator;
else {
- Events_Error::send("The" + aKey + " panel XML definition has been already \
-used by another widget creator");
+ Events_InfoMessage("ModuleBase_WidgetCreatorFactory",
+ "The %1 panel XML definition has been already used by another widget creator")
+ .arg(aKey).send();
}
}
/// fill map of widgets
- const std::set<std::string>& aTypes = theCreator->widgetTypes();
+ std::set<std::string> aTypes;
+ theCreator->widgetTypes(aTypes);
for (anIt = aTypes.begin(), aLast = aTypes.end(); anIt != aLast; anIt++) {
std::string aKey = *anIt;
if (!myCreators.contains(aKey))
myCreators[aKey] = theCreator;
else {
- Events_Error::send("The" + aKey + " widget XML definition has been already \
-used by another widget creator");
+ Events_InfoMessage("ModuleBase_WidgetCreatorFactory",
+ "The %1 widget XML definition has been already used by another widget creator")
+ .arg(aKey).send();
}
}
/// fill map of pages
- const std::set<std::string>& aPTypes = theCreator->pageTypes();
+ std::set<std::string> aPTypes;
+ theCreator->pageTypes(aPTypes);
for (anIt = aPTypes.begin(), aLast = aPTypes.end(); anIt != aLast; anIt++) {
std::string aKey = *anIt;
if (!myPageToCreator.contains(aKey))
myPageToCreator[aKey] = theCreator;
else {
- Events_Error::send("The" + aKey + " page XML definition has been already \
-used by another widget creator");
+ Events_InfoMessage("ModuleBase_WidgetCreatorFactory",
+ "The %1 page XML definition has been already used by another widget creator")
+ .arg(aKey).send();
}
}
}
return myPanelToCreator.contains(theType);
}
-QWidget* ModuleBase_WidgetCreatorFactory::createPanel(const std::string& theType, QWidget* theParent)
+QWidget* ModuleBase_WidgetCreatorFactory::createPanelByType(const std::string& theType,
+ QWidget* theParent,
+ const FeaturePtr& theFeature)
{
QWidget* aPanel = 0;
if (myPanelToCreator.contains(theType)) {
WidgetCreatorPtr aCreator = myPanelToCreator[theType];
- aPanel = aCreator->createPanelByType(theType, theParent);
+ aPanel = aCreator->createPanelByType(theType, theParent, theFeature);
}
return aPanel;
}