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.

Sign up for GitHub

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

Jump to bottom

Devel godard #129

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Devel godard #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9994e54
update items display upon change
godardma Sep 4, 2024
14de006
reversed change on example
godardma Sep 4, 2024
95e4e56
Merge branch 'ENSTABretagneRobotics:master' into master
godardma Sep 4, 2024
95f588f
binded LineStyle and Group Properties on Items
godardma Sep 5, 2024
32c57fb
Merge branch 'master' of github.com:godardma/VIBES
godardma Sep 5, 2024
e4adb1a
added comment
godardma Sep 5, 2024
9f580bc
implemented LineWidth
godardma Sep 5, 2024
7a33da8
pre-pull request commit
godardma Sep 5, 2024
c72a678
added comments
godardma Sep 5, 2024
8f83303
enabled linestyle and linewidth from JSON (for APIs)
godardma Sep 7, 2024
7768ebd
removed eraser
godardma Sep 18, 2024
8dc7a7b
Merge branch 'master' of github.com:godardma/VIBES into devel_godard
godardma Oct 3, 2024
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
7 changes: 5 additions & 2 deletions client-api/python/vibes/example.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
vibes.drawBox(0,1,4,6,color='[#FF12FFA0]', figure='test')
vibes.drawText(12, 12, 'My Text', 0.1, 'b[r]')
vibes.axisAuto()
vibes.drawBox(0.5,2,4,7,color='[#00FFFF66]', figure='test')
vibes.drawBox(0.5,2,4,7,color='[#00FFFF66]', figure='test', name='box1')
vibes.drawBox(-1,0,-4,-6,color='r', figure='test')
vibes.drawLine([[0,0], [4,4]])
vibes.drawEllipse(3, 5, 1, 3, 45)
Expand All @@ -25,7 +25,7 @@
vibes.drawPie([0,0], [5,9], [-120, -40], group="Pie")
# vibes.drawPie([0,0], [5,9], [-120, -40], "[b]")

vibes.drawPie([5,2], [1,2], [160, 220]) #, 'g[y]')
vibes.drawPie([5,2], [1,2], [160, 220],name="pie alone") #, 'g[y]')

# vibes.clearGroup("Pie", figure="test")

Expand Down Expand Up @@ -57,6 +57,9 @@

vibes.drawPolygon([[1,1], [1,4], [5,2], [5, 1]])
vibes.setFigureProperties({'viewbox':'equal'})
vibes.drawAUV(5,3, 1, 2, color='b[yellow]',name='auv1',linestyle="..",linewidth="0.3")
vibes.drawBox(2,4,4,7,color='r[yellow]', figure='test', name='box1',linestyle="-..",linewidth="0.1")
vibes.drawArrow((0,0), (1,1), 0.1, color='[b]', name='arrow1')

vibes.newFigure("raster")
vibes.drawArrow((0,0), (1,1), 0.1)
Expand Down
4 changes: 3 additions & 1 deletion viewer/propertyeditdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ QJsonObject PropertyEditDialog::showEditorForJson(QJsonObject init)
dlg->ui->comboBox_LineStyle->setCurrentText(init["LineStyle"].toString());
dlg->ui->comboBox_FaceColor->setCurrentText(init["FaceColor"].toString());
dlg->ui->comboBox_EdgeColor->setCurrentText(init["EdgeColor"].toString());
dlg->ui->lineEdit_LineWidth->setText(init["LineWidth"].toString());

QJsonObject json;

Expand All @@ -29,9 +30,10 @@ QJsonObject PropertyEditDialog::showEditorForJson(QJsonObject init)
json["LineStyle"] = QJsonValue(dlg->ui->comboBox_LineStyle->currentText());
json["FaceColor"] = QJsonValue(dlg->ui->comboBox_FaceColor->currentText());
json["EdgeColor"] = QJsonValue(dlg->ui->comboBox_EdgeColor->currentText());
json["LineWidth"] = QJsonValue(dlg->ui->lineEdit_LineWidth->text());
}

qDebug() << "dlg json result" << json;
// qDebug() << "dlg json result" << json;

return json;
}
48 changes: 47 additions & 1 deletion viewer/propertyeditdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,11 @@
<string/>
</property>
</item>
<item>
<property name="text">
<string>-</string>
</property>
</item>
<item>
<property name="text">
<string>--</string>
Expand All @@ -275,14 +280,55 @@
<string>-.</string>
</property>
</item>
<item>
<property name="text">
<string>-..</string>
</property>
</item>
<item>
<property name="text">
<string>..</string>
</property>
</item>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Line width</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="lineEdit_LineWidth">
<item>
<property name="text">
<string/>
</property>
</item>
<item>
<property name="text">
<string>-</string>
</property>
</item>
<item>
<property name="text">
<string>:</string>
<string>--</string>
</property>
</item>
<item>
<property name="text">
<string>-.</string>
</property>
</item>
<item>
<property name="text">
<string>-..</string>
</property>
</item>
<item>
<property name="text">
<string>..</string>
</property>
</item>
</widget>
Expand Down
Loading
Loading