Commits

Pam Ford authored fa208ca1a52
Improve plotms indexing for connecting points
No tags

code/plotms/Actions/ActionCacheLoad.cc

Modified
111 111 }
112 112 }
113 113 }*/
114 114 return valid;
115 115 }
116 116
117 117 void ActionCacheLoad::setUpWorkParameters(CacheThread* cacheThread, int plotIndex, vector<PMS::Axis>& axes){
118 118
119 119 PlotMSPlotParameters& params = plots[plotIndex]->parameters();
120 120 PMS_PP_MSData* paramsData = params.typedGroup<PMS_PP_MSData>();
121 - PMS_PP_Display* paramsDisplay = params.typedGroup<PMS_PP_Display>();
122 121
123 122 if ( cacheThread != NULL ){
124 123 cacheThread->setLoad(true);
125 124 cacheThread->setCacheBase(&plots[plotIndex]->cache());
126 125 if ( cachedData.size() == 0 ){
127 126 cacheThread->setAxesData( axes.size() );
128 127 }
129 128 else {
130 129 cacheThread->setAxesData( cachedData[plotIndex] );
131 130 }
132 131
133 132 cacheThread->setPlot(plots[plotIndex]);
134 133 cacheThread->setName( paramsData->filename() );
135 134 cacheThread->setSelection( paramsData->selection() );
136 135 cacheThread->setAveraging( paramsData->averaging() );
137 136 cacheThread->setTransformations(paramsData->transformations());
138 137 cacheThread->setCalibration(paramsData->calibration());
139 - cacheThread->setXConnect(paramsDisplay->xConnect(plotIndex));
140 - cacheThread->setTimeConnect(paramsDisplay->timeConnect(plotIndex));
141 138 cacheThread->setSetupPlot( setupPlot );
142 139 }
143 140 }
144 141
145 142 bool ActionCacheLoad::loadAxes() {
146 143 bool axesLoaded = false;
147 144 if ( client != NULL ){
148 145 //Only get the axes from the client if they
149 146 //have not already been specified.
150 147 if ( axes.size() == 0 ){

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut