Fri, 29 Jul 2022 13:12:26 +0200
First load of changes for hops. In EditHop load the dropdown buttons from the global table. Use named query fields. Added database utilisation and bu_factor fields for hop extracts. Added edit fields for these new fields. Added post boil SG, utilisation and bu_factor parameters to the toIBU function. Added hops form parameter to the hopFlavourContribution and hopAromaContribution display bars. In the hops inventory list dispay volumes instead of weight for hop extracts. Modified the TinsethIBU function to use utilisation and bu_factor parameters. Add calculations for co2 and iso hop extracts, this is work in progress. The toIBU function makes use of the preSG and postSG values to use the correct SG to caall the TinsethIBU function. This results in a bit lower IBU values mostly affecting the late additions. Added use hop at bottling for iso hop extracts like Tetra hops using the formula from BarthHaas.
/*************************************************************************** * Copyright (C) 2006-2008 by Tomasz Ziobrowski * * http://www.3electrons.com * * e-mail: t.ziobrowski@3electrons.com * * * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include <QtGui> #include <cmath> #include <assert.h> #include "thermometer.h" using namespace std; ThermoMeter::ThermoMeter(QWidget *parent) : AbstractMeter(parent) { m_max=80; m_min=0; m_maximum=80; // najpierw ręcznie potem seterem by wywołać calcMaxMin setMinimum(0); setValue(0); setNominal(30); calcMaxMin(); // bo nie wiemy czym są zainicjowane limity setCritical(60); setValueOffset(270); setDigitOffset(10); setSuffix(QString(" [C]")); m_digitFont.setPointSize(15); m_valueFont.setPointSize(18); // QWidget setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Expanding); setWindowTitle(tr("Analog Thermometer")); resize(200, 200); assert(m_max-m_min != 0); } void ThermoMeter::initCoordinateSystem(QPainter & painter) { // inicjalizacja paintera painter.setRenderHint(QPainter::Antialiasing); //painter.translate(width() / 2, height() / 2); painter.translate( width()/2.0,0.0); painter.scale( height()/ 300.0, height()/307.0); } void ThermoMeter::paintBackground(QPainter & painter) { initCoordinateSystem(painter); // kształt szkalnej bańki QPainterPath glass; // początek łuku dolnego po lewej stronie glass.moveTo(12.5,267.5); glass.quadTo(12.5,263.0, 7.5,257.0); glass.lineTo(7.5,25.0); // łuk górny zamykajac5y bańkę od góry. glass.quadTo(7.5,12.5 , 0,12.5); glass.quadTo(-7.5,12.5,-7.5,25.0); glass.lineTo(-7.5,257.0); // tutaj musi być łuk dolny o promineniu 25 glass.quadTo(-12.5,263.0, -12.5,267.5); glass.quadTo(-12.5,278.0, 0.0,280.0); glass.quadTo( 12.5,278.0, 12.5,267.5); QLinearGradient linearGrad(QPointF(-2.0, 0.0), QPointF(12.5, 0.0)); linearGrad.setSpread(QGradient::ReflectSpread); linearGrad.setColorAt(1.0, QColor(0,150,255,170)); linearGrad.setColorAt(0.0, QColor(255,255,255,0)); painter.setBrush(QBrush(linearGrad)); painter.setPen(Qt::black); painter.drawPath(glass); /* QRadialGradient radial(0.0,267.5,12.5,-10.0,263.0); radial.setColorAt(1.0,QColor(0,150,255,110)); radial.setColorAt(1.0,QColor(255,255,255,0)); painter.setPen(Qt::NoPen); painter.drawEllipse(QRectF(-12.5,255.0,25.0,25.0)); */ QPen pen; int length = 12; for (int i=0;i<=32;i++) { pen.setWidthF(1.0); length = 12; if (i%4) { length = 8; pen.setWidthF(0.75); } if (i%2) { length = 5; pen.setWidthF(0.5); } painter.setPen(pen); painter.drawLine(-7,28+i*7, -7+length,28+i*7); } if (digitOffset()) { painter.setFont(digitFont()); for (int i=0;i<9;i++) { QString val = QString("%1").arg(m_min + i*(m_max - m_min)/8.0 ); QSize Size = painter.fontMetrics().size(Qt::TextSingleLine, val); painter.drawText( QPointF( digitOffset(),252 - i * 28 +Size.width()/4.0) , val); } } }// paintBackground // Offset by lepiej było widać o co z nim biega - mówiąc oględnie offset to miejsce // poniżej zera od którego zaczynamy rysować słupek rtęci. #define OFFSET 10 void ThermoMeter::paintEvent(QPaintEvent * ) { // Inicjalizacja paintera QPainter painter(this); initCoordinateSystem(painter); // --------------------------------------------- /// // Dobór colorów do rysowania QColor color=Qt::blue; if (m_value >= m_nominal ) color=QColor(0,200,0); if (m_value >= m_critical) { color=Qt::red; painter.setPen(color); // by potem temp podać na czerwono } if (valueOffset()) { painter.setFont(valueFont()); QString Str = prefix() + QString("%1").arg(value()) + suffix(); QSize Size = painter.fontMetrics().size(Qt::TextSingleLine, Str); painter.drawText(QPointF (Size.width() / -2,valueOffset() + Size.height()) , Str); } QLinearGradient slupek(0.0,0.0,5.0,0.0); QRadialGradient zbiornik(0.0,267.0,10.0,-5.0,262.0); slupek.setSpread(QGradient::ReflectSpread); zbiornik.setSpread(QGradient::ReflectSpread); color.setHsv(color.hue(),color.saturation(),color.value()); slupek.setColorAt(1.0,color); zbiornik.setColorAt(1.0,color); color.setHsv(color.hue(),color.saturation()-200,color.value()); slupek.setColorAt(0.0,color); zbiornik.setColorAt(0.0,color); // Wyznaczenie wysokości słupka; double factor = m_value - m_min; factor /= m_max - m_min; int temp = static_cast<int> (224.0 * factor), height = temp + OFFSET; if (231 < temp ) height = 231 + OFFSET; // by rtęć doszła do końca terometra ale go nie rozwaliła if (OFFSET-5 >= height ) height = OFFSET-5; // by nie zeszlo poniżej pieciu "pixeli" poniżej zera // Narysowanie słupka wraz z zbiorniczkiem rtęci painter.setPen(Qt::NoPen); painter.setBrush(slupek); painter.drawRect(-5,252+OFFSET - height ,10, height); painter.setBrush(zbiornik); painter.drawEllipse(QRectF(-10.0,257.5,20.0,20.0)); painter.end(); // bardzo istotne - inaczej pod Xami jest błąd // nie wiem czy to to powoduje krash pod win98 i brak bańki pod XP. // Nałożenie szklanej bańki drawBackground(); }// paintEvent #undef OFFSET