source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "note-column.hh"
-#include "collision.hh"
+#include "note-collision.hh"
#include "engraver.hh"
#include "axis-group-interface.hh"
/*
collect Note_column, and as soon as there are 2 or more, put them in
a collision object. */
-class Collision_engraver : public Engraver {
- Item * col_p_;
- Link_array<Score_element> note_column_l_arr_;
+class Collision_engraver : public Engraver
+{
+ Item * col_;
+ Link_array<Grob> note_columns_;
protected:
- virtual void acknowledge_element (Score_element_info);
- virtual void process_acknowledged ();
- virtual void do_pre_move_processing();
+ virtual void acknowledge_grob (Grob_info);
+ virtual void process_acknowledged_grobs ();
+ virtual void stop_translation_timestep ();
public:
- VIRTUAL_COPY_CONS(Translator);
- Collision_engraver();
+ TRANSLATOR_DECLARATIONS (Collision_engraver);
};
void
-Collision_engraver::process_acknowledged ()
+Collision_engraver::process_acknowledged_grobs ()
{
- if (col_p_ || note_column_l_arr_.size () < 2)
+ if (col_ || note_columns_.size () < 2)
return ;
- if (!col_p_)
+ if (!col_)
{
- col_p_ = new Item (get_property ("NoteCollision"));
- Axis_group_interface::set_interface (col_p_);
- Axis_group_interface::set_axes (col_p_, X_AXIS, Y_AXIS);
-
- announce_element (col_p_,0);
+ col_ = make_item ("NoteCollision", SCM_EOL);
+
}
- for (int i=0; i< note_column_l_arr_.size (); i++)
- Collision::add_column (col_p_,note_column_l_arr_[i]);
+ for (int i=0; i< note_columns_.size (); i++)
+ Note_collision_interface::add_column (col_,note_columns_[i]);
}
void
-Collision_engraver::acknowledge_element (Score_element_info i)
+Collision_engraver::acknowledge_grob (Grob_info i)
{
- if (Note_column::has_interface (i.elem_l_))
+ if (Note_column::has_interface (i.grob_))
{
/*should check Y axis? */
- if (Note_column::rest_b (i.elem_l_) || i.elem_l_->parent_l(X_AXIS))
+ if (Note_column::has_rests (i.grob_) || i.grob_->get_parent (X_AXIS))
return ;
- note_column_l_arr_.push (i.elem_l_);
+ note_columns_.push (i.grob_);
}
}
void
-Collision_engraver::do_pre_move_processing()
+Collision_engraver::stop_translation_timestep ()
{
- if (col_p_)
- {
- typeset_element (col_p_);
- col_p_ =0;
- }
- note_column_l_arr_.clear ();
+ col_ =0;
+ note_columns_.clear ();
}
-Collision_engraver::Collision_engraver()
+Collision_engraver::Collision_engraver ()
{
- col_p_ =0;
+ col_ =0;
}
-ADD_THIS_TRANSLATOR(Collision_engraver);
+
+ENTER_DESCRIPTION (Collision_engraver,
+/* descr */ "",
+/* creats*/ "NoteCollision",
+/* accepts */ "",
+/* acks */ "note-column-interface",
+/* reads */ "",
+/* write */ "");