Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[1822] branches/conditions/src
|
From: <ob...@us...> - 2013-05-26 15:54:27
|
Revision: 1822
http://sourceforge.net/p/scstudio/code/1822
Author: obouda
Date: 2013-05-26 15:54:24 +0000 (Sun, 26 May 2013)
Log Message:
-----------
renamed class LocalCondition to Condition
Modified Paths:
--------------
branches/conditions/src/data/Z120/Context.cpp
branches/conditions/src/data/Z120/z120_save.cpp
branches/conditions/src/data/beautify/layout_optimizer.cpp
branches/conditions/src/data/exporttex/exportTex.cpp
branches/conditions/src/data/msc/Condition.h
branches/conditions/src/data/msc/MessageEvent.cpp
branches/conditions/src/data/time_relevant_ordering/time_relevant_ordering.cpp
branches/conditions/src/view/visio/addon/extract.cpp
branches/conditions/src/view/visio/addon/visualize.cpp
Modified: branches/conditions/src/data/Z120/Context.cpp
===================================================================
--- branches/conditions/src/data/Z120/Context.cpp 2013-05-26 14:36:20 UTC (rev 1821)
+++ branches/conditions/src/data/Z120/Context.cpp 2013-05-26 15:54:24 UTC (rev 1822)
@@ -710,7 +710,7 @@
context->z->print_report(RS_WARNING,
stringize() << "Warning 34: Condition across multiple instances is not supported yet.");
- LocalConditionPtr local_condition = new LocalCondition(TOWSTRING(context->condition_name));
+ ConditionPtr local_condition = new Condition(TOWSTRING(context->condition_name));
MessageEventPtr cur_ev = boost::dynamic_pointer_cast<MessageEvent>(context->current_event);
if (cur_ev == NULL)
throw std::runtime_error("expecting a condition event");
Modified: branches/conditions/src/data/Z120/z120_save.cpp
===================================================================
--- branches/conditions/src/data/Z120/z120_save.cpp 2013-05-26 14:36:20 UTC (rev 1821)
+++ branches/conditions/src/data/Z120/z120_save.cpp 2013-05-26 15:54:24 UTC (rev 1822)
@@ -384,7 +384,7 @@
{
// REF: unhack
//hack until the object model is being fixed
- LocalCondition* cond = dynamic_cast<LocalCondition*>(incomplete_message.get());
+ Condition* cond = dynamic_cast<Condition*>(incomplete_message.get());
if(cond != NULL)
stream << "condition " << VALID_NAME(cond->get_label()) << " shared";
else
Modified: branches/conditions/src/data/beautify/layout_optimizer.cpp
===================================================================
--- branches/conditions/src/data/beautify/layout_optimizer.cpp 2013-05-26 14:36:20 UTC (rev 1821)
+++ branches/conditions/src/data/beautify/layout_optimizer.cpp 2013-05-26 15:54:24 UTC (rev 1822)
@@ -186,7 +186,7 @@
{
// REF: unhack
// NOTE: a hack for conditions support - until object model is fixed
- LocalCondition* cond = dynamic_cast<LocalCondition*>(in_mess.get());
+ Condition* cond = dynamic_cast<Condition*>(in_mess.get());
if(cond != NULL)
{
if(m_user_condition)
@@ -376,7 +376,7 @@
{
// REF: unhack
// NOTE: a hack for conditions support - until object model is fixed
- LocalCondition* cond = dynamic_cast<LocalCondition*>(in_mess.get());
+ Condition* cond = dynamic_cast<Condition*>(in_mess.get());
if(cond != NULL)
{
add_relative_distance_constraint(m_lp, e1, e2, m_successor_distance+cond->get_height());
@@ -444,7 +444,7 @@
// LOST MESSAGE EVENT
// REF: unhack
// NOTE: a hack for conditions support - until object model is fixed
- LocalCondition* cond = dynamic_cast<LocalCondition*>(in_mess.get());
+ Condition* cond = dynamic_cast<Condition*>(in_mess.get());
if(cond == NULL)
{
float horizontal_space = std::sqrt(std::pow(m_incomplete_message_length,2) - std::pow(m_send_receive_distance,2));
@@ -665,7 +665,7 @@
IncompleteMessagePtr in_mess = strictTmpMsg->get_incomplete_message();
if (in_mess->is_lost())
{
- LocalConditionPtr cond = boost::dynamic_pointer_cast<LocalCondition>(in_mess);
+ ConditionPtr cond = boost::dynamic_pointer_cast<Condition>(in_mess);
if (cond != NULL)
extra_height = cond->get_height();
}
@@ -792,7 +792,7 @@
{
// REF: unhack
// NOTE: a hack for conditions support - until object model is fixed
- LocalCondition* cond = dynamic_cast<LocalCondition*>(in_mess.get());
+ Condition* cond = dynamic_cast<Condition*>(in_mess.get());
if(cond != NULL)
{
double tmp_height = cond->get_height();
@@ -847,7 +847,7 @@
if(in_mess->is_lost())
{
// NOTE: a hack for local conditions support - until object model is fixed
- LocalCondition* cond = dynamic_cast<LocalCondition*>(in_mess.get());
+ Condition* cond = dynamic_cast<Condition*>(in_mess.get());
if(cond == NULL)
in_mess->set_dot_position(MscPoint(incomplete_message_length, send_receive_distance));
@@ -1098,7 +1098,7 @@
{
// REF: unhack
// NOTE: a hack for local conditions support - until object model is fixed
- LocalCondition* cond = dynamic_cast<LocalCondition*>(in_mess.get());
+ Condition* cond = dynamic_cast<Condition*>(in_mess.get());
if (cond != NULL)
{
double tmp_height = cond->get_height();
Modified: branches/conditions/src/data/exporttex/exportTex.cpp
===================================================================
--- branches/conditions/src/data/exporttex/exportTex.cpp 2013-05-26 14:36:20 UTC (rev 1821)
+++ branches/conditions/src/data/exporttex/exportTex.cpp 2013-05-26 15:54:24 UTC (rev 1822)
@@ -1,4 +1,4 @@
-/*
+/*
* scstudio - Sequence Chart Studio
* http://scstudio.sourceforge.net
*
@@ -460,7 +460,7 @@
{
// REF: unhack
//temporary solution - Condition not implemented yet
- LocalConditionPtr localCondition = boost::dynamic_pointer_cast<LocalCondition>(msg_event->get_incomplete_message());
+ ConditionPtr localCondition = boost::dynamic_pointer_cast<Condition>(msg_event->get_incomplete_message());
if(localCondition!=NULL)
{
m_stream << m_local_condition_height_map.printLength(localCondition->get_height());
@@ -888,7 +888,7 @@
{
// REF: unhack
//temporary solution - Condition not implemented yet
- LocalConditionPtr local_condition = boost::dynamic_pointer_cast<LocalCondition>(msg_event->get_incomplete_message());
+ ConditionPtr local_condition = boost::dynamic_pointer_cast<Condition>(msg_event->get_incomplete_message());
if(local_condition!=NULL)
{
coor -= local_condition->get_height();
@@ -957,7 +957,7 @@
//temporary solution - Condition not implemented yet
// REF: unhack
- LocalConditionPtr local_condition = boost::dynamic_pointer_cast<LocalCondition>(msg_event->get_incomplete_message());
+ ConditionPtr local_condition = boost::dynamic_pointer_cast<Condition>(msg_event->get_incomplete_message());
if(local_condition!=NULL)
{
edge_point(local_condition->get_event()->get_instance()->get_line_begin().get_x(),local_condition->get_width());
Modified: branches/conditions/src/data/msc/Condition.h
===================================================================
--- branches/conditions/src/data/msc/Condition.h 2013-05-26 14:36:20 UTC (rev 1821)
+++ branches/conditions/src/data/msc/Condition.h 2013-05-26 15:54:24 UTC (rev 1822)
@@ -22,14 +22,14 @@
/**
* \brief Local condition on an instance in Basic MSC.
*/
-class SCMSC_EXPORT LocalCondition : public IncompleteMessage
-// NOTE: just a quick hack until the object model is fixed; LocalCondition behaves just like a lost message
+class SCMSC_EXPORT Condition : public IncompleteMessage
+// NOTE: just a quick hack until the object model is fixed; Condition behaves just like a lost message
{
Coordinate m_width;
Coordinate m_height;
public:
- LocalCondition(const std::wstring& label = L"", Coordinate width = 0.0, Coordinate height = 0.0) :
+ Condition(const std::wstring& label = L"", Coordinate width = 0.0, Coordinate height = 0.0) :
IncompleteMessage(LOST, label), m_width(width), m_height(height)
{
}
@@ -40,6 +40,6 @@
void set_height(Coordinate height) { m_height = height; }
};
-typedef boost::intrusive_ptr<LocalCondition> LocalConditionPtr;
+typedef boost::intrusive_ptr<Condition> ConditionPtr;
#endif // #ifndef _CONDITION_H
Modified: branches/conditions/src/data/msc/MessageEvent.cpp
===================================================================
--- branches/conditions/src/data/msc/MessageEvent.cpp 2013-05-26 14:36:20 UTC (rev 1821)
+++ branches/conditions/src/data/msc/MessageEvent.cpp 2013-05-26 15:54:24 UTC (rev 1822)
@@ -28,7 +28,7 @@
IncompleteMessage* incomplete = dynamic_cast<IncompleteMessage*>(get_message().get());
// note: hack until object model is fixed
- if (incomplete == NULL || dynamic_cast<LocalCondition*>(incomplete) != NULL)
+ if (incomplete == NULL || dynamic_cast<Condition*>(incomplete) != NULL)
return false;
return incomplete->is_lost();
@@ -37,7 +37,7 @@
bool MessageEvent::is_receive() const
{
// FIXME: should return !is_send(); when the hack is eliminated
- if (!is_matched() && (get_message().get() == NULL || dynamic_cast<LocalCondition*>(get_message().get()) != NULL)) // NOTE: hack until object model is fixed
+ if (!is_matched() && (get_message().get() == NULL || dynamic_cast<Condition*>(get_message().get()) != NULL)) // NOTE: hack until object model is fixed
return false;
return !is_send();
}
Modified: branches/conditions/src/data/time_relevant_ordering/time_relevant_ordering.cpp
===================================================================
--- branches/conditions/src/data/time_relevant_ordering/time_relevant_ordering.cpp 2013-05-26 14:36:20 UTC (rev 1821)
+++ branches/conditions/src/data/time_relevant_ordering/time_relevant_ordering.cpp 2013-05-26 15:54:24 UTC (rev 1822)
@@ -215,7 +215,7 @@
{
// REF: unhack
// NOTE: a hack for conditions support - until object model is fixed
- LocalConditionPtr cond = boost::dynamic_pointer_cast<LocalCondition>(in_mess);
+ ConditionPtr cond = boost::dynamic_pointer_cast<Condition>(in_mess);
if(cond != NULL)
{
double tmp_height = cond->get_height();
@@ -298,7 +298,7 @@
{
if(in_mess->is_lost())
{
- LocalConditionPtr cond = boost::dynamic_pointer_cast<LocalCondition>(in_mess);
+ ConditionPtr cond = boost::dynamic_pointer_cast<Condition>(in_mess);
if(cond == NULL)
{
in_mess->set_dot_position(MscPoint(settings.m_instance_space/3,0));
@@ -383,7 +383,7 @@
{
if(in_mess->is_lost())
{
- LocalConditionPtr cond = boost::dynamic_pointer_cast<LocalCondition>(in_mess);
+ ConditionPtr cond = boost::dynamic_pointer_cast<Condition>(in_mess);
if(cond == NULL)
{
in_mess->set_dot_position(MscPoint(ins->get_line_begin().get_x()+(settings.m_instance_space/3),0));
Modified: branches/conditions/src/view/visio/addon/extract.cpp
===================================================================
--- branches/conditions/src/view/visio/addon/extract.cpp 2013-05-26 14:36:20 UTC (rev 1821)
+++ branches/conditions/src/view/visio/addon/extract.cpp 2013-05-26 15:54:24 UTC (rev 1822)
@@ -633,7 +633,7 @@
case ST_BMSC_CONDITION:
{
- LocalCondition* new_local_condition = new LocalCondition((const wchar_t*)shape->Text);
+ Condition* new_local_condition = new Condition((const wchar_t*)shape->Text);
// note: this shape is rotated by 90 degrees
new_local_condition->set_width(GetHeight(shape));
new_local_condition->set_height(GetWidth(shape));
Modified: branches/conditions/src/view/visio/addon/visualize.cpp
===================================================================
--- branches/conditions/src/view/visio/addon/visualize.cpp 2013-05-26 14:36:20 UTC (rev 1821)
+++ branches/conditions/src/view/visio/addon/visualize.cpp 2013-05-26 15:54:24 UTC (rev 1822)
@@ -324,7 +324,7 @@
{
// NOTE: hack - for conditions, a lost message is (mis)used until the object model is fixed
// REF: unhack
- LocalCondition* local_condition = dynamic_cast<LocalCondition*>(incomplete_message.get());
+ Condition* local_condition = dynamic_cast<Condition*>(incomplete_message.get());
if(local_condition != NULL)
{
Visio::IVShapePtr cond = drop_shape(vsoPage, shapes, incomplete_message, find_master(ST_BMSC_CONDITION));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|