[Bf-blender-cvs] [a262ea8c47f] master: Cleanup: trailing space for compositor
Campbell Barton
noreply at git.blender.org
Sun Jun 17 17:07:16 CEST 2018
Commit: a262ea8c47f8106f66e16935c556f383ef306861
Author: Campbell Barton
Date: Sun Jun 17 17:05:29 2018 +0200
Branches: master
https://developer.blender.org/rBa262ea8c47f8106f66e16935c556f383ef306861
Cleanup: trailing space for compositor
===================================================================
M source/blender/compositor/intern/COM_ChunkOrder.h
M source/blender/compositor/intern/COM_CompositorContext.h
M source/blender/compositor/intern/COM_Converter.cpp
M source/blender/compositor/intern/COM_Converter.h
M source/blender/compositor/intern/COM_Debug.cpp
M source/blender/compositor/intern/COM_Debug.h
M source/blender/compositor/intern/COM_Device.h
M source/blender/compositor/intern/COM_ExecutionGroup.cpp
M source/blender/compositor/intern/COM_ExecutionGroup.h
M source/blender/compositor/intern/COM_ExecutionSystem.cpp
M source/blender/compositor/intern/COM_ExecutionSystem.h
M source/blender/compositor/intern/COM_MemoryBuffer.h
M source/blender/compositor/intern/COM_MemoryProxy.h
M source/blender/compositor/intern/COM_Node.cpp
M source/blender/compositor/intern/COM_Node.h
M source/blender/compositor/intern/COM_NodeConverter.cpp
M source/blender/compositor/intern/COM_NodeConverter.h
M source/blender/compositor/intern/COM_NodeGraph.cpp
M source/blender/compositor/intern/COM_NodeGraph.h
M source/blender/compositor/intern/COM_NodeOperation.cpp
M source/blender/compositor/intern/COM_NodeOperation.h
M source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
M source/blender/compositor/intern/COM_NodeOperationBuilder.h
M source/blender/compositor/intern/COM_OpenCLDevice.cpp
M source/blender/compositor/intern/COM_OpenCLDevice.h
M source/blender/compositor/intern/COM_SingleThreadedOperation.cpp
M source/blender/compositor/intern/COM_SingleThreadedOperation.h
M source/blender/compositor/intern/COM_WorkScheduler.cpp
M source/blender/compositor/intern/COM_WorkScheduler.h
M source/blender/compositor/intern/COM_compositor.cpp
M source/blender/compositor/nodes/COM_AlphaOverNode.cpp
M source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
M source/blender/compositor/nodes/COM_BlurNode.cpp
M source/blender/compositor/nodes/COM_BokehBlurNode.cpp
M source/blender/compositor/nodes/COM_BokehImageNode.cpp
M source/blender/compositor/nodes/COM_BoxMaskNode.cpp
M source/blender/compositor/nodes/COM_BrightnessNode.cpp
M source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
M source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
M source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
M source/blender/compositor/nodes/COM_ColorCurveNode.cpp
M source/blender/compositor/nodes/COM_ColorMatteNode.cpp
M source/blender/compositor/nodes/COM_ColorNode.cpp
M source/blender/compositor/nodes/COM_ColorRampNode.cpp
M source/blender/compositor/nodes/COM_ColorSpillNode.cpp
M source/blender/compositor/nodes/COM_ColorToBWNode.cpp
M source/blender/compositor/nodes/COM_CombineColorNode.cpp
M source/blender/compositor/nodes/COM_CombineColorNode.h
M source/blender/compositor/nodes/COM_CompositorNode.cpp
M source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
M source/blender/compositor/nodes/COM_CornerPinNode.cpp
M source/blender/compositor/nodes/COM_CropNode.cpp
M source/blender/compositor/nodes/COM_DefocusNode.cpp
M source/blender/compositor/nodes/COM_DespeckleNode.cpp
M source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
M source/blender/compositor/nodes/COM_DilateErodeNode.cpp
M source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
M source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
M source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
M source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
M source/blender/compositor/nodes/COM_FilterNode.cpp
M source/blender/compositor/nodes/COM_FlipNode.cpp
M source/blender/compositor/nodes/COM_GammaNode.cpp
M source/blender/compositor/nodes/COM_GlareNode.cpp
M source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
M source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
M source/blender/compositor/nodes/COM_IDMaskNode.cpp
M source/blender/compositor/nodes/COM_ImageNode.cpp
M source/blender/compositor/nodes/COM_InpaintNode.cpp
M source/blender/compositor/nodes/COM_InvertNode.cpp
M source/blender/compositor/nodes/COM_KeyingNode.cpp
M source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
M source/blender/compositor/nodes/COM_LensDistortionNode.cpp
M source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
M source/blender/compositor/nodes/COM_MapRangeNode.cpp
M source/blender/compositor/nodes/COM_MapUVNode.cpp
M source/blender/compositor/nodes/COM_MapValueNode.cpp
M source/blender/compositor/nodes/COM_MathNode.cpp
M source/blender/compositor/nodes/COM_MixNode.cpp
M source/blender/compositor/nodes/COM_MovieClipNode.cpp
M source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
M source/blender/compositor/nodes/COM_NormalNode.cpp
M source/blender/compositor/nodes/COM_OutputFileNode.cpp
M source/blender/compositor/nodes/COM_PixelateNode.cpp
M source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp
M source/blender/compositor/nodes/COM_RotateNode.cpp
M source/blender/compositor/nodes/COM_ScaleNode.cpp
M source/blender/compositor/nodes/COM_SeparateColorNode.cpp
M source/blender/compositor/nodes/COM_SeparateColorNode.h
M source/blender/compositor/nodes/COM_SetAlphaNode.cpp
M source/blender/compositor/nodes/COM_SocketProxyNode.cpp
M source/blender/compositor/nodes/COM_SocketProxyNode.h
M source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
M source/blender/compositor/nodes/COM_SwitchNode.cpp
M source/blender/compositor/nodes/COM_TextureNode.cpp
M source/blender/compositor/nodes/COM_TimeNode.cpp
M source/blender/compositor/nodes/COM_TonemapNode.cpp
M source/blender/compositor/nodes/COM_TrackPositionNode.cpp
M source/blender/compositor/nodes/COM_TransformNode.cpp
M source/blender/compositor/nodes/COM_TranslateNode.cpp
M source/blender/compositor/nodes/COM_ValueNode.cpp
M source/blender/compositor/nodes/COM_VectorBlurNode.cpp
M source/blender/compositor/nodes/COM_VectorCurveNode.cpp
M source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
M source/blender/compositor/nodes/COM_ZCombineNode.cpp
M source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
M source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
M source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
M source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
M source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
M source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
M source/blender/compositor/operations/COM_AntiAliasOperation.h
M source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
M source/blender/compositor/operations/COM_BilateralBlurOperation.h
M source/blender/compositor/operations/COM_BlurBaseOperation.h
M source/blender/compositor/operations/COM_BokehBlurOperation.cpp
M source/blender/compositor/operations/COM_BokehBlurOperation.h
M source/blender/compositor/operations/COM_BokehImageOperation.h
M source/blender/compositor/operations/COM_BoxMaskOperation.cpp
M source/blender/compositor/operations/COM_BoxMaskOperation.h
M source/blender/compositor/operations/COM_BrightnessOperation.h
M source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
M source/blender/compositor/operations/COM_CalculateMeanOperation.h
M source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
M source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
M source/blender/compositor/operations/COM_ChangeHSVOperation.h
M source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
M source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
M source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
M source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
M source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
M source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
M source/blender/compositor/operations/COM_ColorCorrectionOperation.h
M source/blender/compositor/operations/COM_ColorCurveOperation.cpp
M source/blender/compositor/operations/COM_ColorCurveOperation.h
M source/blender/compositor/operations/COM_ColorRampOperation.h
M source/blender/compositor/operations/COM_ColorSpillOperation.cpp
M source/blender/compositor/operations/COM_ColorSpillOperation.h
M source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
M source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
M source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
M source/blender/compositor/operations/COM_ConvertOperation.h
M source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
M source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
M source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
M source/blender/compositor/operations/COM_CropOperation.cpp
M source/blender/compositor/operations/COM_CropOperation.h
M source/blender/compositor/operations/COM_CurveBaseOperation.h
M source/blender/compositor/operations/COM_DifferenceMatteOperation.h
M source/blender/compositor/operations/COM_DilateErodeOperation.cpp
M source/blender/compositor/operations/COM_DilateErodeOperation.h
M source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
M source/blender/compositor/operations/COM_DirectionalBlurOperation.h
M source/blender/compositor/operations/COM_DisplaceOperation.cpp
M source/blender/compositor/operations/COM_DisplaceOperation.h
M source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
M source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
M source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cpp
M source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h
M source/blender/compositor/operations/COM_DotproductOperation.h
M source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
M source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
M source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
M source/blender/compositor/operations/COM_EllipseMaskOperation.h
M source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
M source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
M source/blender/compositor/operations/COM_FlipOperation.cpp
M source/blender/compositor/operations/COM_FlipOperation.h
M source/blender/compositor/operations/COM_GammaCorrectOperation.h
M source/blender/compositor/operations/COM_GammaOperation.cpp
M source/blender/compositor/operations/COM_GammaOperation.h
M source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
M source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
M source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
M source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
M source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
M source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
M source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
M source/blender/compositor/operations/COM_GaussianXBlurOperation.h
M source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
M source/blender/compositor/operations/COM_GaussianYBlurOperation.h
M source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
M source/blender/compositor/operations/COM_GlareThresholdOperation.h
M source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
M source/blender/compositor/operations/COM_ImageOperation.h
M source/blender/compositor/operations/COM_InpaintOperation.cpp
M source/blender/compositor/operations/COM_InpaintOperation.h
M source/blender/compositor/operations/COM_InvertOperation.cpp
M source/blender/compositor/operations/COM_InvertOperation.h
M source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
M source/blender/compositor/operations/COM_LuminanceMatteOperation.h
M source/blender/compositor/operations/COM_MapRangeOperation.cpp
M source/blender/compositor/operations/COM_MapRangeOperation.h
M source/blender/compositor/operations/COM_MapUVOperation.cpp
M source/blender/compositor/operations/COM_MapUVOperation.h
M source/blender/compositor/operations/COM_MapValueOperation.cpp
M source/blender/compositor/operations/COM_MapValueOperation.h
M source/blender/compositor/operations/COM_MathBaseOperation.cpp
M source/blender/compositor/operations/COM_MathBaseOperation.h
M source/blender/compositor/operations/COM_MixOperation.cpp
M source/blender/compositor/operations/COM_MixOperation.h
M source/blender/compositor/operations/COM_MovieClipOperation.h
M source/blender/compositor/operations/COM_NormalizeOperation.cpp
M source/blender/compositor/operations/COM_OutputFileOperation.cpp
M source/blender/compositor/operations/COM_OutputFileOperation.h
M source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp
M source/blender/compositor/operations/COM_PlaneCornerPinOperation.h
M source/blender/compositor/operations/COM_PreviewOperation.cpp
M source/blender/compositor/operations/COM_PreviewOperation.h
M source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
M source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
M source/blender/compositor/operations/COM_ReadBufferOperation.cpp
M source/blender/compositor/operations/COM_ReadBufferOperation.h
M source/blender/compositor/operations/COM_RenderLayersProg.cpp
M source/blender/compositor/operations/COM_RotateOperation.cpp
M source/blender/compositor/operations/COM_RotateOperation.h
M source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
M source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
M source/blender/compositor/operations/COM_SetAlphaOperation.cpp
M source/blender/compositor/operations/COM_SetAlphaOperation.h
M source/blender/compositor/operations/COM_SetSamplerOperation.h
M source/blender/compositor/operations/COM_SetValueOperation.h
M source/blender/compositor/operations/COM_SetVectorOperation.h
M source/blender/compositor/operations/COM_SocketProxyOperation.h
M source/blender/compositor/operations/COM_SunBeamsOperation.cpp
M source/blender/compositor/operations/COM_TextureOperation.h
M source/blender/compositor/operations/COM_TonemapOperation.h
M source/blender/compositor/operations/COM_TranslateOperation.h
M source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
M source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
M source/blender/compositor/operations/COM_VectorBlurOperation.h
M source/blender/compositor/operations/COM_VectorCurveOperation.h
M source/blender/compositor/operations/COM_ViewerOperation.cpp
M source/blender/compositor/operations/COM_ViewerOperation.h
M source/blender/compositor/operations/COM_WriteBufferOperation.cpp
M source/blender/compositor/operations/COM_WriteBufferOperation.h
M source/blender/compositor/operations/COM_ZCombineOperation.h
===================================================================
diff --git a/source/blender/compositor/intern/COM_ChunkOrder.h b/source/blender/compositor/intern/COM_ChunkOrder.h
index 0310933e5c5..4728b771e3c 100644
--- a/source/blender/compositor/intern/COM_ChunkOrder.h
+++ b/source/blender/compositor/intern/COM_ChunkOrder.h
@@ -34,7 +34,7 @@ public:
ChunkOrder();
void determineDistance(ChunkOrderHotspot **hotspots, unsigned int numberOfHotspots);
friend bool operator<(const ChunkOrder &a, const ChunkOrder &b);
-
+
void setChunkNumber(unsigned int chunknumber) { this->m_number = chunknumber; }
void setX(int x) { this->m_x = x; }
void setY(int y) { this->m_y = y; }
diff --git a/source/blender/compositor/intern/COM_CompositorContext.h b/source/blender/compositor/intern/COM_CompositorContext.h
index d58e8502414..1c702503915 100644
--- a/source/blender/compositor/intern/COM_CompositorContext.h
+++ b/source/blender/compositor/intern/COM_CompositorContext.h
@@ -126,7 +126,7 @@ public:
* @brief get the scene of the context
*/
const RenderData *getRenderData() const { return this->m_rd; }
-
+
void setScene(Scene *scene) { m_scene = scene; }
Scene *getScene() const { return m_scene; }
@@ -196,7 +196,7 @@ public:
void setViewName(const char *viewName) { this->m_viewName = viewName; }
int getChunksize() const { return this->getbNodeTree()->chunksize; }
-
+
void setFastCalculation(bool fastCalculation) {this->m_fastCalculation = fastCalculation;}
bool isFastCalculation() const { return this->m_fastCalculation; }
bool isGroupnodeBufferEnabled() const { return (this->getbNodeTree()->flag & NTREE_COM_GROUPNODE_BUFFER) != 0; }
diff --git a/source/blender/compositor/intern/COM_Converter.cpp b/source/blender/compositor/intern/COM_Converter.cpp
index 3d49443c146..58e0da04e5e 100644
--- a/source/blender/compositor/intern/COM_Converter.cpp
+++ b/source/blender/compositor/intern/COM_Converter.cpp
@@ -414,7 +414,7 @@ NodeOperation *Converter::convertDataType(NodeOperationOutput *from, NodeOperati
{
DataType fromDatatype = from->getDataType();
DataType toDatatype = to->getDataType();
-
+
if (fromDatatype == COM_DT_VALUE && toDatatype == COM_DT_COLOR) {
return new ConvertValueToColorOperation();
}
@@ -433,7 +433,7 @@ NodeOperation *Converter::convertDataType(NodeOperationOutput *from, NodeOperati
else if (fromDatatype == COM_DT_VECTOR && toDatatype == COM_DT_COLOR) {
return new ConvertVectorToColorOperation();
}
-
+
return NULL;
}
diff --git a/source/blender/compositor/intern/COM_Converter.h b/source/blender/compositor/intern/COM_Converter.h
index 7ed5616d899..b57220351e8 100644
--- a/source/blender/compositor/intern/COM_Converter.h
+++ b/source/blender/compositor/intern/COM_Converter.h
@@ -50,14 +50,14 @@ public:
* @see Node
*/
static Node *convert(bNode *b_node);
-
+
/**
* @brief True if the node is considered 'fast'.
*
* Slow nodes will be skipped if fast execution is required.
*/
static bool is_fast_node(bNode *b_node);
-
+
/**
* @brief This method will add a datetype conversion rule when the to-socket does not support the from-socket actual data type.
*
@@ -68,7 +68,7 @@ public:
* @see NodeLink - a link between two sockets
*/
static NodeOperation *convertDataType(NodeOperationOutput *from, NodeOperationInput *to);
-
+
/**
* @brief This method will add a resolution rule based on the settings of the NodeInput.
*
diff --git a/source/blender/compositor/intern/COM_Debug.cpp b/source/blender/compositor/intern/COM_Debug.cpp
index b95b7500cca..6179bd26275 100644
--- a/source/blender/compositor/intern/COM_Debug.cpp
+++ b/source/blender/compositor/intern/COM_Debug.cpp
@@ -118,7 +118,7 @@ void DebugInfo::execution_group_finished(const ExecutionGroup *group)
int DebugInfo::graphviz_operation(const ExecutionSystem *system, const NodeOperation *operation, const ExecutionGroup *group, char *str, int maxlen)
{
int len = 0;
-
+
std::string fillcolor = "gainsboro";
if (operation->isViewerOperation()) {
const ViewerOperation *viewer = (const ViewerOperation *)operation;
@@ -141,14 +141,14 @@ int DebugInfo::graphviz_operation(const ExecutionSystem *system, const NodeOpera
else if (operation->isWriteBufferOperation()) {
fillcolor = "darkorange";
}
-
+
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "// OPERATION: %p\r\n", operation);
if (group)
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "\"O_%p_%p\"", operation, group);
else
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "\"O_%p\"", operation);
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, " [fillcolor=%s,style=filled,shape=record,label=\"{", fillcolor.c_str());
-
+
int totinputs = operation->getNumberOfInputSockets();
if (totinputs != 0) {
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "{");
@@ -173,11 +173,11 @@ int DebugInfo::graphviz_operation(const ExecutionSystem *system, const NodeOpera
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "}");
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "|");
}
-
+
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "%s\\n(%s)", m_op_names[operation].c_str(), typeid(*operation).name());
-
+
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, " (%u,%u)", operation->getWidth(), operation->getHeight());
-
+
int totoutputs = operation->getNumberOfOutputSockets();
if (totoutputs != 0) {
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "|");
@@ -204,7 +204,7 @@ int DebugInfo::graphviz_operation(const ExecutionSystem *system, const NodeOpera
}
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "}\"]");
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "\r\n");
-
+
return len;
}
@@ -233,7 +233,7 @@ int DebugInfo::graphviz_legend_group(const char *name, const char *color, const
int DebugInfo::graphviz_legend(char *str, int maxlen)
{
int len = 0;
-
+
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "{\r\n");
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "rank = sink;\r\n");
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Legend [shape=none, margin=0, label=<\r\n");
@@ -266,12 +266,12 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma
{
char strbuf[64];
int len = 0;
-
+
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "digraph compositorexecution {\r\n");
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "ranksep=1.5\r\n");
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "rankdir=LR\r\n");
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "splines=false\r\n");
-
+
#if 0
for (ExecutionSystem::Operations::const_iterator it = system->m_operations.begin();
it != system->m_operations.end(); ++it) {
@@ -279,13 +279,13 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "// OPERATION: %s\r\n", node->getbNode()->typeinfo->ui_name);
}
#endif
-
+
int totops = system->m_operations.size();
int totgroups = system->m_groups.size();
std::map<NodeOperation *, std::vector<std::string> > op_groups;
for (int i = 0; i < totgroups; ++i) {
const ExecutionGroup *group = system->m_groups[i];
-
+
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "// GROUP: %d\r\n", i);
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "subgraph cluster_%d{\r\n", i);
/* used as a check for executing group */
@@ -302,41 +302,41 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "color=black\r\n");
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "fillcolor=chartreuse4\r\n");
}
-
+
for (ExecutionGroup::Operations::const_iterator it = group->m_operations.begin(); it != group->m_operations.end(); ++it) {
NodeOperation *operation = *it;
-
+
sprintf(strbuf, "_%p", group);
op_groups[operation].push_back(std::string(strbuf));
-
+
len += graphviz_operation(system, operation, group, str + len, maxlen > len ? maxlen - len : 0);
}
-
+
// len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "// OUTPUTOPERATION: %p\r\n", group->getOutputOperation());
// len += snprintf(str+len, maxlen>len ? maxlen-len : 0, " O_%p\r\n", group->getOutputOperation());
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "}\r\n");
}
-
+
/* operations not included in any group */
for (int j = 0; j < totops; ++j) {
NodeOperation *operation = system->m_operations[j];
if (op_groups.find(operation) != op_groups.end())
continue;
-
+
op_groups[operation].push_back(std::string(""));
-
+
len += graphviz_operation(system, operation, 0, str + len, maxlen > len ? maxlen - len : 0);
}
-
+
for (int i = 0; i < totops; i++) {
NodeOperation *operation = system->m_operations[i];
-
+
if (operation->isReadBufferOperation()) {
ReadBufferOperation *read = (ReadBufferOperation *)operation;
WriteBufferOperation *write = read->getMemoryProxy()->getWriteBufferOperation();
std::vector<std::string> &read_groups = op_groups[read];
std::vector<std::string> &write_groups = op_groups[write];
-
+
for (int k = 0; k < write_groups.size(); ++k) {
for (int l = 0; l < read_groups.size(); ++l) {
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "\"O_%p%s\" -> \"O_%p%s\" [style=dotted]\r\n", write, write_groups[k].c_str(), read, read_groups[l].c_str());
@@ -344,17 +344,17 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma
}
}
}
-
+
for (int i = 0; i < totops; i++) {
NodeOperation *op = system->m_operations[i];
-
+
for (NodeOperation::Inputs::const_iterator it = op->m_inputs.begin(); it != op->m_inputs.end(); ++it) {
NodeOperationInput *to = *it;
NodeOperationOutput *from = to->getLink();
-
+
if (!from)
continue;
-
+
std::string color;
switch (from->getDataType()) {
case COM_DT_VALUE:
@@ -367,12 +367,12 @@ bool DebugInfo::graphviz_system(con
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list