Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
NeqModPlus
Building Physics
Building Physics Catalog Editor
Commits
c10258a1
Commit
c10258a1
authored
3 years ago
by
Kai-Holger Brassel
Browse files
Options
Download
Email Patches
Plain Diff
UI improvements
parent
7140fdfe
master
No related merge requests found
Changes
27
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialItemProvider.java
+0
-11
...ttgart/buildingphysics/provider/MaterialItemProvider.java
de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MountingItemProvider.java
+0
-11
...ttgart/buildingphysics/provider/MountingItemProvider.java
de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowCatalogItemProvider.java
+2
-10
...t/buildingphysics/provider/WindowCatalogItemProvider.java
de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowTypeItemProvider.java
+0
-11
...gart/buildingphysics/provider/WindowTypeItemProvider.java
de.hftstuttgart.buildingphysics.viewmodel/viewmodels/ConstructionCategory.view
+8
-1
...ingphysics.viewmodel/viewmodels/ConstructionCategory.view
de.hftstuttgart.buildingphysics.viewmodel/viewmodels/WindowCatalog.view
+2
-17
...t.buildingphysics.viewmodel/viewmodels/WindowCatalog.view
de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel
+10
-10
...tstuttgart.buildingphysics/model/buildingphysics.genmodel
with
22 additions
and
71 deletions
+22
-71
de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialItemProvider.java
+
0
-
11
View file @
c10258a1
...
...
@@ -244,17 +244,6 @@ public class MaterialItemProvider extends ItemProviderAdapter implements IEditin
ItemPropertyDescriptor
.
GENERIC_VALUE_IMAGE
,
null
,
null
));
}
/**
* This returns Material.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public
Object
getImage
(
Object
object
)
{
return
overlayImage
(
object
,
getResourceLocator
().
getImage
(
"full/obj16/Material"
));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
...
...
This diff is collapsed.
Click to expand it.
de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MountingItemProvider.java
+
0
-
11
View file @
c10258a1
...
...
@@ -124,17 +124,6 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin
return
super
.
getChildFeature
(
object
,
child
);
}
/**
* This returns Mounting.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public
Object
getImage
(
Object
object
)
{
return
overlayImage
(
object
,
getResourceLocator
().
getImage
(
"full/obj16/Mounting"
));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
...
...
This diff is collapsed.
Click to expand it.
de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowCatalogItemProvider.java
+
2
-
10
View file @
c10258a1
...
...
@@ -2,7 +2,6 @@
*/
package
de.hftstuttgart.buildingphysics.provider
;
import
de.hftstuttgart.buildingphysics.BuildingPhysicsFactory
;
import
de.hftstuttgart.buildingphysics.BuildingPhysicsPackage
;
import
de.hftstuttgart.buildingphysics.WindowCatalog
;
...
...
@@ -11,9 +10,7 @@ import java.util.List;
import
org.eclipse.emf.common.notify.AdapterFactory
;
import
org.eclipse.emf.common.notify.Notification
;
import
org.eclipse.emf.ecore.EStructuralFeature
;
import
org.eclipse.emf.edit.provider.IItemPropertyDescriptor
;
import
org.eclipse.emf.edit.provider.ViewerNotification
;
...
...
@@ -104,13 +101,11 @@ public class WindowCatalogItemProvider extends CatalogItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @generated
NOT
*/
@Override
public
String
getText
(
Object
object
)
{
String
label
=
((
WindowCatalog
)
object
).
getName
();
return
label
==
null
||
label
.
length
()
==
0
?
getString
(
"_UI_WindowCatalog_type"
)
:
getString
(
"_UI_WindowCatalog_type"
)
+
" "
+
label
;
return
getString
(
"_UI_WindowCatalog_type"
);
}
/**
...
...
@@ -142,9 +137,6 @@ public class WindowCatalogItemProvider extends CatalogItemProvider {
@Override
protected
void
collectNewChildDescriptors
(
Collection
<
Object
>
newChildDescriptors
,
Object
object
)
{
super
.
collectNewChildDescriptors
(
newChildDescriptors
,
object
);
newChildDescriptors
.
add
(
createChildParameter
(
BuildingPhysicsPackage
.
Literals
.
WINDOW_CATALOG__WINDOW_TYPES
,
BuildingPhysicsFactory
.
eINSTANCE
.
createWindowType
()));
}
}
This diff is collapsed.
Click to expand it.
de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowTypeItemProvider.java
+
0
-
11
View file @
c10258a1
...
...
@@ -261,17 +261,6 @@ public class WindowTypeItemProvider extends ItemProviderAdapter implements IEdit
ItemPropertyDescriptor
.
GENERIC_VALUE_IMAGE
,
null
,
null
));
}
/**
* This returns WindowType.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public
Object
getImage
(
Object
object
)
{
return
overlayImage
(
object
,
getResourceLocator
().
getImage
(
"full/obj16/WindowType"
));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
...
...
This diff is collapsed.
Click to expand it.
de.hftstuttgart.buildingphysics.viewmodel/viewmodels/ConstructionCategory.view
+
8
-
1
View file @
c10258a1
<?xml version="1.0" encoding="UTF-8"?>
<org.eclipse.emf.ecp.view.model:View
xmi:version=
"2.0"
xmlns:xmi=
"http://www.omg.org/XMI"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore=
"http://www.eclipse.org/emf/2002/Ecore"
xmlns:org.eclipse.emf.ecp.view.model=
"http://org/eclipse/emf/ecp/view/model/1180"
xmi:id=
"__9S1ELPYEeup29SeaUMpQQ"
name=
"ConstructionCategory"
>
<org.eclipse.emf.ecp.view.model:View
xmi:version=
"2.0"
xmlns:xmi=
"http://www.omg.org/XMI"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore=
"http://www.eclipse.org/emf/2002/Ecore"
xmlns:org.eclipse.emf.ecp.view.model=
"http://org/eclipse/emf/ecp/view/model/1180"
xmlns:org.eclipse.emf.ecp.view.table.model=
"http://org/eclipse/emf/ecp/view/table/model/150"
xmi:id=
"__9S1ELPYEeup29SeaUMpQQ"
name=
"ConstructionCategory"
>
<rootEClass
href=
"http://www.hftstuttgart.de/buildingphysics#//ConstructionCategory"
/>
<children
xsi:type=
"org.eclipse.emf.ecp.view.model:Control"
xmi:id=
"__9TcILPYEeup29SeaUMpQQ"
name=
"Control name"
>
<domainModelReference
xsi:type=
"org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference"
xmi:id=
"__9TcIbPYEeup29SeaUMpQQ"
>
<domainModelEFeature
xsi:type=
"ecore:EAttribute"
href=
"http://www.hftstuttgart.de/buildingphysics#//ConstructionCategory/name"
/>
</domainModelReference>
</children>
<children
xsi:type=
"org.eclipse.emf.ecp.view.table.model:TableControl"
xmi:id=
"_vgicgLeuEeu0KumwacCHxQ"
detailEditing=
"WithPanel"
>
<domainModelReference
xsi:type=
"org.eclipse.emf.ecp.view.table.model:TableDomainModelReference"
xmi:id=
"_yN_hQLeuEeu0KumwacCHxQ"
>
<domainModelReference
xsi:type=
"org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference"
xmi:id=
"_yN_hQbeuEeu0KumwacCHxQ"
>
<domainModelEFeature
xsi:type=
"ecore:EReference"
href=
"http://www.hftstuttgart.de/buildingphysics#//ConstructionCategory/mountings"
/>
</domainModelReference>
</domainModelReference>
</children>
<ecorePaths>
/de.hftstuttgart.buildingphysics/model/buildingphysics.ecore
</ecorePaths>
</org.eclipse.emf.ecp.view.model:View>
This diff is collapsed.
Click to expand it.
de.hftstuttgart.buildingphysics.viewmodel/viewmodels/WindowCatalog.view
+
2
-
17
View file @
c10258a1
...
...
@@ -17,23 +17,8 @@
</domainModelReference>
</children>
<children
xsi:type=
"org.eclipse.emf.ecp.view.table.model:TableControl"
xmi:id=
"_jQX8wK15Eeuda6ijj1ILcQ"
detailEditing=
"WithPanel"
>
<domainModelReference
xsi:type=
"org.eclipse.emf.ecp.view.table.model:TableDomainModelReference"
xmi:id=
"_lX_JgK15Eeuda6ijj1ILcQ"
>
<columnDomainModelReferences
xsi:type=
"org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference"
xmi:id=
"_Fy7TkK22Eeup29SeaUMpQQ"
>
<domainModelEFeature
xsi:type=
"ecore:EAttribute"
href=
"http://www.hftstuttgart.de/buildingphysics#//WindowType/id"
/>
</columnDomainModelReferences>
<columnDomainModelReferences
xsi:type=
"org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference"
xmi:id=
"_Fy7Tka22Eeup29SeaUMpQQ"
>
<domainModelEFeature
xsi:type=
"ecore:EAttribute"
href=
"http://www.hftstuttgart.de/buildingphysics#//WindowType/name"
/>
</columnDomainModelReferences>
<columnDomainModelReferences
xsi:type=
"org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference"
xmi:id=
"_Fy7Tkq22Eeup29SeaUMpQQ"
>
<domainModelEFeature
xsi:type=
"ecore:EAttribute"
href=
"http://www.hftstuttgart.de/buildingphysics#//WindowType/uValue"
/>
</columnDomainModelReferences>
<columnDomainModelReferences
xsi:type=
"org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference"
xmi:id=
"_Fy7Tk622Eeup29SeaUMpQQ"
>
<domainModelEFeature
xsi:type=
"ecore:EAttribute"
href=
"http://www.hftstuttgart.de/buildingphysics#//WindowType/gValue"
/>
</columnDomainModelReferences>
<columnDomainModelReferences
xsi:type=
"org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference"
xmi:id=
"_Fy7TlK22Eeup29SeaUMpQQ"
>
<domainModelEFeature
xsi:type=
"ecore:EAttribute"
href=
"http://www.hftstuttgart.de/buildingphysics#//WindowType/glazingNumber"
/>
</columnDomainModelReferences>
<domainModelReference
xsi:type=
"org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference"
xmi:id=
"_lX_Jga15Eeuda6ijj1ILcQ"
>
<domainModelReference
xsi:type=
"org.eclipse.emf.ecp.view.table.model:TableDomainModelReference"
xmi:id=
"_v8IfcLfGEeu0KumwacCHxQ"
>
<domainModelReference
xsi:type=
"org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference"
xmi:id=
"_v8IfcbfGEeu0KumwacCHxQ"
>
<domainModelEFeature
xsi:type=
"ecore:EReference"
href=
"http://www.hftstuttgart.de/buildingphysics#//WindowCatalog/windowTypes"
/>
</domainModelReference>
</domainModelReference>
...
...
This diff is collapsed.
Click to expand it.
de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel
+
10
-
10
View file @
c10258a1
...
...
@@ -16,7 +16,7 @@
<genFeatures
property=
"None"
children=
"true"
createChild=
"true"
ecoreFeature=
"ecore:EReference buildingphysics.ecore#//BuildingPhysicsCatalog/windowCatalog"
/>
<genFeatures
property=
"None"
children=
"true"
createChild=
"true"
ecoreFeature=
"ecore:EReference buildingphysics.ecore#//BuildingPhysicsCatalog/materialCatalog"
/>
</genClasses>
<genClasses
ecoreClass=
"buildingphysics.ecore#//WindowType"
>
<genClasses
image=
"false"
ecoreClass=
"buildingphysics.ecore#//WindowType"
>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute buildingphysics.ecore#//WindowType/windowTypeId"
/>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute buildingphysics.ecore#//WindowType/name"
/>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute buildingphysics.ecore#//WindowType/uValue"
/>
...
...
@@ -30,23 +30,23 @@
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute buildingphysics.ecore#//WindowType/disposalCarbon"
/>
<genFeatures
createChild=
"false"
propertyMultiLine=
"true"
ecoreFeature=
"ecore:EAttribute buildingphysics.ecore#//WindowType/disposalDescription"
/>
</genClasses>
<genClasses
ecoreClass=
"buildingphysics.ecore#//Catalog"
>
<genClasses
image=
"false"
ecoreClass=
"buildingphysics.ecore#//Catalog"
>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute buildingphysics.ecore#//Catalog/name"
/>
<genFeatures
createChild=
"false"
propertyMultiLine=
"true"
ecoreFeature=
"ecore:EAttribute buildingphysics.ecore#//Catalog/description"
/>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute buildingphysics.ecore#//Catalog/source"
/>
</genClasses>
<genClasses
ecoreClass=
"buildingphysics.ecore#//WindowCatalog"
>
<genFeatures
property=
"None"
children=
"true"
createChild=
"
tru
e"
ecoreFeature=
"ecore:EReference buildingphysics.ecore#//WindowCatalog/windowTypes"
/>
<genFeatures
property=
"None"
children=
"true"
createChild=
"
fals
e"
ecoreFeature=
"ecore:EReference buildingphysics.ecore#//WindowCatalog/windowTypes"
/>
</genClasses>
<genClasses
ecoreClass=
"buildingphysics.ecore#//MaterialCatalog"
>
<genFeatures
property=
"None"
children=
"true"
createChild=
"
tru
e"
ecoreFeature=
"ecore:EReference buildingphysics.ecore#//MaterialCatalog/materialCategories"
/>
<genFeatures
property=
"None"
children=
"true"
createChild=
"
tru
e"
ecoreFeature=
"ecore:EReference buildingphysics.ecore#//MaterialCatalog/constructionCategories"
/>
<genFeatures
property=
"None"
children=
"true"
createChild=
"
fals
e"
ecoreFeature=
"ecore:EReference buildingphysics.ecore#//MaterialCatalog/materialCategories"
/>
<genFeatures
property=
"None"
children=
"true"
createChild=
"
fals
e"
ecoreFeature=
"ecore:EReference buildingphysics.ecore#//MaterialCatalog/constructionCategories"
/>
</genClasses>
<genClasses
ecoreClass=
"buildingphysics.ecore#//MaterialCategory"
>
<genFeatures
property=
"None"
children=
"true"
createChild=
"
tru
e"
ecoreFeature=
"ecore:EReference buildingphysics.ecore#//MaterialCategory/materials"
/>
<genFeatures
property=
"None"
createChild=
"
fals
e"
ecoreFeature=
"ecore:EReference buildingphysics.ecore#//MaterialCategory/materials"
/>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute buildingphysics.ecore#//MaterialCategory/name"
/>
</genClasses>
<genClasses
ecoreClass=
"buildingphysics.ecore#//Material"
>
<genClasses
image=
"false"
ecoreClass=
"buildingphysics.ecore#//Material"
>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute buildingphysics.ecore#//Material/materialId"
/>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute buildingphysics.ecore#//Material/name"
/>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute buildingphysics.ecore#//Material/density"
/>
...
...
@@ -61,14 +61,14 @@
</genClasses>
<genClasses
ecoreClass=
"buildingphysics.ecore#//ConstructionCategory"
>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute buildingphysics.ecore#//ConstructionCategory/name"
/>
<genFeatures
property=
"None"
children=
"true"
createChild=
"
tru
e"
ecoreFeature=
"ecore:EReference buildingphysics.ecore#//ConstructionCategory/mountings"
/>
<genFeatures
property=
"None"
createChild=
"
fals
e"
ecoreFeature=
"ecore:EReference buildingphysics.ecore#//ConstructionCategory/mountings"
/>
</genClasses>
<genClasses
ecoreClass=
"buildingphysics.ecore#//Mounting"
>
<genClasses
image=
"false"
ecoreClass=
"buildingphysics.ecore#//Mounting"
>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute buildingphysics.ecore#//Mounting/mountingId"
/>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute buildingphysics.ecore#//Mounting/name"
/>
<genFeatures
property=
"None"
children=
"true"
createChild=
"true"
ecoreFeature=
"ecore:EReference buildingphysics.ecore#//Mounting/layers"
/>
</genClasses>
<genClasses
ecoreClass=
"buildingphysics.ecore#//Layer"
>
<genClasses
image=
"false"
ecoreClass=
"buildingphysics.ecore#//Layer"
>
<genFeatures
notify=
"false"
createChild=
"false"
propertySortChoices=
"true"
ecoreFeature=
"ecore:EReference buildingphysics.ecore#//Layer/material"
suppressedGetVisibility=
"false"
suppressedSetVisibility=
"false"
/>
<genFeatures
createChild=
"false"
ecoreFeature=
"ecore:EAttribute buildingphysics.ecore#//Layer/thickness"
/>
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets