diff --git a/app/HGProductionTool/dialog_userinput.cpp b/app/HGProductionTool/dialog_userinput.cpp index 8fcdbf3..73b71ee 100644 --- a/app/HGProductionTool/dialog_userinput.cpp +++ b/app/HGProductionTool/dialog_userinput.cpp @@ -46,7 +46,7 @@ Dialog_UserInput::Dialog_UserInput(ui_helper::value_type type, const QString &ti this->setFont(ft); - ui->lineEdit->setValidator(new QRegExpValidator(QRegExp("[0-9]+$"))); + ui->lineEdit->setValidator(new QRegExpValidator(QRegExp("^-?(([0-9]{0,16}(\\.[0-9]{1,16})$)|([0-9]+$))"))); } Dialog_UserInput::~Dialog_UserInput() @@ -70,7 +70,7 @@ parameter *Dialog_UserInput::getParam() } else if (m_type == ui_helper::VAL_TYPE_FLOAT) { - param->m_fData = ui->lineEdit->text().toDouble(); + param->m_fData = ui->lineEdit->text().toFloat(); } else if (m_type == ui_helper::VAL_TYPE_STRING) { @@ -119,7 +119,7 @@ size_t UserInputParams::get_size() if (m_type == ui_helper::VAL_TYPE_INT || m_type == ui_helper::VAL_TYPE_TIPS_VAL) return sizeof(int); if (m_type == ui_helper::VAL_TYPE_FLOAT) - return sizeof(double); + return sizeof(float); if (m_type == ui_helper::VAL_TYPE_STRING) return m_sData.size() + 1; return 0; diff --git a/app/HGProductionTool/dialog_userinput.h b/app/HGProductionTool/dialog_userinput.h index 65609c0..0f1dc8a 100644 --- a/app/HGProductionTool/dialog_userinput.h +++ b/app/HGProductionTool/dialog_userinput.h @@ -21,7 +21,7 @@ public: ui_helper::value_type m_type; bool m_bData; int m_iData; - double m_fData; + float m_fData; std::wstring m_sData; }; diff --git a/app/HGProductionTool/form_maininterface.ui b/app/HGProductionTool/form_maininterface.ui index fa214b7..9e4b97c 100644 --- a/app/HGProductionTool/form_maininterface.ui +++ b/app/HGProductionTool/form_maininterface.ui @@ -167,7 +167,7 @@ - +