WebSVN - OpenInventory - Различия - Редакция 109 и 110


#ifndef MAINWINDOW_H
#define MAINWINDOW_H


//#include "mysql.h"

#include <QMainWindow>
#include <QStandardItemModel>
#include <QStandardItem>
#include <QTreeWidgetItem>
#include <QTextCodec>
#include <QSqlDatabase>

#include <QtGui>
#include <QString>
#include <QtSql>


/*
#include <QSqlField>
#include <QSqlRecord>
#include <QSqlTableModel>
#include <QSqlQueryModel>
#include <QTableView>
#include <QSqlDriverPlugin>
#include <QIcon>
#include <QVariant>
#include <QProcess>
#include <QByteArray>
*/

typedef struct Class {
        QString name;
        QString ID;

} TClass;




namespace Ui {
    class MainWindow;
}

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

protected:
    void changeEvent(QEvent *e);

private:
    Ui::MainWindow *ui;

    QList<QTreeWidgetItem *> root_items_list;
    QStandardItemModel *model;
    QStandardItem *item;
    QTreeWidgetItem *rootItem1, *rootItem2;
    void openBase();
    bool readModel();
    void setupModelData(const QStringList &lines, QTreeWidgetItem *parent);
    void creatModelString();
    QString modelString; // ñòðîêà, îïèñûâàþùàÿ ìîäåëü ïðåäñòàâëåíèÿ
    void addChildsString(QTreeWidgetItem *parentItem, int level);

    QSqlDatabase sql;

    bool openDataBase();
    bool buildPreviewModel(QString modelName, QString rootClassID);

    bool rebuildPreviewModel(QTreeWidgetItem* root_item, QString rootClassID);

    QString ClassName(QString class_id); //âîçâðàùàåò èìÿ êëàññà ïî åãî ID
    void addChildsItems(QTreeWidgetItem *perent_class_item); // äîáîâëÿåì ê ýëåìåíòó äåðåâà â êà÷åñòâå äî÷åðíèõ ýëåìåíòîâ âñå êëàññû, äëÿ êîòîðûõ êëàññ ýëåìåíòà ÿâëÿåòñÿ êîíòåéíåðîì
    QStringList classChields(QString class_id);
    QMap <QString, QString> getClassList(); // ïîëó÷àåì ñïèñîê êëàññîâ
    void initComboBox();
    QList<QTreeWidgetItem *> rootItems; // ñïèñîê óêàçàòåëåé êîðíåâûõ óçëîâ (ìîäåëåé)

    QMap <QString, QString> class_list_map;
    void getDatabaseData();
    void buildTree(QTreeWidgetItem * model_item);
    QString getClassInctance(QString class_id); // ïîëó÷àåì èìÿ òàáëèöû - õðàíèëèùà îáúåêòîâ êëàññà
    void showClassObjects(QTreeWidgetItem * parent_item, QTreeWidgetItem * model_item); // îòîáðàçèì îáúåêòû êëàññîâà
    void showObjectChildrens(QString object_ID, QTreeWidgetItem * object_item, QTreeWidgetItem * model_item); // îòîáðàçèì îáúåêòû êëàññîâà


private slots:
    void on_comboBox_currentIndexChanged( int index );
    void on_treeWidget_itemChanged ( QTreeWidgetItem * item, int column );
    void on_treeWidget_itemClicked ( QTreeWidgetItem * item, int column );
};




#endif // MAINWINDOW_H
 

