summaryrefslogtreecommitdiffstats
path: root/src/sp-mesh-array.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/sp-mesh-array.cpp')
-rw-r--r--src/sp-mesh-array.cpp168
1 files changed, 126 insertions, 42 deletions
diff --git a/src/sp-mesh-array.cpp b/src/sp-mesh-array.cpp
index 355150893..c47c338de 100644
--- a/src/sp-mesh-array.cpp
+++ b/src/sp-mesh-array.cpp
@@ -46,7 +46,7 @@
#include "document.h"
#include "sp-root.h"
-#include "sp-mesh.h"
+#include "sp-mesh-gradient.h"
#include "sp-mesh-array.h"
#include "sp-mesh-row.h"
#include "sp-mesh-patch.h"
@@ -574,7 +574,60 @@ void SPMeshPatchI::setOpacity( guint i, gdouble opacity ) {
};
-SPMeshNodeArray::SPMeshNodeArray( SPMesh *mg ) {
+/**
+ Return stop pointer for corner of patch.
+*/
+SPStop* SPMeshPatchI::getStopPtr( guint i ) {
+
+ assert( i < 4 );
+
+ SPStop* stop = nullptr;
+ switch ( i ) {
+ case 0:
+ stop = (*nodes)[ row ][ col ]->stop;
+ break;
+ case 1:
+ stop = (*nodes)[ row ][ col+3 ]->stop;
+ break;
+ case 2:
+ stop = (*nodes)[ row+3 ][ col+3 ]->stop;
+ break;
+ case 3:
+ stop = (*nodes)[ row+3 ][ col ]->stop;
+ break;
+ }
+
+ return stop;
+};
+
+
+/**
+ Set stop pointer for corner of patch.
+*/
+void SPMeshPatchI::setStopPtr( guint i, SPStop* stop ) {
+
+ assert( i < 4 );
+
+ switch ( i ) {
+ case 0:
+ (*nodes)[ row ][ col ]->stop = stop;
+ break;
+ case 1:
+ (*nodes)[ row ][ col+3 ]->stop = stop;
+ break;
+ case 2:
+ (*nodes)[ row+3 ][ col+3 ]->stop = stop;
+ break;
+ case 3:
+ (*nodes)[ row+3 ][ col ]->stop = stop;
+ break;
+
+ }
+
+};
+
+
+SPMeshNodeArray::SPMeshNodeArray( SPMeshGradient *mg ) {
read( mg );
@@ -586,7 +639,7 @@ SPMeshNodeArray::SPMeshNodeArray( const SPMeshNodeArray& rhs ) {
built = false;
mg = NULL;
- drag_valid = false;
+ draggers_valid = false;
nodes = rhs.nodes; // This only copies the pointers but it does size the vector of vectors.
@@ -607,7 +660,7 @@ SPMeshNodeArray& SPMeshNodeArray::operator=( const SPMeshNodeArray& rhs ) {
built = false;
mg = NULL;
- drag_valid = false;
+ draggers_valid = false;
nodes = rhs.nodes; // This only copies the pointers but it does size the vector of vectors.
@@ -620,28 +673,50 @@ SPMeshNodeArray& SPMeshNodeArray::operator=( const SPMeshNodeArray& rhs ) {
return *this;
};
-
-void SPMeshNodeArray::read( SPMesh *mg_in ) {
+// Fill array with data from mesh objects.
+// Returns true of array's dimensions unchanged.
+bool SPMeshNodeArray::read( SPMeshGradient *mg_in ) {
mg = mg_in;
- clear();
+ // Count rows and columns, if unchanged reuse array to keep draggers valid.
+ unsigned cols = 0;
+ unsigned rows = 0;
+ for (auto& ro: mg->children) {
+ if (SP_IS_MESHROW(&ro)) {
+ ++rows;
+ if (rows == 1 ) {
+ for (auto& po: ro.children) {
+ if (SP_IS_MESHPATCH(&po)) {
+ ++cols;
+ }
+ }
+ }
+ }
+ }
+ bool same_size = true;
+ if (cols != patch_columns() || rows != patch_rows() ) {
+ // Draggers will be invalidated.
+ same_size = false;
+ clear();
+ draggers_valid = false;
+ }
Geom::Point current_p( mg->x.computed, mg->y.computed );
// std::cout << "SPMeshNodeArray::read: p: " << current_p << std::endl;
guint max_column = 0;
guint irow = 0; // Corresponds to top of patch being read in.
- for ( SPObject *ro = mg->firstChild() ; ro ; ro = ro->getNext() ) {
+ for (auto& ro: mg->children) {
- if (SP_IS_MESHROW(ro)) {
+ if (SP_IS_MESHROW(&ro)) {
guint icolumn = 0; // Corresponds to left of patch being read in.
- for ( SPObject *po = ro->firstChild() ; po ; po = po->getNext() ) {
+ for (auto& po: ro.children) {
- if (SP_IS_MESHPATCH(po)) {
+ if (SP_IS_MESHPATCH(&po)) {
- SPMeshpatch *patch = SP_MESHPATCH(po);
+ SPMeshpatch *patch = SP_MESHPATCH(&po);
// std::cout << "SPMeshNodeArray::read: row size: " << nodes.size() << std::endl;
SPMeshPatchI new_patch( &nodes, irow, icolumn ); // Adds new nodes.
@@ -652,15 +727,15 @@ void SPMeshNodeArray::read( SPMesh *mg_in ) {
// Only 'top' side defined for first row.
if( irow != 0 ) ++istop;
- for ( SPObject *so = po->firstChild() ; so ; so = so->getNext() ) {
- if (SP_IS_STOP(so)) {
+ for (auto& so: po.children) {
+ if (SP_IS_STOP(&so)) {
if( istop > 3 ) {
// std::cout << " Mesh Gradient: Too many stops: " << istop << std::endl;
break;
}
- SPStop *stop = SP_STOP(so);
+ SPStop *stop = SP_STOP(&so);
// Handle top of first row.
if( istop == 0 && icolumn == 0 ) {
@@ -701,7 +776,7 @@ void SPMeshNodeArray::read( SPMesh *mg_in ) {
dp = Geom::Point( x, y );
new_patch.setPoint( istop, 3, current_p + dp );
} else {
- std::cout << "Failed to read l" << std::endl;
+ std::cerr << "Failed to read l" << std::endl;
}
}
// To facilitate some side operations, set handles to 1/3 and
@@ -723,7 +798,7 @@ void SPMeshNodeArray::read( SPMesh *mg_in ) {
p = Geom::Point( x, y );
new_patch.setPoint( istop, 3, p );
} else {
- std::cout << "Failed to read L" << std::endl;
+ std::cerr << "Failed to read L" << std::endl;
}
}
// To facilitate some side operations, set handles to 1/3 and
@@ -743,7 +818,7 @@ void SPMeshNodeArray::read( SPMesh *mg_in ) {
p += current_p;
new_patch.setPoint( istop, i, p );
} else {
- std::cout << "Failed to read c: " << i << std::endl;
+ std::cerr << "Failed to read c: " << i << std::endl;
}
}
break;
@@ -756,13 +831,13 @@ void SPMeshNodeArray::read( SPMesh *mg_in ) {
p = Geom::Point( x, y );
new_patch.setPoint( istop, i, p );
} else {
- std::cout << "Failed to read C: " << i << std::endl;
+ std::cerr << "Failed to read C: " << i << std::endl;
}
}
break;
default:
// should not reach
- std::cout << "Path Error: unhandled path type: " << path_type << std::endl;
+ std::cerr << "Path Error: unhandled path type: " << path_type << std::endl;
}
current_p = new_patch.getPoint( istop, 3 );
@@ -774,6 +849,7 @@ void SPMeshNodeArray::read( SPMesh *mg_in ) {
double opacity = stop->opacity;
new_patch.setColor( istop, color );
new_patch.setOpacity( istop, opacity );
+ new_patch.setStopPtr( istop, stop );
}
}
@@ -797,7 +873,7 @@ void SPMeshNodeArray::read( SPMesh *mg_in ) {
if( !os.fail() ) {
new_patch.setTensorPoint( i, new_patch.getPoint( i, 0 ) + Geom::Point( x, y ) );
} else {
- std::cout << "Failed to read p: " << i << std::endl;
+ std::cerr << "Failed to read p: " << i << std::endl;
break;
}
}
@@ -830,15 +906,15 @@ void SPMeshNodeArray::read( SPMesh *mg_in ) {
// std::cout << "SPMeshNodeArray::Read: result:" << std::endl;
// print();
- drag_valid = false;
built = true;
+ return same_size;
};
/**
Write repr using our array.
*/
-void SPMeshNodeArray::write( SPMesh *mg ) {
+void SPMeshNodeArray::write( SPMeshGradient *mg ) {
// std::cout << "SPMeshNodeArray::write: entrance:" << std::endl;
// print();
@@ -848,15 +924,15 @@ void SPMeshNodeArray::write( SPMesh *mg ) {
// First we must delete reprs for old mesh rows and patches.
GSList *descendant_reprs = NULL;
GSList *descendant_objects = NULL;
- for ( SPObject *row = mg->firstChild(); row; row = row->getNext() ) {
- descendant_reprs = g_slist_prepend (descendant_reprs, row->getRepr());
- descendant_objects = g_slist_prepend (descendant_objects, row );
- for ( SPObject *patch = row->firstChild(); patch; patch = patch->getNext() ) {
- descendant_reprs = g_slist_prepend (descendant_reprs, patch->getRepr());
- descendant_objects = g_slist_prepend (descendant_objects, patch );
- for ( SPObject *stop = patch->firstChild(); stop; stop = stop->getNext() ) {
- descendant_reprs = g_slist_prepend (descendant_reprs, stop->getRepr());
- descendant_objects = g_slist_prepend (descendant_objects, stop );
+ for (auto& row: mg->children) {
+ descendant_reprs = g_slist_prepend (descendant_reprs, row.getRepr());
+ descendant_objects = g_slist_prepend (descendant_objects, &row);
+ for (auto& patch: row.children) {
+ descendant_reprs = g_slist_prepend (descendant_reprs, patch.getRepr());
+ descendant_objects = g_slist_prepend (descendant_objects, &patch);
+ for (auto& stop: patch.children) {
+ descendant_reprs = g_slist_prepend (descendant_reprs, stop.getRepr());
+ descendant_objects = g_slist_prepend (descendant_objects, &stop);
}
}
}
@@ -967,10 +1043,10 @@ void SPMeshNodeArray::write( SPMesh *mg ) {
break;
case 'z':
case 'Z':
- std::cout << "sp_mesh_repr_write: bad path type" << path_type << std::endl;
+ std::cout << "SPMeshNodeArray::write(): bad path type" << path_type << std::endl;
break;
default:
- std::cout << "sp_mesh_repr_write: unhandled path type" << path_type << std::endl;
+ std::cout << "SPMeshNodeArray::write(): unhandled path type" << path_type << std::endl;
}
stop->setAttribute("path", is.str().c_str());
// std::cout << "SPMeshNodeArray::write: path: " << is.str().c_str() << std::endl;
@@ -1039,18 +1115,19 @@ static SPColor default_color( SPItem *item ) {
/**
Create a default mesh.
*/
-void SPMeshNodeArray::create( SPMesh *mg, SPItem *item, Geom::OptRect bbox ) {
+void SPMeshNodeArray::create( SPMeshGradient *mg, SPItem *item, Geom::OptRect bbox ) {
// std::cout << "SPMeshNodeArray::create: Entrance" << std::endl;
if( !bbox ) {
// Set default size to bounding box if size not given.
std::cout << "SPMeshNodeArray::create(): bbox empty" << std::endl;
- Geom::OptRect bbox = item->geometricBounds();
- }
- if( !bbox ) {
- std::cout << "SPMeshNodeArray::create: ERROR: No bounding box!" << std::endl;
- return;
+ bbox = item->geometricBounds();
+
+ if( !bbox ) {
+ std::cout << "SPMeshNodeArray::create: ERROR: No bounding box!" << std::endl;
+ return;
+ }
}
Geom::Coord const width = bbox->dimensions()[Geom::X];
@@ -1414,6 +1491,7 @@ void SPMeshNodeArray::print() {
<< " Node edge: " << nodes[i][j]->node_edge
<< " Set: " << nodes[i][j]->set
<< " Path type: " << nodes[i][j]->path_type
+ << " Stop: " << nodes[i][j]->stop
<< std::endl;
} else {
std::cout << "Error: missing mesh node." << std::endl;
@@ -1775,7 +1853,9 @@ guint SPMeshNodeArray::patch_rows() {
Number of patch columns.
*/
guint SPMeshNodeArray::patch_columns() {
-
+ if (nodes.empty()) {
+ return 0;
+ }
return nodes[0].size()/3;
}
@@ -2344,7 +2424,11 @@ guint SPMeshNodeArray::color_pick( std::vector<guint> icorners, SPItem* item ) {
*/
void SPMeshNodeArray::update_handles( guint corner, std::vector< guint > /*selected*/, Geom::Point p_old, MeshNodeOperation /*op*/ )
{
- assert( drag_valid );
+ if (!draggers_valid) {
+ std::cerr << "SPMeshNodeArray::update_handles: Draggers not valid!" << std::endl;
+ return;
+ }
+ // assert( draggers_valid );
// std::cout << "SPMeshNodeArray::update_handles: "
// << " corner: " << corner
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 03:03:31 +0000