Fix icons#11
Conversation
ZGainsforth
left a comment
ZGainsforth
left a comment
There was a problem hiding this comment.
I think this will require a change to stoichwebapp and stoichiometryfitter since we will be returning a plotly figure in both cases.
| # @app.route('/') | ||
| # def notdash(): | ||
| # df = pd.DataFrame({ | ||
| # 'Fruit': ['Apples', 'Oranges', 'Bananas', 'Apples', 'Oranges', |
There was a problem hiding this comment.
This part shouldn't be checked in.
| ProtosolarChondricity = ProtosolarToFe | ||
|
|
||
| GEMSAtPct, GEMSAtPctSD = GEMSPlot(AtPct, ProtosolarToSi) | ||
| GEMSAtPct, GEMSAtPctSD= GEMSPlot(AtPct, ProtosolarToSi) |
There was a problem hiding this comment.
I prefer the space before the =
|
|
||
| return Chondricity, ElementSigma, GEMSChiSqRed, DOF | ||
|
|
||
| def GEMSChiPlotWeb(AtPct, Protosolar): |
There was a problem hiding this comment.
There should be only one ChiPlot function which is the same for web and wxpython. In both cases, we should return the plotly figure. If in wxpython, the fig.show auto-loads a browser, I think. If in web, then it can be embedded in the gui. But you don't want to fork code like this or a single change requires changes in two locations.
ZGainsforth
left a comment
ZGainsforth
left a comment
There was a problem hiding this comment.
I think this will require a change to stoichwebapp and stoichiometryfitter since we will be returning a plotly figure in both cases.
|
Alas, the icons and the GEMS phase commits are both in the same pull request. Because other work has been done in the meantime on the phase files, approving this pull request for the icon stuff would break the phase file stuff. You should go in and drop the phase commit, or else do a new pull request with just the icons. Incidentally, this is a good example of why you want to think of commits and pull requests as atomic actions. Essentially, everything that is necessary for a certain feature is included, and nothing else is included. This allows features to be worked on in parallel without tripping on each other. With larger teams this becomes really important. It's less important on a project this size. |
2 participants
Fix github icons and title icons