SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@887 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2020-03-23 14:08:28 +00:00
parent 782ac32cb7
commit 665578ace3
25 changed files with 119 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
qcd_utils/pult/CMakeLists.txt
View File

@@ -4,6 +4,7 @@ qt_sources(SRC)
qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
qt_add_executable(${PROJECT_NAME} WIN32 out_CPP)
qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets qad_graphic qad_application qcd_utils piqt_utils)
qt_target_include_directories(${PROJECT_NAME} PRIVATE ${QAD_INCLUDES} "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_SOURCE_DIR}/../../piqt_utils")
message(STATUS "Building ${PROJECT_NAME}")
if(LIB)
if(WIN32)

10
qcd_utils/pult/cdgraphics.cpp
View File

@@ -1,5 +1,5 @@
#include "cdgraphics.h"
#include "ui_qcd_graphic.h"
//#include "ui_qcd_graphic.h"
#include "cdutils_core.h"
#include "cdutils_x.h"
#include "qcd_core.h"
@@ -80,8 +80,8 @@ QByteArray GDockWidget::save() const {
cs.add(1, windowTitle())
.add(2, getList(x_list))
.add(3, graphic->graphic()->save())
.add(4, graphic->ui->evalHistory->expression())
.add(5, graphic->ui->evalVisible->expression());
.add(4, graphic->evalSpinBoxHistory()->expression())
.add(5, graphic->evalSpinBoxVisible()->expression());
return cs.data();
}
@@ -94,8 +94,8 @@ void GDockWidget::load(QByteArray ba) {
case 1: setWindowTitle(cs.getData<QString>()); break;
case 2: x_list = setList(cs.getData<QStringList>()); break;
case 3: graphic->graphic()->load(cs.getData<QByteArray>()); break;
case 4: graphic->ui->evalHistory->setExpression(cs.getData<QString>()); break;
case 5: graphic->ui->evalVisible->setExpression(cs.getData<QString>()); break;
case 4: graphic->evalSpinBoxHistory()->setExpression(cs.getData<QString>()); break;
case 5: graphic->evalSpinBoxVisible()->setExpression(cs.getData<QString>()); break;
default: break;
}
}