WebSVN - OpenInventory - Различия - Редакция 61 и 62


#ifndef CLASSEDITOR_H
#define CLASSEDITOR_H

#include <QMainWindow>
#include "mysql.h"
#include "mymodel.h"
#include "modelfordescriptiontable.h"

#include <QTreeView>


namespace Ui {
    class ClassEditor;
}

class ClassEditor : public QMainWindow {
    Q_OBJECT
public:
    ClassEditor(QWidget *parent = 0);
    ~ClassEditor();

protected:
    void changeEvent(QEvent *e);

private:
    Ui::ClassEditor *ui;
    MySql sql;
    SettingsDialog settdialog;
    TableField *field;
    SqlTable *table;
    QModelIndex currIndexOfClassesTable; // ïåðåìåííàÿ õðàíèò òåêóùèé èíäåêñ òàáëèöû êëàññîâ
    QString currClassID; // òåêóùèé èäåíòèôèêàòîð êëàññà

    QSqlTableModel* model;
   // QSqlTableModel* modelForDescription;
    ModelForDescriptionTable* modelForDescription;

    QTableView* tableForDescription;
    MyModel* mymodel;

    void addNewClass(); // äîáàâèì íîâûé êëàññ
    void addNewClass_new();
    void addNewField(); // äîáàâëÿåì íîâîå ïîëå ê êëàññó

private slots:

    void on_pushButton_clicked();           // îáðàáîò÷èê íàæàòèÿ êíîïêè "Íîâûé êëàññ"
    void on_pushButton_2_clicked();         // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü êëàññ"
    void on_pushButton_3_clicked();         // îáðàáîò÷èê íàæàòèÿ êíîïêè "Íîâîå ïîëå"
    void on_pushButton_4_clicked();         // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü ïîëå"
    void on_tableView_clicked(const QModelIndex & index );
 
 
    void on_myModel_dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight );
    void on_modelForDescription_dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight );

};

#endif // CLASSEDITOR_H
 

Редакция 61	Редакция 62
1	#ifndef CLASSEDITOR_H	1	#ifndef CLASSEDITOR_H
2	#define CLASSEDITOR_H	2	#define CLASSEDITOR_H
3		3
4	#include <QMainWindow>	4	#include <QMainWindow>
5	#include "mysql.h"	5	#include "mysql.h"
6	#include "mymodel.h"	6	#include "mymodel.h"
7	#include "modelfordescriptiontable.h"	7	#include "modelfordescriptiontable.h"
8		8
9	#include <QTreeView>	9	#include <QTreeView>
10		10
11		11
12	namespace Ui {	12	namespace Ui {
13	class ClassEditor;	13	class ClassEditor;
14	}	14	}
15		15
16	class ClassEditor : public QMainWindow {	16	class ClassEditor : public QMainWindow {
17	Q_OBJECT	17	Q_OBJECT
18	public:	18	public:
19	ClassEditor(QWidget *parent = 0);	19	ClassEditor(QWidget *parent = 0);
20	~ClassEditor();	20	~ClassEditor();
21		21
22	protected:	22	protected:
23	void changeEvent(QEvent *e);	23	void changeEvent(QEvent *e);
24		24
25	private:	25	private:
26	Ui::ClassEditor *ui;	26	Ui::ClassEditor *ui;
27	MySql sql;	27	MySql sql;
28	SettingsDialog settdialog;	28	SettingsDialog settdialog;
29	TableField *field;	29	TableField *field;
30	SqlTable *table;	30	SqlTable *table;
-		31	QModelIndex currIndexOfClassesTable; // ïåðåìåííàÿ õðàíèò òåêóùèé èíäåêñ òàáëèöû êëàññîâ
-		32	QString currClassID; // òåêóùèé èäåíòèôèêàòîð êëàññà
31		33
32	QSqlTableModel* model;	34	QSqlTableModel* model;
33	// QSqlTableModel* modelForDescription;	35	// QSqlTableModel* modelForDescription;
34	ModelForDescriptionTable* modelForDescription;	36	ModelForDescriptionTable* modelForDescription;
35		37
36	QTableView* tableForDescription;	38	QTableView* tableForDescription;
37	MyModel* mymodel;	39	MyModel* mymodel;
38		40
39	void addNewClass(); // äîáàâèì íîâûé êëàññ	41	void addNewClass(); // äîáàâèì íîâûé êëàññ
40	void addNewClass_new();	42	void addNewClass_new();
-		43	void addNewField(); // äîáàâëÿåì íîâîå ïîëå ê êëàññó
41		44
42	private slots:	45	private slots:
43		46
44	void on_pushButton_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Íîâûé êëàññ"	47	void on_pushButton_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Íîâûé êëàññ"
45	void on_pushButton_2_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü êëàññ"	48	void on_pushButton_2_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü êëàññ"
46	void on_pushButton_3_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Íîâîå ïîëå"	49	void on_pushButton_3_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Íîâîå ïîëå"
47	void on_pushButton_4_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü ïîëå"	50	void on_pushButton_4_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü ïîëå"
48	void on_tableView_clicked(const QModelIndex & index );	51	void on_tableView_clicked(const QModelIndex & index );
49		-
50		-
-		52	void on_myModel_dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight );
-		53	void on_modelForDescription_dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight );
51		54
52	};	55	};
53		56
54	#endif // CLASSEDITOR_H	57	#endif // CLASSEDITOR_H
55		58

Хранилища Subversion OpenInventory

(root)/trunk/ClassEditor/classeditor.h - Редакция 61 → 62