Редакция 109	Редакция 110
1	#ifndef MAINWINDOW_H	1	#ifndef MAINWINDOW_H
2	#define MAINWINDOW_H	2	#define MAINWINDOW_H
3		3
4		4
5	//#include "mysql.h"	5	//#include "mysql.h"
6		6
7	#include <QMainWindow>	7	#include <QMainWindow>
8	#include <QStandardItemModel>	8	#include <QStandardItemModel>
9	#include <QStandardItem>	9	#include <QStandardItem>
10	#include <QTreeWidgetItem>	10	#include <QTreeWidgetItem>
11	#include <QTextCodec>	11	#include <QTextCodec>
12	#include <QSqlDatabase>	12	#include <QSqlDatabase>
13		13
14	#include <QtGui>	14	#include <QtGui>
15	#include <QString>	15	#include <QString>
16	#include <QtSql>	16	#include <QtSql>
17		17
18		18
19	/*	19	/*
20	#include <QSqlField>	20	#include <QSqlField>
21	#include <QSqlRecord>	21	#include <QSqlRecord>
22	#include <QSqlTableModel>	22	#include <QSqlTableModel>
23	#include <QSqlQueryModel>	23	#include <QSqlQueryModel>
24	#include <QTableView>	24	#include <QTableView>
25	#include <QSqlDriverPlugin>	25	#include <QSqlDriverPlugin>
26	#include <QIcon>	26	#include <QIcon>
27	#include <QVariant>	27	#include <QVariant>
28	#include <QProcess>	28	#include <QProcess>
29	#include <QByteArray>	29	#include <QByteArray>
30	*/	30	*/
31		31
32	typedef struct Class {	32	typedef struct Class {
33	QString name;	33	QString name;
34	QString ID;	34	QString ID;
35		35
36	} TClass;	36	} TClass;
37		37
38		38
39		39
40		40
41	namespace Ui {	41	namespace Ui {
42	class MainWindow;	42	class MainWindow;
43	}	43	}
44		44
45	class MainWindow : public QMainWindow {	45	class MainWindow : public QMainWindow {
46	Q_OBJECT	46	Q_OBJECT
47	public:	47	public:
48	MainWindow(QWidget *parent = 0);	48	MainWindow(QWidget *parent = 0);
49	~MainWindow();	49	~MainWindow();
50		50
51	protected:	51	protected:
52	void changeEvent(QEvent *e);	52	void changeEvent(QEvent *e);
53		53
54	private:	54	private:
55	Ui::MainWindow *ui;	55	Ui::MainWindow *ui;
56		56
57	QList<QTreeWidgetItem *> root_items_list;	57	QList<QTreeWidgetItem *> root_items_list;
58	QStandardItemModel *model;	58	QStandardItemModel *model;
59	QStandardItem *item;	59	QStandardItem *item;
60	QTreeWidgetItem rootItem1, rootItem2;	60	QTreeWidgetItem rootItem1, rootItem2;
61	void openBase();	61	void openBase();
62	bool readModel();	62	bool readModel();
63	void setupModelData(const QStringList &lines, QTreeWidgetItem *parent);	63	void setupModelData(const QStringList &lines, QTreeWidgetItem *parent);
64	void creatModelString();	64	void creatModelString();
65	QString modelString; // ñòðîêà, îïèñûâàþùàÿ ìîäåëü ïðåäñòàâëåíèÿ	65	QString modelString; // ñòðîêà, îïèñûâàþùàÿ ìîäåëü ïðåäñòàâëåíèÿ
66	void addChildsString(QTreeWidgetItem *parentItem, int level);	66	void addChildsString(QTreeWidgetItem *parentItem, int level);
67		67
68	QSqlDatabase sql;	68	QSqlDatabase sql;
69		69
70	bool openDataBase();	70	bool openDataBase();
71	bool buildPreviewModel(QString modelName, QString rootClassID);	71	bool buildPreviewModel(QString modelName, QString rootClassID);
72		72
73	bool rebuildPreviewModel(QTreeWidgetItem* root_item, QString rootClassID);	73	bool rebuildPreviewModel(QTreeWidgetItem* root_item, QString rootClassID);
74		74
75	QString ClassName(QString class_id); //âîçâðàùàåò èìÿ êëàññà ïî åãî ID	75	QString ClassName(QString class_id); //âîçâðàùàåò èìÿ êëàññà ïî åãî ID
76	void addChildsItems(QTreeWidgetItem *perent_class_item); // äîáîâëÿåì ê ýëåìåíòó äåðåâà â êà÷åñòâå äî÷åðíèõ ýëåìåíòîâ âñå êëàññû, äëÿ êîòîðûõ êëàññ ýëåìåíòà ÿâëÿåòñÿ êîíòåéíåðîì	76	void addChildsItems(QTreeWidgetItem *perent_class_item); // äîáîâëÿåì ê ýëåìåíòó äåðåâà â êà÷åñòâå äî÷åðíèõ ýëåìåíòîâ âñå êëàññû, äëÿ êîòîðûõ êëàññ ýëåìåíòà ÿâëÿåòñÿ êîíòåéíåðîì
77	QStringList classChields(QString class_id);	77	QStringList classChields(QString class_id);
78	QMap <QString, QString> getClassList(); // ïîëó÷àåì ñïèñîê êëàññîâ	78	QMap <QString, QString> getClassList(); // ïîëó÷àåì ñïèñîê êëàññîâ
79	void initComboBox();	79	void initComboBox();
80	QList<QTreeWidgetItem *> rootItems; // ñïèñîê óêàçàòåëåé êîðíåâûõ óçëîâ (ìîäåëåé)	80	QList<QTreeWidgetItem *> rootItems; // ñïèñîê óêàçàòåëåé êîðíåâûõ óçëîâ (ìîäåëåé)
81		81
82	QMap <QString, QString> class_list_map;	82	QMap <QString, QString> class_list_map;
83	void getDatabaseData();	83	void getDatabaseData();
84	void buildTree(QTreeWidgetItem * model_item);	84	void buildTree(QTreeWidgetItem * model_item);
85	QString getClassInctance(QString class_id); // ïîëó÷àåì èìÿ òàáëèöû - õðàíèëèùà îáúåêòîâ êëàññà	85	QString getClassInctance(QString class_id); // ïîëó÷àåì èìÿ òàáëèöû - õðàíèëèùà îáúåêòîâ êëàññà
86	void showClassObjects(QTreeWidgetItem * parent_item, QTreeWidgetItem * model_item); // îòîáðàçèì îáúåêòû äî÷åðíèõ êëàññîâ	86	void showClassObjects(QTreeWidgetItem * parent_item, QTreeWidgetItem * model_item); // îòîáðàçèì îáúåêòû êëàññîâà
-		87	void showObjectChildrens(QString object_ID, QTreeWidgetItem * object_item, QTreeWidgetItem * model_item); // îòîáðàçèì îáúåêòû êëàññîâà
-		88
87		89
88	private slots:	90	private slots:
89	void on_comboBox_currentIndexChanged( int index );	91	void on_comboBox_currentIndexChanged( int index );
90	void on_treeWidget_itemChanged ( QTreeWidgetItem * item, int column );	92	void on_treeWidget_itemChanged ( QTreeWidgetItem * item, int column );
91	void on_treeWidget_itemClicked ( QTreeWidgetItem * item, int column );	93	void on_treeWidget_itemClicked ( QTreeWidgetItem * item, int column );
92	};	94	};
93		95
94		96
95		97
96		98
97	#endif // MAINWINDOW_H	99	#endif // MAINWINDOW_H
98		100

Хранилища Subversion OpenInventory

(root)/trunk/DBViewer/mainwindow.h - Редакция 109 → 110