Mercurial > hg > svgui

comparison layer/FlexiNoteLayer.cpp @ 625:1336439dc055 tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed flexi note layer and propagated model selection to analyser
author gyorgyf
date Sat, 13 Apr 2013 13:39:17 +0100
parents 49afde2dd704
children 7256926d3af1
comparison
equal deleted inserted replaced
623:49afde2dd704 625:1336439dc055
37 #include <iostream> 37 #include <iostream>
38 #include <cmath> 38 #include <cmath>
39 #include <utility> 39 #include <utility>
40 40
41 FlexiNoteLayer::FlexiNoteLayer() : 41 FlexiNoteLayer::FlexiNoteLayer() :
42 SingleColourLayer(), 42 SingleColourLayer(),
43 m_model(0), 43
44 m_editing(false), 44 m_model(0),
45 m_originalPoint(0, 0.0, 0, 1.f, tr("New Point")), 45 m_editing(false),
46 m_editingPoint(0, 0.0, 0, 1.f, tr("New Point")), 46 m_originalPoint(0, 0.0, 0, 1.f, tr("New Point")),
47 m_editingCommand(0), 47 m_editingPoint(0, 0.0, 0, 1.f, tr("New Point")),
48 m_verticalScale(MIDIRangeScale), 48 m_editingCommand(0),
49 m_scaleMinimum(34), 49 m_verticalScale(AutoAlignScale),
50 m_scaleMaximum(77) 50 m_scaleMinimum(0),
51 { 51 m_scaleMaximum(0)
52 } 52
53 53 // m_model(0),
54 void 54 // m_editing(false),
55 FlexiNoteLayer::setModel(FlexiNoteModel *model) 55 // m_originalPoint(0, 0.0, 0, 1.f, tr("New Point")),
56 { 56 // m_editingPoint(0, 0.0, 0, 1.f, tr("New Point")),
57 // m_editingCommand(0),
58 // m_verticalScale(MIDIRangeScale),
59 // m_scaleMinimum(34),
60 // m_scaleMaximum(77)
61 {
62 std::cerr << "NOTE: constructed FlexiNoteLayer" << std::endl;
63 }
64
65 void
66 FlexiNoteLayer::setModel(FlexiNoteModel *model) // THIS FUNCTION FAILS
67 {
68 std::cerr << "NOTE: FlexiNoteLayer::setModel called" << std::endl; //delete this!!
57 if (m_model == model) return; 69 if (m_model == model) return;
58 m_model = model; 70 m_model = model;
59 71
60 connectSignals(m_model); 72 connectSignals(m_model);
61 73
62 // SVDEBUG << "FlexiNoteLayer::setModel(" << model << ")" << endl; 74 // SVDEBUG << "FlexiNoteLayer::setModel(" << model << ")" << endl;
63 75
64 m_scaleMinimum = 0; 76 m_scaleMinimum = 0;
65 m_scaleMaximum = 0; 77 m_scaleMaximum = 0;
78 std::cerr << "NOTE: FlexiNoteLayer::NoteModel set" << std::endl; //delete this!!
66 79
67 emit modelReplaced(); 80 emit modelReplaced();
68 } 81 }
69 82
70 Layer::PropertyList 83 Layer::PropertyList