LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't show clef change checkbox on panel for tracks without G/F clefs

Browse source
This commit is contained in:
Andrey M. Tokarev 2014-12-29 10:45:00 +03:00
parent 7d873873b1
commit bc0bbcd637
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mscore/importmidi/importmidi_clef.h
View file

@ -5,10 +5,12 @@
namespace Ms {
class Staff;
class InstrumentTemplate;
enum class ClefType : signed char;
namespace MidiClef {
bool hasGFclefs(const InstrumentTemplate *templ);
void createClefs(Staff *staff, int indexOfOperation, bool isDrumTrack);
ClefType clefTypeFromAveragePitch(int averagePitch);

20
mscore/importmidi/importmidi_model.cpp
View file

@ -1,5 +1,6 @@
#include "importmidi_model.h"
#include "importmidi_inner.h"
#include "importmidi_clef.h"
#include "mscore/preferences.h"
#include "libmscore/instrtemplate.h"
@ -561,6 +562,18 @@ void TracksModel::reset(const MidiOperations::Opers &opers,
}
QString headerName() const { return QCoreApplication::translate(
"MIDI import operations", "Clef\nchanges"); }
bool isEditable(int trackIndex) const
{
if (_opers.isDrumTrack.value(trackIndex))
return false;
const int instrIndex = _opers.msInstrIndex.value(trackIndex);
const auto &trackInstrList = _opers.msInstrList.value(trackIndex);
const InstrumentTemplate *instr = (trackInstrList.empty())
? nullptr : trackInstrList[instrIndex];
if (instr && !MidiClef::hasGFclefs(instr))
return false;
return true;
}
QVariant value(int trackIndex) const
{
return _opers.changeClef.value(trackIndex);
@ -569,6 +582,10 @@ void TracksModel::reset(const MidiOperations::Opers &opers,
{
_opers.changeClef.setValue(trackIndex, value.toBool());
}
bool isVisible(int trackIndex) const
{
return isEditable(trackIndex);
}
};
_columns.push_back(std::unique_ptr<Column>(new ClefChanges(_trackOpers)));
@ -848,7 +865,8 @@ QVariant TracksModel::data(const QModelIndex &index, int role) const
return (value.toBool()) ? Qt::Checked : Qt::Unchecked;
}
}
else if (editableSingleTrack(trackIndex, index.column())) {
else if (editableSingleTrack(trackIndex, index.column())
&& _columns[index.column()]->isVisible(trackIndex)) {
QVariant value = _columns[index.column()]->value(trackIndex);
if (value.type() == QVariant::Bool)
return (value.toBool()) ? Qt::Checked : Qt::Unchecked;