SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Пелипенко Иван
2019-12-12 17:08:03 +00:00
parent af250891cc
commit 23c7f76f53
5 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qglengine/glscene.cpp
View File

@@ -280,8 +280,8 @@ const Box3D & Scene::boundingBox() const {
} }
Material * Scene::newMaterial() { Material * Scene::newMaterial(const QString & name) {
materials << new Material(); materials << new Material(name);
makeMaterialsUniqueNames(); makeMaterialsUniqueNames();
mat_changed = true; mat_changed = true;
return materials.back(); return materials.back();

2
qglengine/glscene.h
View File

@@ -82,7 +82,7 @@ public:
const Box3D & boundingBox() const; const Box3D & boundingBox() const;
QVector<Material*> getMaterials() const {return materials;} QVector<Material*> getMaterials() const {return materials;}
Material * newMaterial(); Material * newMaterial(const QString & name = QString());
void removeMaterial(Material * m); void removeMaterial(Material * m);
void makeMaterialsUniqueNames(); void makeMaterialsUniqueNames();

15
qglengine/widgets/materials_editor.cpp
View File

@@ -51,6 +51,7 @@ bool MaterialsEditor::event(QEvent * e) {
ui->comboMaterial->setIconSize(sz * 3); ui->comboMaterial->setIconSize(sz * 3);
ui->buttonRename->setIconSize(sz); ui->buttonRename->setIconSize(sz);
ui->buttonAdd ->setIconSize(sz); ui->buttonAdd ->setIconSize(sz);
ui->buttonClone ->setIconSize(sz);
ui->buttonDelete->setIconSize(sz); ui->buttonDelete->setIconSize(sz);
ui->buttonAssign->setIconSize(sz); ui->buttonAssign->setIconSize(sz);
ui->buttonUnset ->setIconSize(sz); ui->buttonUnset ->setIconSize(sz);
@@ -162,6 +163,20 @@ void MaterialsEditor::on_buttonAdd_clicked() {
} }
void MaterialsEditor::on_buttonClone_clicked() {
if (!view) return;
Material * curm = currentMaterial();
if (!curm) return;
Material * m = view->scene()->newMaterial(curm->name);
QString nm = m->name;
*m = *curm;
m->name = nm;
m->_changed = true;
materialsChanged();
selectMaterial(m);
}
void MaterialsEditor::on_buttonDelete_clicked() { void MaterialsEditor::on_buttonDelete_clicked() {
if (!view) return; if (!view) return;
Material * m = currentMaterial(); Material * m = currentMaterial();

1
qglengine/widgets/materials_editor.h
View File

@@ -53,6 +53,7 @@ private slots:
void on_comboMaterial_currentIndexChanged(int index); void on_comboMaterial_currentIndexChanged(int index);
void on_buttonRename_clicked(); void on_buttonRename_clicked();
void on_buttonAdd_clicked(); void on_buttonAdd_clicked();
void on_buttonClone_clicked();
void on_buttonDelete_clicked(); void on_buttonDelete_clicked();
void on_buttonAssign_clicked(); void on_buttonAssign_clicked();
void on_buttonUnset_clicked(); void on_buttonUnset_clicked();

47
qglengine/widgets/materials_editor.ui
View File

@@ -68,17 +68,6 @@
</item> </item>
<item> <item>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QToolButton" name="buttonRename">
<property name="toolTip">
<string>Rename ...</string>
</property>
<property name="icon">
<iconset resource="../qglview.qrc">
<normaloff>:/icons/edit-rename.png</normaloff>:/icons/edit-rename.png</iconset>
</property>
</widget>
</item>
<item row="0" column="2" rowspan="2"> <item row="0" column="2" rowspan="2">
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
@@ -106,7 +95,18 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="3">
<widget class="QToolButton" name="buttonAssign">
<property name="toolTip">
<string>Assign</string>
</property>
<property name="icon">
<iconset resource="widgets.qrc">
<normaloff>:/icons/go-jump.png</normaloff>:/icons/go-jump.png</iconset>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QToolButton" name="buttonAdd"> <widget class="QToolButton" name="buttonAdd">
<property name="toolTip"> <property name="toolTip">
<string>Add</string> <string>Add</string>
@@ -117,7 +117,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="0" column="1">
<widget class="QToolButton" name="buttonDelete"> <widget class="QToolButton" name="buttonDelete">
<property name="toolTip"> <property name="toolTip">
<string>Delete</string> <string>Delete</string>
@@ -128,14 +128,25 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="3"> <item row="1" column="1">
<widget class="QToolButton" name="buttonAssign"> <widget class="QToolButton" name="buttonRename">
<property name="toolTip"> <property name="toolTip">
<string>Assign</string> <string>Rename ...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="widgets.qrc"> <iconset resource="../qglview.qrc">
<normaloff>:/icons/go-jump.png</normaloff>:/icons/go-jump.png</iconset> <normaloff>:/icons/edit-rename.png</normaloff>:/icons/edit-rename.png</iconset>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QToolButton" name="buttonClone">
<property name="toolTip">
<string>Clone</string>
</property>
<property name="icon">
<iconset resource="../../qad/utils/qad_utils.qrc">
<normaloff>:/icons/edit-copy.png</normaloff>:/icons/edit-copy.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>