Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/hatch #255

Merged
merged 6 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions data/io.github.dubstar_04.design.metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
<li>Draw entities using correct colour when part of a block, supporting colour 'ByBlock'</li>
<li>Add Block command, enabling creation of block</li>
<li>Add Explode command, enabling decomposition of blocks into primative entities</li>
<li>Add Hatch command and common patterns</li>
</ul>
</description>
</release>
Expand Down
4 changes: 4 additions & 0 deletions src/Design/canvas.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import Gtk from 'gi://Gtk?version=4.0';
import GObject from 'gi://GObject';
import Gdk from 'gi://Gdk';
import Adw from 'gi://Adw?version=1';
import Cairo from 'cairo';

import {Core} from '../Design-Core/core/core/core.js';

Expand Down Expand Up @@ -168,6 +169,9 @@ export const Canvas = GObject.registerClass({
onDraw(area, cr, width, height) {
// this is the main drawing function for the canvas
// this is triggered by design core calling the paintingCallback()

// set the line cap - this is required to make dotted lines work
cr.setLineCap(Cairo.LineCap.SQUARE);
this.core.canvas.paint(cr, width, height);
cr.$dispose();
}
Expand Down
9 changes: 9 additions & 0 deletions src/Design/propertiesWindow.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import Gdk from 'gi://Gdk';

import {Colours} from '../Design-Core/core/lib/colours.js';
import {DesignCore} from '../Design-Core/core/designCore.js';
import {Patterns} from '../Design-Core/core/lib/patterns.js';

export const PropertiesWindow = GObject.registerClass({
GTypeName: 'PropertiesWindow',
Expand Down Expand Up @@ -106,6 +107,8 @@ export const PropertiesWindow = GObject.registerClass({
case 'radius':
case 'width':
case 'lineWidth':
case 'scale':
case 'angle':
suffixWidget = new Gtk.Entry({valign: Gtk.Align.CENTER, text: `${value}`});
suffixWidget.width_request = widgetWidth;
const changedSignal = suffixWidget.connect('changed', () => {
Expand Down Expand Up @@ -177,6 +180,7 @@ export const PropertiesWindow = GObject.registerClass({
case 'layer':
case 'styleName':
case 'lineType':
case 'patternName':
const model = this.getModel(property);
suffixWidget = Gtk.DropDown.new_from_strings(model);
suffixWidget.width_request = widgetWidth;
Expand Down Expand Up @@ -274,6 +278,11 @@ export const PropertiesWindow = GObject.registerClass({
const lineStyles = DesignCore.LTypeManager.getStyles();
const lineStyleNames = lineStyles.map((style) => style.name);
model = lineStyleNames;
break;
case 'patternName':
const patternNames = Object.keys(Patterns.hatch_patterns);
model = patternNames;
break;
}
return model;
}
Expand Down
2 changes: 2 additions & 0 deletions src/io.github.dubstar_04.design.src.gresource.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<file>Design-Core/core/lib/logging.js</file>
<file>Design-Core/core/lib/matrix.js</file>
<file>Design-Core/core/lib/mouse.js</file>
<file>Design-Core/core/lib/patterns.js</file>
<file>Design-Core/core/lib/scene.js</file>
<file>Design-Core/core/lib/settings.js</file>
<file>Design-Core/core/lib/snapping.js</file>
Expand Down Expand Up @@ -65,6 +66,7 @@
<file>Design-Core/core/entities/baseDimension.js</file>
<file>Design-Core/core/entities/entity.js</file>
<file>Design-Core/core/entities/insert.js</file>
<file>Design-Core/core/entities/hatch.js</file>
<file>Design-Core/core/entities/line.js</file>
<file>Design-Core/core/entities/lwpolyline.js</file>
<file>Design-Core/core/entities/point.js</file>
Expand Down
Loading