Browse Source

bug fix

cl-refactor
yann300 10 years ago
parent
commit
177e99c29b
  1. 5
      mix/CodeModel.cpp
  2. 2
      mix/CodeModel.h
  3. 20
      mix/qml/html/codeeditor.js

5
mix/CodeModel.cpp

@ -352,7 +352,7 @@ void CodeModel::gasEstimation(solidity::CompilerStack const& _cs)
for (auto gasIte = gasCosts.begin(); gasIte != gasCosts.end(); ++gasIte)
{
SourceLocation location = gasIte->first->getLocation();
SourceLocation const& location = gasIte->first->getLocation();
GasMeter::GasConsumption cost = gasIte->second;
std::stringstream v;
v << cost.value;
@ -364,7 +364,8 @@ void CodeModel::gasEstimation(solidity::CompilerStack const& _cs)
QVariantList CodeModel::gasCostByDocumentId(QString const& _documentId) const
{
if (m_gasCostsMaps.contains(_documentId))
auto ite = m_gasCostsMaps.find(_documentId);
if (ite != m_gasCostsMaps.end())
{
auto sourceMapIter = m_gasCostsMaps.find(_documentId);
return sourceMapIter.value();

2
mix/CodeModel.h

@ -137,7 +137,7 @@ class GasMap: public QObject
Q_PROPERTY(bool isInfinite MEMBER m_isInfinite CONSTANT)
public:
GasMap(int _start, int _end, QString _gas, bool _isInfinite): m_start(_start), m_end(_end), m_gas(_gas), m_isInfinite(_isInfinite) {}
GasMap(int _start, int _end, QString _gas, bool _isInfinite): m_start(_start), m_end(_end), m_gas(_gas), m_isInfinite(_isInfinite) { QQmlEngine::setObjectOwnership(this, QQmlEngine::JavaScriptOwnership); }
int m_start;
int m_end;

20
mix/qml/html/codeeditor.js

@ -215,7 +215,6 @@ var gasCosts = null;
setGasCosts = function(_gasCosts)
{
gasCosts = JSON.parse(_gasCosts);
if (showingGasEstimation)
{
displayGasEstimation(false);
@ -278,12 +277,13 @@ var gasAnnotation;
function listenMouseOver(e)
{
var node = e.target || e.srcElement;
if (node) {
if (!gasAnnotation && node.className && node.className.indexOf("CodeMirror-gasCosts") !== -1)
if (node)
{
if (node.className && node.className.indexOf("CodeMirror-gasCosts") !== -1)
{
if (gasAnnotation)
gasAnnotation.clear();
var cl = node.className.split(" ")[1];
var cl = getClass(node);
var gasTitle = gasMarkRef[cl].value.isInfinite ? "infinite" : gasMarkRef[cl].value.gas;
gasTitle = gasTitle + " gas";
gasAnnotation = editor.addLineWidget(gasMarkRef[cl].line + 1, makeGasCostMarker(gasTitle), { coverGutter: false, above: true });
@ -296,7 +296,19 @@ function listenMouseOver(e)
}
}
function getClass(node)
{
var classes = node.className.split(" ");
for (var k in classes)
{
if (classes[k].indexOf("CodeMirror-gasCosts") !== -1)
return classes[k];
}
return "";
}
// blue => red ["#1515ED", "#1714EA", "#1914E8", "#1B14E6", "#1D14E4", "#1F14E2", "#2214E0", "#2414DE", "#2614DC", "#2813DA", "#2A13D8", "#2D13D6", "#2F13D4", "#3113D2", "#3313D0", "#3513CE", "#3713CC", "#3A12CA", "#3C12C8", "#3E12C6", "#4012C4", "#4212C2", "#4512C0", "#4712BE", "#4912BC", "#4B11BA", "#4D11B8", "#4F11B6", "#5211B4", "#5411B2", "#5611B0", "#5811AE", "#5A11AC", "#5D11AA", "#5F10A7", "#6110A5", "#6310A3", "#6510A1", "#67109F", "#6A109D", "#6C109B", "#6E1099", "#700F97", "#720F95", "#750F93", "#770F91", "#790F8F", "#7B0F8D", "#7D0F8B", "#7F0F89", "#820E87", "#840E85", "#860E83", "#880E81", "#8A0E7F", "#8D0E7D", "#8F0E7B", "#910E79", "#930D77", "#950D75", "#970D73", "#9A0D71", "#9C0D6F", "#9E0D6D", "#A00D6B", "#A20D69", "#A50D67", "#A70C64", "#A90C62", "#AB0C60", "#AD0C5E", "#AF0C5C", "#B20C5A", "#B40C58", "#B60C56", "#B80B54", "#BA0B52", "#BD0B50", "#BF0B4E", "#C10B4C", "#C30B4A", "#C50B48", "#C70B46", "#CA0A44", "#CC0A42", "#CE0A40", "#D00A3E", "#D20A3C", "#D50A3A", "#D70A38", "#D90A36", "#DB0934", "#DD0932", "#DF0930", "#E2092E", "#E4092C", "#E6092A", "#E80928", "#EA0926", "#ED0924"]
/* green => red */ var colorGradient = ["#429C27", "#439A26", "#449926", "#469726", "#479626", "#489525", "#4A9325", "#4B9225", "#4D9025", "#4E8F25", "#4F8E24", "#518C24", "#528B24", "#548924", "#558824", "#568723", "#588523", "#598423", "#5B8223", "#5C8122", "#5D8022", "#5F7E22", "#607D22", "#627B22", "#637A21", "#647921", "#667721", "#677621", "#697421", "#6A7320", "#6B7220", "#6D7020", "#6E6F20", "#706E20", "#716C1F", "#726B1F", "#74691F", "#75681F", "#76671E", "#78651E", "#79641E", "#7B621E", "#7C611E", "#7D601D", "#7F5E1D", "#805D1D", "#825B1D", "#835A1D", "#84591C", "#86571C", "#87561C", "#89541C", "#8A531B", "#8B521B", "#8D501B", "#8E4F1B", "#904D1B", "#914C1A", "#924B1A", "#94491A", "#95481A", "#97461A", "#984519", "#994419", "#9B4219", "#9C4119", "#9E4019", "#9F3E18", "#A03D18", "#A23B18", "#A33A18", "#A43917", "#A63717", "#A73617", "#A93417", "#AA3317", "#AB3216", "#AD3016", "#AE2F16", "#B02D16", "#B12C16", "#B22B15", "#B42915", "#B52815", "#B72615", "#B82514", "#B92414", "#BB2214", "#BC2114", "#BE1F14", "#BF1E13", "#C01D13", "#C21B13", "#C31A13", "#C51813", "#C61712", "#C71612", "#C91412", "#CA1312", "#CC1212"]
editor.setOption("extraKeys", extraKeys);

Loading…
Cancel
Save