comparison: src/DetailCO2meter.cpp
src/DetailCO2meter.cpp
- changeset 332
- 146874d7bb47
- parent 328
- ee2c8b29f389
- child 416
- 3fac92cb1ee1
equal
deleted
inserted
replaced
| 331:612925137029 | 332:146874d7bb47 |
|---|---|
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
| 15 * along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 */ | 16 */ |
| 17 #include "DetailCO2meter.h" | 17 #include "DetailCO2meter.h" |
| 18 #include "ChartCarbonate.h" | |
| 18 #include "../ui/ui_DetailCO2meter.h" | 19 #include "../ui/ui_DetailCO2meter.h" |
| 19 #include "global.h" | 20 #include "global.h" |
| 20 #include "MainWindow.h" | 21 #include "MainWindow.h" |
| 21 | 22 |
| 22 | 23 |
| 51 while (query.next()) { | 52 while (query.next()) { |
| 52 ui->codePick->addItem(query.value("code").toString()+" - "+query.value("name").toString()); | 53 ui->codePick->addItem(query.value("code").toString()+" - "+query.value("name").toString()); |
| 53 } | 54 } |
| 54 | 55 |
| 55 connect(ui->codePick, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &DetailCO2meter::code_changed); | 56 connect(ui->codePick, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &DetailCO2meter::code_changed); |
| 57 connect(ui->logButton, SIGNAL(clicked()), this, SLOT(on_ChartButton_clicked())); | |
| 56 connect(parent, SIGNAL(updateCO2meter(QString)), this, SLOT(refreshCO2meter(QString))); | 58 connect(parent, SIGNAL(updateCO2meter(QString)), this, SLOT(refreshCO2meter(QString))); |
| 57 emit refreshTable(); | 59 emit refreshTable(); |
| 58 } | 60 } |
| 59 | 61 |
| 60 | 62 |
| 137 emit refreshTable(); | 139 emit refreshTable(); |
| 138 } | 140 } |
| 139 } | 141 } |
| 140 | 142 |
| 141 | 143 |
| 144 void DetailCO2meter::on_ChartButton_clicked() | |
| 145 { | |
| 146 ChartCarbonate dialog(_beercode, _beername, this); | |
| 147 } | |
| 148 | |
| 149 | |
| 142 void DetailCO2meter::on_quitButton_clicked() | 150 void DetailCO2meter::on_quitButton_clicked() |
| 143 { | 151 { |
| 144 this->close(); | 152 this->close(); |
| 145 this->setResult(1); | 153 this->setResult(1); |
| 146 } | 154 } |
