projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove .gitignore do nothing is ignored.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
synfigapp
/
action_param.cpp
diff --git
a/synfig-studio/trunk/src/synfigapp/action_param.cpp
b/synfig-studio/trunk/src/synfigapp/action_param.cpp
index
ed70296
..
3e45ce2
100644
(file)
--- a/
synfig-studio/trunk/src/synfigapp/action_param.cpp
+++ b/
synfig-studio/trunk/src/synfigapp/action_param.cpp
@@
-2,7
+2,7
@@
/*! \file action_param.cpp
** \brief Template File
**
/*! \file action_param.cpp
** \brief Template File
**
-** $Id
: action_param.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-33,6
+33,8
@@
#include "action.h"
#include "canvasinterface.h"
#include "action.h"
#include "canvasinterface.h"
+#include "general.h"
+
#endif
using namespace std;
#endif
using namespace std;
@@
-44,10
+46,10
@@
using namespace Action;
/* === P R O C E D U R E S ================================================= */
bool
/* === P R O C E D U R E S ================================================= */
bool
-Action::canidate_check(const ParamVocab& param_vocab, const ParamList& param_list)
+Action::can
d
idate_check(const ParamVocab& param_vocab, const ParamList& param_list)
{
ParamVocab::const_iterator iter;
{
ParamVocab::const_iterator iter;
-
+
for(iter=param_vocab.begin();iter!=param_vocab.end();++iter)
{
int n(param_list.count(iter->get_name()));
for(iter=param_vocab.begin();iter!=param_vocab.end();++iter)
{
int n(param_list.count(iter->get_name()));
@@
-60,14
+62,14
@@
Action::canidate_check(const ParamVocab& param_vocab, const ParamList& param_lis
if(iter->get_user_supplied() || iter->get_optional())
continue;
if(iter->get_user_supplied() || iter->get_optional())
continue;
-
+
if(n==0)
return false;
if(n==1 && iter->get_requires_multiple())
return false;
if(n>1 && !iter->get_supports_multiple())
return false;
if(n==0)
return false;
if(n==1 && iter->get_requires_multiple())
return false;
if(n>1 && !iter->get_supports_multiple())
return false;
-
+
if(iter->get_type()!=param_list.find(iter->get_name())->second.get_type())
return false;
}
if(iter->get_type()!=param_list.find(iter->get_name())->second.get_type())
return false;
}
@@
-172,7
+174,7
@@
Param::Param(const Param &rhs):
}
Param::Param(const etl::handle<synfigapp::CanvasInterface>& x):
}
Param::Param(const etl::handle<synfigapp::CanvasInterface>& x):
-
+
type_(TYPE_CANVASINTERFACE)
{
_ParamCounter::counter++;
type_(TYPE_CANVASINTERFACE)
{
_ParamCounter::counter++;
@@
-182,7
+184,7
@@
Param::Param(const etl::handle<synfigapp::CanvasInterface>& x):
/*
Param::Param(synfigapp::CanvasInterface* x):
/*
Param::Param(synfigapp::CanvasInterface* x):
-
+
type_(TYPE_CANVASINTERFACE)
{
_ParamCounter::counter++;
type_(TYPE_CANVASINTERFACE)
{
_ParamCounter::counter++;
@@
-192,7
+194,7
@@
Param::Param(synfigapp::CanvasInterface* x):
*/
Param::Param(const etl::loose_handle<synfigapp::CanvasInterface>& x):
*/
Param::Param(const etl::loose_handle<synfigapp::CanvasInterface>& x):
-
+
type_(TYPE_CANVASINTERFACE)
{
_ParamCounter::counter++;
type_(TYPE_CANVASINTERFACE)
{
_ParamCounter::counter++;
@@
-200,7
+202,7
@@
Param::Param(const etl::loose_handle<synfigapp::CanvasInterface>& x):
data.canvas_interface.get()=x;
}
data.canvas_interface.get()=x;
}
-Param::Param(const synfig::Canvas::Handle& x):
+Param::Param(const synfig::Canvas::Handle& x):
type_(TYPE_CANVAS)
{
_ParamCounter::counter++;
type_(TYPE_CANVAS)
{
_ParamCounter::counter++;
@@
-208,7
+210,7
@@
Param::Param(const synfig::Canvas::Handle& x):
data.canvas.get()=x;
}
data.canvas.get()=x;
}
-Param::Param(const synfig::Canvas::LooseHandle& x):
+Param::Param(const synfig::Canvas::LooseHandle& x):
type_(TYPE_CANVAS)
{
_ParamCounter::counter++;
type_(TYPE_CANVAS)
{
_ParamCounter::counter++;
@@
-217,7
+219,7
@@
Param::Param(const synfig::Canvas::LooseHandle& x):
}
Param::Param(const synfig::Layer::Handle& x):
}
Param::Param(const synfig::Layer::Handle& x):
-
+
type_(TYPE_LAYER)
{
_ParamCounter::counter++;
type_(TYPE_LAYER)
{
_ParamCounter::counter++;
@@
-226,7
+228,7
@@
Param::Param(const synfig::Layer::Handle& x):
}
Param::Param(const synfig::Layer::LooseHandle& x):
}
Param::Param(const synfig::Layer::LooseHandle& x):
-
+
type_(TYPE_LAYER)
{
_ParamCounter::counter++;
type_(TYPE_LAYER)
{
_ParamCounter::counter++;
@@
-235,7
+237,7
@@
Param::Param(const synfig::Layer::LooseHandle& x):
}
Param::Param(const synfig::ValueNode::Handle& x):
}
Param::Param(const synfig::ValueNode::Handle& x):
-
+
type_(TYPE_VALUENODE)
{
_ParamCounter::counter++;
type_(TYPE_VALUENODE)
{
_ParamCounter::counter++;
@@
-244,7
+246,7
@@
Param::Param(const synfig::ValueNode::Handle& x):
}
Param::Param(const synfig::ValueNode::LooseHandle& x):
}
Param::Param(const synfig::ValueNode::LooseHandle& x):
-
+
type_(TYPE_VALUENODE)
{
_ParamCounter::counter++;
type_(TYPE_VALUENODE)
{
_ParamCounter::counter++;
@@
-253,7
+255,7
@@
Param::Param(const synfig::ValueNode::LooseHandle& x):
}
Param::Param(const synfig::ValueBase& x):
}
Param::Param(const synfig::ValueBase& x):
-
+
type_(TYPE_VALUE)
{
_ParamCounter::counter++;
type_(TYPE_VALUE)
{
_ParamCounter::counter++;
@@
-261,7
+263,7
@@
Param::Param(const synfig::ValueBase& x):
data.value.get()=x;
}
data.value.get()=x;
}
-Param::Param(const synfig::RendDesc& x):
+Param::Param(const synfig::RendDesc& x):
type_(TYPE_RENDDESC)
{
_ParamCounter::counter++;
type_(TYPE_RENDDESC)
{
_ParamCounter::counter++;
@@
-278,7
+280,7
@@
Param::Param(const synfig::Time& x):
}
Param::Param(const synfig::Activepoint& x):
}
Param::Param(const synfig::Activepoint& x):
-
+
type_(TYPE_ACTIVEPOINT)
{
_ParamCounter::counter++;
type_(TYPE_ACTIVEPOINT)
{
_ParamCounter::counter++;
@@
-286,7
+288,7
@@
Param::Param(const synfig::Activepoint& x):
data.activepoint.get()=x;
}
data.activepoint.get()=x;
}
-Param::Param(const synfig::Waypoint& x):
+Param::Param(const synfig::Waypoint& x):
type_(TYPE_WAYPOINT)
{
_ParamCounter::counter++;
type_(TYPE_WAYPOINT)
{
_ParamCounter::counter++;
@@
-294,7
+296,7
@@
Param::Param(const synfig::Waypoint& x):
data.waypoint.get()=x;
}
data.waypoint.get()=x;
}
-Param::Param(const synfig::Waypoint::Model& x):
+Param::Param(const synfig::Waypoint::Model& x):
type_(TYPE_WAYPOINTMODEL)
{
_ParamCounter::counter++;
type_(TYPE_WAYPOINTMODEL)
{
_ParamCounter::counter++;
@@
-319,7
+321,7
@@
Param::Param(const char * x):
}
Param::Param(const synfig::Keyframe& x):
}
Param::Param(const synfig::Keyframe& x):
-
+
type_(TYPE_KEYFRAME)
{
_ParamCounter::counter++;
type_(TYPE_KEYFRAME)
{
_ParamCounter::counter++;
@@
-328,7
+330,7
@@
Param::Param(const synfig::Keyframe& x):
}
Param::Param(const synfigapp::ValueDesc& x):
}
Param::Param(const synfigapp::ValueDesc& x):
-
+
type_(TYPE_VALUEDESC)
{
_ParamCounter::counter++;
type_(TYPE_VALUEDESC)
{
_ParamCounter::counter++;
@@
-351,7
+353,7
@@
Param::Param(const EditMode& x):
}
Param::Param(const synfig::Real& x):
}
Param::Param(const synfig::Real& x):
-
+
type_(TYPE_REAL)
{
_ParamCounter::counter++;
type_(TYPE_REAL)
{
_ParamCounter::counter++;
@@
-359,7
+361,7
@@
Param::Param(const synfig::Real& x):
}
Param::Param(const bool& x):
}
Param::Param(const bool& x):
-
+
type_(TYPE_BOOL)
{
_ParamCounter::counter++;
type_(TYPE_BOOL)
{
_ParamCounter::counter++;
@@
-377,7
+379,7
@@
Param::operator=(const Param& rhs)
{
clear();
type_=rhs.type_;
{
clear();
type_=rhs.type_;
-
+
switch(type_)
{
case TYPE_ACTIVEPOINT:
switch(type_)
{
case TYPE_ACTIVEPOINT: