Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch jf_fixes Excluding Merge-Ins
This is equivalent to a diff from bbe76b18e5 to 113e356859
|
2026-04-14
| ||
| 14:35 | Added scripts for install/uninstall/update in /usr/local/ directories. Leaf check-in: 113e356859 user: johnfound tags: jf_fixes | |
|
2025-11-17
| ||
| 06:50 | Another, more general way to fix the "zero" problem. RS_Vector now can't have values lower than RS_TOLERANCE. The previous fix was rolled back. I am not sure how this fix will affect the performance, but at first glance seems everything is OK. check-in: adcf5798e7 user: johnfound tags: jf_fixes | |
|
2025-09-10
| ||
| 17:13 | Sync with the main repository, but there are so many changes, that I am not very sure how will merge with my changes. Leaf check-in: 3defcaed62 user: johnfound tags: trunk, origin/weblate, master | |
|
2024-12-20
| ||
| 08:55 | Merge the changes from the official repository. check-in: cd11d14313 user: johnfound tags: jf_fixes | |
| 08:42 | Sync with the github repository. check-in: bbe76b18e5 user: johnfound tags: trunk, origin/weblate, master | |
|
2024-11-27
| ||
| 23:06 | Arcs and splines (#1967) * source files layout (WIP) * initial support for Named Views (dxf support, widget, toolbar and menu changes). * displaying drawing variables in drawing options * localization update for drawing variables * better support of shortcuts for 1..5 views * option to show current action's icon options widget * PR readme * PR readme * remove spline point action * restoring fit points on spline points from dxf, restored getNearestPoint on Spline, SplineAppendPoint actions * Spline Add Point action * spline modification actions refactoring, localization strings * explode spline action * option for showing ID entities in dialog/entity info - #1951 * fix for check version on startup if disabled - #1920 * spline from polyline action * spline delete between two points action, menu/toolbars adjustments, localization * arc3points - alternative points mode added * arc 2 points commands * draw arc center radius alternative mode, localization * fix for #1950 * intersections with construction lines which are not in construction layer (as a fix for angle snap with entity snap) * fix for polyline append command (support of arcs), changes in draw polyline UI options (buttons), commands for polyline daw mode * ArcTangental - alternative arc mode support by CTRL * selection entities by type in SelectWindow, alternative mode for selection/deselection * deselecting entities with SHIFT pressed * translations update * draw points lattice command, select points command * out RS_Vector to debug * paste to points command * cleanup * commands for arc2p commands * source code layout * changes readme --------- Co-authored-by: sand1024 <sand1024@gmail.com> check-in: 49b93c42a5 user: noreply@github.com tags: trunk, origin/weblate, master | |
Changes to CMakeLists.txt.
1 2 3 4 5 6 7 8 9 10 11 12 | 1 2 3 4 5 6 7 8 9 10 11 12 13 | + | cmake_minimum_required(VERSION 3.22) project(LibreCAD VERSION 2.2.2) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) #set(MIN_GW_PATH_PREFIX "c:\\DevTools\\QT\\6.7.2\\mingw_64") set(MIN_GW_PATH_PREFIX "d:\\Qt\\QT6\\6.7.0\\mingw_64") #set(MIN_GW_PATH_PREFIX "c:\\DevTools\\QT\\6.7.2\\mingw_64") set(BOOST_DIR "c:\\Local\\boost_1_84_0") set(Boost_INCLUDE_DIR "c:\\Local\\boost_1_84_0") |
| ︙ | |||
200 201 202 203 204 205 206 207 208 209 210 211 212 213 | 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 | + + | include_directories(librecad/src/ui/dock_widgets/entity_info) include_directories(librecad/src/ui/dock_widgets/pen_palette) include_directories(librecad/src/ui/dock_widgets/block_widget) include_directories(librecad/src/ui/dock_widgets/library_widget) include_directories(librecad/src/ui/dock_widgets/layer_widget) include_directories(librecad/src/ui/dock_widgets/views_list) #Temporary disabled for build include_directories(plugins/iso_fittings) include_directories(generated/plugin/iso_fittings/ui) #include_directories(plugins/align) #include_directories(plugins/asciifile) #include_directories(plugins/divide) #include_directories(plugins/gear) #include_directories(plugins/list) #include_directories(plugins/picfile) #include_directories(plugins/plotequation) |
| ︙ |
Added install.
|
Changes to librecad/src/actions/drawing/draw/curve/lc_actiondrawarc2pointsbase.cpp.
| ︙ | |||
34 35 36 37 38 39 40 41 42 43 | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | + - |
void LC_ActionDrawArc2PointsBase::trigger() {
RS_PreviewActionInterface::trigger();
RS_Entity* createdEntity = createArc(getStatus(), endPoint, alternated, true);
if (createdEntity != nullptr){
if (document) {
document->startUndoCycle();
createdEntity->setParent(container);
createdEntity->setSelected(true);
createdEntity->setLayerToActive();
createdEntity->setPenToActive();
|
| ︙ |
Changes to librecad/src/actions/drawing/draw/dimensions/lc_actioncircledimbase.cpp.
| ︙ | |||
39 40 41 42 43 44 45 | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | - + |
void LC_ActionCircleDimBase::trigger() {
RS_ActionDimension::trigger();
if (entity != nullptr) {
preparePreview(entity, *pos, alternateAngle);
auto *newEntity = createDim(container);
|
| ︙ |
Changes to librecad/src/actions/drawing/draw/dimensions/lc_actiondimarc.cpp.
| ︙ | |||
72 73 74 75 76 77 78 | 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 | - + |
if (!dimArcData.centre.valid){
RS_DEBUG->print(RS_Debug::D_ERROR, "LC_ActionDimArc::trigger: dimArcData.centre is not valid.\n");
return;
}
auto newEntity= new LC_DimArc(container, *data, dimArcData);
|
| ︙ |
Changes to librecad/src/actions/drawing/draw/dimensions/lc_actiondimlinearbase.cpp.
| ︙ | |||
47 48 49 50 51 52 53 | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | - + |
}
void LC_ActionDimLinearBase::trigger(){
RS_ActionDimension::trigger();
preparePreview();
auto *dim = createDim(container);
|
| ︙ |
Changes to librecad/src/actions/drawing/draw/dimensions/lc_actiondrawdimbaseline.cpp.
| ︙ | |||
49 50 51 52 53 54 55 | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | - + |
}
void LC_ActionDrawDimBaseline::trigger() {
RS_ActionDimension::trigger();
preparePreview();
auto *dim = createDim(container);
|
| ︙ |
Changes to librecad/src/actions/drawing/draw/dimensions/rs_actiondimangular.cpp.
| ︙ | |||
59 60 61 62 63 64 65 | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | - + |
void RS_ActionDimAngular::trigger(){
RS_PreviewActionInterface::trigger();
if (line1->getStartpoint().valid && line2->getStartpoint().valid) {
auto* newEntity = new RS_DimAngular( container,*data,*edata);
|
| ︙ |
Changes to librecad/src/actions/drawing/draw/dimensions/rs_actiondimleader.cpp.
| ︙ | |||
68 69 70 71 72 73 74 | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | - + |
void RS_ActionDimLeader::trigger(){
RS_PreviewActionInterface::trigger();
if (!pPoints->points.empty()){
auto *leaderEntity = new RS_Leader(container, RS_LeaderData(true));
|
| ︙ |
Changes to librecad/src/actions/drawing/rs_actiondefault.cpp.
| ︙ | |||
515 516 517 518 519 520 521 522 523 524 525 526 527 528 | 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 | + |
data.useCurrentAttributes = false;
data.keepOriginals = isControl(e);
data.offset = pPoints->v2 - pPoints->v1;
m.move(data);
goToNeutralStatus();
updateSelectionWidget();
deleteSnapper();
clearSelection = true;
break;
}
case MovingRef: {
RS_Vector mouse = snapPoint(e);
deletePreview();
|
| ︙ | |||
666 667 668 669 670 671 672 673 674 675 676 677 678 679 | 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 | + |
document->endUndoCycle();
}
graphicView->redraw();
goToNeutralStatus();
updateSelectionWidget();
clearSelection = true;
break;
}
default:
break;
}
} else if (e->button() == Qt::RightButton){
//cleanup
|
| ︙ | |||
690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 | 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 | + + + + + + + + + + |
// select single entity:
RS_Entity *en = catchEntity(e);
if (en != nullptr){
deletePreview();
RS_Selection s(*container, graphicView);
if (clearSelection) s.selectAll(false);
clearSelection = false;
s.selectSingle(en);
updateSelectionWidget();
e->accept();
goToNeutralStatus();
} else {
setStatus(SetCorner2);
if (clearSelection) {
RS_Selection s(*container, graphicView);
s.selectAll(false);
clearSelection = false;
}
}
break;
}
case SetCorner2: {
//v2 = snapPoint(e);
pPoints->v2 = toGraph(e);
// select window:
//if (graphicView->toGuiDX(v1.distanceTo(v2))>20) {
deletePreview();
bool cross = (pPoints->v1.x > pPoints->v2.x);
RS_Selection s(*container, graphicView);
if (clearSelection) s.selectAll(false);
clearSelection = false;
bool select = (e->modifiers() & Qt::ShiftModifier) == 0;
s.selectWindow(typeToSelect, pPoints->v1, pPoints->v2, select, cross);
updateSelectionWidget();
goToNeutralStatus();
e->accept();
|
| ︙ |
Changes to librecad/src/actions/drawing/rs_actiondefault.h.
| ︙ | |||
82 83 84 85 86 87 88 89 90 91 92 93 94 95 | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | + + + |
struct Points;
std::unique_ptr<Points> pPoints;
RS2::SnapRestriction snapRestriction;
RS2::EntityType typeToSelect = RS2::EntityType::EntityUnknown;
bool allowEntityQuickInfoForCTRL = false;
bool allowEntityQuickInfoAuto = false;
bool clearSelection = false;
void checkSupportOfQuickEntityInfo();
void clearQuickInfoWidget();
void updateQuickInfoWidget(RS_Entity *pEntity);
void goToNeutralStatus();
RS2::CursorType doGetMouseCursor(int status) override;
void onMouseLeftButtonRelease(int status, QMouseEvent *e) override;
void onMouseRightButtonRelease(int status, QMouseEvent *e) override;
|
| ︙ |
Changes to librecad/src/lib/actions/rs_snapper.cpp.
| ︙ | |||
371 372 373 374 375 376 377 | 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 | - + |
double ds2=mouseCoord.squaredTo(t);
if (ds2 < ds2Min){
ds2Min=ds2;
pImpData->snapSpot = t;
}
}
|
| ︙ | |||
439 440 441 442 443 444 445 | 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 | - + - + |
}
return coord;
}
double RS_Snapper::getSnapRange() const{
// issue #1631: redefine this method to the minimum graph distance to allow "Snap Free"
// When the closest of any other snapping point is beyond this distance, free snapping is used.
|
| ︙ |
Changes to librecad/src/lib/actions/rs_snapper.h.
| ︙ | |||
75 76 77 78 79 80 81 | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | - + |
bool snapEndpoint {false}; //< Whether to snap to endpoints or not.
bool snapGrid {false}; //< Whether to snap to grid or not.
bool snapFree {false}; //< Whether to snap freely
bool snapAngle {false}; //< Whether to snap along line under certain angle
RS2::SnapRestriction restriction {RS2::RestrictNothing}; /// The restriction on the free snap.
|
| ︙ |
Changes to librecad/src/lib/debug/rs_debug.cpp.
| ︙ | |||
24 25 26 27 28 29 30 | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | - | ** **********************************************************************/ #include <climits> #include <cstdarg> #include <cstdio> #include <iostream> |
| ︙ | |||
214 215 216 217 218 219 220 | 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 | - + |
/**
* Sets the debugging level.
*/
void RS_Debug::setLevel(RS_DebugLevel level) {
if (debugLevel == level)
return;
debugLevel = level;
|
| ︙ |
Changes to librecad/src/lib/engine/document/container/rs_entitycontainer.cpp.
| ︙ | |||
185 186 187 188 189 190 191 | 185 186 187 188 189 190 191 192 193 194 195 196 197 198 | - - - - - - - - - |
// point to new deep copies:
for (auto e: tmp) {
entities.append(e);
e->reparent(this);
}
}
|
| ︙ | |||
433 434 435 436 437 438 439 440 441 | 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 | + + - + + + |
return;
}
}
}
*/
if (!entity) return;
RS_Layer* layer = entity->getLayer(true);
if (entity->rtti() == RS2::EntityImage ||
|
| ︙ |
Changes to librecad/src/lib/engine/document/container/rs_entitycontainer.h.
| ︙ | |||
63 64 65 66 67 68 69 | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | - - |
virtual void detach();
/** @return RS2::EntityContainer */
RS2::EntityType rtti() const override{
return RS2::EntityContainer;
}
|
| ︙ |
Changes to librecad/src/lib/engine/document/entities/lc_dimarc.cpp.
| ︙ | |||
21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | + + |
** This copyright notice MUST APPEAR in all copies of the script!
**
**********************************************************************/
#include <cmath>
#include <iostream>
#include <libintl.h>
#include "lc_dimarc.h"
#include "rs_arc.h"
#include "rs_debug.h"
#include "rs_graphic.h"
#include "rs_line.h"
#include "rs_math.h"
#include "rs_mtext.h"
#include "rs_solid.h"
#include "rs_units.h"
LC_DimArcData::LC_DimArcData(const LC_DimArcData &input_dimArcData)
:
|
| ︙ | |||
180 181 182 183 184 185 186 | 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 | - - - - - - - - - - - - + - - - - + - - - - + - - - - - - - - - - - - - - - - - - - - |
extLine1->setLayer (nullptr);
extLine2->setLayer (nullptr);
addEntity (extLine1);
addEntity (extLine2);
|
| ︙ | |||
255 256 257 258 259 260 261 | 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 | - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + - - - + - |
auto* text { new RS_MText (this, textData) };
text->setPen (RS_Pen (getTextColor(), RS2::WidthByBlock, RS2::SolidLine));
text->setLayer (nullptr);
addEntity (text);
|
| ︙ | |||
452 453 454 455 456 457 458 | 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 | - + - |
void LC_DimArc::calcDimension()
{
const double endAngle = dimArcData.endAngle.angle();
const double startAngle = dimArcData.startAngle.angle();
|
| ︙ |
Changes to librecad/src/lib/engine/document/entities/lc_dimarc.h.
| ︙ | |||
128 129 130 131 132 133 134 | 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 | - + - |
RS_Vector arrowEndPoint;
RS_Vector dimStartPoint;
RS_Vector dimEndPoint;
RS_Line* extLine1 = nullptr;
RS_Line* extLine2 = nullptr;
|
| ︙ |
Changes to librecad/src/lib/engine/document/entities/rs_arc.cpp.
| ︙ | |||
296 297 298 299 300 301 302 | 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 | - + |
RS_Vector RS_Arc::getStartpoint() const{
return startPoint;
}
/** @return End point of the entity. */
RS_Vector RS_Arc::getEndpoint() const{
return endPoint;
|
| ︙ |
Changes to librecad/src/lib/engine/document/entities/rs_dimangular.cpp.
| ︙ | |||
28 29 30 31 32 33 34 35 36 37 38 39 40 41 | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | + | #include<cmath> #include<iostream> #include "rs_arc.h" #include "rs_constructionline.h" #include "rs_debug.h" #include "rs_dimangular.h" #include "rs_dimension.h" #include "rs_information.h" #include "rs_line.h" #include "rs_math.h" #include "rs_mtext.h" #include "rs_solid.h" #include "rs_units.h" |
| ︙ | |||
378 379 380 381 382 383 384 385 386 387 388 389 390 391 | 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 | + + + + |
textAngle);
RS_MText* text {new RS_MText( this, textData)};
// move text to the side:
text->setPen( RS_Pen( getTextColor(), RS2::WidthByBlock, RS2::SolidLine));
text->setLayer( nullptr);
auto* bg = createBackground(text);
addEntity(bg);
addEntity( text);
calculateBorders();
}
void RS_DimAngular::update()
{
|
| ︙ |
Changes to librecad/src/lib/engine/document/entities/rs_dimension.cpp.
| ︙ | |||
21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | + + + + + + + |
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
**
** This copyright notice MUST APPEAR in all copies of the script!
**
**********************************************************************/
#include<iostream>
#include "rs_block.h"
#include "rs_color.h"
#include "rs_debug.h"
#include "rs_dimension.h"
#include "rs_filterdxfrw.h" //for int <-> rs_color conversion
#include "rs_information.h"
#include "rs_line.h"
#include "rs_math.h"
#include "rs_modification.h"
#include "rs_mtext.h"
#include "rs_polyline.h"
#include "rs_solid.h"
#include "rs_units.h"
#include "rs_vector.h"
#include "rs_graphicview.h"
RS_DimensionData::RS_DimensionData():
definitionPoint(false),
middleOfText(false),
valign(RS_MTextData::VABottom),
halign(RS_MTextData::HALeft),
lineSpacingStyle(RS_MTextData::Exact),
|
| ︙ | |||
160 161 162 163 164 165 166 167 168 169 170 171 172 173 | 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + |
/**
* Sets a new text for the label.
*/
void RS_Dimension::setLabel(const QString& l) {
data.text = l;
}
RS_Hatch* RS_Dimension::createBackground(RS_MText* text) {
text->update();
double w = text->getUsedTextWidth()/2;
double h = text->getUsedTextHeight()/2;
auto* rect = new RS_Polyline();
double b = -0.414213562373; // tan(90°/4)
rect->addVertex(RS_Vector(-w, -2*h), b);
rect->addVertex(RS_Vector(-w-h, -h), 0.0);
rect->addVertex(RS_Vector(-w-h, h), b);
rect->addVertex(RS_Vector(-w, 2*h), 0.0);
rect->addVertex(RS_Vector(w, 2*h), b);
rect->addVertex(RS_Vector(w+h, h), 0.0);
rect->addVertex(RS_Vector(w+h, -h), b);
rect->addVertex(RS_Vector(w, -2*h), 0.0);
rect->setClosed(true, b);
double ofsx = 0.0;
double ofsy = 0.0;
switch (text->getHAlign()) {
case RS_MTextData::HALeft : ofsx = w; break;
case RS_MTextData::HARight : ofsx = -w; break;
default:;
}
switch (text->getVAlign()) {
case RS_MTextData::VABottom : ofsy = h; break;
case RS_MTextData::VATop : ofsy = -h; break;
default:;
}
rect->move(RS_Vector(ofsx, ofsy, 0.0));
rect->rotate(RS_Vector(0,0,0), text->getAngle());
rect->move(text->getInsertionPoint());
auto* bg = new RS_Hatch(this, RS_HatchData(true, 1.0, 0.0, nullptr));
bg->addEntity(rect);
bg->update();
RS_Document* doc = getDocument();
RS_Block* block = getBlock();
RS_GraphicView* view = (doc) ? doc->getGraphicView() : (block) ? block->getGraphicView() : nullptr;
RS_Color clr = (view) ? view->getBackground() : RS_Color(255, 255, 255, 254);
bg->setPen(RS_Pen(clr, RS2::WidthByBlock, RS2::SolidLine));
bg->setLayer(nullptr);
return bg;
}
/**
* Find intersections between a line and an EntityContainer. Solutions are
* sorted along the line before returning.
*
* @param infiniteLine Treat the line as infinitely long in both directions.
*/
|
| ︙ | |||
282 283 284 285 286 287 288 289 290 291 292 293 294 295 | 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 | + + |
getLabel(),
getTextStyle(),
textAngle);
auto* text = new RS_MText(this, textData);
text->setPen(RS_Pen(getTextColor(), RS2::WidthByBlock, RS2::SolidLine));
text->setLayer(nullptr);
RS_Hatch* bg = createBackground(text);
// evaluate intersection between dim line and text
double textIntersectionLength = 0.0;
double w = text->getUsedTextWidth()/2+dimgap;
double h = text->getUsedTextHeight()/2+dimgap;
// textCorner variables correspond to the corners of the text bounding box
// if the text were to be positioned in the center of the dimensionLine.
|
| ︙ | |||
320 321 322 323 324 325 326 327 328 329 330 331 332 333 | 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 | + |
dimensionLineOutside2 = new RS_Line{this, p2 + dir, p2};
// move text to the side if it won't fit either
RS_Vector distH;
if (textIntersectionLength>distance && autoText) {
distH.setPolar(textIntersectionLength/2.0+arrowSize*2+distance/2.0,
arrowAngle1);
bg->move(distH);
text->move(distH);
textPos = text->getInsertionPoint();
data.middleOfText = textPos;
}
}
double dimtsz=getTickSize()*dimscale;
bool displayArrows = dimtsz < 0.01;
|
| ︙ | |||
433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 | 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 | + + + |
} else if (splitDimensionLine && dimensionLineInside1) {
addEntity(dimensionLineInside1);
addEntity(dimensionLineInside2);
} else {
addEntity(dimensionLine);
}
addEntity(bg);
addEntity(text);
}
/**
* Creates an aligned-text dimensioning line (line with one, two or no arrows
* and aligned text).
*
* @param forceAutoText Automatically reposition the text label.
*/
void RS_Dimension::updateCreateAlignedTextDimensionLine(const RS_Vector& p1,
const RS_Vector& p2, bool arrow1, bool arrow2, bool forceAutoText) {
// general scale (DIMSCALE)
double dimscale = getGeneralScale();
// text height (DIMTXT)
double dimtxt = getTextHeight()*dimscale;
// text distance to line (DIMGAP)
double dimgap = getDimensionLineGap()*dimscale;
// length of dimension line:
double distance = p1.distanceTo(p2);
double direction = (cos(p1.angleTo(p2)) >= 0.0) ? 1.0 : -1.0;
// arrow size:
double arrowSize = getArrowSize()*dimscale;
// do we have to put the arrows outside of the line?
bool outsideArrows = (distance<arrowSize*2.5);
// arrow angles:
|
| ︙ | |||
494 495 496 497 498 499 500 | 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 | - + + + + + + + - + - - - - - - + + + + + + + + + + + + - + - - - + - - - + + + + + + + + + + |
RS_Vector distV = RS_Vector::polar(dimgap + dimtxt/2.0, dimAngle1+a);
// move text away from dimension line:
textPos+=distV;
//// the next update should still be able to adjust this
//// auto text position. leave it invalid
|
| ︙ |
Changes to librecad/src/lib/engine/document/entities/rs_dimension.h.
| ︙ | |||
25 26 27 28 29 30 31 32 33 34 35 36 37 38 | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | + |
**********************************************************************/
#ifndef RS_DIMENSION_H
#define RS_DIMENSION_H
#include "rs_entitycontainer.h"
#include "rs_hatch.h"
#include "rs_mtext.h"
/**
* Holds the data that is common to all dimension entities.
*/
struct RS_DimensionData : public RS_Flags {
/**
|
| ︙ | |||
176 177 178 179 180 181 182 183 184 185 | 177 178 179 180 181 182 183 184 185 186 187 | + |
bool arrow1=true, bool arrow2=true, bool autoText=false);
void updateCreateAlignedTextDimensionLine(
const RS_Vector& p1, const RS_Vector& p2,
bool arrow1=true, bool arrow2=true, bool autoText=false);
protected:
/** Data common to all dimension entities. */
RS_DimensionData data;
RS_Hatch* createBackground(RS_MText* text);
};
#endif
|
Changes to librecad/src/lib/engine/document/entities/rs_entity.cpp.
| ︙ | |||
27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | + + + + | #include <iostream> #include <utility> #include <QPolygon> #include <QString> #include "lc_layertreeitem.h" #include "lc_layertreemodel.h" #include "lc_layertreemodel_options.h" #include "rs_arc.h" #include "rs_block.h" #include "rs_circle.h" #include "rs_ellipse.h" #include "rs_entity.h" #include "rs_graphic.h" #include "rs_graphicview.h" #include "rs_information.h" #include "rs_insert.h" #include "rs_layer.h" #include "rs_layerlist.h" #include "rs_line.h" #include "rs_mtext.h" #include "rs_point.h" #include "rs_polyline.h" #include "rs_text.h" #include "rs_units.h" #include "rs_vector.h" |
| ︙ | |||
234 235 236 237 238 239 240 | 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 | - - + + - - - - + + + |
}
/**
* @return true if this entity or any parent entities are undone.
*/
bool RS_Entity::isUndone() const {
|
| ︙ | |||
762 763 764 765 766 767 768 | 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 | - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + | } /** * Sets the layer of this entity to the current layer of * the graphic this entity is in. If this entity (and none * of its parents) are in a graphic the layer is set to nullptr. */ |
| ︙ |
Changes to librecad/src/lib/engine/document/entities/rs_entity.h.
| ︙ | |||
141 142 143 144 145 146 147 | 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 | - + |
virtual RS_Graphic* getGraphic() const;
RS_Block *getBlock() const;
RS_Insert *getInsert() const;
RS_Entity *getBlockOrInsert() const;
RS_Document *getDocument() const;
void setLayer(const QString &name);
void setLayer(RS_Layer *l);
|
| ︙ |
Changes to librecad/src/lib/engine/document/entities/rs_hatch.cpp.
| ︙ | |||
22 23 24 25 26 27 28 29 30 31 32 33 34 35 | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | + | ** ** This copyright notice MUST APPEAR in all copies of the script! ** **********************************************************************/ #include <cmath> #include <iostream> #include <memory> #include <qnamespace.h> #include <set> #include <QPainterPath> #include <QBrush> #include <QString> #include "lc_looputils.h" |
| ︙ | |||
588 589 590 591 592 593 594 | 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 | - - - - - + + - - - - - - + - - - - - - - - - - - - + - - - - + + + + + + + + + - - - + + |
auto* loop = (RS_EntityContainer*)l;
loop->optimizeContours();
}
}
needOptimization = false;
}
QPainterPath path;
|
| ︙ |
Changes to librecad/src/lib/engine/document/entities/rs_mtext.cpp.
| ︙ | |||
263 264 265 266 267 268 269 270 271 272 273 274 275 276 | 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 | + |
* text or it's data, position, alignment, .. changes.
* This method also updates the usedTextWidth / usedTextHeight property.
*/
void RS_MText::update() {
RS_DEBUG->print("RS_MText::update");
clear();
if (isUndone()) {
return;
}
usedTextWidth = 0.0;
usedTextHeight = 0.0;
|
| ︙ | |||
400 401 402 403 404 405 406 | 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 | - + |
++i;
}
// add texts:
double upperWidth{0.0};
if (!upperText.isEmpty()) {
RS_MText *upper =
|
| ︙ | |||
571 572 573 574 575 576 577 | 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 | - + + |
// next letter position:
letterPosition += letterSpace;
}
RS_MText *RS_MText::createUpperLower(QString text, const RS_MTextData &data,
const RS_Vector &position) {
auto *line = new RS_MText(
|
| ︙ | |||
619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 | 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 | + + + + - - - - |
textLine->move(RS_Vector{- textLine->getMax().x, 0.});
break;
default:
textLine->move(RS_Vector{- textLine->getMin().x, 0.});
break;
}
textLine->setPen(RS_Pen(RS2::FlagInvalid));
textLine->setLayer(nullptr);
textLine->forcedCalculateBorders();
// Update actual text size (before rotating, after scaling!):
if (textLine->getSize().x > usedTextWidth) {
usedTextWidth = textLine->getSize().x;
}
usedTextHeight += data.height * data.lineSpacingFactor * ls;
// Gets the distance over text base-line (before rotating, after scaling!):
double textTail = textLine->getMin().y;
// Move:
textLine->move(data.insertionPoint + RS_Vector{0., -data.height * lineCounter * data.lineSpacingFactor * ls});
// Rotate:
// textLine->rotate(data.insertionPoint, data.angle);
|
| ︙ | |||
797 798 799 800 801 802 803 804 | 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 | + + - + |
void RS_MText::draw(RS_Painter *painter, RS_GraphicView *view,
double & patternOffset) {
/*if (!(painter && view))
return;*/
#ifdef DEBUG_LINE_POINTS
painter->drawRect(view->toGui(getMin()), view->toGui(getMax()));
#endif
if (!view->isPrintPreview() && !view->isPrinting()) {
if ((view->getSimplifyPanning() && view->isPanning()) ||
|
| ︙ |
Changes to librecad/src/lib/engine/document/entities/rs_text.cpp.
| ︙ | |||
542 543 544 545 546 547 548 549 | 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 | + + + - + + + |
painter->drawLine(view->toGui(baselineStartPoint), view->toGui(baselineEndPoint));
}
void RS_Text::draw(RS_Painter* painter, RS_GraphicView* view, double& patternOffset){
// if (!(painter && view)) {
// return;
// }
if (!view->isPrintPreview() && !view->isPrinting()){
if (
(view->getSimplifyPanning() && view->isPanning()) ||
|
| ︙ |
Changes to librecad/src/lib/engine/rs_pen.h.
| ︙ | |||
51 52 53 54 55 56 57 | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | - + - + |
*/
RS_Pen(const RS_Color& c,
RS2::LineWidth w,
RS2::LineType t) : RS_Flags() {
setColor(c);
setWidth(w);
setLineType(t);
|
| ︙ | |||
152 153 154 155 156 157 158 159 160 161 162 163 164 165 | 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 | + + + + + + + + |
float getAlpha() const {
return alpha;
}
void setAlpha(float a) {
alpha = a;
}
void setScale(double s) {
Scale = s;
}
double getScale() const {
return Scale;
}
//RS_Pen& operator = (const RS_Pen& p) {
// lineType = p.lineType;
// width = p.width;
// color = p.color;
// setFlags(p.getFlags());
|
| ︙ | |||
199 200 201 202 203 204 205 | 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 | - + + + + + |
friend std::ostream& operator << (std::ostream& os, const RS_Pen& p);
protected:
RS2::LineType lineType = RS2::SolidLine;
RS2::LineWidth width = RS2::Width00;
|
Changes to librecad/src/lib/engine/rs_system.cpp.
| ︙ | |||
558 559 560 561 562 563 564 | 558 559 560 561 562 563 564 565 566 567 568 569 570 571 | - - - - |
for(QString& file: files)
{
fileList += path + "/" + file;
}
}
}
|
| ︙ | |||
668 669 670 671 672 673 674 | 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 | - - - - - |
QStringList ret;
RS_DEBUG->print("RS_System::getDirectoryList: Paths:");
for (QStringList::Iterator it = dirList.begin(); it != dirList.end(); ++it ) {
if (QFileInfo( *it).isDir()) {
ret += (*it);
|
| ︙ | |||
716 717 718 719 720 721 722 | 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 | - + |
QString ret;
#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
QString territory = RS_Locale::territoryToString(loc.territory());
#else
QString territory = RS_Locale::countryToString(loc.country());
#endif
|
| ︙ |
Changes to librecad/src/lib/engine/rs_vector.cpp.
| ︙ | |||
43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | + + |
*/
RS_Vector::RS_Vector(double vx, double vy, double vz):
x(vx)
,y(vy)
,z(vz)
,valid(true)
{
FixZeroes();
}
/**
* Constructor for a unit vector with given angle
*/
RS_Vector::RS_Vector(double angle):
x(std::cos(angle))
,y(std::sin(angle))
,valid(true)
{
FixZeroes();
}
RS_Vector::RS_Vector(const QPointF &point):
RS_Vector{point.x(), point.y()}
{}
/**
|
| ︙ | |||
83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 | + + + + + |
* Sets to a unit vector by the direction angle
*/
void RS_Vector::set(double angle) {
x = std::cos(angle);
y = std::sin(angle);
z = 0.;
valid = true;
FixZeroes();
}
/**
* Sets a new position for the vector.
*/
void RS_Vector::set(double vx, double vy, double vz) {
x = vx;
y = vy;
z = vz;
valid = true;
FixZeroes();
}
void RS_Vector::plus(const RS_Vector &other) {
x+= other.x;
y+= other.y;
z+= other.z;
FixZeroes();
}
void RS_Vector::minus(const RS_Vector &other) {
x-= other.x;
y-= other.y;
z-= other.z;
FixZeroes();
}
/**
* Sets a new position for the vector in polar coordinates.
*/
void RS_Vector::setPolar(double radius, double angle) {
x = radius * std::cos(angle);
y = radius * std::sin(angle);
z = 0.0;
valid = true;
FixZeroes();
}
RS_Vector RS_Vector::polar(double rho, double theta){
return {rho * std::cos(theta), rho * std::sin(theta), 0.};
}
/**
* Returns vector that defines point located in specified distance and angle from current
|
| ︙ | |||
289 290 291 292 293 294 295 296 297 298 299 300 301 302 | 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 | + |
* 0/0 by the angle of the vector
*/
RS_Vector& RS_Vector::rotate(const RS_Vector& angleVector) {
double x0 = x * angleVector.x - y * angleVector.y;
y = x * angleVector.y + y * angleVector.x;
x = x0;
FixZeroes();
return *this;
}
/**
* Rotates this vector around the given center by the given angle.
*/
RS_Vector& RS_Vector::rotate(const RS_Vector& center, double ang) {
|
| ︙ | |||
310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 | 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 | + + |
/**
* Scales this vector by the given factors with 0/0 as center.
*/
RS_Vector& RS_Vector::scale(double factor) {
x *= factor;
y *= factor;
FixZeroes();
return *this;
}
/**
* Scales this vector by the given factors with 0/0 as center.
*/
RS_Vector& RS_Vector::scale(const RS_Vector& factor) {
x *= factor.x;
y *= factor.y;
FixZeroes();
return *this;
}
RS_Vector RS_Vector::scale(const RS_Vector& factor) const{
return {x*factor.x, y*factor.y};
}
|
| ︙ | |||
357 358 359 360 361 362 363 364 365 366 367 368 369 370 | 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 | + |
return *this;
}
RS_Vector& RS_Vector::shear(double k)
{
x += k * y;
FixZeroes();
return *this;
}
/**
* Streams the vector components to stdout. e.g.: "1/4/0"
*/
std::ostream& operator << (std::ostream& os, const RS_Vector& v) {
|
| ︙ | |||
487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 | 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 | + + + + + + |
/**
* += operator. Assert: both vectors must be valid.
*/
RS_Vector RS_Vector::operator += (const RS_Vector& v) {
x += v.x;
y += v.y;
z += v.z;
FixZeroes();
return *this;
}
/**
* -= operator
*/
RS_Vector RS_Vector::operator -= (const RS_Vector& v) {
x -= v.x;
y -= v.y;
z -= v.z;
FixZeroes();
return *this;
}
RS_Vector RS_Vector::operator *= (const RS_Vector& v) {
x *= v.x;
y *= v.y;
z *= v.z;
FixZeroes();
return *this;
}
RS_Vector RS_Vector::operator /= (const RS_Vector& v) {
if (fabs(v.x)> RS_TOLERANCE && fabs(v.y)>RS_TOLERANCE){
x /= v.x;
y /= v.y;
if (std::isnormal(v.z))
z /= v.z;
}
FixZeroes();
return *this;
}
/**
* *= operator
*/
RS_Vector RS_Vector::operator *= (double s) {
x *= s;
y *= s;
z *= s;
FixZeroes();
return *this;
}
/**
* /= operator
*/
RS_Vector RS_Vector::operator /= (double s) {
if(std::abs(s)>RS_TOLERANCE) {
x /= s;
y /= s;
z /= s;
}
FixZeroes();
return *this;
}
/**
* == operator
*/
bool RS_Vector::operator == (const RS_Vector& v) const {
|
| ︙ | |||
559 560 561 562 563 564 565 566 567 568 569 570 571 572 | 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 | + + + + + + + |
}
bool RS_Vector::operator != (bool valid) const
{
return this->valid != valid;
}
void RS_Vector::FixZeroes() {
if (fabs(x)<RS_TOLERANCE) x = 0.0;
if (fabs(y)<RS_TOLERANCE) y = 0.0;
if (fabs(z)<RS_TOLERANCE) z = 0.0;
}
/**
* @return A vector with the minimum components from the vectors v1 and v2.
* These might be mixed components from both vectors.
*/
RS_Vector RS_Vector::minimum (const RS_Vector& v1, const RS_Vector& v2) {
if (!v2) return v1;
if (!v1) return v2;
|
| ︙ |
Changes to librecad/src/lib/engine/rs_vector.h.
| ︙ | |||
24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | + + |
**
**********************************************************************/
#ifndef RS_VECTOR_H
#define RS_VECTOR_H
#include "rs.h"
#include <vector>
#include <iosfwd>
class QPointF;
/**
* Represents a 3d vector (x/y/z)
*
* @author Andrew Mustun
*/
class RS_Vector {
public:
RS_Vector()=default;
RS_Vector(double vx, double vy, double vz=0.0);
explicit RS_Vector(double angle);
//RS_Vector(double v[]);
explicit RS_Vector(bool valid);
explicit RS_Vector(const QPointF& point);
|
| ︙ | |||
154 155 156 157 158 159 160 161 162 163 164 165 166 167 | 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 | + + + + |
#endif
public:
double x=0.;
double y=0.;
double z=0.;
bool valid=false;
private:
void FixZeroes();
};
/**
* Represents one to 4 vectors. Typically used to return multiple
* solutions from a function.
*/
|
| ︙ |
Changes to librecad/src/lib/gui/rs_graphicview.cpp.
| ︙ | |||
44 45 46 47 48 49 50 51 52 53 54 55 56 57 | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | + | #include "rs_math.h" #include "rs_painter.h" #include "rs_snapper.h" #include "rs_settings.h" #include "rs_units.h" #include "lc_linemath.h" #include "dxf_format.h" #include "lc_defaults.h" #ifdef EMU_C99 #include "emu_c99.h" #endif #ifdef DEBUG_RENDERING #define DEBUG_RENDERING_DETAILS |
| ︙ | |||
115 116 117 118 119 120 121 | 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 | - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + |
:QWidget(parent, f), eventHandler{new RS_EventHandler{this}},
m_colorData{std::make_unique<ColorData>()},
grid{std::make_unique<RS_Grid>(this)},
defaultSnapMode{std::make_unique<RS_SnapMode>()},
drawingMode(RS2::ModeFull),
savedViews(16),
previousViewTime{std::make_unique<QDateTime>(QDateTime::currentDateTime())} {
|
| ︙ | |||
463 464 465 466 467 468 469 | 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 | - + - + |
}
/**
* zooms in by factor f in x
*/
void RS_GraphicView::zoomInX(double f) {
factor.x *= f;
|
| ︙ | |||
552 553 554 555 556 557 558 | 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 | - - + + |
auto const dV = container->getMax() - container->getMin();
sx = std::max(dV.x, 0.);
sy = std::max(dV.y, 0.);
} else {
sx = container->getSize().x;
sy = container->getSize().y;
}
|
| ︙ | |||
643 644 645 646 647 648 649 | 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 | - + |
}
/**
* Saves the current view as previous view to which we can
* switch back later with @see restoreView().
*/
void RS_GraphicView::saveView() {
|
| ︙ | |||
681 682 683 684 685 686 687 | 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 | - - - - - - + + + + + + - - + + - - + + |
adjustOffsetControls();
adjustZoomControls();
invalidate();
redraw();
}
|
| ︙ | |||
1068 1069 1070 1071 1072 1073 1074 | 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 | - - - - - - + + + + + + - - + + - - + + |
painter->setPen(penSaved);
}
#ifdef DEBUG_RENDERING_DETAILS
layer1Time += drawLayer1Timer.elapsed();
#endif
}
|
| ︙ | |||
1134 1135 1136 1137 1138 1139 1140 | 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 | - - + |
pen.setColor(m_colorData->previewReferenceHighlightedEntitiesColor);
} else {
pen.setColor(m_colorData->previewReferenceEntitiesColor);
}
pen.setLineType(RS2::SolidLine);
pen.setWidth(RS2::LineWidth::Width00);
e->setPen(pen);
|
| ︙ | |||
1161 1162 1163 1164 1165 1166 1167 | 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 | - - + + - - + + - - - + + + - - + + - - + + - + |
}
}
}
}
}
|
| ︙ | |||
1211 1212 1213 1214 1215 1216 1217 | 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 | - - + - - - - - + - - - - - + - - - - - + + - + + - + |
// This is the standard (AutoCAD like) behaviour.
// bug# 3437941
// ------------------------------------------------------------
if (pen.getAlpha() == 1.0) {
if (width >0) {
double wf = 1.0; // Width factor.
|
| ︙ | |||
1294 1295 1296 1297 1298 1299 1300 | 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 | - + - - + |
}
}
else{
lastPaintedHighlighted = highlighted;
lastPaintedSelected = selected;
lastPaintOverlay = overlayPaint;
}
|
| ︙ | |||
1371 1372 1373 1374 1375 1376 1377 | 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 | - + - - - - + + - - - - - - - - + - - - + + - - - - - - - - - - + |
lastPaintOverlay = overlayPaint;
}
#ifdef DEBUG_RENDERING
setPenTimer.start();
#endif
|
| ︙ | |||
1491 1492 1493 1494 1495 1496 1497 | 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 | - + |
// update is disabled:
// given entity is nullptr:
if (!e) {
return;
}
// check for selected entity drawing
|
| ︙ | |||
1692 1693 1694 1695 1696 1697 1698 | 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 | - + - + |
*
* @see drawIt()
*/
void RS_GraphicView::drawAbsoluteZero(RS_Painter *painter){
int const zr = zeroShortAxisMarkSize;
RS_Pen pen_xAxis (m_colorData->xAxisExtensionColor, RS2::Width00, RS2::SolidLine);
|
| ︙ | |||
1825 1826 1827 1828 1829 1830 1831 | 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 | - + |
}
RS2::LineType relativeZeroPenType = RS2::SolidLine;
if (m_colorData->hideRelativeZero) relativeZeroPenType = RS2::NoPen;
RS_Pen p(m_colorData->relativeZeroColor, RS2::Width00, relativeZeroPenType);
|
| ︙ | |||
1897 1898 1899 1900 1901 1902 1903 | 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 | - + - + |
int numX = graphic->getPagesNumHoriz();
int numY = graphic->getPagesNumVert();
// gray background:
painter->fillRect(0, 0, getWidth(), getHeight(),
printPreviewBackgroundColor);
|
| ︙ | |||
2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 | 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 | + + + + + + + + + |
RS2::EntityType RS_GraphicView::getTypeToSelect() const {
return typeToSelect;
}
void RS_GraphicView::setTypeToSelect(RS2::EntityType mType) {
typeToSelect = mType;
}
bool RS_GraphicView::getSimplifySmall() const {
return simplifySmall;
}
bool RS_GraphicView::getSimplifyPanning() const {
return simplifyPanning;
}
int RS_GraphicView::getMinRenderableTextHeightInPx() const {
return minRenderableTextHeightInPx;
}
void RS_GraphicView::loadGridSettings() {
if (grid != nullptr){
|
| ︙ |
Changes to librecad/src/lib/gui/rs_graphicview.h.
| ︙ | |||
377 378 379 380 381 382 383 | 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 | - + + + |
int getPointMode() const;
int getPointSize() const;
double getMinCircleDrawingRadius() const;
double getMinArcDrawingRadius() const;
double getMinEllipseMajorRadius() const;
double getMinEllipseMinorRadius() const;
double getMinLineDrawingLen() const;
|
| ︙ | |||
425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 | 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 | + + + - - + + |
bool extendAxisLines = false;
int extendAxisModeX = 0;
int extendAxisModeY = 0;
int entityHandleHalfSize = 2;
int relativeZeroRadius = 5;
int zeroShortAxisMarkSize = 20;
bool simplifySmall = true;
bool simplifyPanning = true;
int minRenderableTextHeightInPx = 4;
bool ignoreDraftForHighlight = false;
/**
* Delete mode. If true, all drawing actions will delete in background color
* instead.
*/
bool deleteMode = false;
LC_Rect view_rect;
void drawEntityReferencePoints(RS_Painter *painter, const RS_Entity *e) const;
void invalidate();
// painting cached values
|
| ︙ | |||
518 519 520 521 522 523 524 525 526 527 | 523 524 525 526 527 528 529 530 531 532 533 | + |
signals:
void relative_zero_changed(const RS_Vector &);
void previous_zoom_state(bool);
private:
bool m_panOnZoom = false;
bool m_skipFirstZoom = false;
bool m_modifyOnZoom = true;
};
#endif
|
Changes to librecad/src/lib/gui/rs_linetypepattern.cpp.
| ︙ | |||
29 30 31 32 33 34 35 | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | + + + + - + |
#include <map>
#include "rs_linetypepattern.h"
#include "rs.h"
namespace {
// after the line pattern fixed, these patteds are defined in millimeters.
// It is another question how correct are these numbers bellow.
// For example - in my drawings, patternCenterSmall is too big and patternCenterTiny a
// little bit smaller than I need.
|
| ︙ |
Changes to librecad/src/lib/gui/rs_painter.cpp.
| ︙ | |||
23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | + - + - + - - + + - + |
** This copyright notice MUST APPEAR in all copies of the script!
**
**********************************************************************/
#include<cmath>
#include<QPainterPath>
#include<QPolygon>
#include <cstdio>
#include "dxf_format.h"
#include "rs_color.h"
#include "rs_spline.h"
#include "rs_polyline.h"
#include "rs_debug.h"
#include "rs_math.h"
#include "rs_painter.h"
#include "rs_graphicview.h"
#include "rs_linetypepattern.h"
#include "rs_arc.h"
#include "rs_ellipse.h"
#include "rs_circle.h"
namespace {
// Convert from LibreCAD line style pattern to QPen Dash Pattern.
// QPen dash pattern by default is in the unit of pixel
|
| ︙ | |||
277 278 279 280 281 282 283 | 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 | - + |
restore();
}
}
void RS_Painter::createSolidFillPath(QPainterPath &path, const RS_GraphicView *view, QList<RS_Entity *> entities) {
foreach (auto l, entities) {
|
| ︙ | |||
687 688 689 690 691 692 693 694 695 | 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 | + + + + + + + + - - - - + + + + + + + + + + + + + + + + - + - - + + |
}
pColor.setAlphaF(pen.getAlpha());
RS2::LineType lineType = pen.getLineType();
Qt::PenStyle style = rsToQtLineType(lineType);
double screenWidth = pen.getScreenWidth();
double swpx;
if (screenWidth < 1.0) {
swpx = 0.0;
} else {
swpx = screenWidth;
}
if (style == Qt::CustomDashLine){
double newDashOffset = pen.dashOffset();
|
| ︙ |
Changes to librecad/src/main/doc_plugin_interface.cpp.
| ︙ | |||
26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | + + | #include <QEventLoop> #include <QList> #include <QInputDialog> #include <QFileInfo> #include "doc_plugin_interface.h" #include "document_interface.h" #include "intern/qc_actiongetent.h" #include "intern/qc_actiongetpoint.h" #include "intern/qc_actiongetselect.h" #include "lc_splinepoints.h" #include "lc_undosection.h" #include "rs_actioninterface.h" #include "rs_arc.h" #include "rs_block.h" #include "rs_circle.h" #include "rs_debug.h" #include "rs_dimension.h" #include "rs_ellipse.h" #include "rs_eventhandler.h" #include "rs_graphicview.h" #include "rs_image.h" #include "rs_insert.h" #include "rs_layer.h" #include "rs_line.h" |
| ︙ | |||
353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 | 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 | + + + + + + + + + + |
data->insert(DPI::CLOSEPOLY, static_cast<RS_Polyline*>(entity)->isClosed() );
break;
case RS2::EntityVertex:
data->insert(DPI::ETYPE, DPI::UNKNOWN);
break;
case RS2::EntityDimAligned:
data->insert(DPI::ETYPE, DPI::DIMALIGNED);
data->insert(DPI::TEXTCONTENT, static_cast<RS_Dimension*>(entity)->getLabel(false));
data->insert(DPI::SIZEU, static_cast<RS_Dimension*>(entity)->getMeasuredLabel().toDouble());
break;
case RS2::EntityDimLinear:
data->insert(DPI::ETYPE, DPI::DIMLINEAR);
data->insert(DPI::TEXTCONTENT, static_cast<RS_Dimension*>(entity)->getLabel(false));
data->insert(DPI::SIZEU, static_cast<RS_Dimension*>(entity)->getMeasuredLabel().toDouble());
break;
case RS2::EntityDimRadial:
data->insert(DPI::ETYPE, DPI::DIMRADIAL);
data->insert(DPI::TEXTCONTENT, static_cast<RS_Dimension*>(entity)->getLabel(false));
data->insert(DPI::SIZEU, static_cast<RS_Dimension*>(entity)->getMeasuredLabel().toDouble());
break;
case RS2::EntityDimDiametric:
data->insert(DPI::ETYPE, DPI::DIMDIAMETRIC);
data->insert(DPI::TEXTCONTENT, static_cast<RS_Dimension*>(entity)->getLabel(false));
data->insert(DPI::SIZEU, static_cast<RS_Dimension*>(entity)->getMeasuredLabel().toDouble());
break;
case RS2::EntityDimAngular:
data->insert(DPI::ETYPE, DPI::DIMANGULAR);
data->insert(DPI::TEXTCONTENT, static_cast<RS_Dimension*>(entity)->getLabel(false));
data->insert(DPI::SIZEU, static_cast<RS_Dimension*>(entity)->getMeasuredLabel().toDouble());
break;
case RS2::EntityDimLeader:
data->insert(DPI::ETYPE, DPI::DIMLEADER);
break;
case RS2::EntityUnknown:
default:
data->insert(DPI::ETYPE, DPI::UNKNOWN);
|
| ︙ | |||
617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 | 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 | + + + + + + + + + + + + + + + |
}else{
pl->setClosed(false);
}
break;}
case RS2::EntityVertex:
break;
case RS2::EntityDimAligned:
if (hash.contains(DPI::TEXTCONTENT)) {
static_cast<RS_Dimension*>(ec)->setLabel(hash.take(DPI::TEXTCONTENT).toString());
}
break;
case RS2::EntityDimLinear:
if (hash.contains(DPI::TEXTCONTENT)) {
static_cast<RS_Dimension*>(ec)->setLabel(hash.take(DPI::TEXTCONTENT).toString());
}
break;
case RS2::EntityDimRadial:
if (hash.contains(DPI::TEXTCONTENT)) {
static_cast<RS_Dimension*>(ec)->setLabel(hash.take(DPI::TEXTCONTENT).toString());
}
break;
case RS2::EntityDimDiametric:
if (hash.contains(DPI::TEXTCONTENT)) {
static_cast<RS_Dimension*>(ec)->setLabel(hash.take(DPI::TEXTCONTENT).toString());
}
break;
case RS2::EntityDimAngular:
if (hash.contains(DPI::TEXTCONTENT)) {
static_cast<RS_Dimension*>(ec)->setLabel(hash.take(DPI::TEXTCONTENT).toString());
}
break;
case RS2::EntityDimLeader:
break;
case RS2::EntityUnknown:
default:
break;
}
|
| ︙ |
Changes to librecad/src/main/main.cpp.
| ︙ | |||
60 61 62 63 64 65 66 | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + |
* Main. Creates Application window.
*/
// fixme - sand - refactor and split to several specialized functions
int main(int argc, char** argv)
{
QT_REQUIRE_VERSION(argc, argv, "5.2.1");
|
| ︙ | |||
139 140 141 142 143 144 145 | 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 | - + - - - - - - - - - + + + + + + + + + + - - + - + - + - + |
RS_DEBUG->print( RS_Debug::D_NOTHING, " %d Warning", RS_Debug::D_WARNING);
RS_DEBUG->print( RS_Debug::D_NOTHING, " %d Notice", RS_Debug::D_NOTICE);
RS_DEBUG->print( RS_Debug::D_NOTHING, " %d Informational", RS_Debug::D_INFORMATIONAL);
RS_DEBUG->print( RS_Debug::D_NOTHING, " %d Debugging", RS_Debug::D_DEBUGGING);
exit(0);
}
if (allowOptions&& (argstr.startsWith(lpDebugSwitch0, Qt::CaseInsensitive) ||
|
| ︙ | |||
214 215 216 217 218 219 220 | 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 | - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + |
}
default : {
RS_DEBUG->setLevel(RS_Debug::D_DEBUGGING);
break;
}
}
|
| ︙ |
Changes to librecad/src/plugins/qc_plugininterface.h.
| ︙ | |||
24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | + - + + + + + + |
**
**********************************************************************/
#ifndef QC_PLUGININTERFACE_H
#define QC_PLUGININTERFACE_H
#include <QtPlugin>
#include <qcontainerfwd.h>
class Document_Interface;
/**
* Menu locations for Plugins
*/
class PluginMenuLocation
{
public:
|
| ︙ |
Changes to librecad/src/ui/action_options/insert/qg_insertoptions.cpp.
| ︙ | |||
135 136 137 138 139 140 141 | 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 | - + |
}
void QG_InsertOptions::onAngleEditingFinished(){
setAngleToActionAndView(ui->leAngle->text());
}
void QG_InsertOptions::onFactorEditingFinished(){
|
| ︙ |
Changes to librecad/src/ui/dialogs/settings/options_general/qg_dlgoptionsgeneral.cpp.
| ︙ | |||
299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 | 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 | + + + + + + + + |
checked = LC_GET_BOOL("PanOnZoom", false);
cbPanOnWheelZoom->setChecked(checked);
checked = LC_GET_BOOL("FirstTimeNoZoom", false);
cbFirstTimeNoZoom->setChecked(checked);
checked = LC_GET_BOOL("ModifyOnViewChange", true);
cbModifyOnView->setChecked(checked);
}
LC_GROUP_END();
LC_GROUP("Render");
{
bool checked = LC_GET_BOOL("SimplifyPanning", true);
cbSimplifyPanning->setChecked(checked);
checked = LC_GET_BOOL("SimplifySmall", true);
cbSimplifySmall->setChecked(checked);
int minTextHeight = LC_GET_INT("MinRenderableTextHeightPx", 4);
sbTextMinHeight->setValue(minTextHeight);
int minArcRadius100 = LC_GET_INT("MinArcRadius", 80);
double minArcRadius = minArcRadius100 / 100.0;
sbRenderMinArcRadius->setValue(minArcRadius);
|
| ︙ | |||
564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 | 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 | + + + |
LC_SET("ShowCloseButtonActiveOnly", cbTabCloseButtonMode->currentIndex() == 1);
LC_SET("ShowActionIconInOptions", cbShowCurrentActionIconInOptions->isChecked());
LC_SET("ShowEntityIDs", cbShowEntityIDs->isChecked());
LC_SET("PanOnZoom", cbPanOnWheelZoom->isChecked());
LC_SET("FirstTimeNoZoom", cbFirstTimeNoZoom->isChecked());
LC_SET("ModifyOnViewChange", cbModifyOnView->isChecked());
}
LC_GROUP_END();
LC_GROUP("Render");
{
LC_SET("SimplifySmall", cbSimplifySmall->isChecked());
LC_SET("SimplifyPanning", cbSimplifyPanning->isChecked());
LC_SET("MinRenderableTextHeightPx", sbTextMinHeight->value());
LC_SET("MinArcRadius", (int)(sbRenderMinArcRadius->value()*100));
LC_SET("MinCircleRadius", (int)(sbRenderMinCircleRadius->value()*100));
LC_SET("MinLineLen", (int)(sbRenderMinLineLen->value()*100));
LC_SET("MinEllipseMajor", (int)(sbRenderMinEllipseMajor->value()*100));
LC_SET("MinEllipseMinor", (int)(sbRenderMinEllipseMinor->value()*100));
}
|
| ︙ |
Changes to librecad/src/ui/dialogs/settings/options_general/qg_dlgoptionsgeneral.ui.
1 2 3 4 5 6 7 8 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | - - + + |
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QG_DlgOptionsGeneral</class>
<widget class="QDialog" name="QG_DlgOptionsGeneral">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
|
| ︙ | |||
35 36 37 38 39 40 41 | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | - + |
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
|
| ︙ | |||
1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 | 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 | + + + + + + + |
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>First time only pan</string>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QCheckBox" name="cbModifyOnView">
<property name="text">
<string>View change modifies the document</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<spacer name="verticalSpacer_7">
<property name="orientation">
|
| ︙ | |||
3168 3169 3170 3171 3172 3173 3174 | 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 | - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + |
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="groupBox_14">
<property name="title">
<string>Rendering Minimums</string>
</property>
<layout class="QGridLayout" name="gridLayout_27">
|
| ︙ | |||
3190 3191 3192 3193 3194 3195 3196 | 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 | - + - - - - - - - - - - - - - - - - - - - - - - + - + - + - - + + - + - + - - - - - - - - - - - - - - - + - + - - + + - + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - + + - - + + |
<number>15</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
</widget>
</item>
|
| ︙ |
Changes to librecad/src/ui/dock_widgets/command_line/qg_commandwidget.cpp.
| ︙ | |||
29 30 31 32 33 34 35 | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | - - - | #include <QAction> #include <QDockWidget> #include <QKeyEvent> #include <QFileDialog> #include <QSettings> |
| ︙ |
Changes to librecad/src/ui/dock_widgets/entity_info/lc_quickinfowidget.h.
| ︙ | |||
69 70 71 72 73 74 75 76 77 78 79 80 81 82 | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | + + + |
bool isDisplayPointsPathOnPreview(){return options->displayPointsPath;};
bool isSelectEntitiesInDefaultActionWithCTRL(){return options->selectEntitiesInDefaultActionByCTRL;};
bool isAutoSelectEntitiesInDefaultAction(){return options->autoSelectEntitiesInDefaultAction;};
void onEntityPropertiesEdited(unsigned long originalId, unsigned long editedCloneId);
signals:
virtual void escape();
protected slots:
void onSettings();
void onClearAll();
void onCopyAll();
void onTextChanged();
void onPickEntity();
void onPickCoordinates();
|
| ︙ |
Changes to librecad/src/ui/dock_widgets/layers_tree/lc_layertreeitem.cpp.
| ︙ | |||
255 256 257 258 259 260 261 262 263 264 265 266 267 268 | 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + |
if (child->getLayerType() == type){
result = true;
break;
}
}
return result;
}
/**
* Searches recursively and returns the first child of the given type.
* Or nullptr if there is none.
* @param type layer type
* @return LC_LayerTreeItem* or nullptr
*/
LC_LayerTreeItem* LC_LayerTreeItem::firstChildOfType(int type){
LC_LayerTreeItem* result = nullptr;
int count = childItems.length();
for (int i = 0; i < count; i++) {
LC_LayerTreeItem *child = childItems.at(i);
if (child->getLayerType() == type){
result = child;
break;
} else {
result = child->firstChildOfType(type);
if (result) break;
}
}
return result;
}
void LC_LayerTreeItem::setLayerType(int value){
layerType = value;
}
/**
* If layer is secondary, this is the reference to the normal layer (if any) that corresponds to this item
* @return primary layer item
|
| ︙ |
Changes to librecad/src/ui/dock_widgets/layers_tree/lc_layertreeitem.h.
| ︙ | |||
100 101 102 103 104 105 106 107 108 109 110 111 112 113 | 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 | + |
void setMatched(bool enabled) {matched = enabled;};
bool isMatched() const {return matched;};
bool isActiveLayer() const {return activeLayer;};
void setActiveLayer(bool value){activeLayer = value;};
void invalidate();
bool isInValid() const;
bool hasChildOfType(int type);
LC_LayerTreeItem* firstChildOfType(int type);
bool hasChildWithName(QString& nameToFind, int layerTypeToFind);
void collectPathToParent(QList<LC_LayerTreeItem*> &result, bool includeSelf);
bool isDescendantOf(LC_LayerTreeItem* item);
bool isZero() const {return zero_layer;}
void markAsZero(){zero_layer = true;}
QString getFullName(){return fullName;};
void setFullName(QString &name){fullName = name;};
|
| ︙ |
Changes to librecad/src/ui/dock_widgets/library_widget/qg_librarywidget.cpp.
| ︙ | |||
86 87 88 89 90 91 92 | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 | - + |
vboxLayout->addWidget(dirView);
ivPreview = new QListView(this);
ivPreview->setViewMode(QListView::IconMode);
vboxLayout->addWidget(ivPreview);
bInsert = new QPushButton(tr("Insert"), this);
vboxLayout->addWidget(bInsert);
|
| ︙ |
Changes to librecad/src/ui/dock_widgets/pen_palette/lc_penpalettedata.cpp.
| ︙ | |||
66 67 68 69 70 71 72 | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | + + + - + + + |
// handle error later
}
return result;
}
bool LC_PenPaletteData::loadItems(){
QString fileName = options->pensFileName;
if (fileName.length() == 0) {
createDefaultPens();
|
| ︙ | |||
90 91 92 93 94 95 96 | 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 | - + |
}
file.close();
return true;
}
else {
createDefaultPens();
}
|
| ︙ |
Changes to librecad/src/ui/dock_widgets/views_list/lc_namedviewslistwidget.cpp.
| ︙ | |||
128 129 130 131 132 133 134 | 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 | + - - - - + + + + + |
}
void LC_NamedViewsListWidget::setGraphicView(RS_GraphicView *gv,
QMdiSubWindow *w) {
LC_ViewList *viewsList = nullptr;
if (gv != nullptr && gv->getGraphic() != nullptr) {
RS_Graphic *graphic = gv->getGraphic();
if (graphic != nullptr) {
|
| ︙ |
Changes to librecad/src/ui/main/qc_applicationwindow.cpp.
| ︙ | |||
609 610 611 612 613 614 615 | 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 | + + - + + + + + |
QC_PluginInterface *pluginInterface = qobject_cast<QC_PluginInterface *>(plugin);
if (pluginInterface) {
loadedPlugins.push_back(pluginInterface);
loadedPluginFileNames.push_back(fileName);
PluginCapabilities pluginCapabilities=pluginInterface->getCapabilities();
for(const PluginMenuLocation& loc: pluginCapabilities.menuEntryPoints) {
QAction *actpl = new QAction(loc.menuEntryActionName, plugin);
actpl->setText(loc.menuEntryActionName);
if (loc.menuEntryCmd == "") {
|
| ︙ |
Changes to librecad/src/ui/main/qc_applicationwindow.h.
| ︙ | |||
33 34 35 36 37 38 39 | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | - | #include <QMap> #include <QSettings> #include "rs.h" #include "rs_pen.h" #include "rs_snapper.h" |
| ︙ |
Changes to librecad/src/ui/view/qg_graphicview.cpp.
| ︙ | |||
519 520 521 522 523 524 525 | 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 | - + - - + - |
break;
}
RS_DEBUG->print("QG_GraphicView::mouseReleaseEvent: OK");
}
void QG_GraphicView::addEditEntityEntry(QMouseEvent* event, QMenu& contextMenu){
RS_Entity* entity = snapEntity(*this, event);
|
| ︙ | |||
1385 1386 1387 1388 1389 1390 1391 | 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
antialiasing = LC_GET_BOOL("Antialiasing");
classicRenderer = LC_GET_BOOL("ClassicRenderer", true);
int zoomFactor1000 = LC_GET_INT("ScrollZoomFactor", 1137);
scrollZoomFactor = zoomFactor1000 / 1000.0;
}
LC_GROUP_END();
|
| ︙ |
Changes to librecad/support/fonts/lc_opengost-ar.lff.
1 2 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | - + - + + + + | # Format: LibreCAD Font 1 # Creator: LibreCAD |
| ︙ | |||
86 87 88 89 90 91 92 | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | - + | [0035] 5 3.21428,8.67857;0,8.67857;0,4.82143;1.28571,4.82143;3.21429,2.89286,A-0.41333;3.21428,2.25;1.28571,0.32143,A-0.415;0,0.32143 [0036] 6 2.57142,8.67857;-0,4.5,A0.25451;0,2.05714;3.85714,2.05714,A1;3.85714,2.89286;1.92857,4.82143,A0.41333;0.02727,4.82143 [0037] 7 |
| ︙ | |||
290 291 292 293 294 295 296 | 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 | - + | [0071] q 3.21429,-2.25;3.21429,6.10714;1.28571,6.10714;0,4.82143,A0.415;0,1.60714;1.28571,0.32143,A0.415;3.21429,0.32143 [0072] r 2.57143,5.14286;1.60714,6.10714,A0.40667;0,6.10714;0,0.32143 [0073] s |
| ︙ | |||
867 868 869 870 871 872 873 | 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 | - + - + | 0.64286,8.67857;1.28572,8.03961;1.92857,8.67857 [015a] Ś 3.66448,8.35714;0.91938,8.73186,A0.21596;0.28961,6.68501,A0.53506;3.50134,2.74655;2.56751,0.19158,A-0.56893;-0,0.64298,A-0.18192 2.25011,10.60714;1.92869,9.96429 [015b] ś |
| ︙ | |||
935 936 937 938 939 940 941 | 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 | - + | 0.96467,8.67857;1.60753,8.03961;2.25039,8.67857 [0218] Ș 3.66448,8.35714;0.91938,8.73186,A0.21596;0.28961,6.68501,A0.53506;3.50134,2.74655;2.56751,0.19158,A-0.56893;-0,0.64298,A-0.18192 1.92869,-0.96428;1.92869,-1.60714 [0219] ș |
| ︙ | |||
1057 1058 1059 1060 1061 1062 1063 | 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 | - + | 2.25,8.67857;2.25,0.32143 0,8.67857;0,5.14286;4.5,5.14286,A1;4.5,8.67857 [03a9] Ω 0.64286,0.32143;1.60714,0.32143;1.60714,1.93398;-0,3.53571,A-0.41555;0,6.62143;4.5,6.62143,A-1;4.5,3.53571;2.89286,1.93364,A-0.41432;2.89286,0.32143;3.85714,0.32143 [03b1] α |
| ︙ | |||
1136 1137 1138 1139 1140 1141 1142 | 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 | - + | 0,6.10714;2.57143,6.10714;3.53571,6.42857,A0.169 1.60714,6.10714;1.60714,0.96429;2.25,0.32143,A0.42;2.57143,0.32143 [03c5] υ 0,6.12;0.3825,5.72142,A-0.38513;0.3825,1.15714;1.56374,0.21918,A0.48257;2.55214,0.95464,A0.20391;2.95393,6.10393,A0.19823 [03c6] φ |
| ︙ | |||
1247 1248 1249 1250 1251 1252 1253 | 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 | - + | [0416] Ж 2.57143,8.67857;2.57143,0.32143 0,8.67857;2.22857,4.77857;0,0.32143 5.14285,8.67857;2.91429,4.77857;5.14286,0.32143 2.22857,4.77857;2.91429,4.77857 [0417] З |
| ︙ | |||
1684 1685 1686 1687 1688 1689 1690 | 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 | - + | 2.25096,7.71429;2.25096,5.14286 1.28667,10.92857;0,6.42857;3.21524,6.42857 [2075] ⁵ 2.57143,10.92857;0,10.92857;0,8.35714;1.28571,8.35714;2.57143,7.07143,A-0.415;2.57143,6.42857;1.28571,5.14286,A-0.415;0,5.14286 [2076] ⁶ |
| ︙ | |||
1726 1727 1728 1729 1730 1731 1732 | 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 | - + | [2081] ₁ 0,2.57143;1.28571,3.85306;1.28571,-1.92857 [2082] ₂ 0.00702,3.22393;2.19274,3.48108,A-0.45417;2.37273,1.89321,A-0.35006;0,-1.92857;2.56881,-1.92857 [2083] ₃ |
| ︙ | |||
2739 2740 2741 2742 2743 2744 2745 | 2742 2743 2744 2745 2746 2747 2748 | - - - | 13.49585,11.24916;0,-2.25;13.49346,-2.25;26.99585,11.24916 [e05e] 0,0.32143;17.35714,0.32143,A-0.96296 [e05f] 0,0.32143;17.36598,0.32143,A-0.96247;0,0.32143 |
Changes to librecad/support/patterns/gost_ceramics.dxf.
more than 10,000 changes
Changes to librecad/support/patterns/gost_concrete.dxf.
more than 10,000 changes
Changes to librecad/support/patterns/gost_ferroconcrete.dxf.
more than 10,000 changes
Changes to librecad/support/patterns/gost_ferroconcrete1.dxf.
more than 10,000 changes
Changes to librecad/support/patterns/gost_glass.dxf.
more than 10,000 changes
Changes to librecad/support/patterns/gost_glass1.dxf.
more than 10,000 changes
Changes to librecad/support/patterns/gost_ground.dxf.
more than 10,000 changes
Changes to librecad/support/patterns/gost_ground1.dxf.
more than 10,000 changes
Changes to librecad/support/patterns/gost_liquid.dxf.
more than 10,000 changes
Changes to librecad/support/patterns/gost_metal.dxf.
more than 10,000 changes
Changes to librecad/support/patterns/gost_non-metal.dxf.
more than 10,000 changes
Changes to librecad/support/patterns/gost_sand.dxf.
more than 10,000 changes
Changes to librecad/support/patterns/gost_stone.dxf.
more than 10,000 changes
Changes to librecad/support/patterns/gost_wood.dxf.
more than 10,000 changes
Changes to librecad/support/patterns/gost_wood1.dxf.
more than 10,000 changes
Changes to librecad/support/patterns/kerpele.dxf.
1 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 | - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + - + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + - + + + + + + + + + + + + + + + + + + + - + + + - + - + - + - + + + - + - + - + - + + + - + - + - + - + - + - + + + - - + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + - + + - + + + + + + + + + + + + + + + + + - + + + - - + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + - + + + - + + + + + + + + + + + + + + + + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - + + + + + + + + + + + + + - - - - - - - - + + - - - - + + + + - - - - - - - - + + + + - - - - + + + + - - - - - - - - + + + + - - - + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + - + - + + + - + - + + + - + - + - + - + - + - + + + - + + + - + + + - + + + - + + + + + + + + + + + + + + + + + - + - + - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - - + + + + + + - + + + - - - + + - - - + - - - - - + + - - - + + + - + - + - + - + + + + + - - - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + - - - - - - + - - + + - + - + - - + + - + - - - + - + - + - - - + - - - + + + - + - + - - + + - + - - - + - + - + - - - + - - + + - + - + - - + + - + - - - + - + - + - - - + - - + + - + - + - - + + - + - - - + - + - + - - - + - - - - - - + + + + + + - + - - - + - + - + - - - + - - + + - + - + - - + + - + - + - - - + - + - - - + - - + + - + - + - - - - - - - - + + + + + + - + - + - - - + - - + + - + - + - - + + - + - + - - - + - + - - - + - - + + - + - + - - + + - + - + - - - + - + - - + + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + - + - - + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | 999 |
Added plugins/iso_fittings/iso_fittings.cpp.