WebSVN - OpenInventory - Различия - Редакция 68 и 71


#ifndef CLASSEDITOR_H
#define CLASSEDITOR_H

#include <QMainWindow>
#include "mysql.h"
#include "mymodel.h"
#include "modelfordescriptiontable.h"
#include "delegateforclassestable.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;

    QTableView tableForInstance; // çäåñü áóäåì îòîáðàæàòü òàáëèöó-õðàíèëèùå îáúåêòîà êëàññà

    DelegateForClassesTable classTableDelegate;

  //  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_pushButton_5_clicked();         // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü âñå ïîëÿ"
    void on_action_ID_triggered(bool is_checked);          // îáðàáàòûâàåì âûáîð â ìåíþ "Ïîêàçûâàòü ID"
    void on_action_showAlias_triggered(bool is_checked);     // îáðàáàòûâàåì âûáîð â ìåíþ "Ïîêàçûâàòü ïñåâäîíèì"
    void on_action_showInstance_triggered(bool is_checked); // ... ïîêàçûâàòü õðàíèëèùà îáúåêòîâ
    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 );
    void on_action_removeAllClasses(); // óäàëèòü âñå êëàññû
    void removeClass(int class_row); // ôóíêöèÿ óäàëÿåò êëàññ, íàõîäÿùèéñÿ â ñòðîêå ñ íîìåðîì class_row
};

#endif // CLASSEDITOR_H
 

Редакция 68	Редакция 71
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	#include "delegateforclassestable.h"	8	#include "delegateforclassestable.h"
9		9
10	#include <QTreeView>	10	#include <QTreeView>
11		11
12		12
13	namespace Ui {	13	namespace Ui {
14	class ClassEditor;	14	class ClassEditor;
15	}	15	}
16		16
17	class ClassEditor : public QMainWindow {	17	class ClassEditor : public QMainWindow {
18	Q_OBJECT	18	Q_OBJECT
19	public:	19	public:
20	ClassEditor(QWidget *parent = 0);	20	ClassEditor(QWidget *parent = 0);
21	~ClassEditor();	21	~ClassEditor();
22		22
23	protected:	23	protected:
24	void changeEvent(QEvent *e);	24	void changeEvent(QEvent *e);
25		25
26	private:	26	private:
27	Ui::ClassEditor *ui;	27	Ui::ClassEditor *ui;
28	MySql sql;	28	MySql sql;
29	SettingsDialog settdialog;	29	SettingsDialog settdialog;
30	TableField *field;	30	TableField *field;
31	SqlTable *table;	31	SqlTable *table;
32	QModelIndex currIndexOfClassesTable; // ïåðåìåííàÿ õðàíèò òåêóùèé èíäåêñ òàáëèöû êëàññîâ	32	QModelIndex currIndexOfClassesTable; // ïåðåìåííàÿ õðàíèò òåêóùèé èíäåêñ òàáëèöû êëàññîâ
33	QString currClassID; // òåêóùèé èäåíòèôèêàòîð êëàññà	33	QString currClassID; // òåêóùèé èäåíòèôèêàòîð êëàññà
34		34
35	QSqlTableModel* model;	35	QSqlTableModel* model;
36	// QSqlTableModel* modelForDescription;	36	// QSqlTableModel* modelForDescription;
37	ModelForDescriptionTable* modelForDescription;	37	ModelForDescriptionTable* modelForDescription;
38		38
39	QTableView* tableForDescription;	39	QTableView* tableForDescription;
40	MyModel* mymodel;	40	MyModel* mymodel;
41		41
-		42	QTableView tableForInstance; // çäåñü áóäåì îòîáðàæàòü òàáëèöó-õðàíèëèùå îáúåêòîà êëàññà
-		43
42	DelegateForClassesTable classTableDelegate;	44	DelegateForClassesTable classTableDelegate;
43		45
44	void addNewClass(); // äîáàâèì íîâûé êëàññ	46	// void addNewClass(); // äîáàâèì íîâûé êëàññ
45	void addNewClass_new();	47	void addNewClass_new();
46	void addNewField(); // äîáàâëÿåì íîâîå ïîëå ê êëàññó	48	void addNewField(); // äîáàâëÿåì íîâîå ïîëå ê êëàññó
47		49
48	private slots:	50	private slots:
49		51
50	void on_pushButton_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Íîâûé êëàññ"	52	void on_pushButton_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Íîâûé êëàññ"
51	void on_pushButton_2_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü êëàññ"	53	void on_pushButton_2_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü êëàññ"
52	void on_pushButton_3_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Íîâîå ïîëå"	54	void on_pushButton_3_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Íîâîå ïîëå"
53	void on_pushButton_4_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü ïîëå"	55	void on_pushButton_4_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü ïîëå"
54	void on_pushButton_5_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü âñå ïîëÿ"	56	void on_pushButton_5_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü âñå ïîëÿ"
55	void on_action_ID_triggered(bool is_checked); // îáðàáàòûâàåì âûáîð â ìåíþ "Ïîêàçûâàòü ID"	57	void on_action_ID_triggered(bool is_checked); // îáðàáàòûâàåì âûáîð â ìåíþ "Ïîêàçûâàòü ID"
56	void on_action_showAlias_triggered(bool is_checked); // îáðàáàòûâàåì âûáîð â ìåíþ "Ïîêàçûâàòü ïñåâäîíèì"	58	void on_action_showAlias_triggered(bool is_checked); // îáðàáàòûâàåì âûáîð â ìåíþ "Ïîêàçûâàòü ïñåâäîíèì"
57	void on_action_showInstance_triggered(bool is_checked); // ... ïîêàçûâàòü õðàíèëèùà îáúåêòîâ	59	void on_action_showInstance_triggered(bool is_checked); // ... ïîêàçûâàòü õðàíèëèùà îáúåêòîâ
58	void on_tableView_clicked(const QModelIndex & index );	60	void on_tableView_clicked(const QModelIndex & index );
59	void on_myModel_dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight );	61	void on_myModel_dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight );
60	void on_modelForDescription_dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight );	62	void on_modelForDescription_dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight );
61	void on_action_removeAllClasses(); // óäàëèòü âñå êëàññû	63	void on_action_removeAllClasses(); // óäàëèòü âñå êëàññû
62	void removeClass(int class_row); // ôóíêöèÿ óäàëÿåò êëàññ, íàõîäÿùèéñÿ â ñòðîêå ñ íîìåðîì class_row	64	void removeClass(int class_row); // ôóíêöèÿ óäàëÿåò êëàññ, íàõîäÿùèéñÿ â ñòðîêå ñ íîìåðîì class_row
63	};	65	};
64		66
65	#endif // CLASSEDITOR_H	67	#endif // CLASSEDITOR_H
66		68

Хранилища Subversion OpenInventory

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