X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Fengine%2FProc.hxx;h=de0970fc0b262c85b119e7cf1ec9a3588f58bcdc;hb=52a75f12fdde977172b39325b7acc98370b48473;hp=fe44ed6300b9ed04c6efd965e7534b7b63cec2b7;hpb=88c5f67088445931a1598331e1faae6df0145c0b;p=modules%2Fyacs.git diff --git a/src/engine/Proc.hxx b/src/engine/Proc.hxx index fe44ed630..de0970fc0 100644 --- a/src/engine/Proc.hxx +++ b/src/engine/Proc.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2006-2014 CEA/DEN, EDF R&D +// Copyright (C) 2006-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 @@ -40,7 +40,7 @@ namespace YACS class ComponentInstance; class Logger; - class YACSLIBENGINE_EXPORT Proc: public Bloc + class YACSLIBENGINE_EXPORT Proc : public Bloc { public: Proc(const std::string& name); @@ -51,10 +51,10 @@ namespace YACS virtual TypeCode *createSequenceTc (const std::string& id, const std::string& name, TypeCode *content); virtual TypeCode *createStructTc (const std::string& id, const std::string& name); - virtual TypeCode* getTypeCode(const std::string& name); + virtual TypeCode *getTypeCode(const std::string& name); virtual void setTypeCode(const std::string& name,TypeCode *t); - virtual Container* createContainer(const std::string& name,const std::string& kind=""); - virtual ComponentInstance* createComponentInstance(const std::string& componame, + virtual Container *createContainer(const std::string& name, const std::string& kind=""); + virtual ComponentInstance *createComponentInstance(const std::string& componame, const std::string& name="", const std::string& kind=""); virtual void addComponentInstance(ComponentInstance* inst, const std::string& name="",bool resetCtr=false); @@ -62,10 +62,12 @@ namespace YACS virtual void removeContainer(Container* cont); virtual void accept(Visitor *visitor); virtual Proc *getProc(); - virtual const Proc * getProc() const; + virtual const Proc *getProc() const; + virtual void updateContainersAndComponents(); YACS::StatesForNode getNodeState(int numId); std::string getNodeProgress(int numId); + int getGlobalProgressPercent(); std::string getInPortValue(int nodeNumId, std::string portName); std::string setInPortValue(std::string nodeName, std::string portName, std::string value); std::string getOutPortValue(int nodeNumId, std::string portName); @@ -95,8 +97,12 @@ namespace YACS virtual bool getEdition(){return _edition;} virtual void setEdition(bool edition); virtual void modified(); - virtual void saveSchema(std::string xmlSchemaFile); - virtual void saveState(std::string xmlStateFile); + virtual void saveSchema(const std::string& xmlSchemaFile); + //! deprecated. See VisitorSalomeSaveState and schemaSaveState in order + //! to deal with the execution state of ForEachLoop. + virtual void saveState(const std::string& xmlStateFile); + protected: + void removeContainers(); protected: bool _edition; int _compoinstctr;