(c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "dimension.hh"
#include "local-key-item.hh"
#include "molecule.hh"
#include "scalar.hh"
Local_key_item::Local_key_item ()
{
- c0_position_i_ = 0;
+ c0_position_i_ = 0;
}
void
void
Local_key_item::add (Musical_pitch p)
{
- for (int i=0; i< accs.size(); i++)
- if (!Musical_pitch::compare (p, accs[i]))
+ for (int i=0; i< accidental_pitch_arr_.size(); i++)
+ if (!Musical_pitch::compare (p, accidental_pitch_arr_[i]))
return;
- accs.push (p);
+ accidental_pitch_arr_.push (p);
}
void
Local_key_item::do_pre_processing()
{
- accs.sort (Musical_pitch::compare);
+ accidental_pitch_arr_.sort (Musical_pitch::compare);
}
Molecule*
Molecule *octave_mol_p = 0;
int lastoct = -100;
- for (int i = 0; i < accs.size(); i++)
+ for (int i = 0; i < accidental_pitch_arr_.size(); i++)
{
// do one octave
- if (accs[i].octave_i_ != lastoct)
+ if (accidental_pitch_arr_[i].octave_i_ != lastoct)
{
if (octave_mol_p)
{
}
octave_mol_p= new Molecule;
}
- lastoct = accs[i].octave_i_;
- Real dy = (accs[i].notename_i_ + c0_position_i_) * paper()->internote_f ();
- Atom a (lookup_l ()->accidental (accs[i].accidental_i_));
+
+ lastoct = accidental_pitch_arr_[i].octave_i_;
+ Real dy =
+ (c0_position_i_ + accidental_pitch_arr_[i].notename_i_)
+ * paper()->internote_f ();
+ Atom a (lookup_l ()->accidental (accidental_pitch_arr_[i].accidental_i_));
a.translate_axis (dy, Y_AXIS);
Molecule m(a);
delete octave_mol_p;
}
- if (accs.size())
+ if (accidental_pitch_arr_.size())
{
Box b(Interval (0, paper()->internote_f ()), Interval (0,0));
Molecule m (lookup_l ()->fill (b));
void
Local_key_item::do_substitute_dependency (Score_element*o,Score_element*n)
{
- Item* o_l = o->access_Item ();
- Item* n_l = n?n->access_Item ():0;
+ Item* o_l = dynamic_cast <Item *> (o);
+ Item* n_l = n?dynamic_cast <Item *> (n):0;
support_items_.substitute (o_l, n_l);
}