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

qcd_utils/CMakeLists.txt

@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
 project(qcd_utils)
-if (POLICY CMP0017)
-	cmake_policy(SET CMP0017 NEW)
-endif()
 if (NOT LIBPROJECT)
 	find_package(PIP REQUIRED)
 	option(LIB "System install" 0)

qcd_utils/pult/CMakeLists.txt

@@ -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)

qcd_utils/pult/cdgraphics.cpp

@@ -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;
 		}
 	}

qcd_utils/qcd_graphic.cpp

@@ -28,3 +28,13 @@ void CDGraphicWidget::setConfigVisible(bool on) {
 bool CDGraphicWidget::isConfigVisible() const {
 	return ui->widgetConfig->isVisible();
 }
+
+
+EvalSpinBox * CDGraphicWidget::evalSpinBoxHistory() {
+	return ui->evalHistory;
+}
+
+
+EvalSpinBox * CDGraphicWidget::evalSpinBoxVisible() {
+	return ui->evalVisible;
+}

qcd_utils/qcd_graphic.h

@@ -2,6 +2,7 @@
 #define QCD_GRAPHIC_H
 
 #include <QWidget>
+#include <evalspinbox.h>
 #include <pistring.h>
 
 namespace CDUtils {
@@ -14,6 +15,7 @@ namespace Ui {
 }
 
 class Graphic;
+class Graphic;
 
 
 class CDGraphicWidget: public QWidget {
@@ -26,6 +28,9 @@ public:
 	Graphic * graphic() const;
 	bool isConfigVisible() const;
 
+	EvalSpinBox * evalSpinBoxHistory();
+	EvalSpinBox * evalSpinBoxVisible();
+
 public slots:
 	void setConfigVisible(bool on);