Skip to content

Commit

Permalink
Исправления кода для релиза
Browse files Browse the repository at this point in the history
  • Loading branch information
solderer authored and solderercb committed Sep 15, 2023
1 parent 29b0ecc commit f0f2b43
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion appver.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#define APP_MAJOR 0
#define APP_MINOR 0
#define APP_PATCH 0
#define APP_COMMIT 238
#define APP_COMMIT 239

#define APP_VER STR(APP_MAJOR.APP_MINOR.APP_PATCH.APP_COMMIT) // препроцессор создаст из этой конструкции строку
//#define PROJECT_VERSION APP_MAJOR.APP_MINOR.APP_PATCH.APP_COMMIT // это не нужно, но оставлю для истории
Expand Down
7 changes: 6 additions & 1 deletion tabreceptcartridge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ tabReceptCartridge::tabReceptCartridge(MainWindow *parent) :
// appendToReceptList(repair);
// repair->initCartridgeModel(2);
#else
ui->groupBoxDebugPanel->hide();
// ui->groupBoxDebugPanel->hide();
#endif
}

Expand Down Expand Up @@ -336,6 +336,7 @@ void tabReceptCartridge::print(int repair)
}
}

#ifdef QT_DEBUG
void tabReceptCartridge::randomFill()
{
int i;
Expand Down Expand Up @@ -383,6 +384,7 @@ void tabReceptCartridge::randomFill()
test_scheduler->start(400); // (пере-)запускаем таймер
}
}
#endif

void tabReceptCartridge::fillClientCreds(const int id)
{
Expand Down Expand Up @@ -452,13 +454,16 @@ void tabReceptCartridge::findAndAddBySerial()
ui->lineEditSerial->setText("");
ui->lineEditSerial->setFocus();
}

#ifdef QT_DEBUG
void tabReceptCartridge::dbgRandomFillClicked()
{
test_scheduler_counter = 0;
ui->widgetClient->clearClientCreds();
clearWidgets();
randomFill();
}
#endif

void tabReceptCartridge::relayCreateTabSelectExistingClient(int, QWidget *caller)
{
Expand Down
10 changes: 5 additions & 5 deletions tabrepairnew.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,11 @@ void tabRepairNew::print(int repair)
}
}

void tabRepairNew::fillClientCreds(const int id)
{
ui->widgetClient->fillClientCreds(id);
}

#ifdef QT_DEBUG
void tabRepairNew::randomFill()
{
Expand Down Expand Up @@ -866,11 +871,6 @@ void tabRepairNew::randomFill()

}

void tabRepairNew::fillClientCreds(const int id)
{
ui->widgetClient->fillClientCreds(id);
}

void tabRepairNew::test_scheduler_handler() //
{
randomFill();
Expand Down
2 changes: 2 additions & 0 deletions widgets/sclientinputform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ void SClientInputForm::buttonSelectExistingClientClicked()
emit createTabSelectExistingClient(1, this);
}

#ifdef QT_DEBUG
void SClientInputForm::randomFill()
{
int i;
Expand Down Expand Up @@ -267,6 +268,7 @@ void SClientInputForm::randomFill()

}
}
#endif

void SClientInputForm::setDefaultStyleSheets()
{
Expand Down

0 comments on commit f0f2b43

Please sign in to comment.